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 001/288] =?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 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 002/288] [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 bb118fae427b05ab8c935d756aee5dafa14dec1b Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 6 Jul 2012 19:36:16 +0530
Subject: [PATCH 003/288] [IMP]hr_holidays : view are improved

bzr revid: hsa@tinyerp.com-20120706140616-nylt94v652w9k2eg
---
 addons/hr_holidays/hr_holidays.py       |  3 +-
 addons/hr_holidays/hr_holidays_view.xml | 70 ++++++++++---------------
 2 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index a1ab0ae04f3..84bdab4ad99 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -111,7 +111,7 @@ class hr_holidays(osv.osv):
         return result
 
     _columns = {
-        'name': fields.char('Description', required=True, size=64),
+        'name': fields.text('Description'),
         'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')],
             'State', readonly=True, help='The state is set to \'To Submit\', when a holiday request is created.\
             \nThe state is \'To Approve\', when holiday request is confirmed by user.\
@@ -125,7 +125,6 @@ class hr_holidays(osv.osv):
         #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         #'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
         'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
-        'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True),
         'case_id': fields.many2one('crm.meeting', 'Meeting'),
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1237cdb14f4..287ec8c83e6 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -112,39 +112,32 @@
                 <sheet string="Leave Request">
                     <group>
                         <group>
-                            <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
+                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                                <label for="number_of_days_temp" string="Duration"/>
+                                <group col="3">
+                                    <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1" nolabel="1" class="oe_online"/>
+                                    <label string="-"/>
+                                    <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1" nolabel="1" class="oe_online"/>
+                                    <div><field name="number_of_days_temp" nolabel="1" class="oe_inline"/> <label string="days" class="oe_inline"/></div>
+                                </group>
+                        </group>
+                        <group>
                             <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
                             <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                             <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
                             <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                         </group>
+                    </group>
+                    <group>
                         <group>
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
-                            <label for="number_of_days_temp" string="Duration"/>
-                            <div>
-                                <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/> - 
-                                <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/>
-                                <div>
-                                    <field name="number_of_days_temp" class="oe_inline"/> days
-                                </div>
-                            </div>
+                            <field name="double_validation" invisible="1"/>
+                        </group>
+                        <group>
+                            <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
                         </group>
                     </group>
-                    <notebook colspan="4">
-                        <page string="General">
-                            <group>
-                                <group>
-                                    <field name="manager_id" groups="base.group_no_one"/>
-                                    <field name="double_validation" invisible="1"/>
-                                </group>
-                                <group>
-                                    <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
-                                </group>
-                            </group>
-                            <newline/>
-                            <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
-                        </page>
-                    </notebook>
+                    <newline/>
+                    <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                 </sheet>
                 <footer>
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -171,27 +164,21 @@
                 <sheet>
                     <group>
                         <group>
-                            <field name="name"/>
+                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                            <field name="number_of_days_temp"/>
+                        </group>
+                        <group>
                             <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
                             <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
                             <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')], 'invisible':[('holiday_type','=','employee')]}"/>
                             <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
                         </group>
-                        <group>
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
-                            <field name="number_of_days_temp"/>
-                        </group>
                     </group>
-                    <notebook>
-                        <page string="General">
-                            <group col="4">
-                                <field name="double_validation" invisible="1"/>
-                                <field name="manager_id"/>
-                                <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
-                            </group>
-                            <field name="notes" placeholder="Add a reason..."/>
-                        </page>
-                    </notebook>
+                    <group>
+                        <field name="double_validation" invisible="1"/>
+                        <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
+                    </group>
+                    <field name="name"/>
                 </sheet>
                 <footer>
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -237,7 +224,6 @@
                         <field name="state"/>
                     </header>
                     <group col="4">
-                        <field name="name"/>
                         <field name="holiday_status_id"/>
                         <field name="type"/>
                         <field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
@@ -245,7 +231,7 @@
                         <field name="number_of_days_temp"/>
                         <field name="manager_id"/>
                     </group>
-                    <field name="notes"/>
+                    <field name="name"/>
                 </form>
             </field>
         </record>

From 1fdba1d67b3e7b0e1c04656c56615a496ae3825c Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Mon, 9 Jul 2012 10:30:40 +0530
Subject: [PATCH 004/288] [IMP]hr_holidays-view

bzr revid: pna@tinyerp.com-20120709050040-z6stbyyudbh341vy
---
 addons/hr_holidays/hr_holidays_demo.xml     |  5 +---
 addons/hr_holidays/hr_holidays_view.xml     | 27 +++++++++------------
 addons/hr_holidays/hr_holidays_workflow.xml |  2 +-
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index 6ad5a442a38..fb89fc98185 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -12,7 +12,7 @@
 
     <record model="hr.holidays" id="hr_holidays_employee1_cl">
       <field name="name">Trip with Family</field>
-      <field name="holiday_status_id" ref="holiday_status_cl"/>
+      <field name="holiday_status_id" ref="holiday_status_sl"/>
       <field eval="time.strftime('%Y-%m-01')" name="date_from"/>
       <field eval="time.strftime('%Y-%m-03')" name="date_to"/>
       <field name="type">remove</field>
@@ -52,13 +52,10 @@
       <field name="employee_id" ref="hr.employee_fp"/>
     </record>
 
-    <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
     <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
 
-    <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
     <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
 
-    <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_int_tour"/>
     <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_int_tour"/>
   </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1237cdb14f4..4d23159be0a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -102,7 +102,6 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager" class="oe_highlight"/>
@@ -111,30 +110,29 @@
                 </header>
                 <sheet string="Leave Request">
                     <group>
-                        <group>
-                            <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
-                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
-                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
-                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
-                        </group>
                         <group>
                             <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <label for="number_of_days_temp" string="Duration"/>
                             <div>
-                                <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/> - 
-                                <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/>
+                                <group col="3">
+                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/><label string="-" class="oe_inline" /> 
+                                    <field name="date_to" nolabel="1" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/>
+                                </group>
                                 <div>
                                     <field name="number_of_days_temp" class="oe_inline"/> days
                                 </div>
                             </div>
+                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
+                        </group>
+                        <group>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
+                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
+                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                         </group>
                     </group>
-                    <notebook colspan="4">
-                        <page string="General">
+                    <group colspan="4">
                             <group>
                                 <group>
-                                    <field name="manager_id" groups="base.group_no_one"/>
                                     <field name="double_validation" invisible="1"/>
                                 </group>
                                 <group>
@@ -143,8 +141,7 @@
                             </group>
                             <newline/>
                             <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
-                        </page>
-                    </notebook>
+                    </group>
                 </sheet>
                 <footer>
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index 7013d62a5ed..48f871618c3 100644
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -53,7 +53,7 @@
     <record model="workflow.transition" id="t1">
         <field name="act_from" ref="act_draft" />
         <field name="act_to" ref="act_confirm" />
-        <field name="signal">confirm</field>
+        <field name="signal"></field>
     </record>
 
     <record model="workflow.transition" id="t2">

From 34869c7348f30436f6312728c3e453eefc850f06 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Mon, 9 Jul 2012 11:18:43 +0530
Subject: [PATCH 005/288] [IMP]hr_holidays : view are improved and notes field
 removed

bzr revid: hsa@tinyerp.com-20120709054843-2k8p5jkkejl8rgbs
---
 addons/hr_holidays/hr_holidays.py       | 2 +-
 addons/hr_holidays/hr_holidays_view.xml | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 84bdab4ad99..35686ffa021 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -274,7 +274,7 @@ class hr_holidays(osv.osv):
                     'name': record.name,
                     'categ_id': record.holiday_status_id.categ_id.id,
                     'duration': record.number_of_days_temp * 8,
-                    'description': record.notes,
+                    'description': record.name,
                     'user_id': record.user_id.id,
                     'date': record.date_from,
                     'end_date': record.date_to,
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 287ec8c83e6..453e76fc4bb 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -118,7 +118,10 @@
                                     <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1" nolabel="1" class="oe_online"/>
                                     <label string="-"/>
                                     <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1" nolabel="1" class="oe_online"/>
-                                    <div><field name="number_of_days_temp" nolabel="1" class="oe_inline"/> <label string="days" class="oe_inline"/></div>
+                                    <div>
+                                        <field name="number_of_days_temp" nolabel="1" class="oe_inline"/> 
+                                        <label string="days" class="oe_inline"/>
+                                    </div>
                                 </group>
                         </group>
                         <group>

From fb377c440e245bb7c06325c8ffb3cfdedf4dd72d Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 9 Jul 2012 15:53:03 +0530
Subject: [PATCH 006/288] [IMP] add placeholder and lit demo file changes

bzr revid: dbr@tinyerp.com-20120709102303-38nb5yg46f5q61wd
---
 addons/hr_holidays/hr_holidays_demo.xml | 2 +-
 addons/hr_holidays/hr_holidays_view.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index fb89fc98185..4c9d18683c7 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -12,7 +12,7 @@
 
     <record model="hr.holidays" id="hr_holidays_employee1_cl">
       <field name="name">Trip with Family</field>
-      <field name="holiday_status_id" ref="holiday_status_sl"/>
+      <field name="holiday_status_id" ref="holiday_status_comp"/>
       <field eval="time.strftime('%Y-%m-01')" name="date_from"/>
       <field eval="time.strftime('%Y-%m-03')" name="date_to"/>
       <field name="type">remove</field>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 01500d2fb63..9a6784bc8bc 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -140,7 +140,7 @@
                                 </group>
                             </group>
                             <newline/>
-                            <field name="name" nolabel="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
+                            <field name="name" nolabel="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" placeholder="Add a reason..."/>
                     </group>
                 </sheet>
                 <footer>
@@ -182,7 +182,7 @@
                         <field name="double_validation" invisible="1"/>
                         <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                     </group>
-                    <field name="name"/>
+                    <field name="name" placeholder="Add a reason..."/>
                 </sheet>
                 <footer>
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -235,7 +235,7 @@
                         <field name="number_of_days_temp"/>
                         <field name="manager_id"/>
                     </group>
-                    <field name="name"/>
+                    <field name="name" placeholder="Add a reason..."/>
                 </form>
             </field>
         </record>

From 5beaabfe3bad6e56d5a9140bdae900f60cb00db6 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 10 Jul 2012 10:36:39 +0530
Subject: [PATCH 007/288] [IMP]Improve on_change name

bzr revid: dbr@tinyerp.com-20120710050639-3f1mky0yfqgwowfm
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9a6784bc8bc..a3bf5f23b86 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -111,7 +111,7 @@
                 <sheet string="Leave Request">
                     <group>
                         <group>
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                            <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <label for="number_of_days_temp" string="Duration"/>
                             <div>
                                 <group col="3">

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 008/288] [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 5c84adc958e270d94adf3fb849099a639d9a37d7 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 10 Jul 2012 18:16:51 +0530
Subject: [PATCH 009/288] [IMP]hr_holiday: set name required for history remove
 submit to manager button from allocation view Improve onchange name

bzr revid: dbr@tinyerp.com-20120710124651-m9qrg23ci4gzp8nz
---
 addons/hr_holidays/hr_holidays.py       | 2 +-
 addons/hr_holidays/hr_holidays_view.xml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index a7456d1ceb4..1c4be1d732c 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -112,7 +112,7 @@ class hr_holidays(osv.osv):
         return result
 
     _columns = {
-        'name': fields.text('Description',states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+        'name': fields.text('Description', required=True,states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')],
             'State', readonly=True, help='The state is set to \'To Submit\', when a holiday request is created.\
             \nThe state is \'To Approve\', when holiday request is confirmed by user.\
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index a3bf5f23b86..f1025fa4637 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -158,7 +158,6 @@
             <field name="arch" type="xml">
                 <form string="Allocation Request" version="7.0">
                 <header>
-                    <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
@@ -168,7 +167,7 @@
                 <sheet>
                     <group>
                         <group>
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                            <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <field name="number_of_days_temp"/>
                         </group>
                         <group>

From 5c55b2918c67ca387cadbc172bcdf948ab7efece Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 10 Jul 2012 19:01:27 +0530
Subject: [PATCH 010/288] [IMP]hr_holiday: Set ir_rules for employee

bzr revid: dbr@tinyerp.com-20120710133127-xfjlf1qpj1pol2dx
---
 addons/hr_holidays/security/ir_rule.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index 8e8c97bf7ea..fab12354bf4 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
   <data>
-
+    <record id="property_rule_holidays_employee" model="ir.rule">
+        <field name="name">Employee Holidays</field>
+        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+        <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+    </record>
   </data>
 </openerp>

From 65e6027d63700c49dd49c60d62b41b55849f96e8 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Wed, 11 Jul 2012 11:00:16 +0530
Subject: [PATCH 011/288] [ADD] module base gengo

bzr revid: jam@tinyerp.com-20120711053016-7i20l7l94f56sn9t
---
 addons/base_gengo/__init__.py    | 22 ++++++++++++++++++
 addons/base_gengo/__openerp__.py | 40 ++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 addons/base_gengo/__init__.py
 create mode 100644 addons/base_gengo/__openerp__.py

diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
new file mode 100644
index 00000000000..6825dc22f47
--- /dev/null
+++ b/addons/base_gengo/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Openerp sa (<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/>.
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
new file mode 100644
index 00000000000..43a6e258418
--- /dev/null
+++ b/addons/base_gengo/__openerp__.py
@@ -0,0 +1,40 @@
+# -*- 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': 'Automated Translations through Gengo API',
+    'version': '0.1',
+    'category': 'Tools',
+    'description': """
+Automated Translations through Gengo API
+    """,
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['base'],
+    'init_xml': [],
+    'update_xml': [],
+    'demo_xml': [],
+    'test': [],
+    'installable': True,
+    'auto_install': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From ce21285d02b74e45e10db187c45cfb2daddabadf Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 11 Jul 2012 15:03:13 +0530
Subject: [PATCH 012/288] [IMP]hr_holiday: Remove extra messages and methods

bzr revid: dbr@tinyerp.com-20120711093313-a1bo5nfgxzt9bmr0
---
 addons/hr_holidays/hr_holidays.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 1c4be1d732c..223b697d5bc 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -153,7 +153,6 @@ class hr_holidays(osv.osv):
     
     def create(self, cr, uid, vals, context=None):
         obj_id = super(hr_holidays, self).create(cr, uid, vals, context=context)
-        self.create_notificate(cr, uid, [obj_id], context=context)
         return obj_id
     
     def _create_resource_leave(self, cr, uid, leaves, context=None):
@@ -374,18 +373,11 @@ class hr_holidays(osv.osv):
             if obj.employee_id.parent_id and not obj.employee_id.parent_id.user_id.id in user_ids:
                 user_ids.append(obj.employee_id.parent_id.user_id.id)
         return user_ids
-        
-    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'),
-                        _("The %s request has been <b>created</b> and is waiting confirmation")
-                        % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', 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.")
+                    _("The %s request has been <b>submitted</b> and is waiting for validation by the manager.")
                     % ('leave' if obj.type == 'remove' else 'allocation',), type='notification')
     
     def holidays_validate_notificate(self, cr, uid, ids, context=None):

From ebfa32cbe85ba868bd941cd8373643f31890e163 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 11 Jul 2012 15:21:58 +0530
Subject: [PATCH 013/288] [IMP]hr_holiday: Improve constraints message

bzr revid: dbr@tinyerp.com-20120711095158-fc8j3pibnwqt3asu
---
 addons/hr_holidays/hr_holidays.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 223b697d5bc..139ccb0504f 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -146,7 +146,7 @@ class hr_holidays(osv.osv):
         'holiday_type': 'employee'
     }
     _sql_constraints = [
-        ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "You have to select an employee or a category"),
+        ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "My user has no employee."),
         ('date_check2', "CHECK ( (type='add') OR (date_from <= date_to))", "The start date must be before the end date !"),
         ('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0 !"),
     ]

From b592896f4ba0729ae4f75990db4b68a32af24e82 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Thu, 12 Jul 2012 11:47:40 +0530
Subject: [PATCH 014/288] [ADD]: Add state field for ir.translation

bzr revid: aja@tinyerp.com-20120712061740-4mo3l0d70wxthki2
---
 openerp/addons/base/ir/ir.xml            |  3 +++
 openerp/addons/base/ir/ir_translation.py | 26 +++++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 4de12d8bfeb..ff9ba292fe2 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -1258,6 +1258,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Translations" version="7.0">
+                   <header>
+                        <field name="state" widget="statusbar" nolabel="1"/>
+                   </header>
                    <sheet>
                     <group>
                         <group>
diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index 61e40e807d4..7693f95a7c8 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -77,14 +77,16 @@ class ir_translation_import_cursor(object):
     def push(self, ddict):
         """Feed a translation, as a dictionary, into the cursor
         """
-
+        state= "translated"
+        if not ddict['value']:
+            state = 'translate'
         self._cr.execute("INSERT INTO " + self._table_name \
                 + """(name, lang, res_id, src, type,
-                        imd_model, imd_module, imd_name, value)
-                VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s)""",
+                        imd_model, imd_module, imd_name, value,state)
+                VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)""",
                 (ddict['name'], ddict['lang'], ddict.get('res_id'), ddict['src'], ddict['type'],
                     ddict.get('imd_model'), ddict.get('imd_module'), ddict.get('imd_name'),
-                    ddict['value']))
+                    ddict['value'],state))
 
     def finish(self):
         """ Transfer the data from the temp table to ir.translation
@@ -125,15 +127,16 @@ class ir_translation_import_cursor(object):
         # Step 2: update existing (matching) translations
         if self._overwrite:
             cr.execute("""UPDATE ONLY %s AS irt
-                SET value = ti.value 
+                SET value = ti.value,
+                state = 'translated' 
                 FROM %s AS ti
                 WHERE %s AND ti.value IS NOT NULL AND ti.value != ''
                 """ % (self._parent_table, self._table_name, find_expr))
 
         # Step 3: insert new translations
 
-        cr.execute("""INSERT INTO %s(name, lang, res_id, src, type, value)
-            SELECT name, lang, res_id, src, type, value
+        cr.execute("""INSERT INTO %s(name, lang, res_id, src, type, value,state)
+            SELECT name, lang, res_id, src, type, value,state
               FROM %s AS ti
               WHERE NOT EXISTS(SELECT 1 FROM ONLY %s AS irt WHERE %s);
               """ % (self._parent_table, self._table_name, self._parent_table, find_expr))
@@ -167,6 +170,11 @@ class ir_translation(osv.osv):
         'type': fields.selection(TRANSLATION_TYPE, string='Type', size=16, select=True),
         'src': fields.text('Source'),
         'value': fields.text('Translation Value'),
+        'state':fields.selection([('translate','To Translate'),('inprogress','Translation in Progress'),('translated','Translated')])
+    }
+    
+    _defaults = {
+        'state':'translated',
     }
     
     _sql_constraints = [ ('lang_fkey_res_lang', 'FOREIGN KEY(lang) REFERENCES res_lang(code)', 
@@ -297,6 +305,10 @@ class ir_translation(osv.osv):
         return ids
 
     def write(self, cursor, user, ids, vals, context=None):
+        if vals.get('src'):
+            result= vals.update({'state':'translate'})
+        if vals.get('value'):
+            result= vals.update({'state':'translated'})
         if not context:
             context = {}
         if isinstance(ids, (int, long)):

From 9eda964e6e165f35a77242cba0e57c3e73187b6a Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Fri, 13 Jul 2012 17:41:29 +0530
Subject: [PATCH 015/288] [IMP]Adding .py files in base_gengo module

bzr revid: tch@tinyerp.com-20120713121129-bw973p0ruwlvfm60
---
 addons/base_gengo/__init__.py    | 9 +++++++++
 addons/base_gengo/__openerp__.py | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
index 6825dc22f47..e1537d7ab27 100644
--- a/addons/base_gengo/__init__.py
+++ b/addons/base_gengo/__init__.py
@@ -19,4 +19,13 @@
 #
 ##############################################################################
 
+import res_company
+import ir_translation
+
+
+
+
+
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index 43a6e258418..4f1d296f856 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -30,7 +30,9 @@ Automated Translations through Gengo API
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
-    'update_xml': [],
+    'update_xml': [
+        'ir_translation.xml'  
+           ],
     'demo_xml': [],
     'test': [],
     'installable': True,

From 07f5aaf242b6a2f69d6242ce7cf8f9d77430ba2c Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Fri, 13 Jul 2012 17:49:35 +0530
Subject: [PATCH 016/288] [IMP]Adding .py files in base_gengo module

bzr revid: tch@tinyerp.com-20120713121935-8akpxoebe6i9j1ja
---
 addons/base_gengo/ir_translation.py  | 41 ++++++++++++++++++++++++++
 addons/base_gengo/ir_translation.xml | 17 +++++++++++
 addons/base_gengo/res_company.py     | 43 ++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+)
 create mode 100644 addons/base_gengo/ir_translation.py
 create mode 100644 addons/base_gengo/ir_translation.xml
 create mode 100644 addons/base_gengo/res_company.py

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
new file mode 100644
index 00000000000..7160d102970
--- /dev/null
+++ b/addons/base_gengo/ir_translation.py
@@ -0,0 +1,41 @@
+# -*- 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 osv import fields,osv,orm
+import os
+import openerp 
+import tools
+
+class ir_translation(osv.osv):
+    _name = "ir.translation"
+    _description="Translation"
+    _inherit="ir.translation"
+    _columns = {
+        'gengo_comment':fields.text("comments", help="Comment for translators"),
+        'gengo_translation':fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
+        'gengo_control':fields.boolean('Active'),
+    
+    }
+    
+    _defaults = {
+        'gengo_control':False,
+    }
+
diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
new file mode 100644
index 00000000000..72c6f99730d
--- /dev/null
+++ b/addons/base_gengo/ir_translation.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_translation_search" model="ir.ui.view">
+            <field name="name">Translations</field>
+            <field name="model">ir.translation</field>
+            <field name="inherit_id" ref="base.view_translation_search"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Translations">
+                     <filter icon="terp-project" string="In Progress" domain="[('state','=','inprogress')]"></filter>
+                     <filter string="In Control" domain="[('state','=','translated')]"></filter>
+                </search>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
new file mode 100644
index 00000000000..1fa07bb65e2
--- /dev/null
+++ b/addons/base_gengo/res_company.py
@@ -0,0 +1,43 @@
+# -*- 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 osv import fields,osv,orm
+import os
+import openerp 
+import tools
+
+class res_company(osv.osv):
+    _name = "res.company"
+    _description = "companies"
+    _inherit = "res.company"
+    _columns = {
+           "gengo_private_key":fields.text("Gengo private key"),
+           "gengo_public_key":fields.text("Gengo public key"),
+           "gengo_tier":fields.selection([('machine','Machine'),
+                                          ('standard','Standard'),
+                                          ('pro','Pro'),
+                                          ('ultra','Ultra')],"Tier types", required=True),
+           "gengo_comment":fields.text("comments"),
+           "gengo_auto_approve":fields.boolean("Active"),
+           "fields_ids":fields.many2many('ir.model.fields','fields_company_rel','field_id','model_id'),
+           
+    }
+

From 99f81a5d9723f931b2963dd1b26e673cd023457f Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Fri, 13 Jul 2012 18:38:03 +0530
Subject: [PATCH 017/288] [IMP]Adding .py files in base_gengo module

bzr revid: tch@tinyerp.com-20120713130803-slnbqdvlc9ypf14a
---
 addons/base_gengo/ir_translation.py | 7 ++-----
 addons/base_gengo/res_company.py    | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 7160d102970..053f72f5c2c 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -19,12 +19,9 @@
 #
 ##############################################################################
 
-from osv import fields,osv,orm
-import os
-import openerp 
-import tools
+from osv import fields,osv
 
-class ir_translation(osv.osv):
+class ir_translation(osv.Model):
     _name = "ir.translation"
     _description="Translation"
     _inherit="ir.translation"
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 1fa07bb65e2..81ef413dbe0 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -19,12 +19,9 @@
 #
 ##############################################################################
 
-from osv import fields,osv,orm
-import os
-import openerp 
-import tools
+from osv import fields,osv
 
-class res_company(osv.osv):
+class res_company(osv.Model):
     _name = "res.company"
     _description = "companies"
     _inherit = "res.company"

From be6cb0c3cab8d52e86171d441ed5cc2cd41d625b Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 16 Jul 2012 18:11:35 +0530
Subject: [PATCH 018/288] [IMP]: Improve in base_gengo module

bzr revid: aja@tinyerp.com-20120716124135-k2gyo052r460c3fv
---
 addons/base_gengo/__openerp__.py       |  4 +--
 addons/base_gengo/ir_translation.py    |  3 +--
 addons/base_gengo/ir_translation.xml   | 21 ++++++++++++++-
 addons/base_gengo/res_company.py       | 12 +++++----
 addons/base_gengo/res_company_view.xml | 37 ++++++++++++++++++++++++++
 5 files changed, 67 insertions(+), 10 deletions(-)
 create mode 100644 addons/base_gengo/res_company_view.xml

diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index 4f1d296f856..7afc573b0ca 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -18,7 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 {
     'name': 'Automated Translations through Gengo API',
     'version': '0.1',
@@ -31,7 +30,8 @@ Automated Translations through Gengo API
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
-        'ir_translation.xml'  
+        'ir_translation.xml',
+        'res_company_view.xml'
            ],
     'demo_xml': [],
     'test': [],
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 053f72f5c2c..46d48af87de 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -26,10 +26,9 @@ class ir_translation(osv.Model):
     _description="Translation"
     _inherit="ir.translation"
     _columns = {
-        'gengo_comment':fields.text("comments", help="Comment for translators"),
+        'gengo_comment':fields.text("Comments"),
         'gengo_translation':fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
         'gengo_control':fields.boolean('Active'),
-    
     }
     
     _defaults = {
diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
index 72c6f99730d..52b081cd7d6 100644
--- a/addons/base_gengo/ir_translation.xml
+++ b/addons/base_gengo/ir_translation.xml
@@ -9,9 +9,28 @@
             <field name="arch" type="xml">
                 <search string="Translations">
                      <filter icon="terp-project" string="In Progress" domain="[('state','=','inprogress')]"></filter>
-                     <filter string="In Control" domain="[('state','=','translated')]"></filter>
+                     <filter string="To Control" domain="[('state','=','translated')]"></filter>
                 </search>
             </field>
         </record>
+        
+        <!-- ir.translation form view -->
+        <record model="ir.ui.view" id="view_ir_translation_inherit_base_gengo_form">
+            <field name="name">ir.translation.form.inherit</field>
+            <field name="inherit_id" ref="base.view_translation_form"/>
+            <field name="model">ir.translation</field>           
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                 <xpath expr="//form[@string='Translations']/sheet" position="inside">
+                    <group string="comments" col="1">
+                        <field name="gengo_comment" nolabel="1" placeholder="Add Your comments here for Translation Job...."/>
+                    </group>
+                    <group col="4">
+                        <field name="gengo_translation" />
+                        <field name="gengo_control" />
+                    </group>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 81ef413dbe0..ddfb68f7141 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -23,7 +23,7 @@ from osv import fields,osv
 
 class res_company(osv.Model):
     _name = "res.company"
-    _description = "companies"
+    _description = "Companies"
     _inherit = "res.company"
     _columns = {
            "gengo_private_key":fields.text("Gengo private key"),
@@ -33,8 +33,10 @@ class res_company(osv.Model):
                                           ('pro','Pro'),
                                           ('ultra','Ultra')],"Tier types", required=True),
            "gengo_comment":fields.text("comments"),
-           "gengo_auto_approve":fields.boolean("Active"),
-           "fields_ids":fields.many2many('ir.model.fields','fields_company_rel','field_id','model_id'),
-           
+           "gengo_auto_approve":fields.boolean("Active",help="Jobs are Automatically Approved by Gengo."),
+           "fields_ids":fields.many2many('ir.model.fields','fields_company_rel','field_id','model_id','fields'),
+    }
+    
+    _defaults={
+        "gengo_tier":"machine",
     }
-
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
new file mode 100644
index 00000000000..a4f6ceffcce
--- /dev/null
+++ b/addons/base_gengo/res_company_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <!-- res.company form view -->
+        <record model="ir.ui.view" id="view_company_inherit_base_gengo_form">
+            <field name="name">res.company.form.inherit</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="model">res.company</field>           
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook[last()]" position="inside">
+                    <page string="Gengo Parameters">
+                        <group col="2">
+                            <group col="1" string="Private Key">
+                                <field name="gengo_private_key" nolabel="1"/>
+                            </group>
+                            <group col="1" string="Public Key">
+                                <field name="gengo_public_key" nolabel="1"/>
+                            </group>
+                        </group>
+                        <group col="4">
+                            <field name="gengo_tier" />
+                            <field name="gengo_auto_approve"/>
+                        </group>
+                        <group string="Comments" col="1">
+                            <field name="gengo_comment" nolabel="1" placeholder="Add Your comments here for Translator...."/>
+                        </group>
+                        <group col="1">
+                            <field name="fields_ids" nolabel="1"/>
+                        </group>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>

From 70e73559d2f91e54215f6a2de779dce8a0f0580d Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 16 Jul 2012 18:36:51 +0530
Subject: [PATCH 019/288] [IMP]: change license in base_gengo module

bzr revid: aja@tinyerp.com-20120716130651-qk7z3c1uaypjr9z4
---
 addons/base_gengo/__init__.py       | 6 ------
 addons/base_gengo/ir_translation.py | 4 ++--
 addons/base_gengo/res_company.py    | 4 ++--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
index e1537d7ab27..ca798adebee 100644
--- a/addons/base_gengo/__init__.py
+++ b/addons/base_gengo/__init__.py
@@ -22,10 +22,4 @@
 import res_company
 import ir_translation
 
-
-
-
-
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 46d48af87de..a658b935c93 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-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
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index ddfb68f7141..2a91d13f1b1 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-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

From 28124a66f682faaecdfe6cf4db47f68d0af27bfd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 16 Jul 2012 22:35:12 +0200
Subject: [PATCH 020/288] [IMP] better form view: users, modules, preferences,
 wizards

bzr revid: fp@tinyerp.com-20120716203512-ic75m4qys1v0kid6
---
 .../base/ir/wizard/wizard_menu_view.xml       | 10 ++---
 openerp/addons/base/module/module.py          |  2 +
 openerp/addons/base/module/module_view.xml    | 36 +++++++--------
 .../wizard/base_export_language_view.xml      | 45 +++++++------------
 .../wizard/base_import_language_view.xml      | 10 ++---
 .../wizard/base_language_install_view.xml     | 44 +++++++-----------
 .../wizard/base_module_configuration_view.xml |  6 +--
 .../module/wizard/base_module_import_view.xml | 35 +++++----------
 .../module/wizard/base_module_scan_view.xml   |  6 +--
 .../module/wizard/base_module_update_view.xml | 34 +++++---------
 .../wizard/base_module_upgrade_view.xml       | 18 ++++----
 .../wizard/base_update_translations_view.xml  | 19 +++-----
 openerp/addons/base/res/res_users_view.xml    | 19 +++-----
 13 files changed, 109 insertions(+), 175 deletions(-)

diff --git a/openerp/addons/base/ir/wizard/wizard_menu_view.xml b/openerp/addons/base/ir/wizard/wizard_menu_view.xml
index 58bd98ef785..9f5d912ed1a 100644
--- a/openerp/addons/base/ir/wizard/wizard_menu_view.xml
+++ b/openerp/addons/base/ir/wizard/wizard_menu_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
-                    <header>
-                        <button name="menu_create" string="Create _Menu" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="name"/>
                         <field name="menu_id" domain="[('parent_id','&lt;&gt;',False)]"/>
                     </group>
+                    <footer>
+                        <button name="menu_create" string="Create _Menu" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 392850f7b77..dba1962ae26 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -80,6 +80,7 @@ class module_category(osv.osv):
 
 class module(osv.osv):
     _name = "ir.module.module"
+    _rec_name = "shortdesc"
     _description = "Module"
 
     @classmethod
@@ -177,6 +178,7 @@ class module(osv.osv):
         'name': fields.char("Technical Name", size=128, readonly=True, required=True, select=True),
         'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True),
         'shortdesc': fields.char('Module Name', size=256, readonly=True, translate=True),
+        'summary': fields.char('Summary', size=256, readonly=True, translate=True),
         'description': fields.text("Description", readonly=True, translate=True),
         'author': fields.char("Author", size=128, readonly=True),
         'maintainer': fields.char('Maintainer', size=128, readonly=True),
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index a9f3620fb57..5624c8ff58c 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -113,36 +113,32 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module" version="7.0">
-                <header>
-                    <button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object" class="oe_highlight"/>
-                    <button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object" class="oe_highlight"/>
-                    <button name="button_uninstall" states="installed" string="Uninstall (beta)" icon="terp-dialog-close" type="object"
-                        confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
-                    <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
-                    <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" icon="gtk-cancel" type="object"/>
-                    <button name="button_install_cancel" states="to install" string="Cancel Install" icon="gtk-cancel" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="uninstalled"/>
-                </header>
                 <sheet>
-                    <div class="oe_right oe_button_box">
-                        <field name="icon_image" widget="image"/>
-                    </div>
+                    <field name="icon_image" widget="image" class="oe_avatar oe_left"/>
                     <div class="oe_title">
                         <h1><field name="shortdesc"/></h1>
-                        <h2><field name="category_id" class="oe_inline"/></h2>
+                        <h2 class="oe_fade"><field name="summary"/></h2>
+                        <button name="button_install" states="uninstalled" string="Install" type="object" class="oe_highlight"/>
+                        <button name="button_upgrade" states="installed" string="Upgrade" type="object" class="oe_highlight"/>
+                        <button name="button_uninstall" states="installed" string="Uninstall" type="object"
+                            confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
+                        <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" type="object"/>
+                        <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" type="object"/>
+                        <button name="button_install_cancel" states="to install" string="Cancel Install" type="object"/>
                     </div>
                     <group>
+                        <group>
+                            <field name="author"/>
+                            <field name="website" widget="url"/>
+                            <field name="category_id" widget="selection"/>
+                        </group>
                         <group>
                             <field name="name"/>
                             <field name="license"/>
                             <field name="installed_version"/>
                         </group>
-                        <group>
-                            <field name="author"/>
-                            <field name="website" widget="url"/>
-                        </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Description">
                             <field name="description"/>
                         </page>
@@ -150,7 +146,9 @@
                             <group col="4">
                                 <field name="demo"/>
                                 <field name="application"/>
+                                <field name="state"/>
                             </group>
+                            <label for="dependencies_id"/>
                             <field name="dependencies_id">
                                 <tree string="Dependencies">
                                     <field name="name"/>
diff --git a/openerp/addons/base/module/wizard/base_export_language_view.xml b/openerp/addons/base/module/wizard/base_export_language_view.xml
index 4ed31c3af69..200ed549cbc 100644
--- a/openerp/addons/base/module/wizard/base_export_language_view.xml
+++ b/openerp/addons/base/module/wizard/base_export_language_view.xml
@@ -8,39 +8,24 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Export Translations" version="7.0">
-                    <header>
+                    <group colspan="4" states="choose">
+                        <separator colspan="4" string="Export Translation"/>
+                        <field name="lang"/>
+                        <field name="format" required="1"/>
+                        <field name="modules" nolabel="1"/>
+                        <field invisible="1" name="state"/>
+                    </group>
+                    <group colspan="4" states="get">
+                        <separator string="Export done" colspan="4"/>
+                        <field name="name" invisible="1" colspan="4"/>
+                        <field name="data" nolabel="1" readonly="1" filename="name" colspan="4"/>
+                        <field height="80" name="advice" nolabel="1" colspan="4"/>
+                    </group>
+                    <footer>
                         <button name="act_getfile" string="_Export" type="object" states="choose" class="oe_highlight"/>
                         <label string="or" states="choose"/>
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group col="8">
-                        <group colspan="3">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="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."/>
-                            <label colspan="4" width="220" string="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"/>
-                            <label colspan="4" width="220"/>
-                            <label colspan="4" width="220" string="To browse official translations, you can start with these links:"/>
-                            <label colspan="4" width="220" string="https://help.launchpad.net/Translations"/>
-                            <label colspan="4" width="220" string="https://translations.launchpad.net/openobject"/>
-                        </group>
-                        <separator orientation="vertical" rowspan="15"/>
-                        <group colspan="4">
-                            <group colspan="4" states="choose">
-                                <separator colspan="4" string="Export Translation"/>
-                                <field name="lang"/>
-                                <field name="format" required="1"/>
-                                <field height="200" name="modules" nolabel="1" colspan="4"/>
-                                <field invisible="1" name="state"/>
-                            </group>
-                            <group colspan="4" states="get">
-                                <separator string="Export done" colspan="4"/>
-                                <field name="name" invisible="1" colspan="4"/>
-                                <field name="data" nolabel="1" readonly="1" filename="name" colspan="4"/>
-                                <field height="80" name="advice" nolabel="1" colspan="4"/>
-                            </group>
-                        </group>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_import_language_view.xml b/openerp/addons/base/module/wizard/base_import_language_view.xml
index 3c6a34752c7..3b61e643399 100644
--- a/openerp/addons/base/module/wizard/base_import_language_view.xml
+++ b/openerp/addons/base/module/wizard/base_import_language_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Translation" version="7.0">
-                    <header>
-                        <button name="import_lang" string="_Import" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator string="Import Translation" colspan="2"/>
                         <label nolabel="1" string="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." colspan="2"/>
@@ -23,6 +18,11 @@
                             <field name="overwrite"/>
                         </group>
                     </group>
+                    <footer>
+                        <button name="import_lang" string="_Import" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_language_install_view.xml b/openerp/addons/base/module/wizard/base_language_install_view.xml
index 166c1b05e70..64039177d5d 100644
--- a/openerp/addons/base/module/wizard/base_language_install_view.xml
+++ b/openerp/addons/base/module/wizard/base_language_install_view.xml
@@ -8,33 +8,21 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Load a Translation" version="7.0">
-                    <header>
+                    <separator string="Load a Translation"/>
+                    <field name="state" invisible="1"/>
+                    <group states="init">
+                        <field name="lang"/>
+                        <field name="overwrite" groups="base.group_no_one"/>
+                    </group>
+                    <group states="done" colspan="4">
+                        <label string="The selected language has been successfully installed.
+You must change the preferences of the user and open a new menu to view the changes."/>
+                    </group>
+                    <footer>
                         <button name="lang_install" string="Load" type="object" states="init" class="oe_highlight"/>
                         <label string="or" states="init"/>
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <group colspan="4" col="8">
-                        <group colspan="1">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="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."/>
-                            <label colspan="4" width="220"/>
-                            <label colspan="4" width="220" string="Please be patient, this operation may take a few minutes (depending on the number of modules currently installed)..."/>
-                            <field name="state" invisible="1"/>
-                        </group>
-                        <separator orientation="vertical" colspan="1" rowspan="12"/>
-                        <group colspan="6">
-                            <separator string="Load a Translation" colspan="4"/>
-                            <group states="init" colspan="4">
-                                <field name="lang" colspan="4"/>
-                                <field name="overwrite" colspan="4" groups="base.group_no_one"/>
-                            </group>
-                            <group states="done" colspan="4">
-                                <label string="The selected language has been successfully installed.
-You must change the preferences of the user and open a new menu to view the changes." colspan="4"/>
-                            </group>
-                        </group>
-                    </group>
+                    </footer>
                 </form>
            </field>
         </record>
@@ -49,10 +37,10 @@ You must change the preferences of the user and open a new menu to view the chan
         </record>
 
         <menuitem
-        name="Load a Translation"
-        action="action_view_base_language_install"
-        id="menu_view_base_language_install"
-        parent="menu_translation" sequence="2"/>
+            name="Load a Translation"
+            action="action_view_base_language_install"
+            id="menu_view_base_language_install"
+            parent="menu_translation" sequence="2"/>
     </data>
 </openerp>
 
diff --git a/openerp/addons/base/module/wizard/base_module_configuration_view.xml b/openerp/addons/base/module/wizard/base_module_configuration_view.xml
index 3174103ea4f..61f920b4333 100644
--- a/openerp/addons/base/module/wizard/base_module_configuration_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_configuration_view.xml
@@ -8,10 +8,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="System Configuration Done" version="7.0">
-                    <header>
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <label string="All pending configuration wizards have been executed. You may restart individual wizards via the list of configuration wizards."/>
+                    <footer>
+                        <button string="Close" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_module_import_view.xml b/openerp/addons/base/module/wizard/base_module_import_view.xml
index dc7d1df43e6..3201bd83e10 100644
--- a/openerp/addons/base/module/wizard/base_module_import_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_import_view.xml
@@ -8,35 +8,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import module" version="7.0">
-                    <header>
+                    <field name="state" invisible="1"/>
+                    <separator string="Module Import" colspan="4"/>
+                    <group states="init" col="4">
+                        <label string="Select module package to import (.zip file):" colspan="4"/>
+                        <field name="module_file" colspan="4"/>
+                    </group>
+                    <group states="done" col="4">
+                        <label string="Module file successfully imported!" colspan="4"/>
+                    </group>
+                    <footer>
                         <button name="importzip" string="Import module" type="object" states="init" class="oe_highlight"/>
                         <label string="or" states="init"/>
                         <button name="action_module_open" string="Open Modules" type="object" states="done" class="oe_highlight"/>
                         <label string="or" states="done"/>
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <group col="8">
-                        <group colspan="3" col="1">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label width="220" string='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.'/>
-                            <label width="220"/>
-                            <label width="220" string="Please be patient, this operation may take a few minutes..."/>
-                            <field name="state" invisible="1"/>
-                        </group>
-                        <separator orientation="vertical" rowspan="5"/>
-                        <group colspan="4">
-                            <separator string="Module Import" colspan="4"/>
-                            <group states="init" col="4">
-                                <label string="Select module package to import (.zip file):" colspan="4"/>
-                                <field name="module_file" colspan="4"/>
-                            </group>
-                            <group states="done" col="4">
-                                <label string="Module file successfully imported!" colspan="4"/>
-                            </group>
-                        </group>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_module_scan_view.xml b/openerp/addons/base/module/wizard/base_module_scan_view.xml
index fc9fae11a65..a885dcb60d8 100644
--- a/openerp/addons/base/module/wizard/base_module_scan_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_scan_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Scan for new modules" version="7.0">
-                <header>
+                <label string="This function will check if you installed new modules in the 'addons' path of your server installation."/>
+                <footer>
                     <button name="watch_dir" string="Check new modules" type="object" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
-                <label string="This function will check if you installed new modules in the 'addons' path of your server installation."/>
+                </footer>
              </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_module_update_view.xml b/openerp/addons/base/module/wizard/base_module_update_view.xml
index 2d1fa4b44f1..9a9f7efc00a 100644
--- a/openerp/addons/base/module/wizard/base_module_update_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_update_view.xml
@@ -8,34 +8,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Update Module List" version="7.0">
-                    <header>
+                    <field name="state" invisible="1"/>
+                    <separator string="Module Update Result" colspan="4"/>
+                    <group states="init" colspan="4">
+                        <label string="Click on Update below to start the process..." colspan="4"/>
+                    </group>
+                    <group states="done" colspan="4">
+                        <field name="update" colspan="4"/>
+                        <field name="add" colspan="4"/>
+                    </group>
+                    <footer>
                         <button name="update_module" string="Update" type="object" states="init" class="oe_highlight"/>
                         <label string="or" states="init"/>
                         <button name="action_module_open" string="Open Modules" type="object" states="done" class="oe_highlight"/>
                         <label string="or" states="done"/>
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group col="8">
-                        <group colspan="3">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="This wizard will scan all module repositories on the server side to detect newly added modules as well as any change to existing modules."/>
-                            <label colspan="4" width="220"/>
-                            <label colspan="4" width="220" string="Please be patient, as this operation may take a few seconds..."/>
-                            <field name="state" invisible="1"/>
-                        </group>
-                        <separator orientation="vertical" rowspan="15"/>
-                        <group colspan="4">
-                            <separator string="Module Update Result" colspan="4"/>
-                            <group states="init" colspan="4">
-                                <label string="Click on Update below to start the process..." colspan="4"/>
-                            </group>
-                            <group states="done" colspan="4">
-                                <field name="update" colspan="4"/>
-                                <field name="add" colspan="4"/>
-                            </group>
-                        </group>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
index b0316bdbf4b..f0dd5d83678 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="System Update" version="7.0">
-                    <header>
-                        <button name="upgrade_module" string="Update" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <div><label string="Your system will be updated."/></div>
                     <div><label string="Note that this operation might take a few minutes."/></div>
                     <separator string="Modules to Update"/>
                     <field name="module_info"/>
+                    <footer>
+                        <button name="upgrade_module" string="Update" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -45,13 +45,13 @@
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <form string="Apply Scheduled Upgrades" version="7.0">
-                    <header>
+                    <div><label string="The selected modules have been updated / installed !"/></div>
+                    <div><label string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."/></div>
+                    <footer>
                         <button name="config" string="Start configuration" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <div><label string="The selected modules have been updated / installed !"/></div>
-                    <div><label string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."/></div>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_update_translations_view.xml b/openerp/addons/base/module/wizard/base_update_translations_view.xml
index b80259194de..47c6957ac21 100644
--- a/openerp/addons/base/module/wizard/base_update_translations_view.xml
+++ b/openerp/addons/base/module/wizard/base_update_translations_view.xml
@@ -7,23 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Synchronize Terms" version="7.0">
-                    <header>
+                    <group string="Synchronize Translation">
+                        <field name="lang"/>
+                    </group>
+                    <footer>
                         <button name="act_update" string="Update" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <group col="8">
-                        <group colspan="3">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="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)."/>
-                        </group>
-                        <separator orientation="vertical" rowspan="15"/>
-                        <group colspan="4">
-                            <separator string="Synchronize Translation" colspan="4"/>
-                            <field name="lang" colspan="4"/>
-                        </group>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index a429c84ede7..051c4c00e74 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -81,9 +81,7 @@
                 <form string="Users" version="7.0">
                     <field name="id" invisible="1"/>
                     <sheet>
-                        <div class="oe_right">
-                            <field name="avatar" widget='image' nolabel="1" on_change="onchange_avatar(avatar)" class="oe_avatar"/>
-                        </div>
+                        <field name="avatar" widget='image' on_change="onchange_avatar(avatar)" class="oe_avatar oe_left"/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
@@ -194,24 +192,21 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Users" version="7.0">
-                   <sheet>
-                    <div class="oe_right oe_avatar">
-                        <field name="avatar" widget='image' on_change="onchange_avatar(avatar)"/>
-                    </div>
+                <sheet>
+                    <field name="avatar" widget='image' on_change="onchange_avatar(avatar)" class="oe_avatar oe_left"/>
                     <div class="oe_title">
                         <h1>
-                            <field name="name" readonly="1" class="oe_edit_only oe_inline"/>
-                            (<field name="login" readonly="1" class="oe_edit_only oe_inline"/>)
+                            <field name="name" readonly="1"/>
                         </h1>
-                        <label for="company_id" class="oe_edit_only" groups="base.group_multi_company"/>
                         <h2>
-                            <field name="company_id" widget="selection" readonly="0"
-                                groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
+                            <field name="login" readonly="1"/>
                         </h2>
                     </div>
                     <group col="4" name="preferences" string="Preferences">
                         <field name="context_lang" readonly="0"/>
                         <field name="context_tz" readonly="0"/>
+                        <field name="company_id" widget="selection" readonly="0"
+                            groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
                     </group>
                     <group string="Email Preferences">
                         <field name="user_email" widget="email" readonly="0"/>

From 30ba281af0ace8c31862e9260339e6e4d321fb53 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Tue, 17 Jul 2012 09:51:52 +0200
Subject: [PATCH 021/288] [ADD] enable accesskeys (=shortcuts) They are
 translatable (changes in npybabel.py), a visual hint for the shortcuts to use
 will be added by a yet-to-be-written web module.

bzr revid: hbrunn@therp.nl-20120717075152-gz2ktbme3k388vd6
---
 addons/web/static/src/js/coresetup.js |  2 +-
 addons/web/static/src/xml/base.xml    | 11 ++++++-----
 npybabel.py                           | 11 ++++++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index a5a62b9bcc1..28969d3e152 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -600,7 +600,7 @@ instance.web.qweb.preprocess_node = function() {
             break;
         case 1:
             // Element
-            var attr, attrs = ['label', 'title', 'alt', 'placeholder'];
+            var attr, attrs = ['label', 'title', 'alt', 'placeholder', 'accesskey'];
             while (attr = attrs.pop()) {
                 if (this.attributes[attr]) {
                     this.attributes[attr] = instance.web._t(this.attributes[attr]);
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 2d9caa43bbd..a7b70a2f27b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -685,11 +685,11 @@
 <div t-name="FormView.buttons" class="oe_form_buttons">
     <t t-if="widget.options.action_buttons !== false">
         <span class="oe_form_buttons_view">
-            <button type="button" class="oe_button oe_form_button_edit">Edit</button>
-            <button type="button" class="oe_button oe_form_button_create">Create</button>
+            <button type="button" class="oe_button oe_form_button_edit" accesskey="E">Edit</button>
+            <button 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">Save</button> <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_form_button_cancel">Discard</a>
+            <button type="button" class="oe_button oe_form_button_save oe_highlight" accesskey="S">Save</button> <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_form_button_cancel" accesskey="D">Discard</a>
         </span>
     </t>
 </div>
@@ -775,7 +775,7 @@
     <div class="oe_clear">
         <ul t-attf-class="oe_notebook #{classnames}">
             <li t-foreach="pages" t-as="page" t-att-modifiers="page.modifiers">
-                <a t-attf-href="##{page.id}">
+                <a t-attf-href="##{page.id}" t-att-accesskey="page.accesskey">
                     <t t-esc="page.string"/>
                 </a>
             </li>
@@ -1118,7 +1118,8 @@
     <button type="button" class="oe_button oe_form_button"
         t-att-style="widget.node.attrs.style"
         t-att-tabindex="widget.node.attrs.tabindex"
-        t-att-autofocus="widget.node.attrs.autofocus">
+        t-att-autofocus="widget.node.attrs.autofocus"
+        t-att-accesskey="widget.node.attrs.accesskey">
         <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
         <span t-if="widget.string"><t t-esc="widget.string"/></span>
     </button>
diff --git a/npybabel.py b/npybabel.py
index 14ac115e338..f603791cb84 100755
--- a/npybabel.py
+++ b/npybabel.py
@@ -93,9 +93,10 @@ def extract_qweb(fileobj, keywords, comment_tags, options):
     :rtype: ``iterator``
     """
     result = []
-    def handle_text(text, lineno):
+    def handle_text(text, lineno, name=None):
         text = (text or "").strip()
-        if len(text) > 1: # Avoid mono-char tokens like ':' ',' etc.
+        if len(text) > 1 or name in ['accesskey']: 
+            # Avoid mono-char tokens like ':' ',' etc but keep accesskeys
             result.append((lineno, None, text, [TRANSLATION_FLAG_COMMENT]))
 
     # not using elementTree.iterparse because we need to skip sub-trees in case
@@ -106,10 +107,10 @@ def extract_qweb(fileobj, keywords, comment_tags, options):
             if "t-js" not in el.attrib and \
                     not ("t-jquery" in el.attrib and "t-operation" not in el.attrib) and \
                     not ("t-translation" in el.attrib and el.attrib["t-translation"].strip() == "off"):
-                handle_text(el.text, el.sourceline)
-                for att in ('title', 'alt', 'label', 'placeholder'):
+                handle_text(el.text, el.sourceline, el.tag)
+                for att in ('title', 'alt', 'label', 'placeholder', 'accesskey'):
                     if att in el.attrib:
-                        handle_text(el.attrib[att], el.sourceline)
+                        handle_text(el.attrib[att], el.sourceline, att)
                 iter_elements(el)
             handle_text(el.tail, el.sourceline)
 

From b5c626f6a2fe697d9444bbe2116889c2a9280eab Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Mon, 23 Jul 2012 19:26:20 +0530
Subject: [PATCH 022/288] [FIX]Fixed problem of date picker.

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

bzr revid: amb@tinyerp.com-20120723135620-67qunqvnyz0lj00e
---
 addons/web/static/src/js/view_form.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index d6ed85fedad..9c1cf916a41 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2097,7 +2097,8 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
             changeMonth: true,
             changeYear: true,
             showWeek: true,
-            showButtonPanel: true
+            showButtonPanel: true,
+            firstDay: Date.CultureInfo.firstDayOfWeek
         });
         this.$element.find('img.oe_datepicker_trigger').click(function() {
             if (self.get("effective_readonly") || self.picker('widget').is(':visible')) {

From 2c9e0c2459be2421d4f30b25ed2ac2cd9b93272f Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Thu, 26 Jul 2012 17:57:02 +0530
Subject: [PATCH 023/288] [IMP]:reverted the changes for 'name' field

bzr revid: mtr@tinyerp.com-20120726122702-bbttyqkepqs0fdg6
---
 addons/hr_holidays/hr_holidays.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 9d10f08d590..54ab5f31a29 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -112,7 +112,7 @@ class hr_holidays(osv.osv):
         return result
 
     _columns = {
-        'name': fields.text('Description', required=True,states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+        'name': fields.char('Description', required=True, size=64),
         'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')],
             'State', readonly=True, help='The state is set to \'To Submit\', when a holiday request is created.\
             \nThe state is \'To Approve\', when holiday request is confirmed by user.\
@@ -126,6 +126,7 @@ class hr_holidays(osv.osv):
         #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         #'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
         'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
+        'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True),
         'meeting_id': fields.many2one('crm.meeting', 'Meeting'),
@@ -267,7 +268,7 @@ class hr_holidays(osv.osv):
                     'name': record.name,
                     'categ_ids': record.holiday_status_id.categ_id and [(6,0,[record.holiday_status_id.categ_id.id])] or [],
                     'duration': record.number_of_days_temp * 8,
-                    'description': record.name,
+                    'description': record.notes,
                     'user_id': record.user_id.id,
                     'date': record.date_from,
                     'end_date': record.date_to,

From 21df6496976a133d9bce53363233b8f41eef025e Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Thu, 26 Jul 2012 18:05:17 +0530
Subject: [PATCH 024/288] [IMP]:improved access rights and added ir.rule for
 HR/Officer

bzr revid: mtr@tinyerp.com-20120726123517-l9gc3tn9efl8wwep
---
 addons/hr_holidays/security/ir.model.access.csv | 2 +-
 addons/hr_holidays/security/ir_rule.xml         | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index d2e6c27cded..adb01b51e94 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -4,4 +4,4 @@ access_hr_holidays_user,hr.holidays.user,model_hr_holidays,base.group_hr_user,1,
 access_hr_holidays_employee,hr.holidays.employee,model_hr_holidays,base.group_user,1,1,1,1
 access_hr_holydays_status_employee,hr.holidays.status employee,model_hr_holidays_status,base.group_user,1,0,0,0
 access_hr_holidays_remain_user,hr.holidays.ramain.user,model_hr_holidays_remaining_leaves_user,base.group_hr_user,1,1,1,1
-access_resource_calendar_leaves_manager,resource_calendar_leaves_manager,resource.model_resource_calendar_leaves,base.group_hr_manager,1,1,1,1
+access_resource_calendar_leaves_manager,resource_calendar_leaves_manager,resource.model_resource_calendar_leaves,base.group_hr_user,1,1,1,1
diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index fab12354bf4..33d1a2c107f 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -7,5 +7,13 @@
         <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
         <field name="groups" eval="[(4,ref('base.group_user'))]"/>
     </record>
+    
+    <record id="property_rule_holidays_officer" model="ir.rule">
+        <field name="name">Holidays Officer</field>
+        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="domain_force">[('employee_id.parent_id.user_id','=',user.id)]</field>
+        <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
+    </record>
+    
   </data>
 </openerp>

From 095a0569f8bced160e2b86fc8dfabec27c479ca7 Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Mon, 30 Jul 2012 16:01:39 +0530
Subject: [PATCH 025/288] [IMP]:can now delete a leave which are in 'draft',
 'cancel' and 'confirm' state

bzr revid: mtr@tinyerp.com-20120730103139-n1ni944evcny3dic
---
 addons/hr_holidays/hr_holidays.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 54ab5f31a29..0fcb8f41335 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -200,8 +200,8 @@ class hr_holidays(osv.osv):
 
     def unlink(self, cr, uid, ids, context=None):
         for rec in self.browse(cr, uid, ids, context=context):
-            if rec.state<>'draft':
-                raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is not in draft status !'))
+            if rec.state not in ['draft', 'cancel', 'confirm']:
+                raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is in %s state!')%(rec.state))
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
 
     def onchange_date_from(self, cr, uid, ids, date_to, date_from):

From e9cd4b6d8264c2f21d0b50277c676aebead88cd0 Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 31 Jul 2012 11:55:40 +0530
Subject: [PATCH 026/288] [IMP]:round down the value of days

bzr revid: mtr@tinyerp.com-20120731062540-3iijbtj1d2671fvv
---
 addons/hr_holidays/hr_holidays.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 0fcb8f41335..1ff3ce1a510 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -209,7 +209,7 @@ class hr_holidays(osv.osv):
         if date_to and date_from:
             diff_day = self._get_number_of_days(date_from, date_to)
             result['value'] = {
-                'number_of_days_temp': round(diff_day)+1
+                'number_of_days_temp': round(math.floor(diff_day))+1
             }
             return result
         result['value'] = {

From e31a2f86340c5f7dc9354bc86de4349dbacfe49a Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 31 Jul 2012 14:32:41 +0530
Subject: [PATCH 027/288] [IMP]:imported math module(library)

bzr revid: mtr@tinyerp.com-20120731090241-mvgydus04zrmnjvl
---
 addons/hr_holidays/hr_holidays.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 1ff3ce1a510..aaff2183050 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -25,6 +25,7 @@ import datetime, time
 from itertools import groupby
 from operator import itemgetter
 
+import math
 import netsvc
 from osv import fields, osv
 from tools.translate import _

From dbcd304455f599a1edb4d18903e291760518bceb Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 31 Jul 2012 16:02:15 +0530
Subject: [PATCH 028/288] [IMP]:changed the id,name from 'manager' to 'user'

bzr revid: mtr@tinyerp.com-20120731103215-vc0wx0kiy7d8x6ka
---
 addons/hr_holidays/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 7f386020ef7..3df2c61cf51 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -4,6 +4,6 @@ access_hr_holidays_user,hr.holidays.user,model_hr_holidays,base.group_hr_user,1,
 access_hr_holidays_employee,hr.holidays.employee,model_hr_holidays,base.group_user,1,1,1,1
 access_hr_holydays_status_employee,hr.holidays.status employee,model_hr_holidays_status,base.group_user,1,0,0,0
 access_hr_holidays_remain_user,hr.holidays.ramain.user,model_hr_holidays_remaining_leaves_user,base.group_hr_user,1,1,1,1
-access_resource_calendar_leaves_manager,resource_calendar_leaves_manager,resource.model_resource_calendar_leaves,base.group_hr_user,1,1,1,1
+access_resource_calendar_leaves_user,resource_calendar_leaves_user,resource.model_resource_calendar_leaves,base.group_hr_user,1,1,1,1
 access_crm_meeting_type_manager,crm.meeting.type.manager,base_calendar.model_crm_meeting_type,base.group_hr_manager,1,1,1,1
 

From 0b6e36ef48de4b848dbdbf91cfa402d807edab4f Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Wed, 1 Aug 2012 18:10:44 +0530
Subject: [PATCH 029/288] [IMP]: set reqd=False on 'name' field and improved
 view

bzr revid: mtr@tinyerp.com-20120801124044-1asum92rkjnipnms
---
 addons/hr_holidays/hr_holidays.py       |  2 +-
 addons/hr_holidays/hr_holidays_view.xml | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index aaff2183050..0cf9d5db867 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -113,7 +113,7 @@ class hr_holidays(osv.osv):
         return result
 
     _columns = {
-        'name': fields.char('Description', required=True, size=64),
+        'name': fields.char('Description', size=64),
         'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')],
             'State', readonly=True, help='The state is set to \'To Submit\', when a holiday request is created.\
             \nThe state is \'To Approve\', when holiday request is confirmed by user.\
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index adbf6b0e794..50e572fcbb9 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -110,6 +110,10 @@
                 </header>
                 <sheet string="Leave Request">
                     <group>
+                    	<group col="3">
+                    		<field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
+                    	</group>
+                        <newline></newline>
                         <group>
                             <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <label for="number_of_days_temp" string="Duration"/>
@@ -139,8 +143,6 @@
                                     <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
                                 </group>
                             </group>
-                            <newline/>
-                            <field name="name" nolabel="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" placeholder="Add a reason..."/>
                     </group>
                 </sheet>
                 <div class="oe_chatter">
@@ -166,6 +168,10 @@
                 </header>
                 <sheet>
                     <group>
+	                    <group>
+	                    	<field name="name" required="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
+	                    </group>
+	                    <newline/>
                         <group>
                             <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <field name="number_of_days_temp"/>
@@ -181,7 +187,8 @@
                         <field name="double_validation" invisible="1"/>
                         <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                     </group>
-                    <field name="name" placeholder="Add a reason..."/>
+                    <newline/>
+                    <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>

From 903c783be0f50a65e8c9e18f7c720572c14786c3 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 3 Aug 2012 17:39:46 +0200
Subject: [PATCH 030/288] fixed padding in contact kanban view for companies

bzr revid: mit@openerp.com-20120803153946-5yi9vdtk58jx29bo
---
 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 27caa708cb6..a0f70f5814b 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -177,7 +177,7 @@
                                             <t t-set="color" t-value="kanban_color(record.color.raw_value)"/>
                                             <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')" style="position: relative">
                                                 <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
-                                                <div class="oe_module_vignette">
+                                                <div>
                                                 <a type="edit">
                                                     <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_avatar oe_kanban_avatar_toto"/>
                                                 </a>

From e4a2ac99a71311ae06ecd1ba57f3da55088a7154 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 6 Aug 2012 13:10:35 +0530
Subject: [PATCH 031/288] [IMP]:Improve translation synchronization

bzr revid: aja@tinyerp.com-20120806074035-11pi9wal2psnvl6w
---
 addons/base_gengo/__init__.py                 |   5 +-
 addons/base_gengo/__openerp__.py              |   5 +-
 addons/base_gengo/ir_translation.py           |   5 +-
 addons/base_gengo/res_lang.py                 |  32 ++++
 addons/base_gengo/res_lang_view.xml           |  17 ++
 addons/base_gengo/wizard/__init__.py          |  26 +++
 .../base_gengo/wizard/alert_message_gengo.xml |  22 +++
 .../wizard/gengo_response_scheduler.xml       |  26 +++
 .../wizard/gengo_update_translation.py        | 142 ++++++++++++++++
 addons/base_gengo/wizard/wrap_object.py       | 159 ++++++++++++++++++
 10 files changed, 434 insertions(+), 5 deletions(-)
 create mode 100644 addons/base_gengo/res_lang.py
 create mode 100644 addons/base_gengo/res_lang_view.xml
 create mode 100644 addons/base_gengo/wizard/__init__.py
 create mode 100644 addons/base_gengo/wizard/alert_message_gengo.xml
 create mode 100644 addons/base_gengo/wizard/gengo_response_scheduler.xml
 create mode 100644 addons/base_gengo/wizard/gengo_update_translation.py
 create mode 100644 addons/base_gengo/wizard/wrap_object.py

diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
index ca798adebee..c434c6b1843 100644
--- a/addons/base_gengo/__init__.py
+++ b/addons/base_gengo/__init__.py
@@ -11,7 +11,7 @@
 #
 #    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
+#    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
@@ -21,5 +21,6 @@
 
 import res_company
 import ir_translation
-
+import wizard
+import res_lang
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index 7afc573b0ca..e8fe7e0df17 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -31,7 +31,10 @@ Automated Translations through Gengo API
     'init_xml': [],
     'update_xml': [
         'ir_translation.xml',
-        'res_company_view.xml'
+        'res_company_view.xml',
+        'res_lang_view.xml',
+        'wizard/gengo_response_scheduler.xml',
+        'wizard/alert_message_gengo.xml',
            ],
     'demo_xml': [],
     'test': [],
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index a658b935c93..2c1740b9b04 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -11,7 +11,7 @@
 #
 #    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
+#    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
@@ -29,8 +29,9 @@ class ir_translation(osv.Model):
         'gengo_comment':fields.text("Comments"),
         'gengo_translation':fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
         'gengo_control':fields.boolean('Active'),
+        'job_id':fields.char('Gengo Job Id',size=32),
     }
-    
+        
     _defaults = {
         'gengo_control':False,
     }
diff --git a/addons/base_gengo/res_lang.py b/addons/base_gengo/res_lang.py
new file mode 100644
index 00000000000..48e5a6db995
--- /dev/null
+++ b/addons/base_gengo/res_lang.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-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/>.
+#
+##############################################################################
+
+from osv import fields,osv
+
+class res_company(osv.Model):
+    _name = "res.lang"
+    _description = "Languages"
+    _inherit = "res.lang"
+
+    _columns = {
+        'gengo_sync':fields.boolean('Active', help='Synchronize Translation Periodically')
+    }
+    
diff --git a/addons/base_gengo/res_lang_view.xml b/addons/base_gengo/res_lang_view.xml
new file mode 100644
index 00000000000..efdfeed671e
--- /dev/null
+++ b/addons/base_gengo/res_lang_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <!-- res.company form view -->
+        <record model="ir.ui.view" id="view_language_inherit_base_gengo_form">
+            <field name="name">res.lang.form.inherit</field>
+            <field name="inherit_id" ref="base.res_lang_form"/>
+            <field name="model">res.lang</field>           
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//sheet/group" position="inside">
+                    <field name="gengo_sync" />
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
new file mode 100644
index 00000000000..fe8452a5b64
--- /dev/null
+++ b/addons/base_gengo/wizard/__init__.py
@@ -0,0 +1,26 @@
+# -*- 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 gengo_update_translation
+import wrap_object
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+
diff --git a/addons/base_gengo/wizard/alert_message_gengo.xml b/addons/base_gengo/wizard/alert_message_gengo.xml
new file mode 100644
index 00000000000..9b16c34552f
--- /dev/null
+++ b/addons/base_gengo/wizard/alert_message_gengo.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="update_translation_wizard_view_confirm">
+            <field name="name">update.translations.serial.wizard.view</field>
+            <field name="inherit_id" ref="base.wizard_update_translations"/>
+            <field name="model">base.update.translations</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='Synchronize Translation']" position="inside">
+                        <group colspan="4">
+                            <field name="state" invisible="1"/>
+                            <label string="Your Request has been Successfully Send to Gengo" states="done" colspan="4"/>
+                        </group>
+                        <group colspan="4">
+                            <label string="This language is select as Active All Translation Request will be sent by System Automatically" states="inprogress" colspan="4"/>
+                        </group>                        
+                </xpath>
+            </field>
+        </record>    
+    </data>
+</openerp>
diff --git a/addons/base_gengo/wizard/gengo_response_scheduler.xml b/addons/base_gengo/wizard/gengo_response_scheduler.xml
new file mode 100644
index 00000000000..f924dc5e4ee
--- /dev/null
+++ b/addons/base_gengo/wizard/gengo_response_scheduler.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!--Scheduler Gengo Response-->
+        <record id="gengo_response_scheduler" model="ir.cron">
+            <field name="name" >Run Gengo Response Scheduler</field>
+            <field eval="True" name="active"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field eval="'base.update.translations'" name="model"></field>
+            <field eval="'scheduler_get_gengo_response'" name="function"/>
+        </record>
+        
+        <!--Schedular Sync Request-->
+        <record id="gengo_sync_request_scheduler" model="ir.cron">
+            <field name="name" >Run Gengo Sync Request Scheduler</field>
+            <field eval="True" name="active"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+            <field eval="'base.update.translations'" name="model"></field>
+            <field eval="'scheduler_get_gengo_sync_request'" name="function"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
new file mode 100644
index 00000000000..a5186b4ab6d
--- /dev/null
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -0,0 +1,142 @@
+    # -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-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/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import tools
+import cStringIO
+from tools.translate import _
+import wrap_object
+import logging
+_logger = logging.getLogger(__name__)
+
+class gengo_update_translation(osv.osv_memory):
+
+    def send_translation_terms(self, cr, uid, ids, context):
+        """Lasy Loading will be perform when user or cron send a bunch of request."""
+        
+        total_term=0
+        limit= 0
+        translation_list=context['translation_term_id']
+        range_jobs=1
+        
+        meta = self.pool.get('jobs.meta')
+        translation_pool=self.pool.get('ir.translation')
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        gengo = meta.gengo_authentication(cr,uid,ids,context)
+        job_length=len(context['translation_term_id'])
+        remain=len(context['translation_term_id']) % wrap_object.REQUEST_LIMIT
+        if len(context['translation_term_id']) > wrap_object.REQUEST_LIMIT:
+            if remain > 0:
+                range_jobs=(len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT) + 1
+            else:
+                range_jobs=len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT
+        for length in range(0,range_jobs):
+            trans_list=[]
+            if job_length > wrap_object.REQUEST_LIMIT:
+                job_length-=wrap_object.REQUEST_LIMIT
+                limit+=wrap_object.REQUEST_LIMIT
+            else:
+                limit+=remain
+            for key in translation_list[total_term:limit]:
+                trans_list.append(key)
+            total_term=limit
+            jobs = meta.pack_jobs_request(cr,uid,trans_list,context={'language_code':context['lang']})
+            result = gengo.postTranslationJobs(jobs = jobs) 
+            self.write(cr, uid, ids, {'state':'done'})
+            if user.company_id.gengo_tier == 'machine':
+                if result.get('opstat')=='ok':
+                     for job in result.get('response').get('jobs'):
+                        for translation_id,val in job.items():
+                            translation_pool.write(cr,uid,int(translation_id),{'value':
+                            val['body_tgt'],'state':'translated','gengo_control':True})
+            else:
+                for job in result.get('response').get('jobs'):
+                    for translation_id,val in job.items():
+                        translation_pool.write(cr,uid,int(translation_id),{'job_id':val['job_id']})
+        return
+        
+    def act_update(self, cr, uid, ids, context=None):
+        try:
+            language_pool=self.pool.get('res.lang')
+            this = self.browse(cr, uid, ids)[0]
+            translation_pool=self.pool.get('ir.translation')
+            lang_search_id=language_pool.search(cr, uid, [('gengo_sync','=',True),('code','=',this.lang)])
+            
+            if not lang_search_id:
+                translation_term_id=translation_pool.search(cr,uid,[('state','=','translate'), ('gengo_translation','=','True'),('lang','=',this.lang)])
+                context.update({'lang':this.lang,'translation_term_id':translation_term_id})
+                self.send_translation_terms(cr,uid,ids,context)
+                return
+            else:
+                self.write(cr, uid, ids, {'state':'inprogress'})
+        except Exception, e:
+            raise osv.except_osv(_('Warning !'), _('%s') % e)
+    
+    def scheduler_get_gengo_response(self, cr, uid, ids=0, context=None):
+        """Scheduler will be call to get response from gengo and all term will get 
+        by scheduler which terms are in reviewable state"""
+        
+        meta = self.pool.get('jobs.meta')
+        translation_pool=self.pool.get('ir.translation')
+        
+        gengo = meta.gengo_authentication(cr,uid,ids,context)
+        res = gengo.getTranslationJobs(status = "approved")
+        if res:
+            response = meta.unpack_jobs_response(res)
+            for job in response.response:
+                translation_id=translation_pool.search(cr,uid,[('job_id','=',job.job_id)],context)
+                response=gengo.getTranslationJob(id = job.job_id)
+                translation_pool.write(cr,uid,translation_id,{'value':response['response']['job']['body_tgt'],'state':'translated','gengo_control':True})
+        
+    def scheduler_get_gengo_sync_request(self, cr, uid, ids=0, context=None):
+        """This scheduler will send a job request to the gengo , which terms are 
+        in translate state and gengo_translation is true"""
+        
+        if context is None:
+            context={}
+        try:
+            language_pool=self.pool.get('res.lang')
+            translation_pool=self.pool.get('ir.translation')
+            
+            lang_search_id=language_pool.search(cr, uid, [('gengo_sync','=',True)])
+            lang_ids=language_pool.read(cr, uid,lang_search_id)
+            
+            for lang_id in lang_ids:
+                translation_term_id=translation_pool.search(cr,uid,[('state','=','translate'), ('gengo_translation','=','True'),('lang','=',lang_id['code']),('job_id','=',False)])
+                context.update({'lang':lang_id['code'],'translation_term_id':translation_term_id})
+                if translation_term_id:
+                    self.send_translation_terms(cr, uid, ids, context)
+        except Exception, e:
+             _logger.warning('A Gengo Exception is occur:: %s',e)
+
+    _name = 'base.update.translations'
+    _inherit = "base.update.translations"
+    
+    _columns= {
+        'state':fields.selection([('init','init'),('inprogress','inprogress'),('done','done')], 'state'),
+    }
+    
+    _defaults= {
+        'state':'init',
+    }
+
+gengo_update_translation()
+
diff --git a/addons/base_gengo/wizard/wrap_object.py b/addons/base_gengo/wizard/wrap_object.py
new file mode 100644
index 00000000000..51007bdbd71
--- /dev/null
+++ b/addons/base_gengo/wizard/wrap_object.py
@@ -0,0 +1,159 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-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/>.
+#
+##############################################################################
+
+from osv import orm, osv
+import tools
+from tools.translate import _
+from mygengo import MyGengo
+import re
+
+REQUEST_LIMIT=10
+
+LANG_MAPPING={
+    'ar':'Arabic',
+    'id':'Indonesian',
+    'nl':'Dutch',
+    'fr-ca':'French (Canada)',
+    'pl':'Polish',
+    'zh-tw':'Chinese (Traditional)',
+    'sv':'Swedish',
+    'ko':'Korean',
+    'pt':'Portuguese (Europe)',
+    'en':'English',
+    'ja':'Japanese',
+    'es':'Spanish (Spain)',
+    'zh':'Chinese (Simplified)',
+    'de':'German',
+    'fr':'French',
+    'ru':'Russian',
+    'it':'Italian',
+    'pt-br':'Portuguese (Brazil)',
+}
+
+LANG_CODE_MAPPING = {
+    'ar_SA':'ar',
+    'id_ID':'id',
+    'nl_NL':'nl',
+    'fr_CA':'fr-ca',
+    'pl':'pl',
+    'zh_TW':'zh-tw',
+    'sv_SE':'sv',
+    'ko_KR':'ko',
+    'pt_PT':'pt',
+    'en':'en',
+    'ja_JP':'ja',
+    'es_ES':'es',
+    'zh_CN':'zh',
+    'de_DE':'de',
+    'fr_FR':'fr',
+    'ru_RU':'ru',
+    'it_IT':'it',
+    'pt_BR':'pt-br'
+}
+
+class gengo_response(object):
+    """ 
+    """
+    def __init__(self, jobs):
+        response = jobs['response'] 
+        job = []
+        jobs_id=[]
+        if isinstance(response, list):
+            job = [ gengo_job(value) for value in response]
+        else:
+            job = [ gengo_job(value) for value in response.values()]
+        jobs.update({'response': job})
+        self._data = jobs
+
+    def __getitem__(self, name):
+        return self._data[name]
+
+    def __getattr__(self, name):
+        try:
+            return self[name]
+        except KeyError, e:
+            raise AttributeError(e)
+
+class gengo_job(object):
+    """ 
+    """
+    def __init__(self, job):
+        self._data = job
+
+    def __getitem__(self, name):
+        return self._data[name]
+
+    def __getattr__(self, name):
+        try:
+            return self[name]
+        except KeyError, e:
+            raise AttributeError(e)
+
+class JobsMeta(orm.AbstractModel):
+    
+    _name="jobs.meta"
+    
+    def gengo_authentication(self,cr,uid,ids,context=None):
+        ''' To Send Request and Get Response from Gengo User needs Public and Private
+         key for that user need to signup to gengo and get public and private 
+         key which is provided by gengo to authentic user '''
+    
+        gengo_parameter_pool=self.pool.get('res.users').browse(cr,uid,uid,context)
+        try:
+            gengo = MyGengo(
+                public_key = gengo_parameter_pool.company_id.gengo_public_key.encode('ascii'),
+                private_key = gengo_parameter_pool.company_id.gengo_private_key.encode('ascii'),
+                sandbox = True,
+            )
+            return gengo
+        except Exception, e:
+            raise osv.except_osv(_('Warning !'), _(e))
+             
+    def pack_jobs_request(self, cr, uid, translation_term_id, context):
+        jobs={}
+        auto_approve = 0
+        gengo_parameter_pool=self.pool.get('res.users').browse(cr, uid, uid, context)
+        translation_pool =self.pool.get('ir.translation')
+        
+        if gengo_parameter_pool.company_id.gengo_auto_approve == True:
+            auto_approve=1
+
+        for key,value in LANG_CODE_MAPPING.items():
+            if key == context['language_code']:
+                for terms in translation_pool.read(cr, uid, translation_term_id, context=None):
+#                    translation_pool.write(cr,uid,translation_term_id,{'state':'inprogress'})
+                    if re.search(r"[a-z A-Z]",terms['src']):
+                        job = {'type':'text',
+                                'slug':'single::English to '+ LANG_MAPPING.get(value),
+                                'tier':gengo_parameter_pool.company_id.gengo_tier,
+                                'body_src':terms['src'],
+                                'lc_src':'en',
+                                'lc_tgt':value,     
+                                'auto_approve': auto_approve,   
+                                'comment':gengo_parameter_pool.company_id.gengo_comment ,
+                                }
+                        jobs.update({terms['id']: job})
+                return {'jobs': jobs}
+                
+    def unpack_jobs_response(self, jobs):
+        return gengo_response(jobs)
+        
+        

From 7187ef8bb4dad5cb6302f112e941139f68dcd0fa Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 6 Aug 2012 15:55:17 +0530
Subject: [PATCH 032/288] [IMP]: Improve in base_gengo as per pylint standard

bzr revid: aja@tinyerp.com-20120806102517-tretlbhm2ydwetxi
---
 addons/base_gengo/ir_translation.py           |  21 ++-
 addons/base_gengo/ir_translation.xml          |   4 +-
 addons/base_gengo/res_company.py              |  28 ++--
 addons/base_gengo/res_company_view.xml        |   2 +-
 addons/base_gengo/res_lang.py                 |   7 +-
 addons/base_gengo/res_lang_view.xml           |   2 +-
 addons/base_gengo/wizard/__init__.py          |   2 -
 .../base_gengo/wizard/alert_message_gengo.xml |   6 +-
 .../wizard/gengo_response_scheduler.xml       |   4 +-
 .../wizard/gengo_update_translation.py        | 133 +++++++--------
 addons/base_gengo/wizard/wrap_object.py       | 156 +++++++++---------
 11 files changed, 178 insertions(+), 187 deletions(-)

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 2c1740b9b04..297e449ecdc 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -19,20 +19,19 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
+
 
 class ir_translation(osv.Model):
     _name = "ir.translation"
-    _description="Translation"
-    _inherit="ir.translation"
+    _inherit = "ir.translation"
     _columns = {
-        'gengo_comment':fields.text("Comments"),
-        'gengo_translation':fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
-        'gengo_control':fields.boolean('Active'),
-        'job_id':fields.char('Gengo Job Id',size=32),
-    }
-        
-    _defaults = {
-        'gengo_control':False,
+        'gengo_comment': fields.text("Comments"),
+        'gengo_translation': fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
+        'gengo_control': fields.boolean('Active'),
+        'job_id': fields.char('Gengo Job Id', size=32),
     }
 
+    _defaults = {
+        'gengo_control': False,
+    }
diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
index 52b081cd7d6..753c12c7e7d 100644
--- a/addons/base_gengo/ir_translation.xml
+++ b/addons/base_gengo/ir_translation.xml
@@ -13,12 +13,12 @@
                 </search>
             </field>
         </record>
-        
+
         <!-- ir.translation form view -->
         <record model="ir.ui.view" id="view_ir_translation_inherit_base_gengo_form">
             <field name="name">ir.translation.form.inherit</field>
             <field name="inherit_id" ref="base.view_translation_form"/>
-            <field name="model">ir.translation</field>           
+            <field name="model">ir.translation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                  <xpath expr="//form[@string='Translations']/sheet" position="inside">
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 2a91d13f1b1..888e675e26b 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -19,24 +19,24 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
+
 
 class res_company(osv.Model):
     _name = "res.company"
-    _description = "Companies"
     _inherit = "res.company"
     _columns = {
-           "gengo_private_key":fields.text("Gengo private key"),
-           "gengo_public_key":fields.text("Gengo public key"),
-           "gengo_tier":fields.selection([('machine','Machine'),
-                                          ('standard','Standard'),
-                                          ('pro','Pro'),
-                                          ('ultra','Ultra')],"Tier types", required=True),
-           "gengo_comment":fields.text("comments"),
-           "gengo_auto_approve":fields.boolean("Active",help="Jobs are Automatically Approved by Gengo."),
-           "fields_ids":fields.many2many('ir.model.fields','fields_company_rel','field_id','model_id','fields'),
+           "gengo_private_key": fields.text("Gengo private key"),
+           "gengo_public_key": fields.text("Gengo public key"),
+           "gengo_tier": fields.selection([('machine', 'Machine'),
+                                          ('standard', 'Standard'),
+                                          ('pro', 'Pro'),
+                                          ('ultra', 'Ultra')], "Tier types", required=True),
+           "gengo_comment": fields.text("comments"),
+           "gengo_auto_approve": fields.boolean("Active", help="Jobs are Automatically Approved by Gengo."),
+           "fields_ids": fields.many2many('ir.model.fields', 'fields_company_rel', 'field_id', 'model_id', 'fields'),
     }
-    
-    _defaults={
-        "gengo_tier":"machine",
+
+    _defaults = {
+        "gengo_tier": "machine",
     }
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index a4f6ceffcce..bfa0b1ddf95 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -5,7 +5,7 @@
         <record model="ir.ui.view" id="view_company_inherit_base_gengo_form">
             <field name="name">res.company.form.inherit</field>
             <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="model">res.company</field>           
+            <field name="model">res.company</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//notebook[last()]" position="inside">
diff --git a/addons/base_gengo/res_lang.py b/addons/base_gengo/res_lang.py
index 48e5a6db995..e9c88c9fd29 100644
--- a/addons/base_gengo/res_lang.py
+++ b/addons/base_gengo/res_lang.py
@@ -19,14 +19,13 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
+
 
 class res_company(osv.Model):
     _name = "res.lang"
-    _description = "Languages"
     _inherit = "res.lang"
 
     _columns = {
-        'gengo_sync':fields.boolean('Active', help='Synchronize Translation Periodically')
+        'gengo_sync': fields.boolean('Active', help='Synchronize Translation Periodically')
     }
-    
diff --git a/addons/base_gengo/res_lang_view.xml b/addons/base_gengo/res_lang_view.xml
index efdfeed671e..e0c8edd11aa 100644
--- a/addons/base_gengo/res_lang_view.xml
+++ b/addons/base_gengo/res_lang_view.xml
@@ -5,7 +5,7 @@
         <record model="ir.ui.view" id="view_language_inherit_base_gengo_form">
             <field name="name">res.lang.form.inherit</field>
             <field name="inherit_id" ref="base.res_lang_form"/>
-            <field name="model">res.lang</field>           
+            <field name="model">res.lang</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//sheet/group" position="inside">
diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
index fe8452a5b64..e7935ca8b1c 100644
--- a/addons/base_gengo/wizard/__init__.py
+++ b/addons/base_gengo/wizard/__init__.py
@@ -22,5 +22,3 @@
 import gengo_update_translation
 import wrap_object
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-
diff --git a/addons/base_gengo/wizard/alert_message_gengo.xml b/addons/base_gengo/wizard/alert_message_gengo.xml
index 9b16c34552f..304175db031 100644
--- a/addons/base_gengo/wizard/alert_message_gengo.xml
+++ b/addons/base_gengo/wizard/alert_message_gengo.xml
@@ -7,16 +7,16 @@
             <field name="model">base.update.translations</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='Synchronize Translation']" position="inside">
+                <xpath expr="//group" position="inside">
                         <group colspan="4">
                             <field name="state" invisible="1"/>
                             <label string="Your Request has been Successfully Send to Gengo" states="done" colspan="4"/>
                         </group>
                         <group colspan="4">
                             <label string="This language is select as Active All Translation Request will be sent by System Automatically" states="inprogress" colspan="4"/>
-                        </group>                        
+                        </group>
                 </xpath>
             </field>
-        </record>    
+        </record>
     </data>
 </openerp>
diff --git a/addons/base_gengo/wizard/gengo_response_scheduler.xml b/addons/base_gengo/wizard/gengo_response_scheduler.xml
index f924dc5e4ee..544235d8a6f 100644
--- a/addons/base_gengo/wizard/gengo_response_scheduler.xml
+++ b/addons/base_gengo/wizard/gengo_response_scheduler.xml
@@ -6,12 +6,12 @@
             <field name="name" >Run Gengo Response Scheduler</field>
             <field eval="True" name="active"/>
             <field name="interval_number">1</field>
-            <field name="interval_type">minutes</field>
+            <field name="interval_type">days</field>
             <field name="numbercall">-1</field>
             <field eval="'base.update.translations'" name="model"></field>
             <field eval="'scheduler_get_gengo_response'" name="function"/>
         </record>
-        
+
         <!--Schedular Sync Request-->
         <record id="gengo_sync_request_scheduler" model="ir.cron">
             <field name="name" >Run Gengo Sync Request Scheduler</field>
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index a5186b4ab6d..1a5c90edb0a 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -20,123 +20,118 @@
 ##############################################################################
 
 from osv import osv, fields
-import tools
-import cStringIO
 from tools.translate import _
 import wrap_object
 import logging
 _logger = logging.getLogger(__name__)
 
+
 class gengo_update_translation(osv.osv_memory):
 
     def send_translation_terms(self, cr, uid, ids, context):
         """Lasy Loading will be perform when user or cron send a bunch of request."""
-        
-        total_term=0
-        limit= 0
-        translation_list=context['translation_term_id']
-        range_jobs=1
-        
+        total_term = 0
+        limit = 0
+        translation_list = context['translation_term_id']
+        range_jobs = 1
         meta = self.pool.get('jobs.meta')
-        translation_pool=self.pool.get('ir.translation')
+        translation_pool = self.pool.get('ir.translation')
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
-        gengo = meta.gengo_authentication(cr,uid,ids,context)
-        job_length=len(context['translation_term_id'])
-        remain=len(context['translation_term_id']) % wrap_object.REQUEST_LIMIT
+        gengo = meta.gengo_authentication(cr, uid, ids, context)
+        job_length = len(context['translation_term_id'])
+        remain = len(context['translation_term_id']) % wrap_object.REQUEST_LIMIT
         if len(context['translation_term_id']) > wrap_object.REQUEST_LIMIT:
             if remain > 0:
-                range_jobs=(len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT) + 1
+                range_jobs = (len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT) + 1
             else:
-                range_jobs=len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT
-        for length in range(0,range_jobs):
-            trans_list=[]
+                range_jobs = len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT
+        for length in range(0, range_jobs):
+            trans_list = []
             if job_length > wrap_object.REQUEST_LIMIT:
-                job_length-=wrap_object.REQUEST_LIMIT
-                limit+=wrap_object.REQUEST_LIMIT
+                job_length -= wrap_object.REQUEST_LIMIT
+                limit += wrap_object.REQUEST_LIMIT
             else:
-                limit+=remain
+                limit += remain
             for key in translation_list[total_term:limit]:
                 trans_list.append(key)
-            total_term=limit
-            jobs = meta.pack_jobs_request(cr,uid,trans_list,context={'language_code':context['lang']})
-            result = gengo.postTranslationJobs(jobs = jobs) 
-            self.write(cr, uid, ids, {'state':'done'})
+            total_term = limit
+            jobs = meta.pack_jobs_request(cr, uid, trans_list, context={'language_code': context['lang']})
+            result = gengo.postTranslationJobs(jobs=jobs)
+            self.write(cr, uid, ids, {'state': 'done'})
             if user.company_id.gengo_tier == 'machine':
-                if result.get('opstat')=='ok':
-                     for job in result.get('response').get('jobs'):
-                        for translation_id,val in job.items():
-                            translation_pool.write(cr,uid,int(translation_id),{'value':
-                            val['body_tgt'],'state':'translated','gengo_control':True})
+                if result.get('opstat') == 'ok':
+                    for job in result.get('response').get('jobs'):
+                        for translation_id, val in job.items():
+                            translation_pool.write(cr, uid, int(translation_id), {'value':
+                            val['body_tgt'], 'state': 'translated', 'gengo_control': True})
             else:
                 for job in result.get('response').get('jobs'):
-                    for translation_id,val in job.items():
-                        translation_pool.write(cr,uid,int(translation_id),{'job_id':val['job_id']})
+                    for translation_id, val in job.items():
+                        translation_pool.write(cr, uid, int(translation_id), {'job_id': val['job_id']})
         return
-        
+
     def act_update(self, cr, uid, ids, context=None):
         try:
-            language_pool=self.pool.get('res.lang')
+            language_pool = self.pool.get('res.lang')
             this = self.browse(cr, uid, ids)[0]
-            translation_pool=self.pool.get('ir.translation')
-            lang_search_id=language_pool.search(cr, uid, [('gengo_sync','=',True),('code','=',this.lang)])
-            
+            translation_pool = self.pool.get('ir.translation')
+            lang_search_id = language_pool.search(cr, uid,
+            [('gengo_sync', '=', True), ('code', '=', this.lang)])
+
             if not lang_search_id:
-                translation_term_id=translation_pool.search(cr,uid,[('state','=','translate'), ('gengo_translation','=','True'),('lang','=',this.lang)])
-                context.update({'lang':this.lang,'translation_term_id':translation_term_id})
-                self.send_translation_terms(cr,uid,ids,context)
+                translation_term_id = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', 'True'), ('lang', '=', this.lang)])
+                context.update({'lang': this.lang, 'translation_term_id': translation_term_id})
+                self.send_translation_terms(cr, uid, ids, context)
                 return
             else:
-                self.write(cr, uid, ids, {'state':'inprogress'})
+                self.write(cr, uid, ids, {'state': 'inprogress'})
         except Exception, e:
             raise osv.except_osv(_('Warning !'), _('%s') % e)
-    
+
     def scheduler_get_gengo_response(self, cr, uid, ids=0, context=None):
-        """Scheduler will be call to get response from gengo and all term will get 
+        """Scheduler will be call to get response from gengo and all term will get
         by scheduler which terms are in reviewable state"""
-        
+
         meta = self.pool.get('jobs.meta')
-        translation_pool=self.pool.get('ir.translation')
-        
-        gengo = meta.gengo_authentication(cr,uid,ids,context)
-        res = gengo.getTranslationJobs(status = "approved")
+        translation_pool = self.pool.get('ir.translation')
+        gengo = meta.gengo_authentication(cr, uid, ids, context)
+        res = gengo.getTranslationJobs(status="approved")
         if res:
             response = meta.unpack_jobs_response(res)
             for job in response.response:
-                translation_id=translation_pool.search(cr,uid,[('job_id','=',job.job_id)],context)
-                response=gengo.getTranslationJob(id = job.job_id)
-                translation_pool.write(cr,uid,translation_id,{'value':response['response']['job']['body_tgt'],'state':'translated','gengo_control':True})
-        
+                translation_id = translation_pool.search(cr, uid, [('job_id', '=', job.job_id)], context)
+                response = gengo.getTranslationJob(id=job.job_id)
+                translation_pool.write(cr, uid, translation_id, {'value': response['response']['job']['body_tgt'], 'state': 'translated', 'gengo_control': True})
+
     def scheduler_get_gengo_sync_request(self, cr, uid, ids=0, context=None):
-        """This scheduler will send a job request to the gengo , which terms are 
+        """This scheduler will send a job request to the gengo , which terms are
         in translate state and gengo_translation is true"""
-        
+
         if context is None:
-            context={}
+            context = {}
         try:
-            language_pool=self.pool.get('res.lang')
-            translation_pool=self.pool.get('ir.translation')
-            
-            lang_search_id=language_pool.search(cr, uid, [('gengo_sync','=',True)])
-            lang_ids=language_pool.read(cr, uid,lang_search_id)
-            
+            language_pool = self.pool.get('res.lang')
+            translation_pool = self.pool.get('ir.translation')
+            lang_search_id = language_pool.search(cr, uid, [('gengo_sync', '=', True)])
+            lang_ids = language_pool.read(cr, uid, lang_search_id)
+
             for lang_id in lang_ids:
-                translation_term_id=translation_pool.search(cr,uid,[('state','=','translate'), ('gengo_translation','=','True'),('lang','=',lang_id['code']),('job_id','=',False)])
-                context.update({'lang':lang_id['code'],'translation_term_id':translation_term_id})
+                translation_term_id = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', 'True'), ('lang', '=', lang_id['code']), ('job_id', '=', False)])
+                context.update({'lang': lang_id['code'], 'translation_term_id':  translation_term_id})
                 if translation_term_id:
                     self.send_translation_terms(cr, uid, ids, context)
         except Exception, e:
-             _logger.warning('A Gengo Exception is occur:: %s',e)
+            _logger.warning('A Gengo Exception is occur:: %s', e)
 
     _name = 'base.update.translations'
     _inherit = "base.update.translations"
-    
-    _columns= {
-        'state':fields.selection([('init','init'),('inprogress','inprogress'),('done','done')], 'state'),
+    _columns = {
+        'state': fields.selection([('init', 'init'), ('inprogress', 'inprogress'), ('done', 'done')], 'state'),
     }
-    
-    _defaults= {
-        'state':'init',
+
+    _defaults = {
+        'state': 'init',
     }
 
 gengo_update_translation()
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/wrap_object.py b/addons/base_gengo/wizard/wrap_object.py
index 51007bdbd71..01368e5e2cb 100644
--- a/addons/base_gengo/wizard/wrap_object.py
+++ b/addons/base_gengo/wizard/wrap_object.py
@@ -20,66 +20,65 @@
 ##############################################################################
 
 from osv import orm, osv
-import tools
 from tools.translate import _
 from mygengo import MyGengo
 import re
 
-REQUEST_LIMIT=10
+REQUEST_LIMIT = 10
 
-LANG_MAPPING={
-    'ar':'Arabic',
-    'id':'Indonesian',
-    'nl':'Dutch',
-    'fr-ca':'French (Canada)',
-    'pl':'Polish',
-    'zh-tw':'Chinese (Traditional)',
-    'sv':'Swedish',
-    'ko':'Korean',
-    'pt':'Portuguese (Europe)',
-    'en':'English',
-    'ja':'Japanese',
-    'es':'Spanish (Spain)',
-    'zh':'Chinese (Simplified)',
-    'de':'German',
-    'fr':'French',
-    'ru':'Russian',
-    'it':'Italian',
-    'pt-br':'Portuguese (Brazil)',
+LANG_MAPPING = {
+    'ar': 'Arabic',
+    'id': 'Indonesian',
+    'nl': 'Dutch',
+    'fr-ca': 'French (Canada)',
+    'pl': 'Polish',
+    'zh-tw': 'Chinese (Traditional)',
+    'sv': 'Swedish',
+    'ko': 'Korean',
+    'pt': 'Portuguese (Europe)',
+    'en': 'English',
+    'ja': 'Japanese',
+    'es': 'Spanish (Spain)',
+    'zh': 'Chinese (Simplified)',
+    'de': 'German',
+    'fr': 'French',
+    'ru': 'Russian',
+    'it': 'Italian',
+    'pt-br': 'Portuguese (Brazil)',
 }
 
 LANG_CODE_MAPPING = {
-    'ar_SA':'ar',
-    'id_ID':'id',
-    'nl_NL':'nl',
-    'fr_CA':'fr-ca',
-    'pl':'pl',
-    'zh_TW':'zh-tw',
-    'sv_SE':'sv',
-    'ko_KR':'ko',
-    'pt_PT':'pt',
-    'en':'en',
-    'ja_JP':'ja',
-    'es_ES':'es',
-    'zh_CN':'zh',
-    'de_DE':'de',
-    'fr_FR':'fr',
-    'ru_RU':'ru',
-    'it_IT':'it',
-    'pt_BR':'pt-br'
+    'ar_SA': 'ar',
+    'id_ID': 'id',
+    'nl_NL': 'nl',
+    'fr_CA': 'fr-ca',
+    'pl': 'pl',
+    'zh_TW': 'zh-tw',
+    'sv_SE': 'sv',
+    'ko_KR': 'ko',
+    'pt_PT': 'pt',
+    'en': 'en',
+    'ja_JP': 'ja',
+    'es_ES': 'es',
+    'zh_CN': 'zh',
+    'de_DE': 'de',
+    'fr_FR': 'fr',
+    'ru_RU': 'ru',
+    'it_IT': 'it',
+    'pt_BR': 'pt-br'
 }
 
+
 class gengo_response(object):
-    """ 
+    """
     """
     def __init__(self, jobs):
-        response = jobs['response'] 
+        response = jobs['response']
         job = []
-        jobs_id=[]
         if isinstance(response, list):
-            job = [ gengo_job(value) for value in response]
+            job = [gengo_job(value) for value in response]
         else:
-            job = [ gengo_job(value) for value in response.values()]
+            job = [gengo_job(value) for value in response.values()]
         jobs.update({'response': job})
         self._data = jobs
 
@@ -92,8 +91,9 @@ class gengo_response(object):
         except KeyError, e:
             raise AttributeError(e)
 
+
 class gengo_job(object):
-    """ 
+    """
     """
     def __init__(self, job):
         self._data = job
@@ -107,53 +107,53 @@ class gengo_job(object):
         except KeyError, e:
             raise AttributeError(e)
 
+
 class JobsMeta(orm.AbstractModel):
-    
-    _name="jobs.meta"
-    
-    def gengo_authentication(self,cr,uid,ids,context=None):
+
+    _name = "jobs.meta"
+
+    def gengo_authentication(self, cr, uid, ids, context=None):
         ''' To Send Request and Get Response from Gengo User needs Public and Private
-         key for that user need to signup to gengo and get public and private 
+         key for that user need to signup to gengo and get public and private
          key which is provided by gengo to authentic user '''
-    
-        gengo_parameter_pool=self.pool.get('res.users').browse(cr,uid,uid,context)
+
+        gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
         try:
             gengo = MyGengo(
-                public_key = gengo_parameter_pool.company_id.gengo_public_key.encode('ascii'),
-                private_key = gengo_parameter_pool.company_id.gengo_private_key.encode('ascii'),
-                sandbox = True,
+                public_key=gengo_parameter_pool.company_id.gengo_public_key.encode('ascii'),
+                private_key=gengo_parameter_pool.company_id.gengo_private_key.encode('ascii'),
+                sandbox=True,
             )
             return gengo
         except Exception, e:
             raise osv.except_osv(_('Warning !'), _(e))
-             
-    def pack_jobs_request(self, cr, uid, translation_term_id, context):
-        jobs={}
-        auto_approve = 0
-        gengo_parameter_pool=self.pool.get('res.users').browse(cr, uid, uid, context)
-        translation_pool =self.pool.get('ir.translation')
-        
-        if gengo_parameter_pool.company_id.gengo_auto_approve == True:
-            auto_approve=1
 
-        for key,value in LANG_CODE_MAPPING.items():
+    def pack_jobs_request(self, cr, uid, translation_term_id, context):
+        jobs = {}
+        auto_approve = 0
+        gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
+        translation_pool = self.pool.get('ir.translation')
+
+        if gengo_parameter_pool.company_id.gengo_auto_approve == True:
+            auto_approve = 1
+
+        for key, value in LANG_CODE_MAPPING.items():
             if key == context['language_code']:
                 for terms in translation_pool.read(cr, uid, translation_term_id, context=None):
-#                    translation_pool.write(cr,uid,translation_term_id,{'state':'inprogress'})
-                    if re.search(r"[a-z A-Z]",terms['src']):
-                        job = {'type':'text',
-                                'slug':'single::English to '+ LANG_MAPPING.get(value),
-                                'tier':gengo_parameter_pool.company_id.gengo_tier,
-                                'body_src':terms['src'],
-                                'lc_src':'en',
-                                'lc_tgt':value,     
-                                'auto_approve': auto_approve,   
-                                'comment':gengo_parameter_pool.company_id.gengo_comment ,
+                    translation_pool.write(cr, uid, translation_term_id, {'state': 'inprogress'})
+                    if re.search(r"[a-z A-Z]", terms['src']):
+                        job = {'type': 'text',
+                                'slug': 'single::English to' + LANG_MAPPING.get(value),
+                                'tier': gengo_parameter_pool.company_id.gengo_tier,
+                                'body_src': terms['src'],
+                                'lc_src': 'en',
+                                'lc_tgt': value,
+                                'auto_approve': auto_approve,
+                                'comment': gengo_parameter_pool.company_id.gengo_comment,
                                 }
                         jobs.update({terms['id']: job})
                 return {'jobs': jobs}
-                
+
     def unpack_jobs_response(self, jobs):
         return gengo_response(jobs)
-        
-        
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 1a459a100e34bd46b46458ac66dd39e9850f25cd Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 7 Aug 2012 15:54:51 +0530
Subject: [PATCH 033/288] [IMP]: set domain on the menu 'My Leave Request' to
 filter on user_id

bzr revid: mtr@tinyerp.com-20120807102451-1bc8zsdn1bt40tio
---
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 5b63883ce0a..5dee35fc11f 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -295,7 +295,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
             <field name="context">{}</field>
-            <field name="domain">[('type','=','remove')]</field>
+            <field name="domain">[('type','=','remove'),('employee_id.user_id','=', uid)]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
@@ -329,7 +329,7 @@
             <field name="view_id" ref="view_holiday_new_calendar"/>
             <field name="act_window_id" ref="open_ask_holidays"/>
         </record>
-
+        
         <menuitem name="My Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="request_approve_holidays">

From fb6158254833e1f918776975a1b35f0509f451ce Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 7 Aug 2012 15:59:05 +0530
Subject: [PATCH 034/288] [IMP]: changed ir.rule for HR/Officer to see all
 Leave/Allocation request

bzr revid: mtr@tinyerp.com-20120807102905-bws5jn24hy9ucjnh
---
 addons/hr_holidays/security/ir_rule.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index 33d1a2c107f..ff0270026a4 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -11,7 +11,7 @@
     <record id="property_rule_holidays_officer" model="ir.rule">
         <field name="name">Holidays Officer</field>
         <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
-        <field name="domain_force">[('employee_id.parent_id.user_id','=',user.id)]</field>
+        <field name="domain_force">[(1,'=',1)]</field>
         <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
     </record>
     

From e9992a5a17ed7bada5a91a7f66b7593122ddf2d2 Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 7 Aug 2012 16:54:28 +0530
Subject: [PATCH 035/288] [IMP]: reorganised 'Descripton' field in the
 view,removed from the group

bzr revid: mtr@tinyerp.com-20120807112428-othm98knqk73gs2s
---
 addons/hr_holidays/hr_holidays_view.xml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 5dee35fc11f..1f269f88f86 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -102,11 +102,8 @@
                 </header>
                 <sheet string="Leave Request">
                     <group>
-                    	<group col="3">
-                    		<field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                    	</group>
-                        <newline></newline>
                         <group>
+                            <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                             <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <label for="number_of_days_temp" string="Duration"/>
                             <div>
@@ -160,11 +157,8 @@
                 </header>
                 <sheet>
                     <group>
-	                    <group>
-	                    	<field name="name" required="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-	                    </group>
-	                    <newline/>
                         <group>
+                            <field name="name" required="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                             <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <field name="number_of_days_temp"/>
                         </group>

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 036/288] [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 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 037/288] [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 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 038/288] [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 039/288] [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 f517411cc746b2ea1afbf8243d20921dc50bb65c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 9 Aug 2012 16:59:26 +0200
Subject: [PATCH 040/288] imp

bzr revid: fp@tinyerp.com-20120809145926-7rocmvgxefm9w5w1
---
 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 5c6e02d7461..8550fc415e0 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -179,7 +179,7 @@
                                             <t t-set="color" t-value="kanban_color(record.color.raw_value)"/>
                                             <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')" style="position: relative">
                                                 <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
-                                                <div>
+                                                <div class="oe_module_vignette">
                                                 <a type="edit">
                                                     <img t-att-src="kanban_image('res.partner', 'image_small', record.id.value)" class="oe_avatar oe_kanban_avatar_smallbox"/>
                                                 </a>

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 041/288] [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 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 042/288] 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 81a44cef8e3d09c77739d91d86f8b367414652c7 Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 14 Aug 2012 11:14:25 +0530
Subject: [PATCH 043/288] [IMP]: provided static string for crm.meeting if desc
 is not provided on Leave Req

bzr revid: mtr@tinyerp.com-20120814054425-eqej763roe0qf60i
---
 addons/hr_holidays/hr_holidays.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index e36083c335d..d3021cf4c39 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -266,7 +266,7 @@ class hr_holidays(osv.osv):
             if record.holiday_type == 'employee' and record.type == 'remove':
                 meeting_obj = self.pool.get('crm.meeting')
                 meeting_vals = {
-                    'name': record.name,
+                    'name': record.name or _('Leave Request'),
                     'categ_ids': record.holiday_status_id.categ_id and [(6,0,[record.holiday_status_id.categ_id.id])] or [],
                     'duration': record.number_of_days_temp * 8,
                     'description': record.notes,

From 0c20817c37e166893d5e0d02d5a299e38c0f634b Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 14 Aug 2012 17:50:50 +0530
Subject: [PATCH 044/288] [IMP] hr_holidays: clean workflow of hr_holidays

bzr revid: hmo@tinyerp.com-20120814122050-8pax7b6e06urcyvv
---
 addons/hr_holidays/hr_holidays.py           | 57 +++++++------
 addons/hr_holidays/hr_holidays_view.xml     | 23 +-----
 addons/hr_holidays/hr_holidays_workflow.xml | 88 ++++++++++++++-------
 3 files changed, 91 insertions(+), 77 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index d3021cf4c39..a2c9324914b 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -124,8 +124,6 @@ class hr_holidays(osv.osv):
         'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
-        #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
-        #'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
         'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
@@ -135,8 +133,8 @@ class hr_holidays(osv.osv):
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
         'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
-        'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee'),
-        'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
+        'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+        'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Mode', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
         'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)'),
         'double_validation': fields.related('holiday_status_id', 'double_validation', type='boolean', relation='hr.holidays.status', string='Apply Double Validation'),
     }
@@ -244,25 +242,26 @@ class hr_holidays(osv.osv):
             self.unlink(cr, uid, to_unlink, context=context)
         return True
 
-    def holidays_validate(self, cr, uid, ids, context=None):
+    def holidays_first_validate(self, cr, uid, ids, context=None):
         self.check_holidays(cr, uid, ids, context=context)
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
-        self.holidays_validate_notificate(cr, uid, ids, context=context)
+        self.holidays_first_validate_notificate(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state':'validate1', 'manager_id': manager})
 
-    def holidays_validate2(self, cr, uid, ids, context=None):
+    def holidays_validate(self, cr, uid, ids, context=None):
         self.check_holidays(cr, uid, ids, context=context)
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
         self.write(cr, uid, ids, {'state':'validate'})
         data_holiday = self.browse(cr, uid, ids)
-        holiday_ids = []
         for record in data_holiday:
-            if record.holiday_status_id.double_validation:
-                holiday_ids.append(record.id)
+            if record.double_validation:
+                self.write(cr, uid, [record.id], {'manager_id2': manager})
+            else:
+                self.write(cr, uid, [record.id], {'manager_id': manager})
             if record.holiday_type == 'employee' and record.type == 'remove':
                 meeting_obj = self.pool.get('crm.meeting')
                 meeting_vals = {
@@ -301,9 +300,7 @@ class hr_holidays(osv.osv):
                     wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr)
                     wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr)
                     wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr)
-        if holiday_ids:
-            self.holidays_valid2_notificate(cr, uid, holiday_ids, context=context)
-            self.write(cr, uid, holiday_ids, {'manager_id2': manager})
+        self.holidays_validate_notificate(cr, uid, ids, context=context)
         return True
 
     def holidays_confirm(self, cr, uid, ids, context=None):
@@ -311,15 +308,16 @@ class hr_holidays(osv.osv):
         self.holidays_confirm_notificate(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state':'confirm'})
 
-    def holidays_refuse(self, cr, uid, ids, approval, context=None):
+    def holidays_refuse(self, cr, uid, ids, context=None):
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
-        if approval == 'first_approval':
-            self.write(cr, uid, ids, {'state': 'refuse', 'manager_id': manager})
-        else:
-            self.write(cr, uid, ids, {'state': 'refuse', 'manager_id2': manager})
-        self.holidays_refuse_notificate(cr, uid, ids, approval, context=context)
+        for holiday in self.browse(cr, uid, ids, context=context):
+            if holiday.state == 'validate1':
+                self.write(cr, uid, [holiday.id], {'state': 'refuse', 'manager_id': manager})
+            else:
+                self.write(cr, uid, [holiday.id], {'state': 'refuse', 'manager_id2': manager})
+        self.holidays_refuse_notificate(cr, uid, ids, context=context)
         self.holidays_cancel(cr, uid, ids, context=context)
         return True
 
@@ -333,7 +331,7 @@ class hr_holidays(osv.osv):
             # If a category that created several holidays, cancel all related
             wf_service = netsvc.LocalService("workflow")
             for request in record.linked_request_ids or []:
-                wf_service.trg_validate(uid, 'hr.holidays', request.id, 'cancel', cr)
+                wf_service.trg_validate(uid, 'hr.holidays', request.id, 'refuse', cr)
 
         self._remove_resource_leave(cr, uid, ids, context=context)
         return True
@@ -355,7 +353,7 @@ class hr_holidays(osv.osv):
     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:
+            if obj.state == 'confirm' and obj.holiday_type == 'employee' 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
@@ -389,24 +387,25 @@ class hr_holidays(osv.osv):
                     _("The %s request has been <b>submitted</b> and is waiting for validation by the manager.")
                     % ('leave' if obj.type == 'remove' else 'allocation',), type='notification')
     
+    def holidays_first_validate_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>approved</b>. A second validation is necessary and is now pending.")
+                % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+            
     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_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>approved</b>. A second validation is necessary and is now pending.")
+                    _("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)
             else:
                 self.message_append_note(cr, uid, [obj.id], _('System notification'),
                     _("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)
     
-    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'),
-                    _("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)
     
-    def holidays_refuse_notificate(self, cr, uid, ids, approval, context=None):
+    def holidays_refuse_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>refused</b>. The validation process is now over.")
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1f269f88f86..66a3e8cb62f 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -96,7 +96,7 @@
                 <header>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager" class="oe_highlight"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1,validate" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
@@ -123,16 +123,6 @@
                             <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                         </group>
                     </group>
-                    <group colspan="4">
-                            <group>
-                                <group>
-                                    <field name="double_validation" invisible="1"/>
-                                </group>
-                                <group>
-                                    <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
-                                </group>
-                            </group>
-                    </group>
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -163,17 +153,12 @@
                             <field name="number_of_days_temp"/>
                         </group>
                         <group>
-                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)"/>
                             <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
-                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')], 'invisible':[('holiday_type','=','employee')]}"/>
-                            <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
+                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')]}"/>
+                            <field name="department_id" attrs="{'invisible':[('holiday_type','=','category')]}"/>
                         </group>
                     </group>
-                    <group>
-                        <field name="double_validation" invisible="1"/>
-                        <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
-                    </group>
-                    <newline/>
                     <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
                 </sheet>
                 <div class="oe_chatter">
diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index 9cf13f0e8d7..a2e1d54f96c 100644
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -2,7 +2,16 @@
 <openerp>
 <data>
 
-    <!-- Workflow definition -->
+    <!-- Workflow definition 
+        1. draft->submitted (no signal)
+        2. submitted->accepted (validate signal) if not double_validation
+        2. submitted -> first_accepted (validate signal) if double_validation
+        2. submitted->refused (refuse signal)
+        3. accepted->refused (refuse signal)
+        4. first_accepted -> accepted (second_validate  signal)
+        4. first_accepted -> refused (refuse signal)
+
+    -->
 
     <record model="workflow" id="wkf_holidays">
         <field name="name">hr.wkf.holidays</field>
@@ -10,13 +19,13 @@
         <field name="on_create">True</field>
     </record>
 
-    <record model="workflow.activity" id="act_draft">
+    <record model="workflow.activity" id="act_draft"> <!-- draft -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="flow_start">True</field>
         <field name="name">draft</field>
     </record>
 
-    <record model="workflow.activity" id="act_confirm">
+    <record model="workflow.activity" id="act_confirm"> <!-- submitted -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">confirm</field>
         <field name="kind">function</field>
@@ -24,73 +33,94 @@
         <field name="split_mode">OR</field>
     </record>
 
-    <record model="workflow.activity" id="act_validate">
+    <record model="workflow.activity" id="act_validate"> <!-- accepted -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">validate</field>
         <field name="kind">function</field>
         <field name="action">holidays_validate()</field>
     </record>
 
-    <record model="workflow.activity" id="act_validate1">
+    <record model="workflow.activity" id="act_validate1"> <!-- first_accepted -->
         <field name="wkf_id" ref="wkf_holidays" />
-        <field name="name">second_validate</field>
+        <field name="name">first_validate</field>
         <field name="kind">function</field>
-        <field name="action">holidays_validate2()</field>
+        <field name="action">holidays_first_validate()</field>
+        <field name="split_mode">OR</field>
     </record>
 
 
-    <record model="workflow.activity" id="act_refuse">
+    <record model="workflow.activity" id="act_refuse"> <!-- refused -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">refuse</field>
         <field name="flow_stop">True</field>
-        <field name="kind">stopall</field>
+        <field name="kind">function</field>
+        <field name="action">holidays_refuse()</field>
     </record>
 
     <!--
         workflow transition
     -->
 
-    <record model="workflow.transition" id="t1">
+    <record model="workflow.transition" id="holiday_draft2confirm"> <!-- 1. draft->submitted (no signal) -->
         <field name="act_from" ref="act_draft" />
         <field name="act_to" ref="act_confirm" />
     </record>
 
-    <record model="workflow.transition" id="t2">
+    <record model="workflow.transition" id="holiday_confirm2validate"> <!-- 2. submitted->accepted (validate signal) if not double_validation-->
         <field name="act_from" ref="act_confirm" />
         <field name="act_to" ref="act_validate" />
         <field name="signal">validate</field>
+        <field name="condition">not double_validation</field>
+        <field name="group_id" ref="base.group_hr_user"/>
+    </record>
+
+    <record model="workflow.transition" id="holiday_confirm2validate1"> <!-- 2. submitted -> first_accepted (validate signal) if double_validation-->
+        <field name="act_from" ref="act_confirm" />
+        <field name="act_to" ref="act_validate1" />
+        <field name="condition">double_validation</field>
+        <field name="group_id" ref="base.group_hr_user"/>
+    </record>
+
+
+    <record model="workflow.transition" id="holiday_confirm2refuse"> <!-- 2. submitted->refused (refuse signal) -->
+        <field name="act_from" ref="act_confirm" />
+        <field name="act_to" ref="act_refuse" />
+        <field name="signal">refuse</field>
         <field name="condition">True</field>
         <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
-    <record model="workflow.transition" id="t3">
-        <field name="act_from" ref="act_confirm" />
-        <field name="act_to" ref="act_refuse" />
-        <field name="signal">refuse</field>
-        <field name="condition">holidays_refuse('first_approval')</field>
-        <field name="group_id" ref="base.group_hr_user"/>
-    </record>
-
-    <record model="workflow.transition" id="t4">
+    <record model="workflow.transition" id="holiday_validate2refuse"> <!-- 3. accepted->refused (refuse signal) -->
         <field name="act_from" ref="act_validate" />
         <field name="act_to" ref="act_refuse" />
         <field name="signal">refuse</field>
-        <field name="condition">holidays_refuse('second_approval')</field>
+        <field name="condition">True</field>
         <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
-    <record model="workflow.transition" id="t8">
+    <record model="workflow.transition" id="holiday_validate2refuse"> <!-- 3. accepted->refused (refuse signal) -->
         <field name="act_from" ref="act_validate" />
-        <field name="act_to" ref="act_validate1" />
+        <field name="act_to" ref="act_refuse" />
+        <field name="signal">refuse</field>
+        <field name="condition">True</field>
+        <field name="group_id" ref="base.group_hr_user"/>
+    </record>
+
+
+    <record model="workflow.transition" id="holiday_validate1_validate"> <!-- 4. first_accepted -> accepted (second_validate  signal) -->
+        <field name="act_from" ref="act_validate1" />
+        <field name="act_to" ref="act_validate" />
+        <field name="condition">True</field>
         <field name="signal">second_validate</field>
-        <field name="group_id" ref="base.group_hr_manager" />
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
-    <record model="workflow.transition" id="t11">
-        <field name="act_from" ref="act_validate" />
-        <field name="act_to" ref="act_validate1" />
-        <field name="condition">not holiday_status_id.double_validation</field>
-        <field name="signal" eval="False"/>
+    <record model="workflow.transition" id="holiday_validate1_refuse"> <!-- 4. first_accepted->refused (refuse signal) -->
+        <field name="act_from" ref="act_validate1" />
+        <field name="act_to" ref="act_refuse" />
+        <field name="signal">refuse</field>
+        <field name="condition">True</field>
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
 </data>

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 045/288] [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 046/288] [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 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 047/288] 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 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 048/288] 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 049/288] [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 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 050/288] [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 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 051/288] [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 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 052/288] [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 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 053/288] [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 054/288] [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 055/288] [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 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 056/288] [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 057/288] [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 058/288] [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 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 059/288] [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 060/288] [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 b3079507cd79db087192fff373296702b51ccd01 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Fri, 17 Aug 2012 11:57:30 +0530
Subject: [PATCH 061/288] [IMP]: Improve in gengo_update_translation  method

bzr revid: aja@tinyerp.com-20120817062730-r3mfsyinj3acdxqn
---
 addons/base_gengo/ir_translation.py           |  1 -
 addons/base_gengo/wizard/__init__.py          |  1 +
 .../base_gengo/wizard/alert_message_gengo.xml | 20 +++---
 .../base_gengo/wizard/gengo_update_message.py | 44 +++++++++++++
 .../wizard/gengo_update_translation.py        | 65 ++++++++++---------
 5 files changed, 87 insertions(+), 44 deletions(-)
 create mode 100644 addons/base_gengo/wizard/gengo_update_message.py

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 297e449ecdc..e4ba7716686 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -29,7 +29,6 @@ class ir_translation(osv.Model):
         'gengo_comment': fields.text("Comments"),
         'gengo_translation': fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
         'gengo_control': fields.boolean('Active'),
-        'job_id': fields.char('Gengo Job Id', size=32),
     }
 
     _defaults = {
diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
index e7935ca8b1c..ef9652d93a6 100644
--- a/addons/base_gengo/wizard/__init__.py
+++ b/addons/base_gengo/wizard/__init__.py
@@ -21,4 +21,5 @@
 
 import gengo_update_translation
 import wrap_object
+import gengo_update_message
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/alert_message_gengo.xml b/addons/base_gengo/wizard/alert_message_gengo.xml
index 304175db031..84bfc7bb484 100644
--- a/addons/base_gengo/wizard/alert_message_gengo.xml
+++ b/addons/base_gengo/wizard/alert_message_gengo.xml
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <!-- Update Message Form View -->
         <record model="ir.ui.view" id="update_translation_wizard_view_confirm">
-            <field name="name">update.translations.serial.wizard.view</field>
-            <field name="inherit_id" ref="base.wizard_update_translations"/>
-            <field name="model">base.update.translations</field>
+            <field name="name">gengo.update.message.form</field>
+            <field name="model">gengo.update.message</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="//group" position="inside">
-                        <group colspan="4">
-                            <field name="state" invisible="1"/>
-                            <label string="Your Request has been Successfully Send to Gengo" states="done" colspan="4"/>
-                        </group>
-                        <group colspan="4">
-                            <label string="This language is select as Active All Translation Request will be sent by System Automatically" states="inprogress" colspan="4"/>
-                        </group>
-                </xpath>
+                <form string="Update Gengo Data" version="7.0">
+                    <group>
+                        <field name='name'/>
+                    </group>
+                </form>
             </field>
         </record>
     </data>
diff --git a/addons/base_gengo/wizard/gengo_update_message.py b/addons/base_gengo/wizard/gengo_update_message.py
new file mode 100644
index 00000000000..214b9978a19
--- /dev/null
+++ b/addons/base_gengo/wizard/gengo_update_message.py
@@ -0,0 +1,44 @@
+# -*- 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 osv import osv
+from osv import fields
+
+
+class gengo_update_message(osv.osv):
+    """Update Message"""
+
+    _name = "gengo.update.message"
+    _description = "Update Message"
+    _columns = {
+        'name': fields.text('Message', readonly=True),
+        }
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context == None:
+            context = {}
+        res = super(gengo_update_message, self).default_get(cr, uid, fields, context=context)
+        res.update({'name': context.get('message')})
+        return res
+
+gengo_update_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 1a5c90edb0a..76ac7baa980 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -1,4 +1,4 @@
-    # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Business Applications
@@ -19,8 +19,7 @@
 #
 ##############################################################################
 
-from osv import osv, fields
-from tools.translate import _
+from osv import osv
 import wrap_object
 import logging
 _logger = logging.getLogger(__name__)
@@ -55,22 +54,19 @@ class gengo_update_translation(osv.osv_memory):
             for key in translation_list[total_term:limit]:
                 trans_list.append(key)
             total_term = limit
-            jobs = meta.pack_jobs_request(cr, uid, trans_list, context={'language_code': context['lang']})
-            result = gengo.postTranslationJobs(jobs=jobs)
-            self.write(cr, uid, ids, {'state': 'done'})
+            request = meta.pack_jobs_request(cr, uid, trans_list, context={'language_code': context['lang']})
+            result = gengo.postTranslationJobs(jobs=request)
             if user.company_id.gengo_tier == 'machine':
-                if result.get('opstat') == 'ok':
-                    for job in result.get('response').get('jobs'):
-                        for translation_id, val in job.items():
-                            translation_pool.write(cr, uid, int(translation_id), {'value':
-                            val['body_tgt'], 'state': 'translated', 'gengo_control': True})
-            else:
-                for job in result.get('response').get('jobs'):
-                    for translation_id, val in job.items():
-                        translation_pool.write(cr, uid, int(translation_id), {'job_id': val['job_id']})
-        return
+                response = meta.unpack_jobs_response(result)
+                for job in response.response[1]:
+                    for jobs in job:
+                        translation_term_id = translation_pool.search(cr, uid, [('src', '=', job[jobs]['body_src'])])
+                        translation_pool.write(cr, uid, translation_term_id, {'value': job[jobs]['body_tgt'], 'state': 'translated', 'gengo_control': True})
+            return
 
     def act_update(self, cr, uid, ids, context=None):
+        if context == None:
+            context={}
         try:
             language_pool = self.pool.get('res.lang')
             this = self.browse(cr, uid, ids)[0]
@@ -82,16 +78,29 @@ class gengo_update_translation(osv.osv_memory):
                 translation_term_id = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', 'True'), ('lang', '=', this.lang)])
                 context.update({'lang': this.lang, 'translation_term_id': translation_term_id})
                 self.send_translation_terms(cr, uid, ids, context)
-                return
+                msg = "Your Request has been Successfully Send to Gengo"
             else:
-                self.write(cr, uid, ids, {'state': 'inprogress'})
+                msg = "This language is select as Active All Translation Request will be sent by System Automatically"
+
         except Exception, e:
-            raise osv.except_osv(_('Warning !'), _('%s') % e)
+            msg = '%s' % e
+        context.update({'message': msg})
+        obj_model = self.pool.get('ir.model.data')
+        model_data_ids = obj_model.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'update_translation_wizard_view_confirm')])
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        return {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'gengo.update.message',
+                'views': [(resource_id, 'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+               'context': context,
+            }
 
     def scheduler_get_gengo_response(self, cr, uid, ids=0, context=None):
         """Scheduler will be call to get response from gengo and all term will get
         by scheduler which terms are in reviewable state"""
-
         meta = self.pool.get('jobs.meta')
         translation_pool = self.pool.get('ir.translation')
         gengo = meta.gengo_authentication(cr, uid, ids, context)
@@ -99,9 +108,10 @@ class gengo_update_translation(osv.osv_memory):
         if res:
             response = meta.unpack_jobs_response(res)
             for job in response.response:
-                translation_id = translation_pool.search(cr, uid, [('job_id', '=', job.job_id)], context)
-                response = gengo.getTranslationJob(id=job.job_id)
-                translation_pool.write(cr, uid, translation_id, {'value': response['response']['job']['body_tgt'], 'state': 'translated', 'gengo_control': True})
+                job_response=gengo.getTranslationJob(id=job['job_id'])
+                jobs_response = meta.unpack_jobs_response(job_response)
+                translation_id = translation_pool.search(cr, uid, [('src', '=', jobs_response.response[0]['body_src'])], context)
+                translation_pool.write(cr, uid, translation_id, {'value': jobs_response.response[0]['body_tgt'], 'state': 'translated', 'gengo_control': True})
 
     def scheduler_get_gengo_sync_request(self, cr, uid, ids=0, context=None):
         """This scheduler will send a job request to the gengo , which terms are
@@ -116,7 +126,7 @@ class gengo_update_translation(osv.osv_memory):
             lang_ids = language_pool.read(cr, uid, lang_search_id)
 
             for lang_id in lang_ids:
-                translation_term_id = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', 'True'), ('lang', '=', lang_id['code']), ('job_id', '=', False)])
+                translation_term_id = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', 'True'), ('lang', '=', lang_id['code'])])
                 context.update({'lang': lang_id['code'], 'translation_term_id':  translation_term_id})
                 if translation_term_id:
                     self.send_translation_terms(cr, uid, ids, context)
@@ -125,13 +135,6 @@ class gengo_update_translation(osv.osv_memory):
 
     _name = 'base.update.translations'
     _inherit = "base.update.translations"
-    _columns = {
-        'state': fields.selection([('init', 'init'), ('inprogress', 'inprogress'), ('done', 'done')], 'state'),
-    }
-
-    _defaults = {
-        'state': 'init',
-    }
 
 gengo_update_translation()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

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 062/288] [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 063/288] [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 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 064/288] [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 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 065/288] [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 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 066/288] [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 067/288] [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 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 068/288] [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 069/288] [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 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 070/288] [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 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 071/288] [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 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 072/288] [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 073/288] [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 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 074/288] [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 075/288] [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 076/288] [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 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 077/288] [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 078/288] [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 079/288] [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 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 080/288] [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 081/288] [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 082/288] [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 083/288] [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 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 084/288] [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 085/288] [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 a4ae69e9ee5ea482029dc9b42fd1a7920cdcc60b Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 21 Aug 2012 15:20:17 +0530
Subject: [PATCH 086/288] [IMP] hr_holidays: Now only 'Refuse' button is there
 on approved state

bzr revid: mtr@tinyerp.com-20120821095017-a5f98ihyooe6a344
---
 addons/hr_holidays/hr_holidays_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9cf98d0eebc..c975fb40119 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -94,7 +94,7 @@
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1,validate" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user" />
+                    <button string="Reset to New" name="set_to_draft" states="refuse" type="object" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet string="Leave Request">
@@ -138,8 +138,8 @@
                 <header>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user" />
+                    <button string="Refuse" name="refuse" states="confirm,validate,validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button string="Reset to New" name="set_to_draft" states="cancel,refuse" type="object" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet>

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 087/288] [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 1641bc490aef59d15e14b96febed2ca0afbfd048 Mon Sep 17 00:00:00 2001
From: Patrik <>
Date: Wed, 22 Aug 2012 16:07:07 +0530
Subject: [PATCH 088/288] [FIX] Solve the problem of read method of res.user
 when id in long

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

bzr revid: jir@tinyerp.com-20120822103707-zkucpqtalyi8ncpt
---
 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 cddc02673b8..7427a0d2717 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -188,7 +188,7 @@ class res_users(osv.osv):
         result = super(res_users, self).read(cr, uid, ids, fields, context, load)
         canwrite = self.pool.get('ir.model.access').check(cr, uid, 'res.users', 'write', False)
         if not canwrite:
-            if isinstance(ids, (int, float)):
+            if isinstance(ids, (int, long)):
                 result = override_password(result)
             else:
                 result = map(override_password, result)

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 089/288] [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 090/288] [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 bc0b3c6cc5ed58c141989d547613ae353afe7750 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Thu, 23 Aug 2012 19:12:57 +0530
Subject: [PATCH 091/288] [IMP]: improve in base_gengo sync and add schedular
 for response and request of terms

bzr revid: aja@tinyerp.com-20120823134257-37tzof2yiwfnsr1e
---
 addons/base_gengo/__openerp__.py              |   4 +-
 .../base_gengo/gengo_sync_schedular_data.xml  |  26 +++
 addons/base_gengo/ir_translation.py           |   1 +
 .../wizard/gengo_response_scheduler.xml       |  26 ---
 .../wizard/gengo_update_translation.py        | 159 ++++++++----------
 addons/base_gengo/wizard/wrap_object.py       |  51 +++---
 6 files changed, 120 insertions(+), 147 deletions(-)
 create mode 100644 addons/base_gengo/gengo_sync_schedular_data.xml
 delete mode 100644 addons/base_gengo/wizard/gengo_response_scheduler.xml

diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index e8fe7e0df17..1173d513493 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -28,12 +28,12 @@ Automated Translations through Gengo API
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
+    'init_xml': ['gengo_sync_schedular_data.xml'],
     'update_xml': [
         'ir_translation.xml',
         'res_company_view.xml',
         'res_lang_view.xml',
-        'wizard/gengo_response_scheduler.xml',
+
         'wizard/alert_message_gengo.xml',
            ],
     'demo_xml': [],
diff --git a/addons/base_gengo/gengo_sync_schedular_data.xml b/addons/base_gengo/gengo_sync_schedular_data.xml
new file mode 100644
index 00000000000..ab78b59e0b8
--- /dev/null
+++ b/addons/base_gengo/gengo_sync_schedular_data.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!--Scheduler sync Receive Request-->
+        <record id="gengo_sync_receive_request_scheduler" model="ir.cron">
+            <field name="name" >Gengo Sync Translation (Response)</field>
+            <field eval="False" name="active"/>
+            <field name="interval_number">30</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field eval="'base.update.translations'" name="model"></field>
+            <field eval="'_sync_response'" name="function"/>
+        </record>
+
+        <!--Schedular Sync Send Request-->
+        <record id="gengo_sync_send_request_scheduler" model="ir.cron">
+            <field name="name" >Gengo Sync Translation (Request)</field>
+            <field eval="False" name="active"/>
+            <field name="interval_number">30</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field eval="'base.update.translations'" name="model"></field>
+            <field eval="'_sync_request'" name="function"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index e4ba7716686..7bda5023592 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -29,6 +29,7 @@ class ir_translation(osv.Model):
         'gengo_comment': fields.text("Comments"),
         'gengo_translation': fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
         'gengo_control': fields.boolean('Active'),
+        'job_id':fields.char('Gengo Job Id',size=32),
     }
 
     _defaults = {
diff --git a/addons/base_gengo/wizard/gengo_response_scheduler.xml b/addons/base_gengo/wizard/gengo_response_scheduler.xml
deleted file mode 100644
index 544235d8a6f..00000000000
--- a/addons/base_gengo/wizard/gengo_response_scheduler.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!--Scheduler Gengo Response-->
-        <record id="gengo_response_scheduler" model="ir.cron">
-            <field name="name" >Run Gengo Response Scheduler</field>
-            <field eval="True" name="active"/>
-            <field name="interval_number">1</field>
-            <field name="interval_type">days</field>
-            <field name="numbercall">-1</field>
-            <field eval="'base.update.translations'" name="model"></field>
-            <field eval="'scheduler_get_gengo_response'" name="function"/>
-        </record>
-
-        <!--Schedular Sync Request-->
-        <record id="gengo_sync_request_scheduler" model="ir.cron">
-            <field name="name" >Run Gengo Sync Request Scheduler</field>
-            <field eval="True" name="active"/>
-            <field name="interval_number">1</field>
-            <field name="interval_type">days</field>
-            <field name="numbercall">-1</field>
-            <field eval="'base.update.translations'" name="model"></field>
-            <field eval="'scheduler_get_gengo_sync_request'" name="function"/>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 76ac7baa980..d54358c32d9 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -20,121 +20,104 @@
 ##############################################################################
 
 from osv import osv
-import wrap_object
+import wrap_object as local
 import logging
 _logger = logging.getLogger(__name__)
 
+cron_vals = {
+'name': 'Gengo Sync',
+'active': True,
+'interval_number': 30,
+'interval_type': 'minutes',
+'numbercall': -1,
+'model': "'base.update.translations'",
+'function': ""
+}
 
-class gengo_update_translation(osv.osv_memory):
 
-    def send_translation_terms(self, cr, uid, ids, context):
-        """Lasy Loading will be perform when user or cron send a bunch of request."""
-        total_term = 0
-        limit = 0
-        translation_list = context['translation_term_id']
-        range_jobs = 1
-        meta = self.pool.get('jobs.meta')
+class base_update_translation(osv.osv_memory):
+    def _update_terms(self, cr, uid, ids, response, tier, context):
         translation_pool = self.pool.get('ir.translation')
+        for jobs in response['jobs']:
+            vals = {}
+            for t_id, res in jobs.items():
+                if tier == "machine":
+                    vals.update({'value': res['body_tgt'], 'state': 'translated'})
+                else:
+                    vals.update({'job_id': res['job_id'], 'state': 'inprogress'})
+                translation_pool.write(cr, uid, [t_id], vals, context)
+        return
+
+
+    def _send_translation_terms(self, cr, uid, ids, trg_lang, term_ids, context):
+        """
+        Lazy Polling will be perform when user or cron request for the trnalstion.
+        """
+        meta = self.pool.get('jobs.meta')
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
         gengo = meta.gengo_authentication(cr, uid, ids, context)
-        job_length = len(context['translation_term_id'])
-        remain = len(context['translation_term_id']) % wrap_object.REQUEST_LIMIT
-        if len(context['translation_term_id']) > wrap_object.REQUEST_LIMIT:
-            if remain > 0:
-                range_jobs = (len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT) + 1
-            else:
-                range_jobs = len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT
-        for length in range(0, range_jobs):
-            trans_list = []
-            if job_length > wrap_object.REQUEST_LIMIT:
-                job_length -= wrap_object.REQUEST_LIMIT
-                limit += wrap_object.REQUEST_LIMIT
-            else:
-                limit += remain
-            for key in translation_list[total_term:limit]:
-                trans_list.append(key)
-            total_term = limit
-            request = meta.pack_jobs_request(cr, uid, trans_list, context={'language_code': context['lang']})
-            result = gengo.postTranslationJobs(jobs=request)
-            if user.company_id.gengo_tier == 'machine':
-                response = meta.unpack_jobs_response(result)
-                for job in response.response[1]:
-                    for jobs in job:
-                        translation_term_id = translation_pool.search(cr, uid, [('src', '=', job[jobs]['body_src'])])
-                        translation_pool.write(cr, uid, translation_term_id, {'value': job[jobs]['body_tgt'], 'state': 'translated', 'gengo_control': True})
-            return
+        request = meta.pack_jobs_request(cr, uid, term_ids, trg_lang, context)
+        result = gengo.postTranslationJobs(jobs=request)
+        if result['opstat'] == 'ok':
+            self._update_terms(cr, uid, ids, result['response'], user.company_id.gengo_tier, context)
+        return True
+
+    def do_check_schedular(self, cr, uid, xml_id, name, fn, context=None):
+        cron_pool = self.pool.get('ir.cron')
+        try:
+            res = self.pool.get('ir.model.data')._get_id(cr, uid, 'base_gengo', xml_id)
+            cron_pool.write(cr, uid, [res], {'active': True}, context)
+        except:
+            cron_vals.update({'name': name, "function": fn})
+            return cron_pool.create(cr, uid, cron_vals, context)
 
     def act_update(self, cr, uid, ids, context=None):
         if context == None:
-            context={}
-        try:
-            language_pool = self.pool.get('res.lang')
-            this = self.browse(cr, uid, ids)[0]
-            translation_pool = self.pool.get('ir.translation')
-            lang_search_id = language_pool.search(cr, uid,
-            [('gengo_sync', '=', True), ('code', '=', this.lang)])
+            context = {}
+        lang_pool = self.pool.get('res.lang')
+        for res in self.browse(cr, uid, ids, context):
+            lang_id = lang_pool.search(cr, uid, [('code', '=', res.lang)])
+            lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
+        res = super(base_update_translation, self).act_update(cr, uid, ids, context)
+        self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'gengo_sync_send_request_scheduler', '_sync_request', context)
+        self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'gengo_sync_send_request_scheduler', '_sync_response', context)
+        return {}
 
-            if not lang_search_id:
-                translation_term_id = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', 'True'), ('lang', '=', this.lang)])
-                context.update({'lang': this.lang, 'translation_term_id': translation_term_id})
-                self.send_translation_terms(cr, uid, ids, context)
-                msg = "Your Request has been Successfully Send to Gengo"
-            else:
-                msg = "This language is select as Active All Translation Request will be sent by System Automatically"
-
-        except Exception, e:
-            msg = '%s' % e
-        context.update({'message': msg})
-        obj_model = self.pool.get('ir.model.data')
-        model_data_ids = obj_model.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'update_translation_wizard_view_confirm')])
-        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        return {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'gengo.update.message',
-                'views': [(resource_id, 'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-               'context': context,
-            }
-
-    def scheduler_get_gengo_response(self, cr, uid, ids=0, context=None):
+    def _sync_response(self, cr, uid, ids=0, context=None):
         """Scheduler will be call to get response from gengo and all term will get
-        by scheduler which terms are in reviewable state"""
+        by scheduler which terms are in approved state"""
         meta = self.pool.get('jobs.meta')
         translation_pool = self.pool.get('ir.translation')
         gengo = meta.gengo_authentication(cr, uid, ids, context)
-        res = gengo.getTranslationJobs(status="approved")
-        if res:
-            response = meta.unpack_jobs_response(res)
-            for job in response.response:
-                job_response=gengo.getTranslationJob(id=job['job_id'])
-                jobs_response = meta.unpack_jobs_response(job_response)
-                translation_id = translation_pool.search(cr, uid, [('src', '=', jobs_response.response[0]['body_src'])], context)
-                translation_pool.write(cr, uid, translation_id, {'value': jobs_response.response[0]['body_tgt'], 'state': 'translated', 'gengo_control': True})
+        translation_id = translation_pool.search(cr, uid, [('job_id', '!=', False), ('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=local.LIMIT, context=context)
+        for trns in translation_pool.browse(cr, uid, translation_id, context):
+            job_response = gengo.getTranslationJob(id=trns.job_id)
+            if job_response['response']['job']['status'] == 'approved':
+                translation_pool.write(cr, uid, translation_id, {'value': job_response['response']['job']['body_tgt'], 'state': 'translated', 'gengo_control': True})
+        return True
 
-    def scheduler_get_gengo_sync_request(self, cr, uid, ids=0, context=None):
+    def _sync_request(self, cr, uid, ids=0, context=None):
         """This scheduler will send a job request to the gengo , which terms are
         in translate state and gengo_translation is true"""
-
         if context is None:
             context = {}
         try:
             language_pool = self.pool.get('res.lang')
+            trg_lang = self.browse(cr, uid, ids)[0]
             translation_pool = self.pool.get('ir.translation')
-            lang_search_id = language_pool.search(cr, uid, [('gengo_sync', '=', True)])
-            lang_ids = language_pool.read(cr, uid, lang_search_id)
-
-            for lang_id in lang_ids:
-                translation_term_id = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', 'True'), ('lang', '=', lang_id['code'])])
-                context.update({'lang': lang_id['code'], 'translation_term_id':  translation_term_id})
-                if translation_term_id:
-                    self.send_translation_terms(cr, uid, ids, context)
+            lang_search_id = language_pool.search(cr, uid, [('gengo_sync', '=', True), ('code', '=', trg_lang.lang)])
+            if not lang_search_id:
+                term_ids = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', 'True'), ('lang', '=', trg_lang.lang)], limit=local.LIMIT)
+                self._send_translation_terms(cr, uid, ids, trg_lang.lang, term_ids, context)
+                msg = "Your Request has been Successfully Send to Gengo"
+            else:
+                msg = "This language is select as Active All Translation Request will be sent by System Automatically"
+            context.update({'message': msg})
         except Exception, e:
-            _logger.warning('A Gengo Exception is occur:: %s', e)
+            _logger.warning("%s", e)
 
     _name = 'base.update.translations'
     _inherit = "base.update.translations"
 
-gengo_update_translation()
+base_update_translation()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/wrap_object.py b/addons/base_gengo/wizard/wrap_object.py
index 01368e5e2cb..3ded7af12b1 100644
--- a/addons/base_gengo/wizard/wrap_object.py
+++ b/addons/base_gengo/wizard/wrap_object.py
@@ -24,7 +24,7 @@ from tools.translate import _
 from mygengo import MyGengo
 import re
 
-REQUEST_LIMIT = 10
+LIMIT = 20
 
 LANG_MAPPING = {
     'ar': 'Arabic',
@@ -73,13 +73,6 @@ class gengo_response(object):
     """
     """
     def __init__(self, jobs):
-        response = jobs['response']
-        job = []
-        if isinstance(response, list):
-            job = [gengo_job(value) for value in response]
-        else:
-            job = [gengo_job(value) for value in response.values()]
-        jobs.update({'response': job})
         self._data = jobs
 
     def __getitem__(self, name):
@@ -123,37 +116,33 @@ class JobsMeta(orm.AbstractModel):
                 public_key=gengo_parameter_pool.company_id.gengo_public_key.encode('ascii'),
                 private_key=gengo_parameter_pool.company_id.gengo_private_key.encode('ascii'),
                 sandbox=True,
-            )
+            )   
             return gengo
         except Exception, e:
             raise osv.except_osv(_('Warning !'), _(e))
 
-    def pack_jobs_request(self, cr, uid, translation_term_id, context):
+    def pack_jobs_request(self, cr, uid, term_ids, trg_lang, context):
         jobs = {}
         auto_approve = 0
         gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
         translation_pool = self.pool.get('ir.translation')
-
-        if gengo_parameter_pool.company_id.gengo_auto_approve == True:
+        if gengo_parameter_pool.company_id.gengo_auto_approve:
             auto_approve = 1
+        g_lang = LANG_CODE_MAPPING.get(trg_lang)
+        if g_lang:
+            for terms in translation_pool.browse(cr, uid, term_ids, context):
+                #NOTE: Discard none string and only special char string 
+                if re.search(r"[a-z A-Z]", terms.src) and terms.src:
+                    job = {'type': 'text',
+                            'slug': 'single::English to' + LANG_MAPPING.get(g_lang),
+                            'tier': gengo_parameter_pool.company_id.gengo_tier,
+                            'body_src': terms.src,
+                            'lc_src': 'en',
+                            'lc_tgt': g_lang,
+                            'auto_approve': auto_approve,
+                            'comment': gengo_parameter_pool.company_id.gengo_comment,
+                            }
+                    jobs.update({terms.id: job})
+        return {'jobs': jobs}
 
-        for key, value in LANG_CODE_MAPPING.items():
-            if key == context['language_code']:
-                for terms in translation_pool.read(cr, uid, translation_term_id, context=None):
-                    translation_pool.write(cr, uid, translation_term_id, {'state': 'inprogress'})
-                    if re.search(r"[a-z A-Z]", terms['src']):
-                        job = {'type': 'text',
-                                'slug': 'single::English to' + LANG_MAPPING.get(value),
-                                'tier': gengo_parameter_pool.company_id.gengo_tier,
-                                'body_src': terms['src'],
-                                'lc_src': 'en',
-                                'lc_tgt': value,
-                                'auto_approve': auto_approve,
-                                'comment': gengo_parameter_pool.company_id.gengo_comment,
-                                }
-                        jobs.update({terms['id']: job})
-                return {'jobs': jobs}
-
-    def unpack_jobs_response(self, jobs):
-        return gengo_response(jobs)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

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 092/288] [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 093/288] [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 fedd324e6d6cc774bbcc315096a6388b2e0eb2f7 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Fri, 24 Aug 2012 18:51:25 +0530
Subject: [PATCH 094/288] [IMP]: Improve send and receive queue

bzr revid: aja@tinyerp.com-20120824132125-a74lw82hm77al1zh
---
 .../wizard/gengo_update_translation.py        | 121 ++++++++++++------
 addons/base_gengo/wizard/wrap_object.py       |  73 +++++++----
 2 files changed, 125 insertions(+), 69 deletions(-)

diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index d54358c32d9..61bf9b5ed7d 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -25,17 +25,18 @@ import logging
 _logger = logging.getLogger(__name__)
 
 cron_vals = {
-'name': 'Gengo Sync',
-'active': True,
-'interval_number': 30,
-'interval_type': 'minutes',
-'numbercall': -1,
-'model': "'base.update.translations'",
-'function': ""
+    'name': 'Gengo Sync',
+    'active': True,
+    'interval_number': 30,
+    'interval_type': 'minutes',
+    'numbercall': -1,
+    'model': "'base.update.translations'",
+    'function': ""
 }
 
 
 class base_update_translation(osv.osv_memory):
+
     def _update_terms(self, cr, uid, ids, response, tier, context):
         translation_pool = self.pool.get('ir.translation')
         for jobs in response['jobs']:
@@ -48,25 +49,30 @@ class base_update_translation(osv.osv_memory):
                 translation_pool.write(cr, uid, [t_id], vals, context)
         return
 
-
-    def _send_translation_terms(self, cr, uid, ids, trg_lang, term_ids, context):
+    def _send_translation_terms(self, cr, uid, ids, term_ids, context):
         """
         Lazy Polling will be perform when user or cron request for the trnalstion.
         """
         meta = self.pool.get('jobs.meta')
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
-        gengo = meta.gengo_authentication(cr, uid, ids, context)
-        request = meta.pack_jobs_request(cr, uid, term_ids, trg_lang, context)
-        result = gengo.postTranslationJobs(jobs=request)
-        if result['opstat'] == 'ok':
-            self._update_terms(cr, uid, ids, result['response'], user.company_id.gengo_tier, context)
+        flag, gengo = meta.gengo_authentication(cr, uid, context)
+        if flag:
+
+            request = meta.pack_jobs_request(cr, uid, term_ids, context)
+            if request:
+                result = gengo.postTranslationJobs(jobs=request)
+                if result['opstat'] == 'ok':
+                    self._update_terms(cr, uid, ids, result['response'], user.company_id.gengo_tier, context)
+        else:
+            _logger.error(gengo)
         return True
 
     def do_check_schedular(self, cr, uid, xml_id, name, fn, context=None):
         cron_pool = self.pool.get('ir.cron')
         try:
-            res = self.pool.get('ir.model.data')._get_id(cr, uid, 'base_gengo', xml_id)
-            cron_pool.write(cr, uid, [res], {'active': True}, context)
+            res = []
+            model, res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base_gengo', xml_id)
+            cron_pool.write(cr, uid, [res], {'active': True}, context=context)
         except:
             cron_vals.update({'name': name, "function": fn})
             return cron_pool.create(cr, uid, cron_vals, context)
@@ -75,46 +81,77 @@ class base_update_translation(osv.osv_memory):
         if context == None:
             context = {}
         lang_pool = self.pool.get('res.lang')
-        for res in self.browse(cr, uid, ids, context):
-            lang_id = lang_pool.search(cr, uid, [('code', '=', res.lang)])
-            lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
-        res = super(base_update_translation, self).act_update(cr, uid, ids, context)
-        self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'gengo_sync_send_request_scheduler', '_sync_request', context)
-        self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'gengo_sync_send_request_scheduler', '_sync_response', context)
-        return {}
+        super(base_update_translation, self).act_update(cr, uid, ids, context)
+        msg = "1. Translation file loaded succesfully.\n2. Processing Gengo Translation:\n"
+        meta = self.pool.get('jobs.meta')
+        flag, gengo = meta.gengo_authentication(cr, uid, context)
+        if not flag:
+            msg += gengo
+        else:
+            for res in self.browse(cr, uid, ids, context):
+                lang_id = lang_pool.search(cr, uid, [('code', '=', res.lang)])
+                lang_search = lang_pool.search(cr, uid, [('gengo_sync', '=', True),
+                ('id', '=', lang_id[0])])
+                if lang_search:
+                    msg += 'This language %s is alreay in queue for processing.' % (res.lang)
+                else:
+                    msg += "Translation for language %s is queued for processing." % (res.lang)
+                    lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
+                    _logger.info("Your translation request for language '%s' has been send sucessfully.", res.lang)
 
-    def _sync_response(self, cr, uid, ids=0, context=None):
+                self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'Gengo Sync Translation (Request)', '_sync_request', context)
+                self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'Gengo Sync Translation (Response)', '_sync_response', context)
+                self._sync_request(cr, uid, ids, context)
+        context.update({'message': msg})
+        obj_model = self.pool.get('ir.model.data')
+        model_data_ids = obj_model.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'update_translation_wizard_view_confirm')])
+        view_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        return {
+                 'view_type': 'form',
+                 'view_mode': 'form',
+                 'res_model': 'gengo.update.message',
+                 'views': [(view_id, 'form')],
+                 'type': 'ir.actions.act_window',
+                 'target': 'new',
+                 'context': context,
+             }
+
+    def _sync_response(self, cr, uid, ids=False, context=None):
         """Scheduler will be call to get response from gengo and all term will get
         by scheduler which terms are in approved state"""
         meta = self.pool.get('jobs.meta')
         translation_pool = self.pool.get('ir.translation')
-        gengo = meta.gengo_authentication(cr, uid, ids, context)
-        translation_id = translation_pool.search(cr, uid, [('job_id', '!=', False), ('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=local.LIMIT, context=context)
-        for trns in translation_pool.browse(cr, uid, translation_id, context):
-            job_response = gengo.getTranslationJob(id=trns.job_id)
-            if job_response['response']['job']['status'] == 'approved':
-                translation_pool.write(cr, uid, translation_id, {'value': job_response['response']['job']['body_tgt'], 'state': 'translated', 'gengo_control': True})
+        flag, gengo = meta.gengo_authentication(cr, uid, context)
+        if not flag:
+            _logger.warning("%s", gengo)
+        else:
+            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=local.LIMIT, context=context)
+            for trns in translation_pool.browse(cr, uid, translation_id, context):
+                if trns.job_id:
+                    job_response = gengo.getTranslationJob(id=trns.job_id)
+                    if job_response['response']['job']['status'] == 'approved':
+                        translation_pool.write(cr, uid, trns.id, {'value': job_response['response']['job']['body_tgt'], 'state': 'translated', 'gengo_control': True})
         return True
 
-    def _sync_request(self, cr, uid, ids=0, context=None):
+    def _sync_request(self, cr, uid, ids=False, context=None):
         """This scheduler will send a job request to the gengo , which terms are
         in translate state and gengo_translation is true"""
         if context is None:
             context = {}
+        language_pool = self.pool.get('res.lang')
+        translation_pool = self.pool.get('ir.translation')
         try:
-            language_pool = self.pool.get('res.lang')
-            trg_lang = self.browse(cr, uid, ids)[0]
-            translation_pool = self.pool.get('ir.translation')
-            lang_search_id = language_pool.search(cr, uid, [('gengo_sync', '=', True), ('code', '=', trg_lang.lang)])
-            if not lang_search_id:
-                term_ids = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', 'True'), ('lang', '=', trg_lang.lang)], limit=local.LIMIT)
-                self._send_translation_terms(cr, uid, ids, trg_lang.lang, term_ids, context)
-                msg = "Your Request has been Successfully Send to Gengo"
+            lang_ids = language_pool.search(cr, uid, [('gengo_sync', '=', True)])
+            langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids)]
+            langs = self.pool.get('jobs.meta').check_lang_support(cr, uid, langs)
+            term_ids = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=local.LIMIT)
+            if term_ids:
+                self._send_translation_terms(cr, uid, ids, term_ids, context)
+                _logger.info("Translation terms %s has been posted to gengo successfully", len(term_ids))
             else:
-                msg = "This language is select as Active All Translation Request will be sent by System Automatically"
-            context.update({'message': msg})
+                _logger.info('No Translation terms to process.')
         except Exception, e:
-            _logger.warning("%s", e)
+            _logger.error("%s", e)
 
     _name = 'base.update.translations'
     _inherit = "base.update.translations"
diff --git a/addons/base_gengo/wizard/wrap_object.py b/addons/base_gengo/wizard/wrap_object.py
index 3ded7af12b1..2679d080d9d 100644
--- a/addons/base_gengo/wizard/wrap_object.py
+++ b/addons/base_gengo/wizard/wrap_object.py
@@ -19,10 +19,9 @@
 #
 ##############################################################################
 
-from osv import orm, osv
-from tools.translate import _
+from osv import orm
+import tools
 from mygengo import MyGengo
-import re
 
 LIMIT = 20
 
@@ -57,12 +56,13 @@ LANG_CODE_MAPPING = {
     'sv_SE': 'sv',
     'ko_KR': 'ko',
     'pt_PT': 'pt',
-    'en': 'en',
+    'en_US': 'en',
     'ja_JP': 'ja',
     'es_ES': 'es',
     'zh_CN': 'zh',
     'de_DE': 'de',
     'fr_FR': 'fr',
+    'fr_BE': 'fr',
     'ru_RU': 'ru',
     'it_IT': 'it',
     'pt_BR': 'pt-br'
@@ -105,44 +105,63 @@ class JobsMeta(orm.AbstractModel):
 
     _name = "jobs.meta"
 
-    def gengo_authentication(self, cr, uid, ids, context=None):
+    def gengo_authentication(self, cr, uid, context=None):
         ''' To Send Request and Get Response from Gengo User needs Public and Private
          key for that user need to signup to gengo and get public and private
          key which is provided by gengo to authentic user '''
 
-        gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
+            return (False, "Invalid gengo configuration.\nEither pulic key or private key is missing.")
         try:
             gengo = MyGengo(
-                public_key=gengo_parameter_pool.company_id.gengo_public_key.encode('ascii'),
-                private_key=gengo_parameter_pool.company_id.gengo_private_key.encode('ascii'),
+                public_key=user.company_id.gengo_public_key.encode('ascii'),
+                private_key=user.company_id.gengo_private_key.encode('ascii'),
                 sandbox=True,
-            )   
-            return gengo
+            )
+            gengo.getAccountStats()
+            return (True, gengo)
         except Exception, e:
-            raise osv.except_osv(_('Warning !'), _(e))
+            return (False, "Gengo Connection Error\n"+e.message)
 
-    def pack_jobs_request(self, cr, uid, term_ids, trg_lang, context):
+    def pack_jobs_request(self, cr, uid, term_ids, context):
         jobs = {}
         auto_approve = 0
         gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
         translation_pool = self.pool.get('ir.translation')
         if gengo_parameter_pool.company_id.gengo_auto_approve:
             auto_approve = 1
-        g_lang = LANG_CODE_MAPPING.get(trg_lang)
-        if g_lang:
-            for terms in translation_pool.browse(cr, uid, term_ids, context):
-                #NOTE: Discard none string and only special char string 
-                if re.search(r"[a-z A-Z]", terms.src) and terms.src:
-                    job = {'type': 'text',
-                            'slug': 'single::English to' + LANG_MAPPING.get(g_lang),
-                            'tier': gengo_parameter_pool.company_id.gengo_tier,
-                            'body_src': terms.src,
-                            'lc_src': 'en',
-                            'lc_tgt': g_lang,
-                            'auto_approve': auto_approve,
-                            'comment': gengo_parameter_pool.company_id.gengo_comment,
-                            }
-                    jobs.update({terms.id: job})
+        for term in translation_pool.browse(cr, uid, term_ids, context):
+            if term.src and term.src != "":
+                job = {'type': 'text',
+                        'slug': 'single::English to' + LANG_CODE_MAPPING[term.lang],
+                        'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
+                        'body_src': term.src,
+                        'lc_src': 'en',
+                        'lc_tgt': LANG_CODE_MAPPING[term.lang],
+                        'auto_approve': auto_approve,
+                        'comment': gengo_parameter_pool.company_id.gengo_comment,
+                }
+                jobs.update({term.id: job})
         return {'jobs': jobs}
 
+    def check_lang_support(self, cr, uid, langs, context=None):
+        new_langs = []
+        flag, gengo = self.gengo_authentication(cr, uid, context)
+        if not flag:
+            return []
+        else:
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            tier = user.company_id.gengo_tier
+            if tier == "machine":
+                tier = "nonprofit"
+
+            lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
+            if lang_pair['opstat'] == 'ok':
+                for g_lang in lang_pair['response']:
+                    for l in langs:
+                        if LANG_CODE_MAPPING[l] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
+                            new_langs.append(l)
+            return list(set(new_langs))
+JobsMeta()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From a1d8ce709f3b1806abe83631afe18c7c158a0be9 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 24 Aug 2012 19:01:15 +0530
Subject: [PATCH 095/288] [ADD] Added new wrapper file and security dir

bzr revid: jam@tinyerp.com-20120824133115-70143pldvvmk2v8y
---
 addons/base_gengo/wizard/abstract_wrapper.py | 167 +++++++++++++++++++
 1 file changed, 167 insertions(+)
 create mode 100644 addons/base_gengo/wizard/abstract_wrapper.py

diff --git a/addons/base_gengo/wizard/abstract_wrapper.py b/addons/base_gengo/wizard/abstract_wrapper.py
new file mode 100644
index 00000000000..2679d080d9d
--- /dev/null
+++ b/addons/base_gengo/wizard/abstract_wrapper.py
@@ -0,0 +1,167 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-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/>.
+#
+##############################################################################
+
+from osv import orm
+import tools
+from mygengo import MyGengo
+
+LIMIT = 20
+
+LANG_MAPPING = {
+    'ar': 'Arabic',
+    'id': 'Indonesian',
+    'nl': 'Dutch',
+    'fr-ca': 'French (Canada)',
+    'pl': 'Polish',
+    'zh-tw': 'Chinese (Traditional)',
+    'sv': 'Swedish',
+    'ko': 'Korean',
+    'pt': 'Portuguese (Europe)',
+    'en': 'English',
+    'ja': 'Japanese',
+    'es': 'Spanish (Spain)',
+    'zh': 'Chinese (Simplified)',
+    'de': 'German',
+    'fr': 'French',
+    'ru': 'Russian',
+    'it': 'Italian',
+    'pt-br': 'Portuguese (Brazil)',
+}
+
+LANG_CODE_MAPPING = {
+    'ar_SA': 'ar',
+    'id_ID': 'id',
+    'nl_NL': 'nl',
+    'fr_CA': 'fr-ca',
+    'pl': 'pl',
+    'zh_TW': 'zh-tw',
+    'sv_SE': 'sv',
+    'ko_KR': 'ko',
+    'pt_PT': 'pt',
+    'en_US': 'en',
+    'ja_JP': 'ja',
+    'es_ES': 'es',
+    'zh_CN': 'zh',
+    'de_DE': 'de',
+    'fr_FR': 'fr',
+    'fr_BE': 'fr',
+    'ru_RU': 'ru',
+    'it_IT': 'it',
+    'pt_BR': 'pt-br'
+}
+
+
+class gengo_response(object):
+    """
+    """
+    def __init__(self, jobs):
+        self._data = jobs
+
+    def __getitem__(self, name):
+        return self._data[name]
+
+    def __getattr__(self, name):
+        try:
+            return self[name]
+        except KeyError, e:
+            raise AttributeError(e)
+
+
+class gengo_job(object):
+    """
+    """
+    def __init__(self, job):
+        self._data = job
+
+    def __getitem__(self, name):
+        return self._data[name]
+
+    def __getattr__(self, name):
+        try:
+            return self[name]
+        except KeyError, e:
+            raise AttributeError(e)
+
+
+class JobsMeta(orm.AbstractModel):
+
+    _name = "jobs.meta"
+
+    def gengo_authentication(self, cr, uid, context=None):
+        ''' To Send Request and Get Response from Gengo User needs Public and Private
+         key for that user need to signup to gengo and get public and private
+         key which is provided by gengo to authentic user '''
+
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
+            return (False, "Invalid gengo configuration.\nEither pulic key or private key is missing.")
+        try:
+            gengo = MyGengo(
+                public_key=user.company_id.gengo_public_key.encode('ascii'),
+                private_key=user.company_id.gengo_private_key.encode('ascii'),
+                sandbox=True,
+            )
+            gengo.getAccountStats()
+            return (True, gengo)
+        except Exception, e:
+            return (False, "Gengo Connection Error\n"+e.message)
+
+    def pack_jobs_request(self, cr, uid, term_ids, context):
+        jobs = {}
+        auto_approve = 0
+        gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
+        translation_pool = self.pool.get('ir.translation')
+        if gengo_parameter_pool.company_id.gengo_auto_approve:
+            auto_approve = 1
+        for term in translation_pool.browse(cr, uid, term_ids, context):
+            if term.src and term.src != "":
+                job = {'type': 'text',
+                        'slug': 'single::English to' + LANG_CODE_MAPPING[term.lang],
+                        'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
+                        'body_src': term.src,
+                        'lc_src': 'en',
+                        'lc_tgt': LANG_CODE_MAPPING[term.lang],
+                        'auto_approve': auto_approve,
+                        'comment': gengo_parameter_pool.company_id.gengo_comment,
+                }
+                jobs.update({term.id: job})
+        return {'jobs': jobs}
+
+    def check_lang_support(self, cr, uid, langs, context=None):
+        new_langs = []
+        flag, gengo = self.gengo_authentication(cr, uid, context)
+        if not flag:
+            return []
+        else:
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            tier = user.company_id.gengo_tier
+            if tier == "machine":
+                tier = "nonprofit"
+
+            lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
+            if lang_pair['opstat'] == 'ok':
+                for g_lang in lang_pair['response']:
+                    for l in langs:
+                        if LANG_CODE_MAPPING[l] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
+                            new_langs.append(l)
+            return list(set(new_langs))
+JobsMeta()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 862c582ba8b1f8d457811ba8d8f87194e832b112 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 24 Aug 2012 19:10:12 +0530
Subject: [PATCH 096/288] [FIX] Added missing udpate btn

bzr revid: jam@tinyerp.com-20120824134012-gu4wefjbdeuw1mw8
---
 .../addons/base/module/wizard/base_update_translations_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/module/wizard/base_update_translations_view.xml b/openerp/addons/base/module/wizard/base_update_translations_view.xml
index 1fe52511ebb..392994178f7 100644
--- a/openerp/addons/base/module/wizard/base_update_translations_view.xml
+++ b/openerp/addons/base/module/wizard/base_update_translations_view.xml
@@ -10,6 +10,8 @@
                         <field name="lang"/>
                     </group>
                     <footer>
+                        <button name="act_update" string="Update" type="object" class="oe_highlight"/> 
+                        or
                         <button name="act_cancel" special="cancel" string="Cancel" type="object"/>
                     </footer>
                 </form>

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 097/288] [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 ac0566a8564e75aa23c99e0de5227a427c8d1fb5 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 27 Aug 2012 12:22:18 +0530
Subject: [PATCH 098/288] [FIX] base_gengo: remove warning

bzr revid: aja@tinyerp.com-20120827065218-3ztowz1icyc6jv82
---
 addons/base_gengo/wizard/__init__.py          |   1 -
 addons/base_gengo/wizard/abstract_wrapper.py  | 167 ------------------
 .../base_gengo/wizard/gengo_update_message.py |   2 +-
 .../wizard/gengo_update_translation.py        | 126 +++++++++++--
 4 files changed, 116 insertions(+), 180 deletions(-)
 delete mode 100644 addons/base_gengo/wizard/abstract_wrapper.py

diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
index 7bde4753da6..3e6c687d9de 100644
--- a/addons/base_gengo/wizard/__init__.py
+++ b/addons/base_gengo/wizard/__init__.py
@@ -20,6 +20,5 @@
 ##############################################################################
 
 import gengo_update_translation
-import abstract_wrapper
 import gengo_update_message
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/abstract_wrapper.py b/addons/base_gengo/wizard/abstract_wrapper.py
deleted file mode 100644
index 2679d080d9d..00000000000
--- a/addons/base_gengo/wizard/abstract_wrapper.py
+++ /dev/null
@@ -1,167 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Business Applications
-#    Copyright (C) 2004-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/>.
-#
-##############################################################################
-
-from osv import orm
-import tools
-from mygengo import MyGengo
-
-LIMIT = 20
-
-LANG_MAPPING = {
-    'ar': 'Arabic',
-    'id': 'Indonesian',
-    'nl': 'Dutch',
-    'fr-ca': 'French (Canada)',
-    'pl': 'Polish',
-    'zh-tw': 'Chinese (Traditional)',
-    'sv': 'Swedish',
-    'ko': 'Korean',
-    'pt': 'Portuguese (Europe)',
-    'en': 'English',
-    'ja': 'Japanese',
-    'es': 'Spanish (Spain)',
-    'zh': 'Chinese (Simplified)',
-    'de': 'German',
-    'fr': 'French',
-    'ru': 'Russian',
-    'it': 'Italian',
-    'pt-br': 'Portuguese (Brazil)',
-}
-
-LANG_CODE_MAPPING = {
-    'ar_SA': 'ar',
-    'id_ID': 'id',
-    'nl_NL': 'nl',
-    'fr_CA': 'fr-ca',
-    'pl': 'pl',
-    'zh_TW': 'zh-tw',
-    'sv_SE': 'sv',
-    'ko_KR': 'ko',
-    'pt_PT': 'pt',
-    'en_US': 'en',
-    'ja_JP': 'ja',
-    'es_ES': 'es',
-    'zh_CN': 'zh',
-    'de_DE': 'de',
-    'fr_FR': 'fr',
-    'fr_BE': 'fr',
-    'ru_RU': 'ru',
-    'it_IT': 'it',
-    'pt_BR': 'pt-br'
-}
-
-
-class gengo_response(object):
-    """
-    """
-    def __init__(self, jobs):
-        self._data = jobs
-
-    def __getitem__(self, name):
-        return self._data[name]
-
-    def __getattr__(self, name):
-        try:
-            return self[name]
-        except KeyError, e:
-            raise AttributeError(e)
-
-
-class gengo_job(object):
-    """
-    """
-    def __init__(self, job):
-        self._data = job
-
-    def __getitem__(self, name):
-        return self._data[name]
-
-    def __getattr__(self, name):
-        try:
-            return self[name]
-        except KeyError, e:
-            raise AttributeError(e)
-
-
-class JobsMeta(orm.AbstractModel):
-
-    _name = "jobs.meta"
-
-    def gengo_authentication(self, cr, uid, context=None):
-        ''' To Send Request and Get Response from Gengo User needs Public and Private
-         key for that user need to signup to gengo and get public and private
-         key which is provided by gengo to authentic user '''
-
-        user = self.pool.get('res.users').browse(cr, uid, uid, context)
-        if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
-            return (False, "Invalid gengo configuration.\nEither pulic key or private key is missing.")
-        try:
-            gengo = MyGengo(
-                public_key=user.company_id.gengo_public_key.encode('ascii'),
-                private_key=user.company_id.gengo_private_key.encode('ascii'),
-                sandbox=True,
-            )
-            gengo.getAccountStats()
-            return (True, gengo)
-        except Exception, e:
-            return (False, "Gengo Connection Error\n"+e.message)
-
-    def pack_jobs_request(self, cr, uid, term_ids, context):
-        jobs = {}
-        auto_approve = 0
-        gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
-        translation_pool = self.pool.get('ir.translation')
-        if gengo_parameter_pool.company_id.gengo_auto_approve:
-            auto_approve = 1
-        for term in translation_pool.browse(cr, uid, term_ids, context):
-            if term.src and term.src != "":
-                job = {'type': 'text',
-                        'slug': 'single::English to' + LANG_CODE_MAPPING[term.lang],
-                        'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
-                        'body_src': term.src,
-                        'lc_src': 'en',
-                        'lc_tgt': LANG_CODE_MAPPING[term.lang],
-                        'auto_approve': auto_approve,
-                        'comment': gengo_parameter_pool.company_id.gengo_comment,
-                }
-                jobs.update({term.id: job})
-        return {'jobs': jobs}
-
-    def check_lang_support(self, cr, uid, langs, context=None):
-        new_langs = []
-        flag, gengo = self.gengo_authentication(cr, uid, context)
-        if not flag:
-            return []
-        else:
-            user = self.pool.get('res.users').browse(cr, uid, uid, context)
-            tier = user.company_id.gengo_tier
-            if tier == "machine":
-                tier = "nonprofit"
-
-            lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
-            if lang_pair['opstat'] == 'ok':
-                for g_lang in lang_pair['response']:
-                    for l in langs:
-                        if LANG_CODE_MAPPING[l] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
-                            new_langs.append(l)
-            return list(set(new_langs))
-JobsMeta()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/gengo_update_message.py b/addons/base_gengo/wizard/gengo_update_message.py
index 214b9978a19..88fb0283825 100644
--- a/addons/base_gengo/wizard/gengo_update_message.py
+++ b/addons/base_gengo/wizard/gengo_update_message.py
@@ -23,7 +23,7 @@ from osv import osv
 from osv import fields
 
 
-class gengo_update_message(osv.osv):
+class gengo_update_message(osv.osv_memory):
     """Update Message"""
 
     _name = "gengo.update.message"
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 9cb5f0696f5..a6db51f870d 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -20,9 +20,58 @@
 ##############################################################################
 
 from osv import osv
-import abstract_wrapper as local
 import logging
+import tools
 _logger = logging.getLogger(__name__)
+try:
+    from mygengo import MyGengo
+except ImportError:
+    raise osv.except_osv(_('Gengo ImportError'),_('Please install mygengo lib from http://pypi.python.org/pypi/mygengo'))
+
+LIMIT = 20
+
+LANG_MAPPING = {
+    'ar': 'Arabic',
+    'id': 'Indonesian',
+    'nl': 'Dutch',
+    'fr-ca': 'French (Canada)',
+    'pl': 'Polish',
+    'zh-tw': 'Chinese (Traditional)',
+    'sv': 'Swedish',
+    'ko': 'Korean',
+    'pt': 'Portuguese (Europe)',
+    'en': 'English',
+    'ja': 'Japanese',
+    'es': 'Spanish (Spain)',
+    'zh': 'Chinese (Simplified)',
+    'de': 'German',
+    'fr': 'French',
+    'ru': 'Russian',
+    'it': 'Italian',
+    'pt-br': 'Portuguese (Brazil)',
+}
+
+LANG_CODE_MAPPING = {
+    'ar_SA': 'ar',
+    'id_ID': 'id',
+    'nl_NL': 'nl',
+    'fr_CA': 'fr-ca',
+    'pl': 'pl',
+    'zh_TW': 'zh-tw',
+    'sv_SE': 'sv',
+    'ko_KR': 'ko',
+    'pt_PT': 'pt',
+    'en_US': 'en',
+    'ja_JP': 'ja',
+    'es_ES': 'es',
+    'zh_CN': 'zh',
+    'de_DE': 'de',
+    'fr_FR': 'fr',
+    'fr_BE': 'fr',
+    'ru_RU': 'ru',
+    'it_IT': 'it',
+    'pt_BR': 'pt-br'
+}
 
 cron_vals = {
     'name': 'Gengo Sync',
@@ -37,6 +86,64 @@ cron_vals = {
 
 class base_update_translation(osv.osv_memory):
 
+    def gengo_authentication(self, cr, uid, context=None):
+        ''' To Send Request and Get Response from Gengo User needs Public and Private
+         key for that user need to signup to gengo and get public and private
+         key which is provided by gengo to authentic user '''
+
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
+            return (False, "Invalid gengo configuration.\nEither pulic key or private key is missing.")
+        try:
+            gengo = MyGengo(
+                public_key=user.company_id.gengo_public_key.encode('ascii'),
+                private_key=user.company_id.gengo_private_key.encode('ascii'),
+                sandbox=True,
+            )
+            gengo.getAccountStats()
+            return (True, gengo)
+        except Exception, e:
+            return (False, "Gengo Connection Error\n"+e.message)
+
+    def pack_jobs_request(self, cr, uid, term_ids, context):
+        jobs = {}
+        auto_approve = 0
+        gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
+        translation_pool = self.pool.get('ir.translation')
+        if gengo_parameter_pool.company_id.gengo_auto_approve:
+            auto_approve = 1
+        for term in translation_pool.browse(cr, uid, term_ids, context):
+            if term.src and term.src != "":
+                job = {'type': 'text',
+                        'slug': 'single::English to' + LANG_CODE_MAPPING[term.lang],
+                        'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
+                        'body_src': term.src,
+                        'lc_src': 'en',
+                        'lc_tgt': LANG_CODE_MAPPING[term.lang],
+                        'auto_approve': auto_approve,
+                        'comment': gengo_parameter_pool.company_id.gengo_comment,
+                }
+                jobs.update({term.id: job})
+        return {'jobs': jobs}
+
+    def check_lang_support(self, cr, uid, langs, context=None):
+        new_langs = []
+        flag, gengo = self.gengo_authentication(cr, uid, context)
+        if not flag:
+            return []
+        else:
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            tier = user.company_id.gengo_tier
+            if tier == "machine":
+                tier = "nonprofit"
+
+            lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
+            if lang_pair['opstat'] == 'ok':
+                for g_lang in lang_pair['response']:
+                    for l in langs:
+                        if LANG_CODE_MAPPING[l] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
+                            new_langs.append(l)
+            return list(set(new_langs))
     def _update_terms(self, cr, uid, ids, response, tier, context):
         translation_pool = self.pool.get('ir.translation')
         for jobs in response['jobs']:
@@ -53,12 +160,11 @@ class base_update_translation(osv.osv_memory):
         """
         Lazy Polling will be perform when user or cron request for the trnalstion.
         """
-        meta = self.pool.get('jobs.meta')
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
-        flag, gengo = meta.gengo_authentication(cr, uid, context)
+        flag, gengo = self.gengo_authentication(cr, uid, context)
         if flag:
 
-            request = meta.pack_jobs_request(cr, uid, term_ids, context)
+            request = self.pack_jobs_request(cr, uid, term_ids, context)
             if request:
                 result = gengo.postTranslationJobs(jobs=request)
                 if result['opstat'] == 'ok':
@@ -83,8 +189,7 @@ class base_update_translation(osv.osv_memory):
         lang_pool = self.pool.get('res.lang')
         super(base_update_translation, self).act_update(cr, uid, ids, context)
         msg = "1. Translation file loaded succesfully.\n2. Processing Gengo Translation:\n"
-        meta = self.pool.get('jobs.meta')
-        flag, gengo = meta.gengo_authentication(cr, uid, context)
+        flag, gengo = self.gengo_authentication(cr, uid, context)
         if not flag:
             msg += gengo
         else:
@@ -119,13 +224,12 @@ class base_update_translation(osv.osv_memory):
     def _sync_response(self, cr, uid, ids=False, context=None):
         """Scheduler will be call to get response from gengo and all term will get
         by scheduler which terms are in approved state"""
-        meta = self.pool.get('jobs.meta')
         translation_pool = self.pool.get('ir.translation')
-        flag, gengo = meta.gengo_authentication(cr, uid, context)
+        flag, gengo = self.gengo_authentication(cr, uid, context)
         if not flag:
             _logger.warning("%s", gengo)
         else:
-            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=local.LIMIT, context=context)
+            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=LIMIT, context=context)
             for trns in translation_pool.browse(cr, uid, translation_id, context):
                 if trns.job_id:
                     job_response = gengo.getTranslationJob(id=trns.job_id)
@@ -143,8 +247,8 @@ class base_update_translation(osv.osv_memory):
         try:
             lang_ids = language_pool.search(cr, uid, [('gengo_sync', '=', True)])
             langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids)]
-            langs = self.pool.get('jobs.meta').check_lang_support(cr, uid, langs)
-            term_ids = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=local.LIMIT)
+            langs = self.check_lang_support(cr, uid, langs)
+            term_ids = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=LIMIT)
             if term_ids:
                 self._send_translation_terms(cr, uid, ids, term_ids, context)
                 _logger.info("Translation terms %s has been posted to gengo successfully", len(term_ids))

From 6ad7a5a4b0cb8d8c23d45d0b4ed3fdb40888df70 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 27 Aug 2012 12:57:43 +0530
Subject: [PATCH 099/288] [FIX/USA] Usabality Impovments ans Import error fixed

bzr revid: jam@tinyerp.com-20120827072743-v022e5obnd06csoy
---
 addons/base_gengo/res_company.py                     | 2 +-
 addons/base_gengo/res_company_view.xml               | 8 ++++----
 addons/base_gengo/wizard/gengo_update_translation.py | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 888e675e26b..8e26f406f30 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -33,7 +33,7 @@ class res_company(osv.Model):
                                           ('pro', 'Pro'),
                                           ('ultra', 'Ultra')], "Tier types", required=True),
            "gengo_comment": fields.text("comments"),
-           "gengo_auto_approve": fields.boolean("Active", help="Jobs are Automatically Approved by Gengo."),
+           "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
            "fields_ids": fields.many2many('ir.model.fields', 'fields_company_rel', 'field_id', 'model_id', 'fields'),
     }
 
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index bfa0b1ddf95..f51ee4d4f95 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -11,11 +11,11 @@
                 <xpath expr="//notebook[last()]" position="inside">
                     <page string="Gengo Parameters">
                         <group col="2">
-                            <group col="1" string="Private Key">
-                                <field name="gengo_private_key" nolabel="1"/>
-                            </group>
                             <group col="1" string="Public Key">
-                                <field name="gengo_public_key" nolabel="1"/>
+                                <field name="gengo_public_key" nolabel="1" placeholder="Add Gengo login Public Key..."/>
+                            </group>
+                            <group col="1" string="Private Key">
+                                <field name="gengo_private_key" nolabel="1" placeholder="Add Gengo login Private Key..."/>
                             </group>
                         </group>
                         <group col="4">
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index a6db51f870d..33e90384275 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -22,6 +22,8 @@
 from osv import osv
 import logging
 import tools
+from tools.translate import _
+
 _logger = logging.getLogger(__name__)
 try:
     from mygengo import MyGengo

From 0072333206e790f5031f207b3cfcfd99b58b5fde Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 27 Aug 2012 15:10:27 +0530
Subject: [PATCH 100/288] [FIX]Import error fixed

bzr revid: jam@tinyerp.com-20120827094027-jgmwf8wrb76epj8q
---
 addons/base_gengo/wizard/gengo_update_translation.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 33e90384275..e2734f04cbe 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -20,15 +20,17 @@
 ##############################################################################
 
 from osv import osv
+try:
+    from mygengo import MyGeng
+except ImportError:
+    raise osv.except_osv(_('Gengo ImportError'), _('Please install mygengo lib from http://pypi.python.org/pypi/mygengo'))
+
 import logging
 import tools
 from tools.translate import _
 
 _logger = logging.getLogger(__name__)
-try:
-    from mygengo import MyGengo
-except ImportError:
-    raise osv.except_osv(_('Gengo ImportError'),_('Please install mygengo lib from http://pypi.python.org/pypi/mygengo'))
+
 
 LIMIT = 20
 

From d1595a063545ca1aed0b2cb73265e7a55c9d4a9c Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 27 Aug 2012 15:11:37 +0530
Subject: [PATCH 101/288] [FIX]_ error fixed

bzr revid: jam@tinyerp.com-20120827094137-vw9ztsn1vv31egy4
---
 addons/base_gengo/wizard/gengo_update_translation.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index e2734f04cbe..9ac023bdbbd 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -20,8 +20,9 @@
 ##############################################################################
 
 from osv import osv
+from tools.translate import _
 try:
-    from mygengo import MyGeng
+    from mygengo import MyGengo
 except ImportError:
     raise osv.except_osv(_('Gengo ImportError'), _('Please install mygengo lib from http://pypi.python.org/pypi/mygengo'))
 

From e112222207c33c093686fc91d709905121ebdbe0 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 27 Aug 2012 16:24:13 +0530
Subject: [PATCH 102/288] [ADD]base_gengo:Get comment from gengo and add to
 openerp

bzr revid: aja@tinyerp.com-20120827105413-usu1a5wqxjx8j71s
---
 .../wizard/gengo_update_translation.py        | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 33e90384275..fe2460d55e0 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -22,6 +22,7 @@
 from osv import osv
 import logging
 import tools
+import time
 from tools.translate import _
 
 _logger = logging.getLogger(__name__)
@@ -88,6 +89,9 @@ cron_vals = {
 
 class base_update_translation(osv.osv_memory):
 
+    _name = 'base.update.translations'
+    _inherit = "base.update.translations"
+
     def gengo_authentication(self, cr, uid, context=None):
         ''' To Send Request and Get Response from Gengo User needs Public and Private
          key for that user need to signup to gengo and get public and private
@@ -224,19 +228,36 @@ class base_update_translation(osv.osv_memory):
              }
 
     def _sync_response(self, cr, uid, ids=False, context=None):
-        """Scheduler will be call to get response from gengo and all term will get
-        by scheduler which terms are in approved state"""
+        """
+        This method  will be call by cron services to get translation from
+        gengo for translation terms which are posted to be translated. It will
+        read translated terms and comments from gengo and will update respective
+        translation in openerp """
         translation_pool = self.pool.get('ir.translation')
         flag, gengo = self.gengo_authentication(cr, uid, context)
         if not flag:
             _logger.warning("%s", gengo)
         else:
             translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=LIMIT, context=context)
-            for trns in translation_pool.browse(cr, uid, translation_id, context):
-                if trns.job_id:
-                    job_response = gengo.getTranslationJob(id=trns.job_id)
+            for term in translation_pool.browse(cr, uid, translation_id, context):
+                if term.job_id:
+                    vals={}
+                    job_response = gengo.getTranslationJob(id=term.job_id)
+                    if job_response['opstat'] != 'ok':
+                        _logger.warning("Invalid Response Skeeping translation Terms for 'id' %s."%(term.job_id))
+                        continue
                     if job_response['response']['job']['status'] == 'approved':
-                        translation_pool.write(cr, uid, trns.id, {'value': job_response['response']['job']['body_tgt'], 'state': 'translated', 'gengo_control': True})
+                        vals.update({'state': 'translated',
+                            'value': job_response['response']['job']['body_tgt'],
+                            'gengo_control': True})
+                    job_comment = gengo.getTranslationJobComments(id=term.job_id)
+                    if job_comment['opstat']=='ok':
+                        gengo_comments=""
+                        for comment in job_comment['response']['thread']:
+                            gengo_comments+='%s by %s at %s. \n'    %(comment['body'],comment['author'],time.ctime(comment['ctime']))
+                        vals.update({'gengo_comment':gengo_comments})
+                    if vals:
+                        translation_pool.write(cr, uid, term.id,vals)
         return True
 
     def _sync_request(self, cr, uid, ids=False, context=None):
@@ -259,8 +280,4 @@ class base_update_translation(osv.osv_memory):
         except Exception, e:
             _logger.error("%s", e)
 
-    _name = 'base.update.translations'
-    _inherit = "base.update.translations"
-
-base_update_translation()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From cd52658a64b4dc63a5b2369ca435f7ee9be4d877 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 27 Aug 2012 16:36:40 +0530
Subject: [PATCH 103/288] [FIX] removed the view type field

bzr revid: jam@tinyerp.com-20120827110640-cjtmztups89c8exs
---
 addons/base_gengo/ir_translation.xml             | 2 --
 addons/base_gengo/res_company_view.xml           | 1 -
 addons/base_gengo/res_lang_view.xml              | 1 -
 addons/base_gengo/wizard/alert_message_gengo.xml | 1 -
 4 files changed, 5 deletions(-)

diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
index 753c12c7e7d..30108c882b5 100644
--- a/addons/base_gengo/ir_translation.xml
+++ b/addons/base_gengo/ir_translation.xml
@@ -5,7 +5,6 @@
             <field name="name">Translations</field>
             <field name="model">ir.translation</field>
             <field name="inherit_id" ref="base.view_translation_search"/>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Translations">
                      <filter icon="terp-project" string="In Progress" domain="[('state','=','inprogress')]"></filter>
@@ -19,7 +18,6 @@
             <field name="name">ir.translation.form.inherit</field>
             <field name="inherit_id" ref="base.view_translation_form"/>
             <field name="model">ir.translation</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                  <xpath expr="//form[@string='Translations']/sheet" position="inside">
                     <group string="comments" col="1">
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index f51ee4d4f95..3606fbf58da 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -6,7 +6,6 @@
             <field name="name">res.company.form.inherit</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//notebook[last()]" position="inside">
                     <page string="Gengo Parameters">
diff --git a/addons/base_gengo/res_lang_view.xml b/addons/base_gengo/res_lang_view.xml
index e0c8edd11aa..38e6b995163 100644
--- a/addons/base_gengo/res_lang_view.xml
+++ b/addons/base_gengo/res_lang_view.xml
@@ -6,7 +6,6 @@
             <field name="name">res.lang.form.inherit</field>
             <field name="inherit_id" ref="base.res_lang_form"/>
             <field name="model">res.lang</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//sheet/group" position="inside">
                     <field name="gengo_sync" />
diff --git a/addons/base_gengo/wizard/alert_message_gengo.xml b/addons/base_gengo/wizard/alert_message_gengo.xml
index 84bfc7bb484..c2121b8ce6d 100644
--- a/addons/base_gengo/wizard/alert_message_gengo.xml
+++ b/addons/base_gengo/wizard/alert_message_gengo.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="update_translation_wizard_view_confirm">
             <field name="name">gengo.update.message.form</field>
             <field name="model">gengo.update.message</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Update Gengo Data" version="7.0">
                     <group>

From 72a2c0f0aba16ccfabfe6647b16f7043af561abb Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 27 Aug 2012 19:07:59 +0530
Subject: [PATCH 104/288] [IMP]: Improve lang_code_mapping

bzr revid: aja@tinyerp.com-20120827133759-resjxxg7w772ntj7
---
 addons/base_gengo/__init__.py                 |   1 +
 .../base_gengo/gengo_sync_schedular_data.xml  |   2 +-
 addons/base_gengo/ir_translation.py           |   2 +-
 addons/base_gengo/res_company.py              |   2 +-
 addons/base_gengo/res_company_view.xml        |   3 -
 addons/base_gengo/wizard/__init__.py          |   1 +
 .../wizard/gengo_update_translation.py        | 108 +++++++-----------
 7 files changed, 49 insertions(+), 70 deletions(-)

diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
index c434c6b1843..b4fd54acd21 100644
--- a/addons/base_gengo/__init__.py
+++ b/addons/base_gengo/__init__.py
@@ -23,4 +23,5 @@ import res_company
 import ir_translation
 import wizard
 import res_lang
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/gengo_sync_schedular_data.xml b/addons/base_gengo/gengo_sync_schedular_data.xml
index ab78b59e0b8..2a12626713c 100644
--- a/addons/base_gengo/gengo_sync_schedular_data.xml
+++ b/addons/base_gengo/gengo_sync_schedular_data.xml
@@ -12,7 +12,7 @@
             <field eval="'_sync_response'" name="function"/>
         </record>
 
-        <!--Schedular Sync Send Request-->
+        <!--Scheduler Sync Send Request-->
         <record id="gengo_sync_send_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Request)</field>
             <field eval="False" name="active"/>
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 7bda5023592..297e449ecdc 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -29,7 +29,7 @@ class ir_translation(osv.Model):
         'gengo_comment': fields.text("Comments"),
         'gengo_translation': fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
         'gengo_control': fields.boolean('Active'),
-        'job_id':fields.char('Gengo Job Id',size=32),
+        'job_id': fields.char('Gengo Job Id', size=32),
     }
 
     _defaults = {
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 8e26f406f30..9062095bb87 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -34,9 +34,9 @@ class res_company(osv.Model):
                                           ('ultra', 'Ultra')], "Tier types", required=True),
            "gengo_comment": fields.text("comments"),
            "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
-           "fields_ids": fields.many2many('ir.model.fields', 'fields_company_rel', 'field_id', 'model_id', 'fields'),
     }
 
     _defaults = {
         "gengo_tier": "machine",
+        "gengo_auto_approve": True,
     }
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index 3606fbf58da..60cd767b140 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -24,9 +24,6 @@
                         <group string="Comments" col="1">
                             <field name="gengo_comment" nolabel="1" placeholder="Add Your comments here for Translator...."/>
                         </group>
-                        <group col="1">
-                            <field name="fields_ids" nolabel="1"/>
-                        </group>
                     </page>
                 </xpath>
             </field>
diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
index 3e6c687d9de..f661b3b8114 100644
--- a/addons/base_gengo/wizard/__init__.py
+++ b/addons/base_gengo/wizard/__init__.py
@@ -21,4 +21,5 @@
 
 import gengo_update_translation
 import gengo_update_message
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 9ac023bdbbd..e3a147f9306 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -21,6 +21,7 @@
 
 from osv import osv
 from tools.translate import _
+import re
 try:
     from mygengo import MyGengo
 except ImportError:
@@ -28,54 +29,30 @@ except ImportError:
 
 import logging
 import tools
-from tools.translate import _
-
 _logger = logging.getLogger(__name__)
 
-
 LIMIT = 20
 
-LANG_MAPPING = {
-    'ar': 'Arabic',
-    'id': 'Indonesian',
-    'nl': 'Dutch',
-    'fr-ca': 'French (Canada)',
-    'pl': 'Polish',
-    'zh-tw': 'Chinese (Traditional)',
-    'sv': 'Swedish',
-    'ko': 'Korean',
-    'pt': 'Portuguese (Europe)',
-    'en': 'English',
-    'ja': 'Japanese',
-    'es': 'Spanish (Spain)',
-    'zh': 'Chinese (Simplified)',
-    'de': 'German',
-    'fr': 'French',
-    'ru': 'Russian',
-    'it': 'Italian',
-    'pt-br': 'Portuguese (Brazil)',
-}
-
 LANG_CODE_MAPPING = {
-    'ar_SA': 'ar',
-    'id_ID': 'id',
-    'nl_NL': 'nl',
-    'fr_CA': 'fr-ca',
-    'pl': 'pl',
-    'zh_TW': 'zh-tw',
-    'sv_SE': 'sv',
-    'ko_KR': 'ko',
-    'pt_PT': 'pt',
-    'en_US': 'en',
-    'ja_JP': 'ja',
-    'es_ES': 'es',
-    'zh_CN': 'zh',
-    'de_DE': 'de',
-    'fr_FR': 'fr',
-    'fr_BE': 'fr',
-    'ru_RU': 'ru',
-    'it_IT': 'it',
-    'pt_BR': 'pt-br'
+    'ar_SA': ('ar', 'Arabic'),
+    'id_ID': ('id', 'Indonesian'),
+    'nl_NL': ('nl', 'Dutch'),
+    'fr_CA': ('fr-ca', 'French (Canada)'),
+    'pl': ('Polish'),
+    'zh_TW': ('zh-tw', 'Chinese (Traditional)'),
+    'sv_SE': ('sv', 'Swedish'),
+    'ko_KR': ('ko', 'Korean'),
+    'pt_PT': ('pt', 'Portuguese (Europe)'),
+    'en_US': ('en', 'English'),
+    'ja_JP': ('ja', 'Japanese'),
+    'es_ES': ('es', 'Spanish (Spain)'),
+    'zh_CN': ('zh', 'Chinese (Simplified)'),
+    'de_DE': ('de', 'German'),
+    'fr_FR': ('fr', 'French'),
+    'fr_BE': ('fr', 'French'),
+    'ru_RU': ('ru', 'Russian'),
+    'it_IT': ('it', 'Italian'),
+    'pt_BR': ('pt-br', 'Portuguese (Brazil)')
 }
 
 cron_vals = {
@@ -93,12 +70,12 @@ class base_update_translation(osv.osv_memory):
 
     def gengo_authentication(self, cr, uid, context=None):
         ''' To Send Request and Get Response from Gengo User needs Public and Private
-         key for that user need to signup to gengo and get public and private
+         key for that user need to sign up to gengo and get public and private
          key which is provided by gengo to authentic user '''
 
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
         if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
-            return (False, "Invalid gengo configuration.\nEither pulic key or private key is missing.")
+            return (False, "Invalid gengo configuration.\n Either public key or private key is missing.")
         try:
             gengo = MyGengo(
                 public_key=user.company_id.gengo_public_key.encode('ascii'),
@@ -108,7 +85,7 @@ class base_update_translation(osv.osv_memory):
             gengo.getAccountStats()
             return (True, gengo)
         except Exception, e:
-            return (False, "Gengo Connection Error\n"+e.message)
+            return (False, "Gengo Connection Error\n" + e.message)
 
     def pack_jobs_request(self, cr, uid, term_ids, context):
         jobs = {}
@@ -118,17 +95,18 @@ class base_update_translation(osv.osv_memory):
         if gengo_parameter_pool.company_id.gengo_auto_approve:
             auto_approve = 1
         for term in translation_pool.browse(cr, uid, term_ids, context):
-            if term.src and term.src != "":
-                job = {'type': 'text',
-                        'slug': 'single::English to' + LANG_CODE_MAPPING[term.lang],
-                        'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
-                        'body_src': term.src,
-                        'lc_src': 'en',
-                        'lc_tgt': LANG_CODE_MAPPING[term.lang],
-                        'auto_approve': auto_approve,
-                        'comment': gengo_parameter_pool.company_id.gengo_comment,
-                }
-                jobs.update({term.id: job})
+            if term.src:
+                if re.search(r"\w",term.src):
+                    job = {'type': 'text',
+                            'slug': 'single::English to ' + LANG_CODE_MAPPING[term.lang][1],
+                            'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
+                            'body_src': term.src,
+                            'lc_src': 'en',
+                            'lc_tgt': LANG_CODE_MAPPING[term.lang][0],
+                            'auto_approve': auto_approve,
+                            'comment': gengo_parameter_pool.company_id.gengo_comment,
+                    }
+                    jobs.update({term.id: job})
         return {'jobs': jobs}
 
     def check_lang_support(self, cr, uid, langs, context=None):
@@ -146,9 +124,10 @@ class base_update_translation(osv.osv_memory):
             if lang_pair['opstat'] == 'ok':
                 for g_lang in lang_pair['response']:
                     for l in langs:
-                        if LANG_CODE_MAPPING[l] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
+                        if LANG_CODE_MAPPING[l][0] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
                             new_langs.append(l)
             return list(set(new_langs))
+
     def _update_terms(self, cr, uid, ids, response, tier, context):
         translation_pool = self.pool.get('ir.translation')
         for jobs in response['jobs']:
@@ -163,17 +142,18 @@ class base_update_translation(osv.osv_memory):
 
     def _send_translation_terms(self, cr, uid, ids, term_ids, context):
         """
-        Lazy Polling will be perform when user or cron request for the trnalstion.
+        Lazy Polling will be perform when user or cron request for the translation.
         """
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
         flag, gengo = self.gengo_authentication(cr, uid, context)
         if flag:
-
             request = self.pack_jobs_request(cr, uid, term_ids, context)
-            if request:
+            if request['jobs']:
                 result = gengo.postTranslationJobs(jobs=request)
                 if result['opstat'] == 'ok':
                     self._update_terms(cr, uid, ids, result['response'], user.company_id.gengo_tier, context)
+            else:
+                _logger.info('')
         else:
             _logger.error(gengo)
         return True
@@ -193,7 +173,7 @@ class base_update_translation(osv.osv_memory):
             context = {}
         lang_pool = self.pool.get('res.lang')
         super(base_update_translation, self).act_update(cr, uid, ids, context)
-        msg = "1. Translation file loaded succesfully.\n2. Processing Gengo Translation:\n"
+        msg = "1. Translation file loaded successfully.\n2. Processing Gengo Translation:\n"
         flag, gengo = self.gengo_authentication(cr, uid, context)
         if not flag:
             msg += gengo
@@ -203,11 +183,11 @@ class base_update_translation(osv.osv_memory):
                 lang_search = lang_pool.search(cr, uid, [('gengo_sync', '=', True),
                 ('id', '=', lang_id[0])])
                 if lang_search:
-                    msg += 'This language %s is alreay in queue for processing.' % (res.lang)
+                    msg += 'This language %s is already in queue for processing.' % (res.lang)
                 else:
                     msg += "Translation for language %s is queued for processing." % (res.lang)
                     lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
-                    _logger.info("Your translation request for language '%s' has been send sucessfully.", res.lang)
+                    _logger.info("Your translation request for language '%s' has been send successfully.", res.lang)
 
                 self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'Gengo Sync Translation (Request)', '_sync_request', context)
                 self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'Gengo Sync Translation (Response)', '_sync_response', context)

From 381676051e91e3d56a71ec02d6dfc53b7ba020ad Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 27 Aug 2012 16:47:56 +0200
Subject: [PATCH 105/288] [IMP] hide the auth_signup_template_user_id field
 when auth_signup_uninvited isn't checked

bzr revid: abo@openerp.com-20120827144756-wp8b4ss07kag4dzj
---
 addons/auth_signup/res_config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml
index 49669d36618..f09e9155b0e 100644
--- a/addons/auth_signup/res_config.xml
+++ b/addons/auth_signup/res_config.xml
@@ -12,7 +12,7 @@
                         <field name="auth_signup_uninvited" class="oe_inline"/>
                         <label for="auth_signup_uninvited"/>
                     </div>
-                    <div>
+                    <div attrs="{'invisible':[('auth_signup_uninvited','=',False)]}">
                         <label for="auth_signup_template_user_id"/>
                         <field name="auth_signup_template_user_id" class="oe_inline"/>
                     </div>

From b9320999214d88ea63cee12d0cc7a1309682c49c Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 27 Aug 2012 18:34:58 +0200
Subject: [PATCH 106/288] [:'(] remove the so-cute image of Chell from the
 portal's demo data

bzr revid: abo@openerp.com-20120827163458-uxan9ylsnrw0p0ym
---
 addons/portal/portal_demo.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index ab2cf22ffb7..a07709cd0d5 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -7,7 +7,6 @@
             <field name="name">Demo Portal User</field>
             <field name="login">portal</field>
             <field name="password">portal</field>
-            <field name="image">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ODdBREI1PC94bXBNTTpJbnN0YW5jZUlEPgogIDx4bXBNTTpEb2N1bWVudElEIHJkZjpyZXNvdXJjZT0neG1wLmRpZDoyMTUxMUFDRjU4NzBFMDExQjE4OEJBMDcwREM1NDg5MicgLz4KICA8eG1wTU06T3JpZ2luYWxEb2N1bWVudElEPnhtcC5kaWQ6MjE1MTFBQ0Y1ODcwRTAxMUIxODhCQTA3MERDNTQ4OTI8L3htcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD4KICA8eG1wTU06SGlzdG9yeT4KICAgPHJkZjpTZXE+CiAgIDwvcmRmOlNlcT4KICA8L3htcE1NOkhpc3Rvcnk+CiA8L3JkZjpEZXNjcmlwdGlvbj4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOmRjPSdodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyc+CiAgPGRjOmZvcm1hdD5pbWFnZS9qcGVnPC9kYzpmb3JtYXQ+CiA8L3JkZjpEZXNjcmlwdGlvbj4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOnBob3Rvc2hvcD0naHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyc+CiAgPHBob3Rvc2hvcDpDb2xvck1vZGU+MzwvcGhvdG9zaG9wOkNvbG9yTW9kZT4KICA8cGhvdG9zaG9wOklDQ1Byb2ZpbGU+c1JHQiBJRUM2MTk2Ni0yLjE8L3Bob3Rvc2hvcDpJQ0NQcm9maWxlPgogPC9yZGY6RGVzY3JpcHRpb24+CgogPHJkZjpEZXNjcmlwdGlvbiB4bWxuczp0aWZmPSdodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyc+CiAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICA8dGlmZjpYUmVzb2x1dGlvbj43MjAwMDAvMTAwMDA8L3RpZmY6WFJlc29sdXRpb24+CiAgPHRpZmY6WVJlc29sdXRpb24+NzIwMDAwLzEwMDAwPC90aWZmOllSZXNvbHV0aW9uPgogIDx0aWZmOlJlc29sdXRpb25Vbml0PjI8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgPHRpZmY6TmF0aXZlRGlnZXN0PjI1NiwyNTcsMjU4LDI1OSwyNjIsMjc0LDI3NywyODQsNTMwLDUzMSwyODIsMjgzLDI5NiwzMDEsMzE4LDMxOSw1MjksNTMyLDMwNiwyNzAsMjcxLDI3MiwzMDUsMzE1LDMzNDMyO0Q1MDVBNEM2MDlBQzIyNUVGMzcwM0UwMTE0NkQ4RTYzPC90aWZmOk5hdGl2ZURpZ2VzdD4KIDwvcmRmOkRlc2NyaXB0aW9uPgoKIDxyZGY6RGVzY3JpcHRpb24geG1sbnM6ZXhpZj0naHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8nPgogIDxleGlmOlBpeGVsWERpbWVuc2lvbj4yNTA8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogIDxleGlmOlBpeGVsWURpbWVuc2lvbj4zNzA8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogIDxleGlmOkNvbG9yU3BhY2U+MTwvZXhpZjpDb2xvclNwYWNlPgogIDxleGlmOk5hdGl2ZURpZ2VzdD4zNjg2NCw0MDk2MCw0MDk2MSwzNzEyMSwzNzEyMiw0MDk2Miw0MDk2MywzNzUxMCw0MDk2NCwzNjg2NywzNjg2OCwzMzQzNCwzMzQzNywzNDg1MCwzNDg1MiwzNDg1NSwzNDg1NiwzNzM3NywzNzM3OCwzNzM3OSwzNzM4MCwzNzM4MSwzNzM4MiwzNzM4MywzNzM4NCwzNzM4NSwzNzM4NiwzNzM5Niw0MTQ4Myw0MTQ4NCw0MTQ4Niw0MTQ4Nyw0MTQ4OCw0MTQ5Miw0MTQ5Myw0MTQ5NSw0MTcyOCw0MTcyOSw0MTczMCw0MTk4NSw0MTk4Niw0MTk4Nyw0MTk4OCw0MTk4OSw0MTk5MCw0MTk5MSw0MTk5Miw0MTk5Myw0MTk5NCw0MTk5NSw0MTk5Niw0MjAxNiwwLDIsNCw1LDYsNyw4LDksMTAsMTEsMTIsMTMsMTQsMTUsMTYsMTcsMTgsMjAsMjIsMjMsMjQsMjUsMjYsMjcsMjgsMzA7MTM3NUU3MDc1MjVBMTE0RjBBRkNBNzg4RTM2QzAyN0I8L2V4aWY6TmF0aXZlRGlnZXN0PgogPC9yZGY6RGVzY3JpcHRpb24+Cgo8L3JkZjpSREY+CjwveDp4bXBtZXRhPgo8P3hwYWNrZXQgZW5kPSdyJz8+Cv/iDFhJQ0NfUFJPRklM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</field>
             <!-- Avoid auto-including this user in any default group -->
             <field name="groups_id" eval="[(5,)]"/>
             <field name="partner_id" eval="ref('base.res_partner_1')"/>

From b8f2de2f97899385ee633615a182e17e1b883903 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 28 Aug 2012 14:10:36 +0530
Subject: [PATCH 107/288] [IMP]:clean code in gengo_update_translation

bzr revid: aja@tinyerp.com-20120828084036-9kxv2axis35vb8sv
---
 .../wizard/gengo_update_translation.py        | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index e3a147f9306..0b9ccd05658 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -38,7 +38,7 @@ LANG_CODE_MAPPING = {
     'id_ID': ('id', 'Indonesian'),
     'nl_NL': ('nl', 'Dutch'),
     'fr_CA': ('fr-ca', 'French (Canada)'),
-    'pl': ('Polish'),
+    'pl_PL': ('pl', 'Polish'),
     'zh_TW': ('zh-tw', 'Chinese (Traditional)'),
     'sv_SE': ('sv', 'Swedish'),
     'ko_KR': ('ko', 'Korean'),
@@ -55,7 +55,7 @@ LANG_CODE_MAPPING = {
     'pt_BR': ('pt-br', 'Portuguese (Brazil)')
 }
 
-cron_vals = {
+CRON_VALS = {
     'name': 'Gengo Sync',
     'active': True,
     'interval_number': 30,
@@ -75,7 +75,7 @@ class base_update_translation(osv.osv_memory):
 
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
         if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
-            return (False, "Invalid gengo configuration.\n Either public key or private key is missing.")
+            return (False, "Invalid gengo configuration.\nEither public key or private key is missing.")
         try:
             gengo = MyGengo(
                 public_key=user.company_id.gengo_public_key.encode('ascii'),
@@ -85,7 +85,7 @@ class base_update_translation(osv.osv_memory):
             gengo.getAccountStats()
             return (True, gengo)
         except Exception, e:
-            return (False, "Gengo Connection Error\n" + e.message)
+            return (False, "Gengo Connection Error\n%s"%e)
 
     def pack_jobs_request(self, cr, uid, term_ids, context):
         jobs = {}
@@ -96,7 +96,7 @@ class base_update_translation(osv.osv_memory):
             auto_approve = 1
         for term in translation_pool.browse(cr, uid, term_ids, context):
             if term.src:
-                if re.search(r"\w",term.src):
+                if re.search(r"\w", term.src):
                     job = {'type': 'text',
                             'slug': 'single::English to ' + LANG_CODE_MAPPING[term.lang][1],
                             'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
@@ -109,7 +109,7 @@ class base_update_translation(osv.osv_memory):
                     jobs.update({term.id: job})
         return {'jobs': jobs}
 
-    def check_lang_support(self, cr, uid, langs, context=None):
+    def check_lang_support(self, cr, uid, langs, context=None):s
         new_langs = []
         flag, gengo = self.gengo_authentication(cr, uid, context)
         if not flag:
@@ -152,8 +152,6 @@ class base_update_translation(osv.osv_memory):
                 result = gengo.postTranslationJobs(jobs=request)
                 if result['opstat'] == 'ok':
                     self._update_terms(cr, uid, ids, result['response'], user.company_id.gengo_tier, context)
-            else:
-                _logger.info('')
         else:
             _logger.error(gengo)
         return True
@@ -165,8 +163,8 @@ class base_update_translation(osv.osv_memory):
             model, res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base_gengo', xml_id)
             cron_pool.write(cr, uid, [res], {'active': True}, context=context)
         except:
-            cron_vals.update({'name': name, "function": fn})
-            return cron_pool.create(cr, uid, cron_vals, context)
+            CRON_VALS.update({'name': name, "function": fn})
+            return cron_pool.create(cr, uid, CRON_VALS, context)
 
     def act_update(self, cr, uid, ids, context=None):
         if context == None:
@@ -180,18 +178,23 @@ class base_update_translation(osv.osv_memory):
         else:
             for res in self.browse(cr, uid, ids, context):
                 lang_id = lang_pool.search(cr, uid, [('code', '=', res.lang)])
-                lang_search = lang_pool.search(cr, uid, [('gengo_sync', '=', True),
-                ('id', '=', lang_id[0])])
-                if lang_search:
-                    msg += 'This language %s is already in queue for processing.' % (res.lang)
-                else:
-                    msg += "Translation for language %s is queued for processing." % (res.lang)
-                    lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
-                    _logger.info("Your translation request for language '%s' has been send successfully.", res.lang)
+                lang_name = self._get_lang_name(cr, uid, res.lang)
+                try:
+                    if LANG_CODE_MAPPING[res.lang][0]:
+                        lang_search = lang_pool.search(cr, uid, [('gengo_sync', '=', True), ('id', '=', lang_id[0])])
+                    if lang_search:
+                        msg += 'This language " %s " is already in queue for processing.' % (lang_name)
+                    else:
+                        msg += 'Translation for language " %s " is queued for processing.' % (lang_name)
+                        lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
+                        _logger.info('Your translation request for language " %s " has been send successfully.', lang_name)
+
+                    self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'Gengo Sync Translation (Request)', '_sync_request', context)
+                    self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'Gengo Sync Translation (Response)', '_sync_response', context)
+                    self._sync_request(cr, uid, ids, context)
+                except:
+                    msg +='Language " %s " is not supported by MyGengo.'%(lang_name)
 
-                self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'Gengo Sync Translation (Request)', '_sync_request', context)
-                self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'Gengo Sync Translation (Response)', '_sync_response', context)
-                self._sync_request(cr, uid, ids, context)
         context.update({'message': msg})
         obj_model = self.pool.get('ir.model.data')
         model_data_ids = obj_model.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'update_translation_wizard_view_confirm')])

From b6617ff6ba4822ae12874f5ae797a6683f4a4475 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 15:03:05 +0530
Subject: [PATCH 108/288] [FIX] Fixed the usablity of cancel btn

bzr revid: jam@tinyerp.com-20120828093305-w2olgo9wkyu7903p
---
 .../addons/base/module/wizard/base_update_translations_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/wizard/base_update_translations_view.xml b/openerp/addons/base/module/wizard/base_update_translations_view.xml
index 392994178f7..4a20ef30bee 100644
--- a/openerp/addons/base/module/wizard/base_update_translations_view.xml
+++ b/openerp/addons/base/module/wizard/base_update_translations_view.xml
@@ -12,7 +12,7 @@
                     <footer>
                         <button name="act_update" string="Update" type="object" class="oe_highlight"/> 
                         or
-                        <button name="act_cancel" special="cancel" string="Cancel" type="object"/>
+                        <button name="act_cancel" special="cancel" string="Cancel" type="object" class="oe_link"/>
                     </footer>
                 </form>
             </field>

From 0fb11f25c455908664023effdff8fa571de58ad9 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 28 Aug 2012 11:53:45 +0200
Subject: [PATCH 109/288] [FIX] account: when generating objects from
 templates, set the default taxes as a super user + use of set_default()
 instead of deprecated set(key='default') (on ir.values)

bzr revid: qdp-launchpad@openerp.com-20120828095345-erwdm59r3wspqbah
---
 addons/account/account.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 907e6207380..5a61f73b6c1 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3345,13 +3345,11 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         # Install all the templates objects and generate the real objects
         acc_template_ref, taxes_ref, tax_code_ref = self._install_template(cr, uid, obj_wizard.chart_template_id.id, company_id, code_digits=obj_wizard.code_digits, obj_wizard=obj_wizard, context=context)
 
-        # write values of default taxes for product
+        # write values of default taxes for product as super user
         if obj_wizard.sale_tax and taxes_ref:
-            ir_values_obj.set(cr, uid, key='default', key2=False, name="taxes_id", company=company_id,
-                                models =[('product.product',False)], value=[taxes_ref[obj_wizard.sale_tax.id]])
+            ir_values_obj.set_default(cr, 1, 'product.product', "taxes_id", [taxes_ref[obj_wizard.sale_tax.id]], for_all_users=True, company=company_id)
         if obj_wizard.purchase_tax and taxes_ref:
-                ir_values_obj.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=company_id,
-                                models =[('product.product',False)], value=[taxes_ref[obj_wizard.purchase_tax.id]])
+            ir_values_obj.set_default(cr, 1, 'product.product', "supplier_taxes_id", [taxes_ref[obj_wizard.purchase_tax.id]], for_all_users=True, company=company_id)
 
         # Create Bank journals
         self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)

From d27721f480340446bc5405523b35febabf1770da Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 15:45:59 +0530
Subject: [PATCH 110/288] [REN] Renamed the state field key value

bzr revid: jam@tinyerp.com-20120828101559-l2zbivjzlmu7baq2
---
 openerp/addons/base/ir/ir_translation.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index 7693f95a7c8..f0a0ccc91e8 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -77,9 +77,9 @@ class ir_translation_import_cursor(object):
     def push(self, ddict):
         """Feed a translation, as a dictionary, into the cursor
         """
-        state= "translated"
-        if not ddict['value']:
-            state = 'translate'
+        state = ddict['value'] and "to_translate" or "translated" 
+        if not :
+            state = 
         self._cr.execute("INSERT INTO " + self._table_name \
                 + """(name, lang, res_id, src, type,
                         imd_model, imd_module, imd_name, value,state)
@@ -170,7 +170,7 @@ class ir_translation(osv.osv):
         'type': fields.selection(TRANSLATION_TYPE, string='Type', size=16, select=True),
         'src': fields.text('Source'),
         'value': fields.text('Translation Value'),
-        'state':fields.selection([('translate','To Translate'),('inprogress','Translation in Progress'),('translated','Translated')])
+        'state':fields.selection([('to_translate','To Translate'),('inprogress','Translation in Progress'),('translated','Translated')])
     }
     
     _defaults = {
@@ -305,14 +305,14 @@ class ir_translation(osv.osv):
         return ids
 
     def write(self, cursor, user, ids, vals, context=None):
-        if vals.get('src'):
-            result= vals.update({'state':'translate'})
-        if vals.get('value'):
-            result= vals.update({'state':'translated'})
         if not context:
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
+        if vals.get('src'):
+            result = vals.update({'state':'to_translate'})
+        if vals.get('value'):
+            result = vals.update({'state':'translated'})
         result = super(ir_translation, self).write(cursor, user, ids, vals, context=context)
         for trans_obj in self.read(cursor, user, ids, ['name','type','res_id','src','lang'], context=context):
             self._get_source.clear_cache(self, user, trans_obj['name'], trans_obj['type'], trans_obj['lang'], trans_obj['src'])

From a4dae41a49327ea40773dbe90f823c602466ffde Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 15:47:23 +0530
Subject: [PATCH 111/288] [FIX] Removed the unused wrong code

bzr revid: jam@tinyerp.com-20120828101723-d6qdm3bqpx3gcqbe
---
 openerp/addons/base/ir/ir_translation.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index f0a0ccc91e8..40facb34699 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -78,8 +78,6 @@ class ir_translation_import_cursor(object):
         """Feed a translation, as a dictionary, into the cursor
         """
         state = ddict['value'] and "to_translate" or "translated" 
-        if not :
-            state = 
         self._cr.execute("INSERT INTO " + self._table_name \
                 + """(name, lang, res_id, src, type,
                         imd_model, imd_module, imd_name, value,state)

From 5022cdd8c7fc703d475a86b73df062591aac70e3 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 15:48:16 +0530
Subject: [PATCH 112/288] [FIX] Impoeved the message

bzr revid: jam@tinyerp.com-20120828101816-hh5qgj5x1gu1oooc
---
 addons/base_gengo/res_company_view.xml        |  2 +-
 .../wizard/gengo_update_translation.py        | 41 ++++++++-----------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index 60cd767b140..d49d35d4b1f 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -14,7 +14,7 @@
                                 <field name="gengo_public_key" nolabel="1" placeholder="Add Gengo login Public Key..."/>
                             </group>
                             <group col="1" string="Private Key">
-                                <field name="gengo_private_key" nolabel="1" placeholder="Add Gengo login Private Key..."/>
+                                <field name="gengo_private_key" widget="password" nolabel="1" placeholder="Add Gengo login Private Key..."/>
                             </group>
                         </group>
                         <group col="4">
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index f75ea44f8b9..4eb9c514d63 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -94,23 +94,20 @@ class base_update_translation(osv.osv_memory):
 
     def pack_jobs_request(self, cr, uid, term_ids, context):
         jobs = {}
-        auto_approve = 0
         gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
         translation_pool = self.pool.get('ir.translation')
-        if gengo_parameter_pool.company_id.gengo_auto_approve:
-            auto_approve = 1
+        auto_approve = gengo_parameter_pool.company_id.gengo_auto_approve and 1 or 0
         for term in translation_pool.browse(cr, uid, term_ids, context):
-            if term.src:
-                if re.search(r"\w", term.src):
-                    job = {'type': 'text',
-                            'slug': 'single::English to ' + LANG_CODE_MAPPING[term.lang][1],
-                            'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
-                            'body_src': term.src,
-                            'lc_src': 'en',
-                            'lc_tgt': LANG_CODE_MAPPING[term.lang][0],
-                            'auto_approve': auto_approve,
-                            'comment': gengo_parameter_pool.company_id.gengo_comment}
-                    jobs.update({term.id: job})
+            if re.search(r"\w", term.src or ""):
+                job = {'type': 'text',
+                        'slug': 'single::English to ' + LANG_CODE_MAPPING[term.lang][1],
+                        'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
+                        'body_src': term.src,
+                        'lc_src': 'en',
+                        'lc_tgt': LANG_CODE_MAPPING[term.lang][0],
+                        'auto_approve': auto_approve,
+                        'comment': gengo_parameter_pool.company_id.gengo_comment}
+                jobs.update({term.id: job})
         return {'jobs': jobs}
 
     def check_lang_support(self, cr, uid, langs, context=None):
@@ -123,7 +120,6 @@ class base_update_translation(osv.osv_memory):
             tier = user.company_id.gengo_tier
             if tier == "machine":
                 tier = "nonprofit"
-
             lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
             if lang_pair['opstat'] == 'ok':
                 for g_lang in lang_pair['response']:
@@ -134,9 +130,9 @@ class base_update_translation(osv.osv_memory):
 
     def _update_terms(self, cr, uid, ids, response, tier, context):
         translation_pool = self.pool.get('ir.translation')
-        for jobs in response['jobs']:
-            vals = {}
+        for jobs in response['jobs']:        
             for t_id, res in jobs.items():
+                vals = {}
                 if tier == "machine":
                     vals.update({'value': res['body_tgt'], 'state': 'translated'})
                 else:
@@ -187,17 +183,16 @@ class base_update_translation(osv.osv_memory):
                     if LANG_CODE_MAPPING[res.lang][0]:
                         lang_search = lang_pool.search(cr, uid, [('gengo_sync', '=', True), ('id', '=', lang_id[0])])
                     if lang_search:
-                        msg += '\t- This language " %s " is already in queue for processing.' % (lang_name)
+                        msg += '  - This language `%s` is already in queue for translation.' % (lang_name)
                     else:
-                        msg += '\t- Translation for language " %s " is queued for processing.' % (lang_name)
+                        msg += '  - The language `%s` is queued for translation through Gengo translation.' % (lang_name)
                         lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
-                        _logger.info('Your translation request for language " %s " has been send successfully.', lang_name)
-
+                        _logger.info('Translation request for language `%s` has been queued successfully.', lang_name)
                     self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'Gengo Sync Translation (Request)', '_sync_request', context)
                     self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'Gengo Sync Translation (Response)', '_sync_response', context)
                     self._sync_request(cr, uid, ids, context)
                 except:
-                    msg +='\t- Language " %s " is not supported by MyGengo.'%(lang_name)
+                    msg +='  - The Language `%s` is not supported by Gengo Traditional Service.'%(lang_name)
 
         context.update({'message': msg})
         obj_model = self.pool.get('ir.model.data')
@@ -230,7 +225,7 @@ class base_update_translation(osv.osv_memory):
                     vals={}
                     job_response = gengo.getTranslationJob(id=term.job_id)
                     if job_response['opstat'] != 'ok':
-                        _logger.warning("Invalid Response Skeeping translation Terms for 'id' %s."%(term.job_id))
+                        _logger.warning("Invalid Response! Skipping translation Terms with `id` %s."%(term.job_id))
                         continue
                     if job_response['response']['job']['status'] == 'approved':
                         vals.update({'state': 'translated',

From 26406e3b0dc0b475f43ac8bdd6c2804f7414b222 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 15:50:46 +0530
Subject: [PATCH 113/288] [REN] Renamed the state field access key names

bzr revid: jam@tinyerp.com-20120828102046-rcedv72s3u1mtl7i
---
 addons/base_gengo/wizard/gengo_update_message.py     | 3 +--
 addons/base_gengo/wizard/gengo_update_translation.py | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/base_gengo/wizard/gengo_update_message.py b/addons/base_gengo/wizard/gengo_update_message.py
index 88fb0283825..45d54ffc54b 100644
--- a/addons/base_gengo/wizard/gengo_update_message.py
+++ b/addons/base_gengo/wizard/gengo_update_message.py
@@ -30,7 +30,7 @@ class gengo_update_message(osv.osv_memory):
     _description = "Update Message"
     _columns = {
         'name': fields.text('Message', readonly=True),
-        }
+    }
 
     def default_get(self, cr, uid, fields, context=None):
         if context == None:
@@ -39,6 +39,5 @@ class gengo_update_message(osv.osv_memory):
         res.update({'name': context.get('message')})
         return res
 
-gengo_update_message()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 4eb9c514d63..e1b2c31f029 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -252,7 +252,7 @@ class base_update_translation(osv.osv_memory):
             lang_ids = language_pool.search(cr, uid, [('gengo_sync', '=', True)])
             langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids)]
             langs = self.check_lang_support(cr, uid, langs)
-            term_ids = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=LIMIT)
+            term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=LIMIT)
             if term_ids:
                 self._send_translation_terms(cr, uid, ids, term_ids, context)
                 _logger.info("Translation terms %s has been posted to gengo successfully", len(term_ids))

From 9464f474a4d99ff0ddcf9d0bc4a36016f0fb0b33 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 16:08:59 +0530
Subject: [PATCH 114/288] [FIX] State Condition

bzr revid: jam@tinyerp.com-20120828103859-jp22lgwzlucc55gl
---
 openerp/addons/base/ir/ir_translation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index 40facb34699..72c0c0b9208 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -77,7 +77,7 @@ class ir_translation_import_cursor(object):
     def push(self, ddict):
         """Feed a translation, as a dictionary, into the cursor
         """
-        state = ddict['value'] and "to_translate" or "translated" 
+        state = ddict['value'] and "translated"  or "to_translate"
         self._cr.execute("INSERT INTO " + self._table_name \
                 + """(name, lang, res_id, src, type,
                         imd_model, imd_module, imd_name, value,state)

From 3e682f4ef6c49e82f04e07bbe565559c1857f9d7 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 16:13:35 +0530
Subject: [PATCH 115/288] [FIX] Imrpoved the tooltiop and renmed conflicts
 label

bzr revid: jam@tinyerp.com-20120828104335-e9p9xoxu4rfg6dqf
---
 addons/base_gengo/res_company_view.xml | 2 +-
 addons/base_gengo/res_lang.py          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index d49d35d4b1f..d78470c8b14 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -14,7 +14,7 @@
                                 <field name="gengo_public_key" nolabel="1" placeholder="Add Gengo login Public Key..."/>
                             </group>
                             <group col="1" string="Private Key">
-                                <field name="gengo_private_key" widget="password" nolabel="1" placeholder="Add Gengo login Private Key..."/>
+                                <field name="gengo_private_key" password="True" nolabel="1" placeholder="Add Gengo login Private Key..."/>
                             </group>
                         </group>
                         <group col="4">
diff --git a/addons/base_gengo/res_lang.py b/addons/base_gengo/res_lang.py
index e9c88c9fd29..43b867c4f76 100644
--- a/addons/base_gengo/res_lang.py
+++ b/addons/base_gengo/res_lang.py
@@ -27,5 +27,5 @@ class res_company(osv.Model):
     _inherit = "res.lang"
 
     _columns = {
-        'gengo_sync': fields.boolean('Active', help='Synchronize Translation Periodically')
+        'gengo_sync': fields.boolean('Gengo Auto Synchronize ?', help='If checked the language will be automatically synchronize translation periodically using gengo translation services.')
     }

From 13bcfc30e022d726462527556076119831d7af6d Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 16:34:26 +0530
Subject: [PATCH 116/288] [IMP] Added limit flaxibility via schedular service
 to raise request response limit portable

bzr revid: jam@tinyerp.com-20120828110426-w10cikelphjuijg9
---
 .../base_gengo/gengo_sync_schedular_data.xml  |  6 +++--
 .../wizard/gengo_update_translation.py        | 26 ++++++++++---------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/addons/base_gengo/gengo_sync_schedular_data.xml b/addons/base_gengo/gengo_sync_schedular_data.xml
index 2a12626713c..78d2c602ac5 100644
--- a/addons/base_gengo/gengo_sync_schedular_data.xml
+++ b/addons/base_gengo/gengo_sync_schedular_data.xml
@@ -5,22 +5,24 @@
         <record id="gengo_sync_receive_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Response)</field>
             <field eval="False" name="active"/>
-            <field name="interval_number">30</field>
+            <field name="interval_number">20</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
             <field eval="'base.update.translations'" name="model"></field>
             <field eval="'_sync_response'" name="function"/>
+            <field eval="'(20,)'" name="args"/>
         </record>
 
         <!--Scheduler Sync Send Request-->
         <record id="gengo_sync_send_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Request)</field>
             <field eval="False" name="active"/>
-            <field name="interval_number">30</field>
+            <field name="interval_number">20</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
             <field eval="'base.update.translations'" name="model"></field>
             <field eval="'_sync_request'" name="function"/>
+            <field eval="'(20,)'" name="args"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index e1b2c31f029..cb11e3bf2d7 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -33,8 +33,6 @@ import time
 
 _logger = logging.getLogger(__name__)
 
-LIMIT = 20
-
 LANG_CODE_MAPPING = {
     'ar_SA': ('ar', 'Arabic'),
     'id_ID': ('id', 'Indonesian'),
@@ -60,11 +58,12 @@ LANG_CODE_MAPPING = {
 CRON_VALS = {
     'name': 'Gengo Sync',
     'active': True,
-    'interval_number': 30,
+    'interval_number': 20,
     'interval_type': 'minutes',
     'numbercall': -1,
     'model': "'base.update.translations'",
-    'function': ""
+    'function': "",
+    'args': "'(20,)'",
 }
 
 
@@ -190,7 +189,7 @@ class base_update_translation(osv.osv_memory):
                         _logger.info('Translation request for language `%s` has been queued successfully.', lang_name)
                     self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'Gengo Sync Translation (Request)', '_sync_request', context)
                     self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'Gengo Sync Translation (Response)', '_sync_response', context)
-                    self._sync_request(cr, uid, ids, context)
+                    self._sync_request(cr, uid, limit=20)
                 except:
                     msg +='  - The Language `%s` is not supported by Gengo Traditional Service.'%(lang_name)
 
@@ -208,18 +207,19 @@ class base_update_translation(osv.osv_memory):
                  'context': context,
              }
 
-    def _sync_response(self, cr, uid, ids=False, context=None):
+    def _sync_response(self, cr, uid, limit=20, context=None):
         """
         This method  will be call by cron services to get translation from
         gengo for translation terms which are posted to be translated. It will
         read translated terms and comments from gengo and will update respective
-        translation in openerp """
+        translation in openerp.
+        """
         translation_pool = self.pool.get('ir.translation')
         flag, gengo = self.gengo_authentication(cr, uid, context)
         if not flag:
             _logger.warning("%s", gengo)
         else:
-            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=LIMIT, context=context)
+            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=limit, context=context)
             for term in translation_pool.browse(cr, uid, translation_id, context):
                 if term.job_id:
                     vals={}
@@ -241,9 +241,11 @@ class base_update_translation(osv.osv_memory):
                         translation_pool.write(cr, uid, term.id,vals)
         return True
 
-    def _sync_request(self, cr, uid, ids=False, context=None):
-        """This scheduler will send a job request to the gengo , which terms are
-        in translate state and gengo_translation is true"""
+    def _sync_request(self, cr, uid, limit=20, context=None):
+        """
+        This scheduler will send a job request to the gengo , which terms are
+        in translate state and gengo_translation is true
+        """
         if context is None:
             context = {}
         language_pool = self.pool.get('res.lang')
@@ -252,7 +254,7 @@ class base_update_translation(osv.osv_memory):
             lang_ids = language_pool.search(cr, uid, [('gengo_sync', '=', True)])
             langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids)]
             langs = self.check_lang_support(cr, uid, langs)
-            term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=LIMIT)
+            term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=limit)
             if term_ids:
                 self._send_translation_terms(cr, uid, ids, term_ids, context)
                 _logger.info("Translation terms %s has been posted to gengo successfully", len(term_ids))

From 3d326bec9bd21c4593e3deab30b34ba0fa6bee36 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 28 Aug 2012 16:49:31 +0530
Subject: [PATCH 117/288] [FIX] hr_holiday: add manager as a followers in leave
 request

bzr revid: hmo@tinyerp.com-20120828111931-fnrpc07v2upp0y8n
---
 addons/hr_holidays/hr_holidays.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index af0c572b431..24e1f66023b 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -367,8 +367,7 @@ class hr_holidays(osv.osv):
     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']
+        return res + ['user_id', 'manager_id', 'manager_id2']
         
     def create_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):

From 768d9cdb7ec65800ba6d5649a16556426a1b2a63 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 28 Aug 2012 13:21:16 +0200
Subject: [PATCH 118/288] [IMP] account: Merge the opening_control and
 closing_control flags in cash_control [IMP] account: In the case where the
 bank statement is a cash register, we can get the coins of the last register.
 [IMP] account: Hide the 'Available Coins' if the journal hasn't the
 cash_control flag. [FIX] account: Use some default values for the profit/loss
 and internal account. [IMP] point_of_sale: Avoid to have two payment methods
 with the cash_control in a pos.config object. [REF] point_of_sale: Refactor
 the computation code of the cash_journal, cash_register and cash_control
 flags. [IMP] point_of_sale: Store the difference in the right account if the
 journal of the statement is a cash_control or nota. [FIX] point_of_sale: Use
 the session name instead of the order name for the
 account.bank.statement.line . [IMP] point_of_sale: [DEMO] Define the default
 payment_methods for the pos.config.

bzr revid: stw@openerp.com-20120828112116-lblikdcn92lcpc7w
---
 addons/account/account.py                     |  2 +
 addons/account/account_cash_statement.py      | 17 +++-
 addons/account/account_view.xml               |  7 +-
 addons/account/demo/account_minimal.xml       |  4 +
 .../point_of_sale/account_bank_statement.py   |  6 +-
 .../point_of_sale/account_statement_view.xml  | 34 -------
 addons/point_of_sale/point_of_sale.py         | 94 ++++++++-----------
 addons/point_of_sale/point_of_sale_demo.xml   |  6 +-
 addons/point_of_sale/point_of_sale_view.xml   | 18 ++--
 .../point_of_sale/point_of_sale_workflow.xml  |  8 +-
 .../wizard/pos_open_statement.py              |  2 +-
 11 files changed, 83 insertions(+), 115 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 907e6207380..31fe7dbfb12 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -746,9 +746,11 @@ class account_journal(osv.osv):
         'profit_account_id' : fields.many2one('account.account', 'Profit Account'),
         'loss_account_id' : fields.many2one('account.account', 'Loss Account'),
         'internal_account_id' : fields.many2one('account.account', 'Internal Transfers Account', select=1),
+        'cash_control' : fields.boolean('Cash Control', help='If you want the journal should be control at opening/closing, check this option'),
     }
 
     _defaults = {
+        'cash_control' : False,
         'with_last_closing_balance' : False,
         'user_id': lambda self, cr, uid, context: uid,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 9af0dcf60f4..17fa05d5f24 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -194,12 +194,27 @@ class account_cash_statement(osv.osv):
             journal = self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context)
         if journal and (journal.type == 'cash') and not vals.get('details_ids'):
             vals['details_ids'] = []
+
+            last_pieces = None
+
+            if journal.with_last_closing_balance == True:
+                domain = [('journal_id', '=', journal.id),
+                          ('state', '=', 'confirm')]
+                last_bank_statement_ids = self.search(cr, uid, domain, limit=1, order='create_date desc', context=context)
+                if last_bank_statement_ids:
+                    last_bank_statement = self.browse(cr, uid, last_bank_statement_ids[0], context=context)
+
+                    last_pieces = dict(
+                        (line.pieces, line.number_closing) for line in last_bank_statement.details_ids
+                    )
+
             for value in journal.cashbox_line_ids:
                 nested_values = {
                     'number_closing' : 0,
-                    'number_opening' : 0,
+                    'number_opening' : last_pieces.get(value.pieces, 0) if isinstance(last_pieces, dict) else 0,
                     'pieces' : value.pieces
                 }
+
                 vals['details_ids'].append([0, False, nested_values])
 
         res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5bf45aab487..81e683e1cfd 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -515,7 +515,7 @@
                             <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
                             <field colspan="4" name="account_control_ids" nolabel="1"/>
                         </page>
-                        <page string="Cash Registers" attrs="{'invisible':[('type', '!=', 'cash')]}">
+                        <page string="Cash Registers">
                             <group>
                                 <group string="Accounts">
                                     <field name="profit_account_id"/>
@@ -524,10 +524,11 @@
                                 </group>
                                 <group string="Miscellaneous">
                                     <field name="with_last_closing_balance"/>
+                                    <field name="cash_control"/>
                                 </group>
                             </group>
-                            <separator string="Available Coins" colspan="4" />
-                            <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4">
+                            <separator string="Available Coins" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)] }"/>
+                            <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)]}">
                                 <tree string="CashBox Lines" editable="bottom">
                                     <field name="pieces" />
                                 </tree>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index baa94450f02..0c62d5cf021 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -381,6 +381,10 @@
             <field name="name">Cash Journal - (test)</field>
             <field name="code">TCSH</field>
             <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="cash_control" eval="True" />
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_cash_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index eb7d791ebf9..06fe1d4a1f8 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -27,15 +27,10 @@ class account_journal(osv.osv):
     _columns = {
         'journal_user': fields.boolean('PoS Payment Method', help="Check this box if this journal define a payment method that can be used in point of sales."),
 
-        'opening_control': fields.boolean('Opening Control', help="If you want the journal should be control at opening, check this option"),
-        'closing_control': fields.boolean('Closing Control', help="If you want the journal should be control at closing, check this option"),
-
         'amount_authorized_diff' : fields.float('Amount Authorized Difference'),
         'self_checkout_payment_method' : fields.boolean('Self Checkout Payment Method'),
     }
     _defaults = {
-        'opening_control' : False,
-        'closing_control' : False,
         'self_checkout_payment_method' : False,
     }
 
@@ -46,6 +41,7 @@ class account_cash_statement(osv.osv):
     _columns = {
         'pos_session_id' : fields.many2one('pos.session'),
     }
+
 account_cash_statement()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index d7f3be2a8d6..86fc8fec164 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -10,8 +10,6 @@
                     <page string="Point of Sale">
                         <group col="4" colspan="4">
                             <field name="journal_user"/>
-                            <field name="opening_control"/>
-                            <field name="closing_control"/>
                             <field name="amount_authorized_diff"/>
                             <field name="self_checkout_payment_method" />
                         </group>
@@ -113,37 +111,5 @@
             <field name="view_id" ref="account.view_bank_statement_form2"/>
             <field name="act_window_id" ref="action_new_bank_statement_all_tree"/>
         </record>
-
-        <!--
-        <menuitem name="Cash Register Management" parent="point_of_sale.menu_point_root"
-            id="menu_point_open_config" sequence="10"/>
-        <menuitem
-            name="Open Cash Registers" parent="menu_point_open_config"
-            string="Open Cash Registers"
-            action="action_pos_open_statement"
-            id="menu_open_statement" sequence="1" />
-
-        <menuitem
-            name="Close Cash Registers" parent="menu_point_open_config"
-            string="Close Cash Registers"
-            action="action_pos_close_statement"
-            id="menu_close_statement" sequence="2" />
-
-        <menuitem
-            parent="menu_point_open_config"
-            action="action_pos_confirm"
-            id="menu_wizard_pos_confirm" sequence="8" />
-
-
-        <menuitem
-            name="List of Cash Registers"
-            parent="menu_point_open_config"
-            action="action_new_bank_statement_all_tree"
-            id="menu_all_menu_all_register"
-            sequence="4"
-        />
-    -->
-
-
     </data>
 </openerp>
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index f4d32985688..7d8a3ab0015 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -74,6 +74,17 @@ class pos_config(osv.osv):
         'group_by' : fields.boolean('Group Journal Items', help="Check this if you want to group the Journal Items by Product while closing a Session"),
     }
 
+    def _check_cash_control(self, cr, uid, ids, context=None):
+        return all(
+            (sum(int(journal.cash_control) for journal in record.journal_ids) <= 1)
+            for record in self.browse(cr, uid, ids, context=context)
+        )
+
+    _constraints = [
+        (_check_cash_control, "You cannot have two cash controls in one Point Of Sale !", ['journal_ids']),
+    ]
+
+
     def name_get(self, cr, uid, ids, context=None):
         result = []
         states = {
@@ -90,11 +101,6 @@ class pos_config(osv.osv):
             result.append((record.id, record.name + ' ('+session.user_id.name+')')) #, '+states[session.state]+')'))
         return result
 
-
-    def _default_payment_journal(self, cr, uid, context=None):
-        res = self.pool.get('account.journal').search(cr, uid, [('type', 'in', ('bank','cash'))], limit=2)
-        return res or []
-
     def _default_sale_journal(self, cr, uid, context=None):
         res = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale')], limit=1)
         return res and res[0] or False
@@ -107,7 +113,6 @@ class pos_config(osv.osv):
         'state' : POS_CONFIG_STATE[0][0],
         'shop_id': _default_shop,
         'journal_id': _default_sale_journal,
-        'journal_ids': _default_payment_journal,
         'group_by' : True,
     }
 
@@ -148,45 +153,20 @@ class pos_session(osv.osv):
         ('closed', 'Closed & Posted'),
     ]
 
-    def _compute_cash_journal_id(self, cr, uid, ids, fieldnames, args, context=None):
-        result = dict.fromkeys(ids, False)
-        for record in self.browse(cr, uid, ids, context=context):
-            for st in record.statement_ids:
-                if st.journal_id.type == 'cash':
-                    result[record.id] = st.journal_id.id
-                    break
-        return result
-
-    def _compute_cash_register_id(self, cr, uid, ids, fieldnames, args, context=None):
-        result = dict.fromkeys(ids, False)
-        for record in self.browse(cr, uid, ids, context=context):
-            for st in record.statement_ids:
-                if st.journal_id.type == 'cash':
-                    result[record.id] = st.id
-                    break
-        return result
-
-    def _compute_controls(self, cr, uid, ids, fieldnames, args, context=None):
-        result = {}
+    def _compute_cash_all(self, cr, uid, ids, fieldnames, args, context=None):
+        result = dict()
 
         for record in self.browse(cr, uid, ids, context=context):
-            has_opening_control = False
-            has_closing_control = False
-
-            for journal in record.config_id.journal_ids:
-                if journal.opening_control == True:
-                    has_opening_control = True
-                if journal.closing_control == True:
-                    has_closing_control = True
-
-                if has_opening_control and has_closing_control:
-                    break
-
-            values = {
-                'has_opening_control': has_opening_control,
-                'has_closing_control': has_closing_control,
+            result[record.id] = {
+                'cash_journal_id' : False,
+                'cash_register_id' : False,
+                'cash_control' : False,
             }
-            result[record.id] = values
+            for st in record.statement_ids:
+                if st.journal_id.cash_control == True:
+                    result[record.id]['cash_control'] = True
+                    result[record.id]['cash_journal_id'] = st.journal_id.id
+                    result[record.id]['cash_register_id'] = st.id
 
         return result
 
@@ -212,12 +192,17 @@ class pos_session(osv.osv):
                 required=True, readonly=True,
                 select=1),
 
-        'cash_journal_id' : fields.function(_compute_cash_journal_id, method=True, 
-                type='many2one', relation='account.journal',
-                string='Cash Journal', store=True),
-        'cash_register_id' : fields.function(_compute_cash_register_id, method=True, 
-                type='many2one', relation='account.bank.statement',
-                string='Cash Register', store=True),
+        'cash_control' : fields.function(_compute_cash_all,
+                                         multi='cash',
+                                         type='boolean', string='Has Cash Control'),
+        'cash_journal_id' : fields.function(_compute_cash_all,
+                                            multi='cash',
+                                            type='many2one', relation='account.journal',
+                                            string='Cash Journal', store=True),
+        'cash_register_id' : fields.function(_compute_cash_all,
+                                             multi='cash',
+                                             type='many2one', relation='account.bank.statement',
+                                             string='Cash Register', store=True),
 
         'opening_details_ids' : fields.related('cash_register_id', 'opening_details_ids', 
                 type='one2many', relation='account.cashbox.line',
@@ -261,8 +246,6 @@ class pos_session(osv.osv):
         'order_ids' : fields.one2many('pos.order', 'session_id', 'Orders'),
 
         'statement_ids' : fields.one2many('account.bank.statement', 'pos_session_id', 'Bank Statement', readonly=True),
-        'has_opening_control' : fields.function(_compute_controls, string='Has Opening Control', multi='control', type='boolean'),
-        'has_closing_control' : fields.function(_compute_controls, string='Has Closing Control', multi='control', type='boolean'),
     }
 
     _defaults = {
@@ -372,10 +355,8 @@ class pos_session(osv.osv):
     def wkf_action_closing_control(self, cr, uid, ids, context=None):
         for session in self.browse(cr, uid, ids, context=context):
             for statement in session.statement_ids:
-                if statement.id <> session.cash_register_id.id:
-                    if statement.balance_end<>statement.balance_end_real:
-                        self.pool.get('account.bank.statement').write(cr, uid,
-                            [statement.id], {'balance_end_real': statement.balance_end})
+                if statement != session.cash_register_id and statement.balance_end != statement.balance_end_real:
+                    self.pool.get('account.bank.statement').write(cr, uid, [statement.id], {'balance_end_real': statement.balance_end})
         return self.write(cr, uid, ids, {'state' : 'closing_control', 'stop_at' : time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
 
     def wkf_action_close(self, cr, uid, ids, context=None):
@@ -388,7 +369,7 @@ class pos_session(osv.osv):
                     if not self.pool.get('ir.model.access').check_groups(cr, uid, "point_of_sale.group_pos_manager"):
                         raise osv.except_osv( _('Error!'),
                             _("Your ending balance is too different from the theorical cash closing (%.2f), the maximum allowed is: %.2f. You can contact your manager to force it.") % (st.difference, st.journal_id.amount_authorized_diff))
-                if st.difference:
+                if st.difference and st.journal_id.cash_control == True:
                     if st.difference > 0.0:
                         name= _('Point of Sale Profit')
                         account_id = st.journal_id.profit_account_id.id
@@ -695,7 +676,7 @@ class pos_order(osv.osv):
         }
         if 'payment_date' in data:
             args['date'] = data['payment_date']
-        args['name'] = order.name
+        args['name'] = order.session_id.name
         if data.get('payment_name', False):
             args['name'] = args['name'] + ': ' + data['payment_name']
         account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
@@ -1084,6 +1065,7 @@ class account_bank_statement_line(osv.osv):
     _columns= {
         'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'),
     }
+
 account_bank_statement_line()
 
 class pos_order_line(osv.osv):
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index db8caaadf3b..47256279c59 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -8,7 +8,7 @@
             <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
             <field name="ean13">0410200000005</field>
         </record>
-    	  <record id="account.cash_journal" model="account.journal">
+        <record id="account.cash_journal" model="account.journal">
             <field eval="True" name="journal_user"/>
         </record>
         <record id="base.user_jsmith" model="res.users">
@@ -36,6 +36,10 @@
             <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')])]" />
+        </record>
+
         <!-- Resource: pos.category -->
 
         <record id="beverage" model="pos.category">
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index dce19ab77b6..c543be89d66 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -791,8 +791,7 @@
                                 <field name="code" />
                                 <field name="name" />
                                 <field name="type" />
-                                <field name="opening_control" />
-                                <field name="closing_control" />
+                                <field name="cash_control" />
                             </tree>
                         </field>
                         <group string="Material Interfaces" >
@@ -878,10 +877,10 @@
                     <header>
                         <button name="open" type="workflow" string="Validate &amp; Open Session" states="opening_control" class="oe_highlight"/>
                         <button name="cashbox_control" type="workflow" string="End of Session"
-                            attrs="{'invisible' : [('has_closing_control', '=', False),('state', '=', 'opened')]}" 
+                            attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', '!=', 'opened')]}" 
                             class="oe_highlight" />
                         <button name="close" type="workflow" string="Validate Closing &amp; Post Entries"
-                            attrs="{'invisible' : [('has_closing_control', '=', True),('state', '=', 'opened')]}"
+                            attrs="{'invisible' : ['|', ('cash_control', '=', True),('state', '!=', 'opened')]}"
                             class="oe_highlight" />
                         <button name="close" type="workflow" string="Validate Closing &amp; Post Entries" states="closing_control"
                             class="oe_highlight" />
@@ -900,8 +899,7 @@
                             <field name="name" attrs="{'invisible': [('name','=','/')]}" class="oe_inline"/>
                         </h1>
                         <group>
-                            <field name="has_opening_control" invisible="1" />
-                            <field name="has_closing_control" invisible="1" />
+                            <field name="cash_control" invisible="1" />
                             <group>
                                 <field name="user_id"/>
                                 <field name="config_id" attrs="{'invisible' : [('config_id', '&lt;&gt;', False)]}"/>
@@ -912,20 +910,20 @@
                             </group>
                             <newline/>
 
-                            <group string="Opening Cash Control">
+                            <group string="Opening Cash Control" attrs="{'invisible' : [('cash_control', '=', False)]}">
                                 <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" />
-                                        <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening)" />
+                                        <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening)" />
                                         <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
                                     </tree>
                                 </field>
                             </group>
-                            <group string="Closing Cash Control" attrs="{'invisible': [('state', '=', 'opening_control')]}">
+                            <group string="Closing Cash Control" attrs="{'invisible': [('state', '!=', 'closing_control')]}">
                                 <field name="details_ids" nolabel="1" colspan="2">
                                     <tree string="Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
-                                        <field name="number_closing"/>
+                                        <field name="number_closing" />
                                         <field name="subtotal_closing"/>
                                     </tree>
                                 </field>
diff --git a/addons/point_of_sale/point_of_sale_workflow.xml b/addons/point_of_sale/point_of_sale_workflow.xml
index 87deb7f18fb..601fbae4d23 100644
--- a/addons/point_of_sale/point_of_sale_workflow.xml
+++ b/addons/point_of_sale/point_of_sale_workflow.xml
@@ -126,14 +126,14 @@
       <field name="act_from" ref="act_start" />
       <field name="act_to" ref="act_opening_control" />
       <field name="signal" eval="False" /> <!-- >start_to_opening_control</field> -->
-      <field name="condition">has_opening_control == True</field>
+      <field name="condition">cash_control == True</field>
     </record>
 
     <record model="workflow.transition" id="trans_start_to_open">
       <field name="act_from" ref="act_start" />
       <field name="act_to" ref="act_open" />
       <field name="signal" eval="False" />
-      <field name="condition">has_opening_control == False</field>
+      <field name="condition">cash_control == False</field>
     </record>
     <!-- state:opening_control -> signal:open -> state:opened -> signal:cashbox_control -> state:closing_control -> signal:close -> state:close -->
 
@@ -147,14 +147,14 @@
       <field name="act_from" ref="act_open" />
       <field name="act_to" ref="act_closing_control" />
       <field name="signal">cashbox_control</field>
-      <field name="condition">has_closing_control == True</field>
+      <field name="condition">cash_control == True</field>
     </record>
 
     <record model="workflow.transition" id="trans_open_to_close">
       <field name="act_from" ref="act_open" />
       <field name="act_to" ref="act_close" />
       <field name="signal">close</field>
-      <field name="condition">has_closing_control == False</field>
+      <field name="condition">cash_control == False</field>
     </record>
 
     <record model="workflow.transition" id="trans_closing_control_to_close">
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 572f6470c34..2219f711b93 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -65,7 +65,7 @@ class pos_open_statement(osv.osv_memory):
             statement_id = statement_obj.create(cr, uid, data, context=context)
             st_ids.append(int(statement_id))
 
-            if journal.opening_control:
+            if journal.cash_control:
                 statement_obj.button_open(cr, uid, [statement_id], context)
 
         tree_res = mod_obj.get_object_reference(cr, uid, 'point_of_sale', 'view_cash_statement_pos_tree')

From baad695095254e3cffca74d51195cc7c524db9fb Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 28 Aug 2012 13:23:29 +0200
Subject: [PATCH 119/288] [FIX] account: company isn't a kwarg for set_default.
 company_id is

bzr revid: qdp-launchpad@openerp.com-20120828112329-g5y9n2e18bvci9r5
---
 addons/account/account.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 5a61f73b6c1..7e0a6170bdb 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3347,9 +3347,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         # write values of default taxes for product as super user
         if obj_wizard.sale_tax and taxes_ref:
-            ir_values_obj.set_default(cr, 1, 'product.product', "taxes_id", [taxes_ref[obj_wizard.sale_tax.id]], for_all_users=True, company=company_id)
+            ir_values_obj.set_default(cr, 1, 'product.product', "taxes_id", [taxes_ref[obj_wizard.sale_tax.id]], for_all_users=True, company_id=company_id)
         if obj_wizard.purchase_tax and taxes_ref:
-            ir_values_obj.set_default(cr, 1, 'product.product', "supplier_taxes_id", [taxes_ref[obj_wizard.purchase_tax.id]], for_all_users=True, company=company_id)
+            ir_values_obj.set_default(cr, 1, 'product.product', "supplier_taxes_id", [taxes_ref[obj_wizard.purchase_tax.id]], for_all_users=True, company_id=company_id)
 
         # Create Bank journals
         self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)

From 9c0ee11cbb5b8a097f2634cacba7fc2b94a06a14 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 17:07:55 +0530
Subject: [PATCH 120/288] [FIX/IMP] Impoved the code and updated the usabality

bzr revid: jam@tinyerp.com-20120828113755-eaazn33wrdrw17xb
---
 addons/base_gengo/ir_translation.py                |  8 ++++----
 addons/base_gengo/ir_translation.xml               |  4 ++--
 addons/base_gengo/res_company.py                   |  4 ++--
 addons/base_gengo/res_company_view.xml             |  4 ++--
 .../base_gengo/wizard/gengo_update_translation.py  | 14 +++++++++-----
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 297e449ecdc..edf939b3851 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -26,10 +26,10 @@ class ir_translation(osv.Model):
     _name = "ir.translation"
     _inherit = "ir.translation"
     _columns = {
-        'gengo_comment': fields.text("Comments"),
-        'gengo_translation': fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
-        'gengo_control': fields.boolean('Active'),
-        'job_id': fields.char('Gengo Job Id', size=32),
+        'gengo_comment': fields.text("Comments & Activity"),
+        'gengo_translation': fields.boolean("Gengo Auto Translation ?", help='If checked the term will be translated by Gengo automatically.'),
+        'gengo_control': fields.boolean('Gengo Traslated', help="If Term is translated using Gengo Service, the check box will be checked.", readonly=True),
+        'job_id': fields.char('Gengo JobId', size=32),
     }
 
     _defaults = {
diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
index 30108c882b5..8a0e6a238b8 100644
--- a/addons/base_gengo/ir_translation.xml
+++ b/addons/base_gengo/ir_translation.xml
@@ -20,8 +20,8 @@
             <field name="model">ir.translation</field>
             <field name="arch" type="xml">
                  <xpath expr="//form[@string='Translations']/sheet" position="inside">
-                    <group string="comments" col="1">
-                        <field name="gengo_comment" nolabel="1" placeholder="Add Your comments here for Translation Job...."/>
+                    <group string="Gengo Comments &amp; Activity" col="1">
+                        <field name="gengo_comment" nolabel="1" placeholder="Gengo Comments &amp; Activity..."/>
                     </group>
                     <group col="4">
                         <field name="gengo_translation" />
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 9062095bb87..058a12bd6e8 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -31,8 +31,8 @@ class res_company(osv.Model):
            "gengo_tier": fields.selection([('machine', 'Machine'),
                                           ('standard', 'Standard'),
                                           ('pro', 'Pro'),
-                                          ('ultra', 'Ultra')], "Tier types", required=True),
-           "gengo_comment": fields.text("comments"),
+                                          ('ultra', 'Ultra')], "Tier Type", required=True),
+           "gengo_comment": fields.text("Comments"),
            "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
     }
 
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index d78470c8b14..fdc0c8833a6 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -21,8 +21,8 @@
                             <field name="gengo_tier" />
                             <field name="gengo_auto_approve"/>
                         </group>
-                        <group string="Comments" col="1">
-                            <field name="gengo_comment" nolabel="1" placeholder="Add Your comments here for Translator...."/>
+                        <group string="Comments for Translator" col="1">
+                            <field name="gengo_comment" nolabel="1" placeholder="Add your comments here for translator...."/>
                         </group>
                     </page>
                 </xpath>
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index cb11e3bf2d7..52c6e5b7fd8 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -127,7 +127,7 @@ class base_update_translation(osv.osv_memory):
                             new_langs.append(l)
             return list(set(new_langs))
 
-    def _update_terms(self, cr, uid, ids, response, tier, context):
+    def _update_terms(self, cr, uid, response, tier, context):
         translation_pool = self.pool.get('ir.translation')
         for jobs in response['jobs']:        
             for t_id, res in jobs.items():
@@ -139,7 +139,7 @@ class base_update_translation(osv.osv_memory):
                 translation_pool.write(cr, uid, [t_id], vals, context)
         return
 
-    def _send_translation_terms(self, cr, uid, ids, term_ids, context):
+    def _send_translation_terms(self, cr, uid,  term_ids, context):
         """
         Lazy Polling will be perform when user or cron request for the translation.
         """
@@ -150,7 +150,7 @@ class base_update_translation(osv.osv_memory):
             if request['jobs']:
                 result = gengo.postTranslationJobs(jobs=request)
                 if result['opstat'] == 'ok':
-                    self._update_terms(cr, uid, ids, result['response'], user.company_id.gengo_tier, context)
+                    self._update_terms(cr, uid, result['response'], user.company_id.gengo_tier, context)
         else:
             _logger.error(gengo)
         return True
@@ -221,6 +221,7 @@ class base_update_translation(osv.osv_memory):
         else:
             translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=limit, context=context)
             for term in translation_pool.browse(cr, uid, translation_id, context):
+                up_term = up_comment = 0
                 if term.job_id:
                     vals={}
                     job_response = gengo.getTranslationJob(id=term.job_id)
@@ -231,14 +232,17 @@ class base_update_translation(osv.osv_memory):
                         vals.update({'state': 'translated',
                             'value': job_response['response']['job']['body_tgt'],
                             'gengo_control': True})
+                        up_term += 1
                     job_comment = gengo.getTranslationJobComments(id=term.job_id)
                     if job_comment['opstat']=='ok':
                         gengo_comments=""
                         for comment in job_comment['response']['thread']:
-                            gengo_comments+='%s by %s at %s. \n'    %(comment['body'],comment['author'],time.ctime(comment['ctime']))
+                            gengo_comments+='%s Commented on %s by %s. \n'%(comment['body'], time.ctime(comment['ctime']), comment['author'])
                         vals.update({'gengo_comment':gengo_comments})
+                        up_comment +=1
                     if vals:
                         translation_pool.write(cr, uid, term.id,vals)
+                    _logger.info("Successfully Updated `%d` terms and Comments for `%d` terms."%(up_term, up_comment ))
         return True
 
     def _sync_request(self, cr, uid, limit=20, context=None):
@@ -256,7 +260,7 @@ class base_update_translation(osv.osv_memory):
             langs = self.check_lang_support(cr, uid, langs)
             term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=limit)
             if term_ids:
-                self._send_translation_terms(cr, uid, ids, term_ids, context)
+                self._send_translation_terms(cr, uid, term_ids, context)
                 _logger.info("Translation terms %s has been posted to gengo successfully", len(term_ids))
             else:
                 _logger.info('No Translation terms to process.')

From 2606c563c476d88acc264544a71eed9b8479d31a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 28 Aug 2012 14:47:54 +0200
Subject: [PATCH 121/288] [IMP] add a template user to the portal and use it as
 default value in the external users config

bzr revid: abo@openerp.com-20120828124754-j2b5m7m58pdv6k0y
---
 addons/auth_signup/res_config.py  | 11 +++++++++++
 addons/auth_signup/res_config.xml |  2 +-
 addons/portal/portal_data.xml     | 12 ++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/addons/auth_signup/res_config.py b/addons/auth_signup/res_config.py
index 6afd1c5b581..faa20d7a593 100644
--- a/addons/auth_signup/res_config.py
+++ b/addons/auth_signup/res_config.py
@@ -29,13 +29,24 @@ class base_config_settings(osv.TransientModel):
         'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup'),
     }
 
+    #todo: @al, @chs: what is this method for ?
     def get_default_signup(self, cr, uid, fields, context=None):
         icp = self.pool.get('ir.config_parameter')
         return {
             'auth_signup_template_user_id': icp.get_param(cr, uid, 'auth.signup_template_user_id', 0) or False
         }
 
+    #todo: @al, @chs: what is this method for ?
     def set_signup(self, cr, uid, ids, context=None):
         config = self.browse(cr, uid, ids[0], context=context)
         icp = self.pool.get('ir.config_parameter')
         icp.set_param(cr, uid, 'auth.signup_template_user_id', config.auth_signup_template_user_id.id)
+
+    def _get_default_template_user(self, cr, uid, context=None):
+        data_obj = self.pool.get('ir.model.data')
+        data_id = data_obj._get_id(cr, uid, 'portal', 'default_template_user')
+        return data_obj.browse(cr, uid, data_id).res_id
+
+    _defaults = {
+        'auth_signup_template_user_id': _get_default_template_user,
+    }
diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml
index f09e9155b0e..c17634ececb 100644
--- a/addons/auth_signup/res_config.xml
+++ b/addons/auth_signup/res_config.xml
@@ -14,7 +14,7 @@
                     </div>
                     <div attrs="{'invisible':[('auth_signup_uninvited','=',False)]}">
                         <label for="auth_signup_template_user_id"/>
-                        <field name="auth_signup_template_user_id" class="oe_inline"/>
+                        <field name="auth_signup_template_user_id" class="oe_inline" domain="['|',('active','=',0),('active','=',1)]"/>
                     </div>
                 </xpath>
             </field>
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index ddfb4cc6729..ed01973b527 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -2,6 +2,18 @@
 <openerp>
     <data noupdate="1">
 
+        <!-- Create a portal template user -->
+        <record id="default_template_user" model="res.users">
+            <field name="name">Template Portal User</field>
+            <field name="login">portal-template</field>
+            <!-- No password: this template user doesn't need to log in -->
+            <field name="password"></field>
+            <field name="active" eval="False"/>
+            <!-- Avoid auto-including this user in any default group, just like a typical portal member -->
+            <field name="groups_id" eval="[(5,)]"/>
+            <field name="partner_id" eval="ref('base.res_partner_1')"/>
+        </record>
+
         <record id="portal" model="res.portal">
             <field name="name">Portal</field>
             <field name="group_id" ref="group_portal_member"/>

From 7c5c081c7cd0582eda263f0788d2e50d497695bc Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 28 Aug 2012 15:18:28 +0200
Subject: [PATCH 122/288] [FIX] account: The 'With Last Closing Balance' is
 checked per default in the demo mode

bzr revid: stw@openerp.com-20120828131828-lqmsnlqxph83vhaf
---
 addons/account/demo/account_minimal.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 0c62d5cf021..b7bc34a3e35 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -384,6 +384,7 @@
             <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="with_last_closing_balance" eval="True" />
             <field name="cash_control" eval="True" />
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_cash_journal"/>

From 804031584467516e744cc686b6f297d063a87302 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 28 Aug 2012 18:58:20 +0530
Subject: [PATCH 123/288] [FIX] hr_holiday: subscribe manager of employee on
 leave confirm

bzr revid: hmo@tinyerp.com-20120828132820-unts2iems2a58q3o
---
 addons/hr_holidays/hr_holidays.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 24e1f66023b..0a26cfbb9f1 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -151,10 +151,6 @@ class hr_holidays(osv.osv):
         ('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0 !"),
     ]
     
-    def create(self, cr, uid, vals, context=None):
-        obj_id = super(hr_holidays, self).create(cr, uid, vals, context=context)
-        return obj_id
-    
     def _create_resource_leave(self, cr, uid, leaves, context=None):
         '''This method will create entry in resource calendar leave object at the time of holidays validated '''
         obj_res_leave = self.pool.get('resource.calendar.leaves')
@@ -305,6 +301,9 @@ class hr_holidays(osv.osv):
 
     def holidays_confirm(self, cr, uid, ids, context=None):
         self.check_holidays(cr, uid, ids, context=context)
+        for record in self.browse(cr, uid, ids, context=context):
+            if record.employee_id and record.employee_id.parent_id and record.employee_id.parent_id.user_id:
+                self.message_subscribe(cr, uid, [record.id], user_ids=[record.employee_id.parent_id.user_id.id], context=context)
         self.holidays_confirm_notificate(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state':'confirm'})
 
@@ -367,7 +366,7 @@ class hr_holidays(osv.osv):
     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)
-        return res + ['user_id', 'manager_id', 'manager_id2']
+        return res + ['user_id']
         
     def create_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):

From aaa01ab8c49129fca3bb757370fdc5244f24af13 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 28 Aug 2012 18:36:57 +0200
Subject: [PATCH 124/288] [IMP] move the template user in the auth_signup
 module, and fix the default methods

bzr revid: abo@openerp.com-20120828163657-x4l6bhebwdq0kslp
---
 addons/auth_signup/__openerp__.py       |  5 ++++-
 addons/auth_signup/auth_signup_data.xml | 22 ++++++++++++++++++++++
 addons/auth_signup/res_config.py        | 15 ++-------------
 addons/portal/portal_data.xml           | 14 ++------------
 4 files changed, 30 insertions(+), 26 deletions(-)
 create mode 100644 addons/auth_signup/auth_signup_data.xml

diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py
index 5f889bfb119..9cfe89cdc1c 100644
--- a/addons/auth_signup/__openerp__.py
+++ b/addons/auth_signup/__openerp__.py
@@ -31,7 +31,10 @@ Allow users to sign up.
     'website': 'http://www.openerp.com',
     'installable': True,
     'depends': ['base_setup'],
-    'data': ['res_config.xml'],
+    'data': [
+        'auth_signup_data.xml',
+        'res_config.xml',
+    ],
     'js': ['static/src/js/auth_signup.js'],
     'qweb': ['static/src/xml/auth_signup.xml'],
 }
diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml
new file mode 100644
index 00000000000..1549fee306e
--- /dev/null
+++ b/addons/auth_signup/auth_signup_data.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- Default template user for new users signing in -->
+        <record id="default_template_user" model="res.users">
+            <field name="name">Template User</field>
+            <field name="login">portaltemplate</field>
+            <!-- No password: this template user doesn't need to log in -->
+            <field name="password"></field>
+            <field name="active" eval="False"/>
+            <!-- Avoid auto-including this user in any default group, just like a typical portal member -->
+            <field name="groups_id" eval="[(5,)]"/>
+        </record>
+
+        <record model="ir.config_parameter" id="blabla">
+            <field name="key">auth.signup_template_user_id</field>
+            <field name="value" ref="default_template_user"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/auth_signup/res_config.py b/addons/auth_signup/res_config.py
index faa20d7a593..888e932bb9f 100644
--- a/addons/auth_signup/res_config.py
+++ b/addons/auth_signup/res_config.py
@@ -29,24 +29,13 @@ class base_config_settings(osv.TransientModel):
         'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup'),
     }
 
-    #todo: @al, @chs: what is this method for ?
-    def get_default_signup(self, cr, uid, fields, context=None):
+    def get_default_auth_signup_template_user_id(self, cr, uid, fields, context=None):
         icp = self.pool.get('ir.config_parameter')
         return {
             'auth_signup_template_user_id': icp.get_param(cr, uid, 'auth.signup_template_user_id', 0) or False
         }
 
-    #todo: @al, @chs: what is this method for ?
-    def set_signup(self, cr, uid, ids, context=None):
+    def set_auth_signup_template_user_id(self, cr, uid, ids, context=None):
         config = self.browse(cr, uid, ids[0], context=context)
         icp = self.pool.get('ir.config_parameter')
         icp.set_param(cr, uid, 'auth.signup_template_user_id', config.auth_signup_template_user_id.id)
-
-    def _get_default_template_user(self, cr, uid, context=None):
-        data_obj = self.pool.get('ir.model.data')
-        data_id = data_obj._get_id(cr, uid, 'portal', 'default_template_user')
-        return data_obj.browse(cr, uid, data_id).res_id
-
-    _defaults = {
-        'auth_signup_template_user_id': _get_default_template_user,
-    }
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index ed01973b527..eb06ca656d6 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -2,22 +2,12 @@
 <openerp>
     <data noupdate="1">
 
-        <!-- Create a portal template user -->
-        <record id="default_template_user" model="res.users">
-            <field name="name">Template Portal User</field>
-            <field name="login">portal-template</field>
-            <!-- No password: this template user doesn't need to log in -->
-            <field name="password"></field>
-            <field name="active" eval="False"/>
-            <!-- Avoid auto-including this user in any default group, just like a typical portal member -->
-            <field name="groups_id" eval="[(5,)]"/>
-            <field name="partner_id" eval="ref('base.res_partner_1')"/>
-        </record>
-
         <record id="portal" model="res.portal">
             <field name="name">Portal</field>
             <field name="group_id" ref="group_portal_member"/>
             <field name="override_menu" eval="False"/>
+            <!-- Insert the template user from auth_signup in the portal members group -->
+            <field name="users" eval="[(4,ref('auth_signup.default_template_user'))]"/>
         </record>
 
         <!-- Mail group for the company's news -->

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 125/288] [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 eb5b3f57330fb12d75673a2e07cf40d299b997fc Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 29 Aug 2012 10:26:47 +0200
Subject: [PATCH 126/288] [REF] base_gengo: misc code improvements made during
 code review

bzr revid: qdp-launchpad@openerp.com-20120829082647-rzl1btht2xc05ee4
---
 addons/base_gengo/res_company.py              |  6 +-
 .../wizard/gengo_update_translation.py        | 99 +++++++++++--------
 2 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 058a12bd6e8..610e46d05d2 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -26,13 +26,13 @@ class res_company(osv.Model):
     _name = "res.company"
     _inherit = "res.company"
     _columns = {
-           "gengo_private_key": fields.text("Gengo private key"),
-           "gengo_public_key": fields.text("Gengo public key"),
+           "gengo_private_key": fields.text("Gengo Private Key"),
+           "gengo_public_key": fields.text("Gengo Public Key"),
            "gengo_tier": fields.selection([('machine', 'Machine'),
                                           ('standard', 'Standard'),
                                           ('pro', 'Pro'),
                                           ('ultra', 'Ultra')], "Tier Type", required=True),
-           "gengo_comment": fields.text("Comments"),
+           "gengo_comment": fields.text("Comments", help="This comment will be automatically be enclosed in each an every request sent to Gengo"),
            "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
     }
 
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 52c6e5b7fd8..2299af02480 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -33,6 +33,8 @@ import time
 
 _logger = logging.getLogger(__name__)
 
+GENGO_DEFAULT_LIMIT = 20
+
 LANG_CODE_MAPPING = {
     'ar_SA': ('ar', 'Arabic'),
     'id_ID': ('id', 'Indonesian'),
@@ -56,14 +58,14 @@ LANG_CODE_MAPPING = {
 }
 
 CRON_VALS = {
-    'name': 'Gengo Sync',
+    'name': _('Synchronization with Gengo'),
     'active': True,
     'interval_number': 20,
     'interval_type': 'minutes',
     'numbercall': -1,
     'model': "'base.update.translations'",
     'function': "",
-    'args': "'(20,)'",
+    'args': "'(20,)'",#not sure
 }
 
 
@@ -75,11 +77,11 @@ class base_update_translation(osv.osv_memory):
     def gengo_authentication(self, cr, uid, context=None):
         ''' To Send Request and Get Response from Gengo User needs Public and Private
          key for that user need to sign up to gengo and get public and private
-         key which is provided by gengo to authentic user '''
+         key which is provided by gengo to authenticate user '''
 
-        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
-            return (False, "  - Invalid gengo configuration, Either Gengo authentication `Public Key` or `Private Key` is missing. Complete Gengo authentication parameter under `Settings > Companies > Gengo Parameters`.")
+            return (False, _("  - Invalid Gengo configuration. Gengo authentication `Public Key` or `Private Key` is missing. Complete Gengo authentication parameters under `Settings > Companies > Gengo Parameters`."))
         try:
             gengo = MyGengo(
                 public_key=user.company_id.gengo_public_key.encode('ascii'),
@@ -89,24 +91,32 @@ class base_update_translation(osv.osv_memory):
             gengo.getAccountStats()
             return (True, gengo)
         except Exception, e:
-            return (False, "Gengo Connection Error\n%s"%e)
+            return (False, _("Gengo Connection Error\n%s") %e)
+
+    def pack_jobs_request(self, cr, uid, term_ids, context=None):
+        ''' prepare the terms that will be requested to gengo and returns them in a dictionary with following format
+            {'jobs': {
+                'term1.id': {...}
+                'term2.id': {...}
+                }
+            }'''
 
-    def pack_jobs_request(self, cr, uid, term_ids, context):
-        jobs = {}
-        gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
         translation_pool = self.pool.get('ir.translation')
-        auto_approve = gengo_parameter_pool.company_id.gengo_auto_approve and 1 or 0
-        for term in translation_pool.browse(cr, uid, term_ids, context):
+        jobs = {}
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        auto_approve = 1 if user.company_id.gengo_auto_approve or 0
+        for term in translation_pool.browse(cr, uid, term_ids, context=context):
             if re.search(r"\w", term.src or ""):
-                job = {'type': 'text',
+                jobs[term.id] = {'type': 'text',
                         'slug': 'single::English to ' + LANG_CODE_MAPPING[term.lang][1],
-                        'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
+                        'tier': tools.ustr(user.company_id.gengo_tier),
+                        #'tier': tools.ustr(term.gengo_tier),
                         'body_src': term.src,
                         'lc_src': 'en',
                         'lc_tgt': LANG_CODE_MAPPING[term.lang][0],
                         'auto_approve': auto_approve,
-                        'comment': gengo_parameter_pool.company_id.gengo_comment}
-                jobs.update({term.id: job})
+                        'comment': gengo_parameter_pool.company_id.gengo_comment,
+                }
         return {'jobs': jobs}
 
     def check_lang_support(self, cr, uid, langs, context=None):
@@ -115,35 +125,38 @@ class base_update_translation(osv.osv_memory):
         if not flag:
             return []
         else:
-            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             tier = user.company_id.gengo_tier
             if tier == "machine":
                 tier = "nonprofit"
             lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
+            #print "tier", tier
+
             if lang_pair['opstat'] == 'ok':
                 for g_lang in lang_pair['response']:
+                     #print 'g_lang', g_lang['lc_tgt'], g_lang['tier']
                     for l in langs:
                         if LANG_CODE_MAPPING[l][0] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
                             new_langs.append(l)
             return list(set(new_langs))
 
-    def _update_terms(self, cr, uid, response, tier, context):
+    def _update_terms(self, cr, uid, response, tier, context=None):
         translation_pool = self.pool.get('ir.translation')
-        for jobs in response['jobs']:        
+        for jobs in response['jobs']:
             for t_id, res in jobs.items():
                 vals = {}
                 if tier == "machine":
                     vals.update({'value': res['body_tgt'], 'state': 'translated'})
                 else:
                     vals.update({'job_id': res['job_id'], 'state': 'inprogress'})
-                translation_pool.write(cr, uid, [t_id], vals, context)
+                translation_pool.write(cr, uid, [t_id], vals, context=context)
         return
 
-    def _send_translation_terms(self, cr, uid,  term_ids, context):
+    def _send_translation_terms(self, cr, uid,  term_ids, context=None):
         """
         Lazy Polling will be perform when user or cron request for the translation.
         """
-        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         flag, gengo = self.gengo_authentication(cr, uid, context)
         if flag:
             request = self.pack_jobs_request(cr, uid, term_ids, context)
@@ -170,33 +183,33 @@ class base_update_translation(osv.osv_memory):
             context = {}
         lang_pool = self.pool.get('res.lang')
         super(base_update_translation, self).act_update(cr, uid, ids, context)
-        msg = "1. Translation file loaded successfully.\n2. Processing Gengo Translation:\n"
+        msg = _("1. Translation file loaded successfully.\n2. Processing Gengo Translation:\n")
         flag, gengo = self.gengo_authentication(cr, uid, context)
         if not flag:
             msg += gengo
         else:
-            for res in self.browse(cr, uid, ids, context):
+            for res in self.browse(cr, uid, ids, context=context):
                 lang_id = lang_pool.search(cr, uid, [('code', '=', res.lang)])
                 lang_name = self._get_lang_name(cr, uid, res.lang)
                 try:
                     if LANG_CODE_MAPPING[res.lang][0]:
                         lang_search = lang_pool.search(cr, uid, [('gengo_sync', '=', True), ('id', '=', lang_id[0])])
                     if lang_search:
-                        msg += '  - This language `%s` is already in queue for translation.' % (lang_name)
+                        msg += _('  - This language `%s` is already in queue for translation.') % (lang_name)
                     else:
-                        msg += '  - The language `%s` is queued for translation through Gengo translation.' % (lang_name)
+                        msg += _('  - The language `%s` is queued for translation through Gengo translation.') % (lang_name)
                         lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
                         _logger.info('Translation request for language `%s` has been queued successfully.', lang_name)
-                    self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'Gengo Sync Translation (Request)', '_sync_request', context)
-                    self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'Gengo Sync Translation (Response)', '_sync_response', context)
-                    self._sync_request(cr, uid, limit=20)
+                    self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', _('Gengo Sync Translation (Request)'), '_sync_request', context)
+                    self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', _('Gengo Sync Translation (Response)'), '_sync_response', context)
+                    self._sync_request(cr, uid, limit=GENGO_DEFAULT_LIMIT)
                 except:
-                    msg +='  - The Language `%s` is not supported by Gengo Traditional Service.'%(lang_name)
+                    msg += _('  - The Language `%s` is not supported by Gengo Traditional Service.') % (lang_name)
 
-        context.update({'message': msg})
         obj_model = self.pool.get('ir.model.data')
         model_data_ids = obj_model.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'update_translation_wizard_view_confirm')])
         view_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        context.update({'message': msg})
         return {
                  'view_type': 'form',
                  'view_mode': 'form',
@@ -207,7 +220,7 @@ class base_update_translation(osv.osv_memory):
                  'context': context,
              }
 
-    def _sync_response(self, cr, uid, limit=20, context=None):
+    def _sync_response(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
         """
         This method  will be call by cron services to get translation from
         gengo for translation terms which are posted to be translated. It will
@@ -226,7 +239,7 @@ class base_update_translation(osv.osv_memory):
                     vals={}
                     job_response = gengo.getTranslationJob(id=term.job_id)
                     if job_response['opstat'] != 'ok':
-                        _logger.warning("Invalid Response! Skipping translation Terms with `id` %s."%(term.job_id))
+                        _logger.warning("Invalid Response! Skipping translation Terms with `id` %s." % (term.job_id))
                         continue
                     if job_response['response']['job']['status'] == 'approved':
                         vals.update({'state': 'translated',
@@ -237,27 +250,27 @@ class base_update_translation(osv.osv_memory):
                     if job_comment['opstat']=='ok':
                         gengo_comments=""
                         for comment in job_comment['response']['thread']:
-                            gengo_comments+='%s Commented on %s by %s. \n'%(comment['body'], time.ctime(comment['ctime']), comment['author'])
-                        vals.update({'gengo_comment':gengo_comments})
+                            gengo_comments += _('%s Commented on %s by %s. \n') %(comment['body'], time.ctime(comment['ctime']), comment['author'])
+                        vals.update({'gengo_comment': gengo_comments})
                         up_comment +=1
                     if vals:
                         translation_pool.write(cr, uid, term.id,vals)
-                    _logger.info("Successfully Updated `%d` terms and Comments for `%d` terms."%(up_term, up_comment ))
+                    _logger.info("Successfully Updated `%d` terms and Comments for `%d` terms." % (up_term, up_comment ))
         return True
 
-    def _sync_request(self, cr, uid, limit=20, context=None):
-        """
-        This scheduler will send a job request to the gengo , which terms are
-        in translate state and gengo_translation is true
-        """
+    def _sync_request(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
+        """This scheduler will send a job request to the gengo , which terms are
+        waiing to be translated and for which gengo_translation is True"""
         if context is None:
             context = {}
         language_pool = self.pool.get('res.lang')
         translation_pool = self.pool.get('ir.translation')
         try:
-            lang_ids = language_pool.search(cr, uid, [('gengo_sync', '=', True)])
-            langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids)]
-            langs = self.check_lang_support(cr, uid, langs)
+            lang_ids = language_pool.search(cr, uid, [('gengo_sync', '=', True)]) #really? what's the point not checking ALL the languages if gengo support it? i feel like it's aunecessary load for the user that must configure yet another thing
+            langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids, context=context)]
+            #print "LANGS 1", langs
+            langs = self.check_lang_support(cr, uid, langs, context=context)#must move
+            #print "LANGS 2", langs
             term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=limit)
             if term_ids:
                 self._send_translation_terms(cr, uid, term_ids, context)

From db08eb4d0a40b15557505bbddbac05f6ff04f91f Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 29 Aug 2012 11:50:22 +0200
Subject: [PATCH 127/288] [REF] base_gengo: misc code improvements made during
 code review

bzr revid: qdp-launchpad@openerp.com-20120829095022-i3fsdc0nvok78q25
---
 addons/base_gengo/ir_translation.py                  |  7 +------
 addons/base_gengo/ir_translation.xml                 | 11 ++++-------
 addons/base_gengo/wizard/gengo_update_translation.py |  6 +++---
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index edf939b3851..c8a5f9ef070 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -26,12 +26,7 @@ class ir_translation(osv.Model):
     _name = "ir.translation"
     _inherit = "ir.translation"
     _columns = {
-        'gengo_comment': fields.text("Comments & Activity"),
         'gengo_translation': fields.boolean("Gengo Auto Translation ?", help='If checked the term will be translated by Gengo automatically.'),
-        'gengo_control': fields.boolean('Gengo Traslated', help="If Term is translated using Gengo Service, the check box will be checked.", readonly=True),
+        'gengo_comment': fields.text("Comments & Activity Linked to Gengo"),
         'job_id': fields.char('Gengo JobId', size=32),
     }
-
-    _defaults = {
-        'gengo_control': False,
-    }
diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
index 8a0e6a238b8..6725504df8a 100644
--- a/addons/base_gengo/ir_translation.xml
+++ b/addons/base_gengo/ir_translation.xml
@@ -7,8 +7,7 @@
             <field name="inherit_id" ref="base.view_translation_search"/>
             <field name="arch" type="xml">
                 <search string="Translations">
-                     <filter icon="terp-project" string="In Progress" domain="[('state','=','inprogress')]"></filter>
-                     <filter string="To Control" domain="[('state','=','translated')]"></filter>
+                     <filter string="To Approve In Gengo" domain="[('state','=','inprogress'),('gengo_translation','=',True)]"></filter>
                 </search>
             </field>
         </record>
@@ -20,12 +19,10 @@
             <field name="model">ir.translation</field>
             <field name="arch" type="xml">
                  <xpath expr="//form[@string='Translations']/sheet" position="inside">
-                    <group string="Gengo Comments &amp; Activity" col="1">
-                        <field name="gengo_comment" nolabel="1" placeholder="Gengo Comments &amp; Activity..."/>
-                    </group>
-                    <group col="4">
+                    <group string="Gengo Translation Service" col="4" colspan="4">
                         <field name="gengo_translation" />
-                        <field name="gengo_control" />
+                        <label string="Note: If the translation state is 'In Progress', it means that the translation has to be approved to be uploaded in this system. You are suppose to do that directly by using your Gengo Account"/>
+                        <field name="gengo_comment" nolabel="1" placeholder="Gengo Comments &amp; Activity..." colspan="4"/>
                     </group>
                 </xpath>
             </field>
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 2299af02480..357d2a5bf74 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -65,7 +65,7 @@ CRON_VALS = {
     'numbercall': -1,
     'model': "'base.update.translations'",
     'function': "",
-    'args': "'(20,)'",#not sure
+    'args': "'(%s,)'" %s GENGO_DEFAULT_LIMIT,
 }
 
 
@@ -175,6 +175,7 @@ class base_update_translation(osv.osv_memory):
             model, res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base_gengo', xml_id)
             cron_pool.write(cr, uid, [res], {'active': True}, context=context)
         except:
+            #the cron job was not found, probably deleted previously, so we create it again using default values
             CRON_VALS.update({'name': name, "function": fn})
             return cron_pool.create(cr, uid, CRON_VALS, context)
 
@@ -243,8 +244,7 @@ class base_update_translation(osv.osv_memory):
                         continue
                     if job_response['response']['job']['status'] == 'approved':
                         vals.update({'state': 'translated',
-                            'value': job_response['response']['job']['body_tgt'],
-                            'gengo_control': True})
+                            'value': job_response['response']['job']['body_tgt'])
                         up_term += 1
                     job_comment = gengo.getTranslationJobComments(id=term.job_id)
                     if job_comment['opstat']=='ok':

From 55cc723fc183c888cfc57fa2d78654a79c029132 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 29 Aug 2012 11:51:37 +0200
Subject: [PATCH 128/288] [FIX] base_gengo: syntax error fixed

bzr revid: qdp-launchpad@openerp.com-20120829095137-hy91xbg1gicwzid2
---
 addons/base_gengo/wizard/gengo_update_translation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 357d2a5bf74..23e66a9489d 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -104,7 +104,7 @@ class base_update_translation(osv.osv_memory):
         translation_pool = self.pool.get('ir.translation')
         jobs = {}
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        auto_approve = 1 if user.company_id.gengo_auto_approve or 0
+        auto_approve = 1 if user.company_id.gengo_auto_approve else 0
         for term in translation_pool.browse(cr, uid, term_ids, context=context):
             if re.search(r"\w", term.src or ""):
                 jobs[term.id] = {'type': 'text',

From f1febea2a3a5cef2585a097738eff52d90da4840 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 29 Aug 2012 12:10:03 +0200
Subject: [PATCH 129/288] [FIX] base_gengo: syntax error fixed

bzr revid: qdp-launchpad@openerp.com-20120829101003-3t7zpydsg6lk3ap1
---
 addons/base_gengo/wizard/gengo_update_translation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 23e66a9489d..a7c8deb0348 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -65,7 +65,7 @@ CRON_VALS = {
     'numbercall': -1,
     'model': "'base.update.translations'",
     'function': "",
-    'args': "'(%s,)'" %s GENGO_DEFAULT_LIMIT,
+    'args': "'(%s,)'" % (str(GENGO_DEFAULT_LIMIT)),
 }
 
 
@@ -244,7 +244,7 @@ class base_update_translation(osv.osv_memory):
                         continue
                     if job_response['response']['job']['status'] == 'approved':
                         vals.update({'state': 'translated',
-                            'value': job_response['response']['job']['body_tgt'])
+                            'value': job_response['response']['job']['body_tgt']})
                         up_term += 1
                     job_comment = gengo.getTranslationJobComments(id=term.job_id)
                     if job_comment['opstat']=='ok':

From 6aded504b3245d35da48e2420bbaf4d9178e8f16 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 29 Aug 2012 14:25:01 +0200
Subject: [PATCH 130/288] [FIX] point_of_sale: redefine the copy function for
 the pos.config to avoid a copy of the sequence. [IMP] point_of_sale:
 Associate a default category for the existing products.

bzr revid: stw@openerp.com-20120829122501-xta26dk5bbav36zz
---
 addons/point_of_sale/point_of_sale.py       | 35 +++++++++++++++++++--
 addons/point_of_sale/point_of_sale_view.xml |  3 +-
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 7d8a3ab0015..8da582f752f 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -84,6 +84,15 @@ class pos_config(osv.osv):
         (_check_cash_control, "You cannot have two cash controls in one Point Of Sale !", ['journal_ids']),
     ]
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        d = {
+            'sequence_id' : False,
+        }
+        d.update(default)
+        return super(pos_order, self).copy(cr, uid, id, d, context=context)
+
 
     def name_get(self, cr, uid, ids, context=None):
         result = []
@@ -676,7 +685,7 @@ class pos_order(osv.osv):
         }
         if 'payment_date' in data:
             args['date'] = data['payment_date']
-        args['name'] = order.session_id.name
+        args['name'] = order.name
         if data.get('payment_name', False):
             args['name'] = args['name'] + ': ' + data['payment_name']
         account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
@@ -712,7 +721,7 @@ class pos_order(osv.osv):
             'pos_statement_id' : order_id,
             'journal_id' : journal_id,
             'type' : 'customer',
-            'ref' : order.name,
+            'ref' : order.session_id.name,
         })
 
         statement_line_obj.create(cr, uid, args, context=context)
@@ -1266,8 +1275,30 @@ class product_product(osv.osv):
             help="If you want to sell this product through the point of sale, select the category it belongs to."),
         'to_weight' : fields.boolean('To Weight', help="This category contains products that should be weighted, mainly used for the self-checkout interface"),
     }
+
+    def _default_pos_categ_id(self, cr, uid, context=None):
+        proxy = self.pool.get('ir.model.data')
+
+        try:
+            category_id = proxy.get_object_reference(cr, uid, 'point_of_sale', 'categ_others')[1]
+        except ValueError:
+            values = {
+                'name' : 'Others',
+            }
+            category_id = self.pool.get('pos.category').create(cr, uid, values, context=context)
+            values = {
+                'name' : 'categ_others',
+                'model' : 'pos.category',
+                'module' : 'point_of_sale',
+                'res_id' : category_id,
+            }
+            proxy.create(cr, uid, values, context=context)
+
+        return category_id
+
     _defaults = {
         'to_weight' : False,
+        'pos_categ_id' : _default_pos_categ_id,
     }
 
     def edit_ean(self, cr, uid, ids, context):
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index c543be89d66..251591685e0 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -126,7 +126,7 @@
             </field>
         </record>
         <record model="ir.ui.view" id="view_pos_order_tree">
-            <field name="name">Sales</field>
+            <field name="name">Orders</field>
             <field name="model">pos.order</field>
             <field name="arch" type="xml">
                 <tree string="POS Orders" colors="blue:state == 'draft';gray:state in ('done','cancel');black:state not in('done','cancel')">
@@ -138,6 +138,7 @@
                     <field name="amount_total" sum="Amount total"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="state"/>
+                    <field name="session_id" />
                 </tree>
             </field>
         </record>

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 131/288] [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 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 132/288] [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 fd4178ee58d80dbcdf4795d69168fac2fbc67c9f Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 29 Aug 2012 16:34:53 +0200
Subject: [PATCH 133/288] [IMP] auth_signup: better ids for the
 config_parameter record

bzr revid: abo@openerp.com-20120829143453-vn6l5b1c8kcvxqgj
---
 addons/auth_signup/auth_signup_data.xml | 4 ++--
 addons/auth_signup/res_config.py        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml
index 1549fee306e..4a6bf9ae4b9 100644
--- a/addons/auth_signup/auth_signup_data.xml
+++ b/addons/auth_signup/auth_signup_data.xml
@@ -13,8 +13,8 @@
             <field name="groups_id" eval="[(5,)]"/>
         </record>
 
-        <record model="ir.config_parameter" id="blabla">
-            <field name="key">auth.signup_template_user_id</field>
+        <record id="default_template_user" model="ir.config_parameter">
+            <field name="key">auth_signup.template_user_id</field>
             <field name="value" ref="default_template_user"/>
         </record>
 
diff --git a/addons/auth_signup/res_config.py b/addons/auth_signup/res_config.py
index 888e932bb9f..813a903870c 100644
--- a/addons/auth_signup/res_config.py
+++ b/addons/auth_signup/res_config.py
@@ -32,10 +32,10 @@ class base_config_settings(osv.TransientModel):
     def get_default_auth_signup_template_user_id(self, cr, uid, fields, context=None):
         icp = self.pool.get('ir.config_parameter')
         return {
-            'auth_signup_template_user_id': icp.get_param(cr, uid, 'auth.signup_template_user_id', 0) or False
+            'auth_signup_template_user_id': icp.get_param(cr, uid, 'auth_signup.template_user_id', 0) or False
         }
 
     def set_auth_signup_template_user_id(self, cr, uid, ids, context=None):
         config = self.browse(cr, uid, ids[0], context=context)
         icp = self.pool.get('ir.config_parameter')
-        icp.set_param(cr, uid, 'auth.signup_template_user_id', config.auth_signup_template_user_id.id)
+        icp.set_param(cr, uid, 'auth_signup.template_user_id', config.auth_signup_template_user_id.id)

From 7d120eb1d10385849be55ad70ad0992329077f2a Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 29 Aug 2012 17:46:34 +0200
Subject: [PATCH 134/288] [FIX] point_of_sale: Set the right balance end for a
 bank statement [FIX] point_of_sale: Show/Hide some tabs

bzr revid: stw@openerp.com-20120829154634-ko3v2bi6oephr04e
---
 addons/point_of_sale/point_of_sale.py       | 3 +++
 addons/point_of_sale/point_of_sale_view.xml | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 8da582f752f..b17e672cb9c 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -396,6 +396,9 @@ class pos_session(osv.osv):
                         'account_id': account_id
                     }, context=context)
 
+                if st.journal_id.type == 'bank':
+                    st.write({'balance_end_real' : st.balance_end})
+
                 getattr(st, 'button_confirm_%s' % st.journal_id.type)(context=context)
         self._confirm_orders(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state' : 'closed'}, context=context)
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 251591685e0..8d7e3c3cefe 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -911,7 +911,7 @@
                             </group>
                             <newline/>
 
-                            <group string="Opening Cash Control" attrs="{'invisible' : [('cash_control', '=', False)]}">
+                            <group string="Opening Cash Control" attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', '=', 'closed')]}">
                                 <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" />
@@ -920,7 +920,7 @@
                                     </tree>
                                 </field>
                             </group>
-                            <group string="Closing Cash Control" attrs="{'invisible': [('state', '!=', 'closing_control')]}">
+                            <group string="Closing Cash Control" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '!=', 'closing_control')]}">
                                 <field name="details_ids" nolabel="1" colspan="2">
                                     <tree string="Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
@@ -930,7 +930,7 @@
                                 </field>
                             </group>
 
-                            <div>
+                            <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', '=', 'opening_control')]}">
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', 'in', ('opening_control', '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 7e05e04f7b42966bff908994885f8e0b75638d89 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 30 Aug 2012 11:47:19 +0200
Subject: [PATCH 135/288] [FIX] project: fix breakage of inherited project
 views after recent fp commits

bzr revid: odo@openerp.com-20120830094719-1vcyuk81as5x4pyp
---
 .../project_long_term_view.xml                | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index b4b98e8fe4a..55a91b36f08 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -96,11 +96,14 @@
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr>
-                        <td><group><field name="use_phases"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
-                    </tr>
+                <xpath expr="//div[@name='options_active']" position='inside'>
+                       <field name="use_phases" class="oe_inline"/>
+                       <label for="use_phases"/>
+                </xpath>
+                <xpath expr="//div[@name='buttons']" position='inside'>
+                        <button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d"
+                                string="Phases" type="action"
+                                attrs="{'invisible':[('use_phases','=', 0)]}"/>
                 </xpath>
             </field>
         </record>
@@ -347,11 +350,9 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
-                </xpath>
-                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                <xpath expr='//div[@name="project"]' position='inside'>
                     <field name="use_phases"/>
+                    <label for="use_phases"/>
                 </xpath>
             </field>
         </record>

From d5713782fe0cab2a40b1e110e79e93c6867b4e85 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 30 Aug 2012 11:49:13 +0200
Subject: [PATCH 136/288] [FIX] project_long_term: wording

bzr revid: odo@openerp.com-20120830094913-rhv8iy1jxgd22vmw
---
 addons/project_long_term/project_long_term.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index d5ac3868a5e..2eab5fa6ac6 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -273,9 +273,9 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
+        'use_phases': fields.boolean('Phases', help="Check this field if you plan to use phase-based scheduling"),
     }
-    
+
     def on_change_template(self, cr, uid, ids, template_id, context=None):
         res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
         if template_id and 'value' in res:

From 424085389f05d45d45f83a9911ba7e68cf82d4ba Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 30 Aug 2012 11:58:21 +0200
Subject: [PATCH 137/288] [FIX] pad: fix case of missing pad server

Default to empty pad url when sever is not set, UI will gracefully handle this case

bzr revid: odo@openerp.com-20120830095821-2044b23scst5dktk
---
 addons/pad/pad.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index 6f6b435cf3c..d21ccd42d16 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -12,6 +12,8 @@ class pad_common(osv.osv_memory):
     def pad_generate_url(self, cr, uid, context=None):
         pad_server = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.pad_server
         # make sure pad server in the form of http://hostname
+        if not pad_server:
+            return ''
         if not pad_server.startswith('http'):
             pad_server = 'http://' + pad_server
         pad_server = pad_server.rstrip('/')

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 138/288] [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 a1e474fa8129f18ecf573b379cbbd5257ee6acbe Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 30 Aug 2012 12:27:46 +0200
Subject: [PATCH 139/288] [IMP] TranslateDialog#on_btn_save should return its
 mutex

bzr revid: fme@openerp.com-20120830102746-hqrzn8vh0rlsdvyu
---
 addons/web/static/src/js/views.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index b9739767c6d..e453ecbc905 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1135,9 +1135,9 @@ instance.web.TranslateDialog = instance.web.Dialog.extend({
         });
     },
     on_btn_save: function() {
-        var trads = {},
-            self = this,
-            trads_mutex = new $.Mutex();
+        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]]) {
@@ -1156,6 +1156,7 @@ instance.web.TranslateDialog = instance.web.Dialog.extend({
             });
         });
         this.close();
+        return trads_mutex;
     },
     on_btn_close: function() {
         this.close();

From 46604fccb57dce8fa1ee2e15bc9ec97e0b5a589d Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 30 Aug 2012 17:20:55 +0530
Subject: [PATCH 140/288] [FIX] Impoved treanlstion state field conditions

bzr revid: jam@tinyerp.com-20120830115055-tf396grzw3f6olfz
---
 openerp/addons/base/ir/ir_translation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index 72c0c0b9208..de2608a081a 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -77,7 +77,7 @@ class ir_translation_import_cursor(object):
     def push(self, ddict):
         """Feed a translation, as a dictionary, into the cursor
         """
-        state = ddict['value'] and "translated"  or "to_translate"
+        state =  "translated" if (ddict['value'] and ddict['value'] != "") else "to_translate"
         self._cr.execute("INSERT INTO " + self._table_name \
                 + """(name, lang, res_id, src, type,
                         imd_model, imd_module, imd_name, value,state)
@@ -172,7 +172,7 @@ class ir_translation(osv.osv):
     }
     
     _defaults = {
-        'state':'translated',
+        'state':'to_translate',
     }
     
     _sql_constraints = [ ('lang_fkey_res_lang', 'FOREIGN KEY(lang) REFERENCES res_lang(code)', 

From 209ff94873b6ead6ab7a69a8f0da9ff3bf4cf4a0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 30 Aug 2012 14:09:04 +0200
Subject: [PATCH 141/288] fix

bzr revid: fp@tinyerp.com-20120830120904-pen3o3nyviryh4q9
---
 addons/project_long_term/project_long_term_view.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index b4b98e8fe4a..4009cd9e5e0 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -347,11 +347,9 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
-                </xpath>
-                <xpath expr='//separator[@name="project_sep"]' position='after'>
-                    <field name="use_phases"/>
+                <xpath expr='//div[@name="options_active"]' position='after'>
+                    <field name="use_phases" class="oe_inline"/>
+                    <label for="use_phases"/>
                 </xpath>
             </field>
         </record>

From 15c7043f566d6177651a2343aada78c3f9918645 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 30 Aug 2012 14:14:03 +0200
Subject: [PATCH 142/288] [IMP] make resequence field customizable, make
 sequence number for first record configurable

bzr revid: xmo@openerp.com-20120830121403-82cr13t824jdxcsh
---
 addons/web/controllers/main.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index f9c36a1f0c0..cf7a7a06feb 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1190,12 +1190,26 @@ class DataSet(openerpweb.Controller):
         return req.session.exec_workflow(model, id, signal)
 
     @openerpweb.jsonrequest
-    def resequence(self, req, model, ids):
+    def resequence(self, req, model, ids, field='sequence', offset=0):
+        """ Re-sequences a number of records in the model, by their ids
+
+        The re-sequencing starts at the first model of ``ids``, the sequence
+        number is incremented by one after each record and starts at ``offset``
+
+        :param ids: identifiers of the records to resequence, in the new sequence order
+        :type ids: list(id)
+        :param str field: field used for sequence specification, defaults to
+                          "sequence"
+        :param int offset: sequence number for first record in ``ids``, allows
+                           starting the resequencing from an arbitrary number,
+                           defaults to ``0``
+        """
         m = req.session.model(model)
-        if not len(m.fields_get(['sequence'])):
+        if not m.fields_get([field]):
             return False
-        for i in range(len(ids)):
-            m.write([ids[i]], { 'sequence': i })
+        # python 2.6 has no start parameter
+        for i, id in enumerate(ids):
+            m.write(id, { field: i + offset })
         return True
 
 class DataGroup(openerpweb.Controller):

From bff39cb5b3fe77403c259d4e72c63956d2c76c17 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 30 Aug 2012 14:19:27 +0200
Subject: [PATCH 143/288] [IMP] Drag handle on SO lines

bzr revid: fp@tinyerp.com-20120830121927-z35yximn8omvhv2k
---
 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 c4edc162f08..a0e69efe849 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -259,8 +259,8 @@
                                     </div>
                                 </form>
                                 <tree string="Sales Order Lines" editable="bottom">
+                                    <field name="sequence" widget="handle"/>
                                     <field name="state" invisible="1"/>
-                                    <field name="sequence" invisible="1"/>
                                     <field name="delay" invisible="1"/>
                                     <field name="tax_id" invisible="1"/>
                                     <field name="type" invisible="1"/>

From 01e5824fb0f0bfc9f81c8833861aee1fc891bbfa Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 30 Aug 2012 14:43:37 +0200
Subject: [PATCH 144/288] [IMP] web_api improve example

bzr revid: al@openerp.com-20120830124337-4uraforhvgv18tff
---
 addons/web_api/static/src/example.html | 38 ++++++++++++--------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/addons/web_api/static/src/example.html b/addons/web_api/static/src/example.html
index 9c920e31fa2..5408b1de36c 100644
--- a/addons/web_api/static/src/example.html
+++ b/addons/web_api/static/src/example.html
@@ -18,38 +18,34 @@
         <script type="text/javascript">
         $(function() {
             $("body").on('click','button',function(ev){
-                eval($("pre.run").text());
+                console.log($("textarea").val());
+                eval($("textarea").val());
             });
         });
         </script> 
     </head> 
     <body>
-        <h1>OpenERP web_api examples</h1>
-        <h2>Example 1: Load the list of defined ir.model <button>Run it !</button></h2>
-        <blockquote>
-        <h3>Code: </h3>
+        <h1>OpenERP web_api test</h1>
+        <h2>Example: Load the content of ir.model <button>Run it !</button></h2>
         <pre>
 &lt;script type="text/javascript" src="/web/webclient/js"&gt;&lt;/script&gt;
 &lt;script type="text/javascript"&gt;
-<pre id="ex1" class="run">
-    var instance = openerp.init(["web"]); // get a new instance
-    instance.session.session_bind(); // bind it to the right hostname
-    instance.session.session_authenticate("trunk", "admin", "admin", false).then(function() {
-        var ds = new instance.web.DataSetSearch(null, "ir.model");
-        ds.read_slice(['name','model'], {}).then(function(models){
-            _.each(models,function(m,i){
-                $("#ex1res").append("&lt;li&gt;" + m.model + " (" + m.name + ") &lt;/li&gt;")
-            });
+<textarea rows="12" cols="100"id="ex1" class="run">
+var instance = openerp.init(["web"]); // get a new instance
+instance.session.session_bind(); // bind it to the right hostname
+instance.session.session_authenticate("trunk", "admin", "admin", false).then(function() {
+    var ds = new instance.web.DataSetSearch(null, "ir.model");
+    ds.read_slice(['name','model'], {}).then(function(models){
+        _.each(models,function(m,i){
+            $("#result").append("&lt;li&gt;" + m.model + " (" + m.name + ") &lt;/li&gt;")
         });
     });
-</pre>&lt;/script&gt;
+});
+</textarea>
+&lt;/script&gt;</pre>
+        <h3>Result:</h3>
+        <pre id="result" class="result">
         </pre>
-        <h3>Div for output:</h3>
-        <div id="ex1res" class="result">
-        &nbsp;
-        </div>
-        </blockquote>
-        <h2>Help me to complete this examples on <a href="http://bazaar.launchpad.net/~openerp/openerp-web/trunk/view/head:/addons/web_api/static/src/example.html">launchpad</a></h2>
     </body> 
 </html> 
 

From 3fea5ea545bf822162ec59a5d52eba513e2fbe34 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 30 Aug 2012 16:34:12 +0200
Subject: [PATCH 145/288] [IMP] allow hyphens in dbnames

bzr revid: al@openerp.com-20120830143412-0n9rag5fa92swnys
---
 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 8478ffeda22..511e37f4ab4 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -120,7 +120,7 @@
                     </tr>
                     <tr>
                         <td><label for="db_name">New database name:</label></td>
-                        <td><input type="text" name="db_name" class="required" matches="^[a-zA-Z][a-zA-Z0-9_]+$" autofocus="true"/></td>
+                        <td><input type="text" name="db_name" class="required" matches="^[a-zA-Z][a-zA-Z0-9_-]+$" autofocus="true"/></td>
                     </tr>
                     <tr>
                         <td><label for="demo_data">Load Demonstration data:</label></td>

From 46f287b2d19b1811a359a74057a3dbe44c6ba449 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 30 Aug 2012 16:50:00 +0200
Subject: [PATCH 146/288] [FIX] base, ir_translation: a write of '' as
 translated value should reset the translation in 'to_translate' state

bzr revid: qdp-launchpad@openerp.com-20120830145000-61uh1tpux5dyp7na
---
 openerp/addons/base/ir/ir_translation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index de2608a081a..23cedbdc574 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -307,7 +307,7 @@ class ir_translation(osv.osv):
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
-        if vals.get('src'):
+        if vals.get('src') or ('value' in vals and not(vals.get('value'))):
             result = vals.update({'state':'to_translate'})
         if vals.get('value'):
             result = vals.update({'state':'translated'})

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 147/288] [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 1c3f30a081c779618b892322924951c88ae9b063 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 30 Aug 2012 18:14:29 +0200
Subject: [PATCH 148/288] [IMP] base_gengo: lots of changes made during the
 code review. Among * database scheme simplification * merge of boolean on
 ir.translation and selection fields on res.company to select the tier (level
 service of gengo), which is now located on ir.translation * move of all the
 new features in a new wizard * removal of wizard to display the results

bzr revid: qdp-launchpad@openerp.com-20120830161429-h7rti6hbnrk8mozg
---
 addons/base_gengo/__openerp__.py              |   4 +-
 addons/base_gengo/ir_translation.py           |  60 +++-
 addons/base_gengo/wizard/__init__.py          |   3 +-
 .../base_gengo/wizard/alert_message_gengo.xml |  17 -
 ...anslation.py => base_gengo_translation.py} | 323 ++++++++----------
 .../wizard/base_gengo_translation_view.xml    |  39 +++
 .../base_gengo/wizard/gengo_update_message.py |  43 ---
 7 files changed, 249 insertions(+), 240 deletions(-)
 delete mode 100644 addons/base_gengo/wizard/alert_message_gengo.xml
 rename addons/base_gengo/wizard/{gengo_update_translation.py => base_gengo_translation.py} (50%)
 create mode 100644 addons/base_gengo/wizard/base_gengo_translation_view.xml
 delete mode 100644 addons/base_gengo/wizard/gengo_update_message.py

diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index 1173d513493..d2e5893d166 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -34,12 +34,14 @@ Automated Translations through Gengo API
         'res_company_view.xml',
         'res_lang_view.xml',
 
-        'wizard/alert_message_gengo.xml',
+        'wizard/base_gengo_translation_view.xml',
            ],
     'demo_xml': [],
     'test': [],
     'installable': True,
     'auto_install': False,
+    #'qweb': ['static/src/xml/base_gengo.xml'],
+    #'js': ['static/src/js/base_gengo.js'],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index c8a5f9ef070..8f896ec561d 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -21,12 +21,70 @@
 
 from osv import fields, osv
 
+LANG_CODE_MAPPING = {
+    'ar_SA': ('ar', 'Arabic'),
+    'id_ID': ('id', 'Indonesian'),
+    'nl_NL': ('nl', 'Dutch'),
+    'fr_CA': ('fr-ca', 'French (Canada)'),
+    'pl_PL': ('pl', 'Polish'),
+    'zh_TW': ('zh-tw', 'Chinese (Traditional)'),
+    'sv_SE': ('sv', 'Swedish'),
+    'ko_KR': ('ko', 'Korean'),
+    'pt_PT': ('pt', 'Portuguese (Europe)'),
+    'en_US': ('en', 'English'),
+    'ja_JP': ('ja', 'Japanese'),
+    'es_ES': ('es', 'Spanish (Spain)'),
+    'zh_CN': ('zh', 'Chinese (Simplified)'),
+    'de_DE': ('de', 'German'),
+    'fr_FR': ('fr', 'French'),
+    'fr_BE': ('fr', 'French'),
+    'ru_RU': ('ru', 'Russian'),
+    'it_IT': ('it', 'Italian'),
+    'pt_BR': ('pt-br', 'Portuguese (Brazil)')
+}
 
 class ir_translation(osv.Model):
     _name = "ir.translation"
     _inherit = "ir.translation"
     _columns = {
-        'gengo_translation': fields.boolean("Gengo Auto Translation ?", help='If checked the term will be translated by Gengo automatically.'),
         'gengo_comment': fields.text("Comments & Activity Linked to Gengo"),
         'job_id': fields.char('Gengo JobId', size=32),
+        "gengo_translation": fields.selection([('', 'Do not translate this term by Gengo'),
+                                            ('machine', 'Translation By Machine'),
+                                            ('standard', 'Standard'),
+                                            ('pro', 'Pro'),
+                                            ('ultra', 'Ultra')], "Gengo Translation Service Level", help='You can select here the service level you want for an automatic translation using Gengo.', required=True),
     }
+    _defaults = {
+        'gengo_translation': '',
+    }
+
+    def _get_all_supported_languages(self, cr, uid, context=None):
+        flag, gengo = self.pool.get('base.gengo.translations').gengo_authentication(cr, uid, context=context)
+        if not flag:
+            raise osv.except_osv(_('Gengo Authentication Error'), gengo)
+        supported_langs = {}
+        lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
+        if lang_pair['opstat'] == 'ok':
+            for g_lang in lang_pair['response']:
+                if g_lang['lc_tgt'] not in supported_langs:
+                    supported_langs[g_lang['lc_tgt']] = []
+                supported_langs[g_lang['lc_tgt']] += [g_lang['tier']]
+        return supported_langs
+
+    def _get_gengo_corresponding_language(cr, lang):
+        return lang in LANG_CODE_MAPPING and LANG_CODE_MAPPING[lang][0] or lang
+
+    def _check_lang_support(self, cr, uid, ids, context=None):
+        supported_langs = self._get_all_supported_languages(cr, uid, context=context)
+        if supported_langs:
+            for term in self.browse(cr, uid, ids, context=context):
+                tier = "nonprofit" if term.gengo_translation == 'machine' else term.gengo_translation
+                language = self._get_gengo_corresponding_language(term.lang)
+                if tier not in supported_langs.get(language,[]):
+                    return False
+        return True
+
+    _constraints = [
+        (_check_lang_support, 'The Gengo translation service selected is not supported for this language.', ['gengo_translation'])
+    ]
diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
index f661b3b8114..e3cd1565124 100644
--- a/addons/base_gengo/wizard/__init__.py
+++ b/addons/base_gengo/wizard/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import gengo_update_translation
-import gengo_update_message
+import base_gengo_translation
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/alert_message_gengo.xml b/addons/base_gengo/wizard/alert_message_gengo.xml
deleted file mode 100644
index c2121b8ce6d..00000000000
--- a/addons/base_gengo/wizard/alert_message_gengo.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!-- Update Message Form View -->
-        <record model="ir.ui.view" id="update_translation_wizard_view_confirm">
-            <field name="name">gengo.update.message.form</field>
-            <field name="model">gengo.update.message</field>
-            <field name="arch" type="xml">
-                <form string="Update Gengo Data" version="7.0">
-                    <group>
-                        <field name='name'/>
-                    </group>
-                </form>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/base_gengo_translation.py
similarity index 50%
rename from addons/base_gengo/wizard/gengo_update_translation.py
rename to addons/base_gengo/wizard/base_gengo_translation.py
index a7c8deb0348..e91be00ec47 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/base_gengo_translation.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import osv
+from osv import osv, fields
 from tools.translate import _
 import re
 try:
@@ -35,53 +35,38 @@ _logger = logging.getLogger(__name__)
 
 GENGO_DEFAULT_LIMIT = 20
 
-LANG_CODE_MAPPING = {
-    'ar_SA': ('ar', 'Arabic'),
-    'id_ID': ('id', 'Indonesian'),
-    'nl_NL': ('nl', 'Dutch'),
-    'fr_CA': ('fr-ca', 'French (Canada)'),
-    'pl_PL': ('pl', 'Polish'),
-    'zh_TW': ('zh-tw', 'Chinese (Traditional)'),
-    'sv_SE': ('sv', 'Swedish'),
-    'ko_KR': ('ko', 'Korean'),
-    'pt_PT': ('pt', 'Portuguese (Europe)'),
-    'en_US': ('en', 'English'),
-    'ja_JP': ('ja', 'Japanese'),
-    'es_ES': ('es', 'Spanish (Spain)'),
-    'zh_CN': ('zh', 'Chinese (Simplified)'),
-    'de_DE': ('de', 'German'),
-    'fr_FR': ('fr', 'French'),
-    'fr_BE': ('fr', 'French'),
-    'ru_RU': ('ru', 'Russian'),
-    'it_IT': ('it', 'Italian'),
-    'pt_BR': ('pt-br', 'Portuguese (Brazil)')
-}
-
-CRON_VALS = {
-    'name': _('Synchronization with Gengo'),
+DEFAULT_CRON_VALS = {
     'active': True,
     'interval_number': 20,
     'interval_type': 'minutes',
-    'numbercall': -1,
-    'model': "'base.update.translations'",
-    'function': "",
+    'model': "'base.gengo.translations'",
     'args': "'(%s,)'" % (str(GENGO_DEFAULT_LIMIT)),
 }
 
+class base_gengo_translations(osv.osv_memory):
 
-class base_update_translation(osv.osv_memory):
-
-    _name = 'base.update.translations'
-    _inherit = "base.update.translations"
+    _name = 'base.gengo.translations'
+    _columns = {
+        'restart_send_job': fields.boolean("Restart Sending Job"),
+        'restart_fetch_job': fields.boolean("Restart Fetching Job"),
+        'lang_id': fields.many2one('res.lang', 'Language', help="Leave empty if you don't want to restrict the request to a single language"),
+    }
 
     def gengo_authentication(self, cr, uid, context=None):
-        ''' To Send Request and Get Response from Gengo User needs Public and Private
-         key for that user need to sign up to gengo and get public and private
-         key which is provided by gengo to authenticate user '''
+        ''' 
+        This method tries to open a connection with Gengo. For that, it uses the Public and Private
+        keys that are linked to the company (given by Gengo on subscription). It returns a tuple with
+         * as first element: a boolean depicting if the authentication was a success or not
+         * as second element: the connection, if it was a success, or the error message returned by 
+            Gengo when the connection failed.
+            This error message can either be displayed in the server logs (if the authentication was called 
+            by the cron) or in a dialog box (if requested by the user), thus it's important to return it 
+            translated.
+        '''
 
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
-            return (False, _("  - Invalid Gengo configuration. Gengo authentication `Public Key` or `Private Key` is missing. Complete Gengo authentication parameters under `Settings > Companies > Gengo Parameters`."))
+            return (False, _("Invalid Gengo configuration. Gengo authentication `Public Key` or `Private Key` is missing. Complete Gengo authentication parameters under `Settings > Companies > Gengo Parameters`."))
         try:
             gengo = MyGengo(
                 public_key=user.company_id.gengo_public_key.encode('ascii'),
@@ -89,10 +74,109 @@ class base_update_translation(osv.osv_memory):
                 sandbox=True,
             )
             gengo.getAccountStats()
+
             return (True, gengo)
         except Exception, e:
             return (False, _("Gengo Connection Error\n%s") %e)
 
+    def do_check_schedular(self, cr, uid, xml_id, name, fn, context=None):
+        """
+        This function is used to reset a cron to its default values, or to recreate it if it was deleted.
+        """
+        cron_pool = self.pool.get('ir.cron')
+        cron_vals = DEFAULT_CRON_VALS.copy()
+        cron_vals.update({'name': name, "function": fn})
+        try:
+            res = []
+            model, res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base_gengo', xml_id)
+            cron_pool.write(cr, uid, [res], cron_vals, context=context)
+        except:
+            #the cron job was not found, probably deleted previously, so we create it again using default values
+            cron_vals.update({'numbercall': -1})
+            return cron_pool.create(cr, uid, cron_vals, context=context)
+
+    def act_update(self, cr, uid, ids, context=None):
+        '''
+        Function called by the wizard.
+        '''
+        if context == None:
+            context = {}
+
+        flag, gengo = self.gengo_authentication(cr, uid, context=context)
+        if not flag:
+            raise osv.except_osv(_('Gengo Authentication Error'), gengo)
+        for wizard in self.browse(cr, uid, ids, context=context):
+            supported_langs = self.pool.get('ir.translation')._get_all_supported_languages(cr, uid, context=context)
+            language = self.pool.get('ir.translation')._get_gengo_corresponding_language(wizard.lang_id.code)
+            if language not in supported_langs:
+                raise osv.except_osv(_("Warning"), _('This language is not supported by the  Gengo translation services.'))
+
+            #send immediately a new request for the selected language (if any)
+            ctx = context.copy()
+            ctx['gengo_language'] = wizard.lang_id.id
+            self._sync_request(cr, uid, limit=GENGO_DEFAULT_LIMIT, context=ctx)
+            #check the cron jobs and eventually restart/recreate them
+            if wizard.restart_send_job:
+                self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', _('Gengo Sync Translation (Request)'), '_sync_request', context=context)
+            if wizard.restart_fetch_job:
+                self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', _('Gengo Sync Translation (Response)'), '_sync_response', context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+    def _sync_response(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
+        """
+        This method will be called by cron services to get translations from
+        Gengo. It will read translated terms and comments from Gengo and will 
+        update respective ir.translation in openerp.
+        """
+        translation_pool = self.pool.get('ir.translation')
+        flag, gengo = self.gengo_authentication(cr, uid, context=context)
+        if not flag:
+            _logger.warning("%s", gengo)
+        else:
+            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', 'in', ('machine','standard','pro','ultra'))], limit=limit, context=context)
+            for term in translation_pool.browse(cr, uid, translation_id, context=context):
+                up_term = up_comment = 0
+                if term.job_id:
+                    vals={}
+                    job_response = gengo.getTranslationJob(id=term.job_id)
+                    if job_response['opstat'] != 'ok':
+                        _logger.warning("Invalid Response! Skipping translation Terms with `id` %s." % (term.job_id))
+                        continue
+                    if job_response['response']['job']['status'] == 'approved':
+                        vals.update({'state': 'translated',
+                            'value': job_response['response']['job']['body_tgt']})
+                        up_term += 1
+                    job_comment = gengo.getTranslationJobComments(id=term.job_id)
+                    if job_comment['opstat']=='ok':
+                        gengo_comments=""
+                        for comment in job_comment['response']['thread']:
+                            gengo_comments += _('%s\n\n--\n Commented on %s by %s.') % (comment['body'], time.ctime(comment['ctime']), comment['author'])
+                        vals.update({'gengo_comment': gengo_comments})
+                        up_comment += 1
+                    if vals:
+                        translation_pool.write(cr, uid, term.id, vals)
+                    _logger.info("Successfully Updated `%d` terms and %d Comments." % (up_term, up_comment ))
+                else:
+                    _logger.warning("%s", 'Cannot retrieve the Gengo job ID for translation %s: %s' % (term.id, term.src))
+        return True
+
+    def _update_terms(self, cr, uid, response, context=None):
+        """
+        Update the terms after their translation were requested to Gengo
+        """
+        translation_pool = self.pool.get('ir.translation')
+        for jobs in response['jobs']:
+            for t_id, res in jobs.items():
+                vals = {}
+                t_id = int(t_id)
+                tier = translation_pool.read(cr, uid, [t_id], ['gengo_translation'], context=context)[0]['gengo_translation']
+                if tier == "machine":
+                    vals.update({'value': res['body_tgt'], 'state': 'translated'})
+                else:
+                    vals.update({'job_id': res['job_id'], 'state': 'inprogress'})
+                translation_pool.write(cr, uid, [t_id], vals, context=context)
+        return
+
     def pack_jobs_request(self, cr, uid, term_ids, context=None):
         ''' prepare the terms that will be requested to gengo and returns them in a dictionary with following format
             {'jobs': {
@@ -108,173 +192,60 @@ class base_update_translation(osv.osv_memory):
         for term in translation_pool.browse(cr, uid, term_ids, context=context):
             if re.search(r"\w", term.src or ""):
                 jobs[term.id] = {'type': 'text',
-                        'slug': 'single::English to ' + LANG_CODE_MAPPING[term.lang][1],
-                        'tier': tools.ustr(user.company_id.gengo_tier),
-                        #'tier': tools.ustr(term.gengo_tier),
+                        'slug': 'single::English to ' + term.lang,
+                        'tier': tools.ustr(term.gengo_translation),
                         'body_src': term.src,
                         'lc_src': 'en',
-                        'lc_tgt': LANG_CODE_MAPPING[term.lang][0],
+                        'lc_tgt': translation_pool._get_gengo_corresponding_language(term.lang),
                         'auto_approve': auto_approve,
-                        'comment': gengo_parameter_pool.company_id.gengo_comment,
+                        'comment': user.company_id.gengo_comment,
                 }
         return {'jobs': jobs}
 
-    def check_lang_support(self, cr, uid, langs, context=None):
-        new_langs = []
-        flag, gengo = self.gengo_authentication(cr, uid, context)
-        if not flag:
-            return []
-        else:
-            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            tier = user.company_id.gengo_tier
-            if tier == "machine":
-                tier = "nonprofit"
-            lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
-            #print "tier", tier
-
-            if lang_pair['opstat'] == 'ok':
-                for g_lang in lang_pair['response']:
-                     #print 'g_lang', g_lang['lc_tgt'], g_lang['tier']
-                    for l in langs:
-                        if LANG_CODE_MAPPING[l][0] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
-                            new_langs.append(l)
-            return list(set(new_langs))
-
-    def _update_terms(self, cr, uid, response, tier, context=None):
-        translation_pool = self.pool.get('ir.translation')
-        for jobs in response['jobs']:
-            for t_id, res in jobs.items():
-                vals = {}
-                if tier == "machine":
-                    vals.update({'value': res['body_tgt'], 'state': 'translated'})
-                else:
-                    vals.update({'job_id': res['job_id'], 'state': 'inprogress'})
-                translation_pool.write(cr, uid, [t_id], vals, context=context)
-        return
 
     def _send_translation_terms(self, cr, uid,  term_ids, context=None):
         """
-        Lazy Polling will be perform when user or cron request for the translation.
+        Send a request to Gengo with all the term_ids in a different job, get the response and update the terms in
+        database accordingly.
         """
+
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        flag, gengo = self.gengo_authentication(cr, uid, context)
+        flag, gengo = self.gengo_authentication(cr, uid, context=context)
         if flag:
-            request = self.pack_jobs_request(cr, uid, term_ids, context)
+            request = self.pack_jobs_request(cr, uid, term_ids, context=context)
             if request['jobs']:
                 result = gengo.postTranslationJobs(jobs=request)
                 if result['opstat'] == 'ok':
-                    self._update_terms(cr, uid, result['response'], user.company_id.gengo_tier, context)
+                    self._update_terms(cr, uid, result['response'], context=context)
         else:
             _logger.error(gengo)
         return True
 
-    def do_check_schedular(self, cr, uid, xml_id, name, fn, context=None):
-        cron_pool = self.pool.get('ir.cron')
-        try:
-            res = []
-            model, res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base_gengo', xml_id)
-            cron_pool.write(cr, uid, [res], {'active': True}, context=context)
-        except:
-            #the cron job was not found, probably deleted previously, so we create it again using default values
-            CRON_VALS.update({'name': name, "function": fn})
-            return cron_pool.create(cr, uid, CRON_VALS, context)
-
-    def act_update(self, cr, uid, ids, context=None):
-        if context == None:
-            context = {}
-        lang_pool = self.pool.get('res.lang')
-        super(base_update_translation, self).act_update(cr, uid, ids, context)
-        msg = _("1. Translation file loaded successfully.\n2. Processing Gengo Translation:\n")
-        flag, gengo = self.gengo_authentication(cr, uid, context)
-        if not flag:
-            msg += gengo
-        else:
-            for res in self.browse(cr, uid, ids, context=context):
-                lang_id = lang_pool.search(cr, uid, [('code', '=', res.lang)])
-                lang_name = self._get_lang_name(cr, uid, res.lang)
-                try:
-                    if LANG_CODE_MAPPING[res.lang][0]:
-                        lang_search = lang_pool.search(cr, uid, [('gengo_sync', '=', True), ('id', '=', lang_id[0])])
-                    if lang_search:
-                        msg += _('  - This language `%s` is already in queue for translation.') % (lang_name)
-                    else:
-                        msg += _('  - The language `%s` is queued for translation through Gengo translation.') % (lang_name)
-                        lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
-                        _logger.info('Translation request for language `%s` has been queued successfully.', lang_name)
-                    self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', _('Gengo Sync Translation (Request)'), '_sync_request', context)
-                    self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', _('Gengo Sync Translation (Response)'), '_sync_response', context)
-                    self._sync_request(cr, uid, limit=GENGO_DEFAULT_LIMIT)
-                except:
-                    msg += _('  - The Language `%s` is not supported by Gengo Traditional Service.') % (lang_name)
-
-        obj_model = self.pool.get('ir.model.data')
-        model_data_ids = obj_model.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'update_translation_wizard_view_confirm')])
-        view_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        context.update({'message': msg})
-        return {
-                 'view_type': 'form',
-                 'view_mode': 'form',
-                 'res_model': 'gengo.update.message',
-                 'views': [(view_id, 'form')],
-                 'type': 'ir.actions.act_window',
-                 'target': 'new',
-                 'context': context,
-             }
-
-    def _sync_response(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
-        """
-        This method  will be call by cron services to get translation from
-        gengo for translation terms which are posted to be translated. It will
-        read translated terms and comments from gengo and will update respective
-        translation in openerp.
-        """
-        translation_pool = self.pool.get('ir.translation')
-        flag, gengo = self.gengo_authentication(cr, uid, context)
-        if not flag:
-            _logger.warning("%s", gengo)
-        else:
-            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=limit, context=context)
-            for term in translation_pool.browse(cr, uid, translation_id, context):
-                up_term = up_comment = 0
-                if term.job_id:
-                    vals={}
-                    job_response = gengo.getTranslationJob(id=term.job_id)
-                    if job_response['opstat'] != 'ok':
-                        _logger.warning("Invalid Response! Skipping translation Terms with `id` %s." % (term.job_id))
-                        continue
-                    if job_response['response']['job']['status'] == 'approved':
-                        vals.update({'state': 'translated',
-                            'value': job_response['response']['job']['body_tgt']})
-                        up_term += 1
-                    job_comment = gengo.getTranslationJobComments(id=term.job_id)
-                    if job_comment['opstat']=='ok':
-                        gengo_comments=""
-                        for comment in job_comment['response']['thread']:
-                            gengo_comments += _('%s Commented on %s by %s. \n') %(comment['body'], time.ctime(comment['ctime']), comment['author'])
-                        vals.update({'gengo_comment': gengo_comments})
-                        up_comment +=1
-                    if vals:
-                        translation_pool.write(cr, uid, term.id,vals)
-                    _logger.info("Successfully Updated `%d` terms and Comments for `%d` terms." % (up_term, up_comment ))
-        return True
-
     def _sync_request(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
-        """This scheduler will send a job request to the gengo , which terms are
-        waiing to be translated and for which gengo_translation is True"""
+        """
+        This scheduler will send a job request to the gengo , which terms are
+        waiing to be translated and for which gengo_translation is enabled. 
+
+        A special key 'gengo_language' can be passed in the context in order to 
+        request only translations of that language only. Its value is the language 
+        ID in openerp.
+        """
         if context is None:
             context = {}
         language_pool = self.pool.get('res.lang')
         translation_pool = self.pool.get('ir.translation')
         try:
-            lang_ids = language_pool.search(cr, uid, [('gengo_sync', '=', True)]) #really? what's the point not checking ALL the languages if gengo support it? i feel like it's aunecessary load for the user that must configure yet another thing
+            #by default, the request will be made for all terms that needs it, whatever the language
+            lang_ids = language_pool.search(cr, uid, [], context=context)
+            if context.get('gengo_language'):
+                #but if this specific key is given, then we restrict the request on terms of this language only
+                lang_ids = [context.get('gengo_language')]
             langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids, context=context)]
-            #print "LANGS 1", langs
-            langs = self.check_lang_support(cr, uid, langs, context=context)#must move
-            #print "LANGS 2", langs
-            term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=limit)
+            #search for the n first terms to translate
+            term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', 'in', ('machine','standard','pro','ultra')), ('lang', 'in', langs)], limit=limit, context=context)
             if term_ids:
-                self._send_translation_terms(cr, uid, term_ids, context)
-                _logger.info("Translation terms %s has been posted to gengo successfully", len(term_ids))
+                self._send_translation_terms(cr, uid, term_ids, context=context)
+                _logger.info("%s Translation terms have been posted to Gengo successfully", len(term_ids))
             else:
                 _logger.info('No Translation terms to process.')
         except Exception, e:
diff --git a/addons/base_gengo/wizard/base_gengo_translation_view.xml b/addons/base_gengo/wizard/base_gengo_translation_view.xml
new file mode 100644
index 00000000000..88ce7788d24
--- /dev/null
+++ b/addons/base_gengo/wizard/base_gengo_translation_view.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="base_gengo_translation_wizard_from">
+            <field name="name">base.gengo.translation.form</field>
+            <field name="model">base.gengo.translations</field>
+            <field name="arch" type="xml">
+                <form string="Gengo Request Form" version="7.0">
+                   <group col="4">
+                        <group>
+                            <field name="restart_send_job"/>
+                            <field name="restart_fetch_job"/>
+                        </group>
+                        <group>
+                            <field name="lang_id"/>
+                            <label colspan="2" string="Leave empty for requesting all the terms to Gengo that needs it, regardless of their language"/>
+                        </group>
+                    </group>
+                    <footer>
+                        <button name="act_update" string="Send" type="object" class="oe_highlight"/> 
+                        or 
+                        <button name="act_cancel" special="cancel" string="Cancel" type="object" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_wizard_base_gengo_translations" model="ir.actions.act_window">
+            <field name="name">Gengo: Manual Request of Translation</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.gengo.translations</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <menuitem action="action_wizard_base_gengo_translations" id="menu_action_wizard_base_gengo_translations" parent="base.menu_translation_app"/>
+
+    </data>
+</openerp>
diff --git a/addons/base_gengo/wizard/gengo_update_message.py b/addons/base_gengo/wizard/gengo_update_message.py
deleted file mode 100644
index 45d54ffc54b..00000000000
--- a/addons/base_gengo/wizard/gengo_update_message.py
+++ /dev/null
@@ -1,43 +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/>.
-#
-##############################################################################
-
-from osv import osv
-from osv import fields
-
-
-class gengo_update_message(osv.osv_memory):
-    """Update Message"""
-
-    _name = "gengo.update.message"
-    _description = "Update Message"
-    _columns = {
-        'name': fields.text('Message', readonly=True),
-    }
-
-    def default_get(self, cr, uid, fields, context=None):
-        if context == None:
-            context = {}
-        res = super(gengo_update_message, self).default_get(cr, uid, fields, context=context)
-        res.update({'name': context.get('message')})
-        return res
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 7e7ed8ce1859e7a36a70c22eec15296ee9b6d433 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 30 Aug 2012 18:15:31 +0200
Subject: [PATCH 149/288] [FIX] google_docs: do not declare self = this as a
 GLOBAL variable

bzr revid: qdp-launchpad@openerp.com-20120830161531-w0it8fda6a2j84vk
---
 addons/google_docs/static/src/js/gdocs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 8f41a9d7b21..694f5736c72 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -3,7 +3,7 @@ var _t = instance.web._t;
 
     instance.web.Sidebar = instance.web.Sidebar.extend({
         on_attachments_loaded: function(attachments) {
-            self = this
+            var self = this;
             self._super(attachments);
             // if attachment contains a google doc url do nothing
             // else display a button to create a google doc

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 150/288] [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 53049c846f47ad5ec6c283f00c1d092dab5ede60 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 30 Aug 2012 18:23:16 +0200
Subject: [PATCH 151/288] [IMP] base_gengo: commit finishing what did the
 previous one: removal of unused files and fields, fixing the cron job data,
 ...

bzr revid: qdp-launchpad@openerp.com-20120830162316-vglsn7lfuxr04772
---
 addons/base_gengo/__init__.py                 |  1 -
 addons/base_gengo/__openerp__.py              |  2 +-
 .../base_gengo/gengo_sync_schedular_data.xml  |  8 ++---
 addons/base_gengo/res_company.py              |  5 ---
 addons/base_gengo/res_company_view.xml        |  1 -
 addons/base_gengo/res_lang.py                 | 31 -------------------
 addons/base_gengo/res_lang_view.xml           | 16 ----------
 addons/base_gengo/wizard/__init__.py          |  2 +-
 ...nslation.py => base_gengo_translations.py} |  0
 ...w.xml => base_gengo_translations_view.xml} |  0
 10 files changed, 6 insertions(+), 60 deletions(-)
 delete mode 100644 addons/base_gengo/res_lang.py
 delete mode 100644 addons/base_gengo/res_lang_view.xml
 rename addons/base_gengo/wizard/{base_gengo_translation.py => base_gengo_translations.py} (100%)
 rename addons/base_gengo/wizard/{base_gengo_translation_view.xml => base_gengo_translations_view.xml} (100%)

diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
index b4fd54acd21..133fa90dc51 100644
--- a/addons/base_gengo/__init__.py
+++ b/addons/base_gengo/__init__.py
@@ -22,6 +22,5 @@
 import res_company
 import ir_translation
 import wizard
-import res_lang
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index d2e5893d166..b60d3db9682 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -34,7 +34,7 @@ Automated Translations through Gengo API
         'res_company_view.xml',
         'res_lang_view.xml',
 
-        'wizard/base_gengo_translation_view.xml',
+        'wizard/base_gengo_translations_view.xml',
            ],
     'demo_xml': [],
     'test': [],
diff --git a/addons/base_gengo/gengo_sync_schedular_data.xml b/addons/base_gengo/gengo_sync_schedular_data.xml
index 78d2c602ac5..bd52a9697d3 100644
--- a/addons/base_gengo/gengo_sync_schedular_data.xml
+++ b/addons/base_gengo/gengo_sync_schedular_data.xml
@@ -4,11 +4,11 @@
         <!--Scheduler sync Receive Request-->
         <record id="gengo_sync_receive_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Response)</field>
-            <field eval="False" name="active"/>
+            <field eval="True" name="active"/>
             <field name="interval_number">20</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
-            <field eval="'base.update.translations'" name="model"></field>
+            <field eval="'base.gengo.translations'" name="model"></field>
             <field eval="'_sync_response'" name="function"/>
             <field eval="'(20,)'" name="args"/>
         </record>
@@ -16,11 +16,11 @@
         <!--Scheduler Sync Send Request-->
         <record id="gengo_sync_send_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Request)</field>
-            <field eval="False" name="active"/>
+            <field eval="True" name="active"/>
             <field name="interval_number">20</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
-            <field eval="'base.update.translations'" name="model"></field>
+            <field eval="'base.gengo.translations'" name="model"></field>
             <field eval="'_sync_request'" name="function"/>
             <field eval="'(20,)'" name="args"/>
         </record>
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 610e46d05d2..22d7b343939 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -28,15 +28,10 @@ class res_company(osv.Model):
     _columns = {
            "gengo_private_key": fields.text("Gengo Private Key"),
            "gengo_public_key": fields.text("Gengo Public Key"),
-           "gengo_tier": fields.selection([('machine', 'Machine'),
-                                          ('standard', 'Standard'),
-                                          ('pro', 'Pro'),
-                                          ('ultra', 'Ultra')], "Tier Type", required=True),
            "gengo_comment": fields.text("Comments", help="This comment will be automatically be enclosed in each an every request sent to Gengo"),
            "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
     }
 
     _defaults = {
-        "gengo_tier": "machine",
         "gengo_auto_approve": True,
     }
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index fdc0c8833a6..0f99efc8ad0 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -18,7 +18,6 @@
                             </group>
                         </group>
                         <group col="4">
-                            <field name="gengo_tier" />
                             <field name="gengo_auto_approve"/>
                         </group>
                         <group string="Comments for Translator" col="1">
diff --git a/addons/base_gengo/res_lang.py b/addons/base_gengo/res_lang.py
deleted file mode 100644
index 43b867c4f76..00000000000
--- a/addons/base_gengo/res_lang.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Business Applications
-#    Copyright (C) 2004-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/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-
-class res_company(osv.Model):
-    _name = "res.lang"
-    _inherit = "res.lang"
-
-    _columns = {
-        'gengo_sync': fields.boolean('Gengo Auto Synchronize ?', help='If checked the language will be automatically synchronize translation periodically using gengo translation services.')
-    }
diff --git a/addons/base_gengo/res_lang_view.xml b/addons/base_gengo/res_lang_view.xml
deleted file mode 100644
index 38e6b995163..00000000000
--- a/addons/base_gengo/res_lang_view.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <!-- res.company form view -->
-        <record model="ir.ui.view" id="view_language_inherit_base_gengo_form">
-            <field name="name">res.lang.form.inherit</field>
-            <field name="inherit_id" ref="base.res_lang_form"/>
-            <field name="model">res.lang</field>
-            <field name="arch" type="xml">
-                <xpath expr="//sheet/group" position="inside">
-                    <field name="gengo_sync" />
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
index e3cd1565124..f5dd71be01c 100644
--- a/addons/base_gengo/wizard/__init__.py
+++ b/addons/base_gengo/wizard/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import base_gengo_translation
+import base_gengo_translations
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/base_gengo_translation.py b/addons/base_gengo/wizard/base_gengo_translations.py
similarity index 100%
rename from addons/base_gengo/wizard/base_gengo_translation.py
rename to addons/base_gengo/wizard/base_gengo_translations.py
diff --git a/addons/base_gengo/wizard/base_gengo_translation_view.xml b/addons/base_gengo/wizard/base_gengo_translations_view.xml
similarity index 100%
rename from addons/base_gengo/wizard/base_gengo_translation_view.xml
rename to addons/base_gengo/wizard/base_gengo_translations_view.xml

From 4639967d0ceb5db0ba1a12d89c7c46d1db012f63 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 31 Aug 2012 04:56:49 +0000
Subject: [PATCH 152/288] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120831045649-sm7os4ihiv8fv422
---
 addons/audittrail/i18n/zh_TW.po         | 138 ++--
 addons/base_setup/i18n/ru.po            |  20 +-
 addons/crm/i18n/ru.po                   |  75 +-
 addons/crm/i18n/zh_TW.po                |  10 +-
 addons/crm_claim/i18n/zh_TW.po          |  15 +-
 addons/crm_helpdesk/i18n/zh_TW.po       | 744 ++++++++++++++++++++
 addons/crm_partner_assign/i18n/zh_TW.po | 885 ++++++++++++++++++++++++
 addons/document/i18n/zh_TW.po           | 182 ++---
 addons/document_page/i18n/zh_TW.po      | 154 +++--
 addons/document_webdav/i18n/zh_TW.po    | 196 ++++++
 addons/edi/i18n/zh_TW.po                | 386 +++++++++++
 addons/email_template/i18n/zh_TW.po     | 711 +++++++++++++++++++
 addons/event/i18n/zh_TW.po              | 359 +++++-----
 addons/event_project/i18n/zh_TW.po      |   4 +-
 addons/procurement/i18n/ru.po           |  18 +-
 addons/product/i18n/ru.po               |  18 +-
 16 files changed, 3426 insertions(+), 489 deletions(-)
 create mode 100644 addons/crm_helpdesk/i18n/zh_TW.po
 create mode 100644 addons/crm_partner_assign/i18n/zh_TW.po
 create mode 100644 addons/document_webdav/i18n/zh_TW.po
 create mode 100644 addons/edi/i18n/zh_TW.po
 create mode 100644 addons/email_template/i18n/zh_TW.po

diff --git a/addons/audittrail/i18n/zh_TW.po b/addons/audittrail/i18n/zh_TW.po
index 293a2a1b117..9da7a569f75 100644
--- a/addons/audittrail/i18n/zh_TW.po
+++ b/addons/audittrail/i18n/zh_TW.po
@@ -7,31 +7,31 @@ 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:36+0000\n"
-"PO-Revision-Date: 2009-01-23 17:17+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-30 13:46+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.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 06:25+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
 #, python-format
 msgid "WARNING: audittrail is not part of the pool"
-msgstr ""
+msgstr "警告：稽核追蹤不屬於此池"
 
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
 msgid "Log"
-msgstr ""
+msgstr "日誌"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: selection:audittrail.rule,state:0
 msgid "Subscribed"
-msgstr ""
+msgstr "已訂閱"
 
 #. module: audittrail
 #: sql_constraint:audittrail.rule:0
@@ -39,330 +39,332 @@ msgid ""
 "There is already a rule defined on this object\n"
 " You cannot define another: please edit the existing one."
 msgstr ""
+"該對象已經定義了稽核規則。\n"
+"您不能再次定義，請直接編輯現有的稽核規則。"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Subscribed Rule"
-msgstr ""
+msgstr "已訂閱規則"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
 msgid "Audittrail Rule"
-msgstr ""
+msgstr "稽核追蹤規則"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_log_tree
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
 msgid "Audit Logs"
-msgstr ""
+msgstr "稽核日誌"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Group By..."
-msgstr ""
+msgstr "分類方式..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: field:audittrail.rule,state:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "訂閱(_S)"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: selection:audittrail.rule,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value:0
 msgid "Old Value"
-msgstr ""
+msgstr "舊值"
 
 #. module: audittrail
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_view_log
 msgid "View log"
-msgstr ""
+msgstr "查看日誌"
 
 #. module: audittrail
 #: help:audittrail.rule,log_read:0
 msgid ""
 "Select this if you want to keep track of read/open on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果你需要追蹤對該對象的任何記錄的讀和打開動作請選擇此項"
 
 #. module: audittrail
 #: field:audittrail.log,method:0
 msgid "Method"
-msgstr ""
+msgstr "方法"
 
 #. module: audittrail
 #: field:audittrail.view.log,from:0
 msgid "Log From"
-msgstr ""
+msgstr "日誌來源"
 
 #. module: audittrail
 #: field:audittrail.log.line,log:0
 msgid "Log ID"
-msgstr ""
+msgstr "日誌標識"
 
 #. module: audittrail
 #: field:audittrail.log,res_id:0
 msgid "Resource Id"
-msgstr ""
+msgstr "資源標識"
 
 #. module: audittrail
 #: help:audittrail.rule,user_id:0
 msgid "if  User is not added then it will applicable for all users"
-msgstr ""
+msgstr "如果未加入使用者則適用於所有使用者"
 
 #. module: audittrail
 #: help:audittrail.rule,log_workflow:0
 msgid ""
 "Select this if you want to keep track of workflow on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果您需要追蹤該對象所有記錄的工作流程請選擇此項"
 
 #. module: audittrail
 #: field:audittrail.rule,user_id:0
 msgid "Users"
-msgstr ""
+msgstr "使用者"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Log Lines"
-msgstr ""
+msgstr "日誌明細"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,object_id:0
 #: field:audittrail.rule,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "對象"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rule"
-msgstr ""
+msgstr "稽核追蹤規則"
 
 #. module: audittrail
 #: field:audittrail.view.log,to:0
 msgid "Log To"
-msgstr ""
+msgstr "記錄到"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value Text: "
-msgstr ""
+msgstr "新值內容： "
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Search Audittrail Rule"
-msgstr ""
+msgstr "搜索稽核追蹤規則"
 
 #. module: audittrail
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
 msgid "Audit Rules"
-msgstr ""
+msgstr "稽核規則"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value : "
-msgstr ""
+msgstr "舊值： "
 
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "資源名稱"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,timestamp:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: audittrail
 #: help:audittrail.rule,log_write:0
 msgid ""
 "Select this if you want to keep track of modification on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果您要追蹤此對象所有記錄的變更請選擇此項。"
 
 #. module: audittrail
 #: field:audittrail.rule,log_create:0
 msgid "Log Creates"
-msgstr ""
+msgstr "建立日誌"
 
 #. module: audittrail
 #: help:audittrail.rule,object_id:0
 msgid "Select object for which you want to generate log."
-msgstr ""
+msgstr "選擇您要生成稽核日誌的對象"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value Text : "
-msgstr ""
+msgstr "舊值內容： "
 
 #. module: audittrail
 #: field:audittrail.rule,log_workflow:0
 msgid "Log Workflow"
-msgstr ""
+msgstr "記錄工作流"
 
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
 msgid "Log Reads"
-msgstr ""
+msgstr "記錄讀操作"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:76
 #, python-format
 msgid "Change audittrail depends -- Setting rule as DRAFT"
-msgstr ""
+msgstr "修改檢查稽核依賴 - 設定規則為草稿"
 
 #. module: audittrail
 #: field:audittrail.log,line_ids:0
 msgid "Log lines"
-msgstr ""
+msgstr "日誌明細"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_id:0
 msgid "Fields"
-msgstr ""
+msgstr "欄位列表"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rules"
-msgstr ""
+msgstr "稽核追蹤規則"
 
 #. module: audittrail
 #: help:audittrail.rule,log_unlink:0
 msgid ""
 "Select this if you want to keep track of deletion on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果你要追蹤所有刪除這個對象記錄的操作請選擇此項"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,user_id:0
 msgid "User"
-msgstr ""
+msgstr "使用者"
 
 #. module: audittrail
 #: field:audittrail.rule,action_id:0
 msgid "Action ID"
-msgstr ""
+msgstr "動作ID"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Users (if User is not added then it will applicable for all users)"
-msgstr ""
+msgstr "使用者（如果沒有選擇使用者則適用於所有使用者）"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "UnSubscribe"
-msgstr ""
+msgstr "取消訂閱"
 
 #. module: audittrail
 #: field:audittrail.rule,log_unlink:0
 msgid "Log Deletes"
-msgstr ""
+msgstr "記錄刪除操作"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
 msgid "Field Description"
-msgstr ""
+msgstr "欄位說明"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Search Audittrail Log"
-msgstr ""
+msgstr "搜尋稽核追蹤日誌"
 
 #. module: audittrail
 #: field:audittrail.rule,log_write:0
 msgid "Log Writes"
-msgstr ""
+msgstr "記錄修改操作"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "Open Logs"
-msgstr ""
+msgstr "打開日誌"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value_text:0
 msgid "New value Text"
-msgstr ""
+msgstr "新值內容"
 
 #. module: audittrail
 #: field:audittrail.rule,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "規則名稱"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value:0
 msgid "New Value"
-msgstr ""
+msgstr "新值"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "AuditTrail Logs"
-msgstr ""
+msgstr "稽核追蹤日誌"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Draft  Rule"
-msgstr ""
+msgstr "草稿規則"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log
 msgid "Audittrail Log"
-msgstr ""
+msgstr "稽核追蹤日誌"
 
 #. module: audittrail
 #: help:audittrail.rule,log_action:0
 msgid ""
 "Select this if you want to keep track of actions on the object of this rule"
-msgstr ""
+msgstr "如果你要追蹤這個對象所有記錄執行的操作請選擇此項"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value : "
-msgstr ""
+msgstr "新值: "
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value_text:0
 msgid "Old value Text"
-msgstr ""
+msgstr "舊值內容"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_view_log
 msgid "View Log"
-msgstr ""
+msgstr "查看日誌"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log_line
 msgid "Log Line"
-msgstr ""
+msgstr "日誌明細"
 
 #. module: audittrail
 #: field:audittrail.rule,log_action:0
 msgid "Log Action"
-msgstr ""
+msgstr "記錄動作"
 
 #. module: audittrail
 #: help:audittrail.rule,log_create:0
 msgid ""
 "Select this if you want to keep track of creation on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果你想追蹤此對象所有記錄的建立請選擇此項"
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index ce9fde3914d..96bbd87b971 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/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 00:36+0000\n"
-"PO-Revision-Date: 2012-01-20 19:34+0000\n"
+"PO-Revision-Date: 2012-08-30 17:01+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 06:08+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -79,12 +79,12 @@ msgstr ""
 #. module: base_setup
 #: field:product.installer,customers:0
 msgid "Customers"
-msgstr ""
+msgstr "Заказчики"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Extended"
-msgstr ""
+msgstr "Расширенный"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -197,7 +197,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Client"
-msgstr ""
+msgstr "Клиент"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
@@ -207,7 +207,7 @@ msgstr ""
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
 msgid "Timezone"
-msgstr ""
+msgstr "Часовой пояс"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
@@ -224,6 +224,8 @@ msgstr ""
 msgid ""
 "Check out this box if you want to always display tips on each menu action"
 msgstr ""
+"Отметьте этот квадратик, если вы хотите всегда выводить советы для каждого "
+"пункта меню"
 
 #. module: base_setup
 #: field:base.setup.terminology,config_logo:0
@@ -261,7 +263,7 @@ msgstr ""
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Simplified"
-msgstr ""
+msgstr "Упрощенный"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_sugarcrm:0
@@ -271,7 +273,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Контрагент"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 6b1cc85b6e5..fab81c37340 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/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-08-06 11:58+0000\n"
+"PO-Revision-Date: 2012-08-30 17:52+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 06:06+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -320,7 +320,7 @@ msgstr "Перспективный партнер"
 #: code:addons/crm/crm_lead.py:735
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Без темы"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
@@ -535,7 +535,7 @@ msgstr "Эл. письмо"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phonecalls during last 7 days"
-msgstr ""
+msgstr "Звонки за последние 7 дней"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -626,7 +626,7 @@ msgstr "Встреча '%s' была подтверждена."
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "В процессе"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -720,7 +720,7 @@ msgstr "Вероятность (%)"
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Company Currency"
-msgstr ""
+msgstr "Валюта организации"
 
 #. module: crm
 #: view:crm.lead:0
@@ -763,7 +763,7 @@ msgstr "Остановить процесс"
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Месяц-1"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -778,7 +778,7 @@ msgstr "Продолжить"
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Period"
-msgstr ""
+msgstr "Дней в периоде"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -933,7 +933,7 @@ msgstr "Внимание!"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current year"
-msgstr ""
+msgstr "Звонки за текущий год"
 
 #. module: crm
 #: field:crm.lead,day_open:0
@@ -943,7 +943,7 @@ msgstr "Дней до открытия"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show Time as"
-msgstr ""
+msgstr "Показать время как"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -973,7 +973,7 @@ msgstr "Мои встречи"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Todays's Phonecalls"
-msgstr ""
+msgstr "Звонки за сегодня"
 
 #. module: crm
 #: view:board.board:0
@@ -1030,7 +1030,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Change Color"
-msgstr ""
+msgstr "Изменить цвет"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1180,7 +1180,7 @@ msgstr "Письмо партнеру"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Call Details"
-msgstr ""
+msgstr "Детали звонка"
 
 #. module: crm
 #: field:crm.meeting,class:0
@@ -1270,7 +1270,7 @@ msgstr "Продолжительность в минутах"
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
-msgstr ""
+msgstr "Название канала"
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0 field:crm.phonecall2opportunity,name:0
@@ -1321,7 +1321,7 @@ msgstr "Дата записи"
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of Recurrency"
-msgstr ""
+msgstr "Конец повторения"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1345,7 +1345,7 @@ msgstr "Установить сигнал на это время, перед с
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule a Call"
-msgstr ""
+msgstr "Назначить звонок"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
@@ -1433,7 +1433,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr ""
+msgstr "Дата звонка"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1549,7 +1549,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Mail"
-msgstr ""
+msgstr "Почта"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
@@ -1905,7 +1905,7 @@ msgstr "Преобразовать в предложение"
 #: model:ir.model,name:crm.model_crm_case_channel
 #: model:ir.ui.menu,name:crm.menu_crm_case_channel
 msgid "Channels"
-msgstr ""
+msgstr "Каналы"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
@@ -2181,7 +2181,7 @@ msgstr "Создать нового партнера"
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Scheduled Calls"
-msgstr ""
+msgstr "Запланированные звонки"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
@@ -2191,7 +2191,7 @@ msgstr "Дата начала"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Scheduled Phonecalls"
-msgstr ""
+msgstr "Запланированные звонки"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2201,7 +2201,7 @@ msgstr "Отклонить"
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Email пользователя"
 
 #. module: crm
 #: help:crm.lead,optin:0
@@ -2387,7 +2387,7 @@ msgstr "Прочее"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_crm
 msgid "Sales"
-msgstr ""
+msgstr "Продажи"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
@@ -2575,7 +2575,7 @@ msgstr "Проверка классификации"
 #. module: crm
 #: field:crm.lead,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "Логин пользователя"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2706,7 +2706,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,subjects:0
 msgid "Subject of Email"
-msgstr ""
+msgstr "Тема письма"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
@@ -2822,7 +2822,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Цветовая палитра"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3010,7 +3010,7 @@ msgstr "Создание предложений из кандидатов"
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM Dashboard"
-msgstr ""
+msgstr "Панель аналитики CRM"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
@@ -3095,7 +3095,7 @@ msgstr "Условие на историю общения"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Date of Call"
-msgstr ""
+msgstr "Дата звонка"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3398,7 +3398,7 @@ msgstr "Закрыть"
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "Запланировать звонок"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -3408,7 +3408,7 @@ msgstr "Категоризация"
 #. module: crm
 #: view:crm.lead:0
 msgid "Log Call"
-msgstr ""
+msgstr "Описать звонок"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
@@ -3438,7 +3438,7 @@ msgstr "Кому"
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -3470,7 +3470,7 @@ msgstr "Описание"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current month"
-msgstr ""
+msgstr "Звонки, сделанные в текущем месяце"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3565,7 +3565,7 @@ msgstr "Проиграно"
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit"
-msgstr ""
+msgstr "Изменить"
 
 #. module: crm
 #: field:crm.lead,country_id:0 view:crm.lead.report:0
@@ -3625,6 +3625,9 @@ msgid ""
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
 msgstr ""
+"Отлеживание источников появления кандидатов и предложений путём создания "
+"специализированных каналов, обслуживаемых при создании докумета в системе. "
+"Например, каналы могут быть такими: сайт, телефонный звонок, реселлер и т.д."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
@@ -3655,7 +3658,7 @@ msgstr "Последовательность"
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Мастер создания электронной почты"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3692,7 +3695,7 @@ msgstr "Год"
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
diff --git a/addons/crm/i18n/zh_TW.po b/addons/crm/i18n/zh_TW.po
index fe6c76a3ce7..a56875dfe82 100644
--- a/addons/crm/i18n/zh_TW.po
+++ b/addons/crm/i18n/zh_TW.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 01:37+0100\n"
-"PO-Revision-Date: 2012-08-30 02:54+0000\n"
-"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"PO-Revision-Date: 2012-08-30 10:41+0000\n"
+"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
 "Language-Team: Cenoq Corp.\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-30 05:12+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2307,7 +2307,7 @@ msgstr "動作"
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
 msgid "Decrease (0>1)"
-msgstr "下降因子(0.0>1.0)"
+msgstr "減少 (0>1)"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
diff --git a/addons/crm_claim/i18n/zh_TW.po b/addons/crm_claim/i18n/zh_TW.po
index d09ec398c20..1346638c87a 100644
--- a/addons/crm_claim/i18n/zh_TW.po
+++ b/addons/crm_claim/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-30 05:12+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -797,14 +797,3 @@ msgstr "建立日期"
 #: view:crm.claim:0
 msgid "In Progress Claims"
 msgstr "正在處理的抱怨"
-
-#~ msgid ""
-#~ "The state is set to 'Draft', when a case is created. \n"
-#~ "If the case is in progress the state is set to 'Open'. \n"
-#~ "When the case is over, the state is set to 'Done'. \n"
-#~ "If the case needs to be reviewed then the state is set to 'Pending'."
-#~ msgstr ""
-#~ "當一個業務建立時狀態設為'草稿'\n"
-#~ "如果業務正在處理狀態設為'開啟'\n"
-#~ "當業務結束狀態設為'完成'\n"
-#~ "如果業務需要審查狀態設為'待定'"
diff --git a/addons/crm_helpdesk/i18n/zh_TW.po b/addons/crm_helpdesk/i18n/zh_TW.po
new file mode 100644
index 00000000000..6cddf9bd735
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/zh_TW.po
@@ -0,0 +1,744 @@
+# Chinese (Traditional) 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-08-30 10:12+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\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-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr "延遲關閉"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "# 業務量"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "分類方式..."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "今日"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current year"
+msgstr "本年發生的服務需求"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr "視察者的電子郵件"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "加入內部備註"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Date of helpdesk requests"
+msgstr "客服需求日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "備註"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "訊息"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My company"
+msgstr "我的公司"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr "客服分析"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "結束日期"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "關聯"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "下一動作"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr "客服協助"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr "額外資訊"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr "估計"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr "劃分"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in last month"
+msgstr "上個月發生的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr "發送新的電子郵件"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk requests during last 7 days"
+msgstr "之前7天內的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+msgid "New"
+msgstr "新建"
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr "客服售後服務報表"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr "電子郵件"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,channel_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,channel_id:0
+msgid "Channel"
+msgstr "管道"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr "郵件"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "My Sales Team(s)"
+msgstr "我的銷售團隊"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr "建立日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr "重設為草稿"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr "待處理"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr "客服分類"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "New Helpdesk Request"
+msgstr "新的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr "日誌資訊"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month of helpdesk requests"
+msgstr "客服需求月份"
+
+#. module: crm_helpdesk
+#: code:addons/crm_helpdesk/crm_helpdesk.py:101
+#, python-format
+msgid "No Subject"
+msgstr "無主題"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr "客服"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "All pending Helpdesk Request"
+msgstr "所有暫停的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Year of helpdesk requests"
+msgstr "服務需求的年份"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr "關聯"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr "溝通"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr "月份"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr "更新日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current month"
+msgstr "當月發生的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr "業務員"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr "關聯2"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Responsible User"
+msgstr "負責使用者"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr "客服協助"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "計劃成本"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,channel_id:0
+msgid "Communication channel."
+msgstr "通訊管道"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr "這些郵件地址將加入到之前發送記錄的發送和接收郵件的郵件副本欄位，分隔多個郵件地址有逗號。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr "搜索客服"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "已結束"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr "回覆"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr "7天"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr "溝通&日誌"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr "完整副本"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "計劃收入"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr "生效"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr "增加篩選條件"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr "客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr "搜索"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr "這些人將收到電子郵件。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr "日誌"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr "優先級"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr "業務夥伴聯絡人"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr "雜項"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr "一般"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr "傳送提醒"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                                 Define "
+"Responsible user and Email account for mail gateway."
+msgstr "屬於此種情況下，銷售團隊。定義負責用戶和電子郵件帳戶的郵件網關。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr "完成"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr "結束"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr "開啟"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr "客服協助來源"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr "客服"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr "負責人"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超過截止日期"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr "說明"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr "概率(%)"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr "電子郵件"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr "為所有的支持請求排序指定具體標準如：處理時間，請求回覆的次數，發送的郵件，成本."
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"當一個業務建立時狀態設為'草稿'\n"
+"如果業務正在處理狀態設為'開啟'\n"
+"當業務結束狀態設為'完成'\n"
+"如果業務需要審查狀態設為'待處理'"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month-1"
+msgstr "上月"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr "客服和協助"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr "我的業務"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr "提問"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support requests."
+msgstr "建立和管理客服類型去更好管理和分類你的需求協助"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Todays's Helpdesk Requests"
+msgstr "今天的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Request Date"
+msgstr "需求日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Open Helpdesk Request"
+msgstr "打開客服需求"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr "銷售團隊"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr "最近動作"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"Helpdesk and Support allow you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary. "
+"You can also assign a priority level. Use the OpenERP Issues system to "
+"manage your support activities. Issues can be connected to the email "
+"gateway: new emails may create issues, each of them automatically gets the "
+"history of the conversation with the customer."
+msgstr ""
+"客服和協助使你可以去追蹤.如果需要選擇一個客戶增加備註和類型這業務夥伴.你可以分配一優先級用系統問題模塊來管理的的支持活動.問題能鏈接郵件閘道.新的郵件可"
+"能建立新的問題,它們能自動寫入於客戶溝通的日誌."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr "持續時間"
diff --git a/addons/crm_partner_assign/i18n/zh_TW.po b/addons/crm_partner_assign/i18n/zh_TW.po
new file mode 100644
index 00000000000..3c77816d71b
--- /dev/null
+++ b/addons/crm_partner_assign/i18n/zh_TW.po
@@ -0,0 +1,885 @@
+# Chinese (Traditional) 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-08-30 10:14+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.MIME-Version: 1.0\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-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,send_to:0
+msgid "Send to"
+msgstr "傳送給"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subtype:0
+msgid "Message type"
+msgstr "訊息類型"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "電子郵件發送後永久刪除"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_close:0
+msgid "Delay to Close"
+msgstr "延遲關閉"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_to:0
+msgid "Message recipients"
+msgstr "收件人"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "計劃收入"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,nbr:0
+msgid "# of Cases"
+msgstr "# 業務量"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Group By..."
+msgstr "分組..."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,template_id:0
+msgid "Template"
+msgstr "範本"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Forward"
+msgstr "轉寄"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr "Geo 定位"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,body_text:0
+msgid "Plain-text version of the message"
+msgstr "內容的純文字版本"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Body"
+msgstr "內文"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Lead"
+msgstr "潛在客戶"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to close"
+msgstr "延遲關閉"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "#Partner"
+msgstr "#Partner"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Whole Story"
+msgstr "完整的情況"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#, python-format
+msgid ""
+"Could not contact geolocation servers, please make sure you have a working "
+"internet connection (%s)"
+msgstr "無法連接到服務器，請確保你的連線(%s) 正常。"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_assign:0
+msgid "Partner Date"
+msgstr "業務夥伴日期"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body_text:0
+msgid "Text contents"
+msgstr "文本內容"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,message_id:0
+msgid "Message unique identifier"
+msgstr "訊息唯一編號"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Latest email"
+msgstr "最近的郵件"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr "Geo 緯度"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr "在這裡加入你在郵件裡要加入現有的單據附件。"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr "Geo 指派的"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_closed:0
+msgid "Close Date"
+msgstr "結束日期"
+
+#. module: crm_partner_assign
+#: help:res.partner,partner_weight:0
+msgid ""
+"Gives the probability to assign a lead to this partner. (0 means no "
+"assignation.)"
+msgstr "為潛在客戶指定一個業務夥伴的概率（表示沒指派）"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr "內容的富文本/HTML版本"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,auto_delete:0
+msgid "Auto Delete"
+msgstr "自動刪除"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr "密件副本收件人"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,partner_id:0
+#: selection:crm.lead.forward.to.partner,send_to:0
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_assigned_id:0
+#: model:ir.model,name:crm_partner_assign.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability:0
+msgid "Avg Probability"
+msgstr "平均概率"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Previous"
+msgstr "前一個"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#, python-format
+msgid "Network error"
+msgstr "網絡錯誤"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_from:0
+msgid "From"
+msgstr "來自"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#: field:res.partner,grade_id:0
+#: view:res.partner.grade:0
+msgid "Partner Grade"
+msgstr "業務夥伴級別"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Section"
+msgstr "劃分"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send"
+msgstr "發送"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Next"
+msgstr "下一個"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,priority:0
+msgid "Priority"
+msgstr "優先級"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超過截止日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,type:0
+msgid "Type"
+msgstr "類型"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr "內容類型，一般是“html”或“純文本”，用於對應地選擇純文本或富文本"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Assign Date"
+msgstr "分配日期"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Leads Analysis"
+msgstr "潛在客戶分析"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,creation_date:0
+msgid "Creation Date"
+msgstr "建立日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,res_id:0
+msgid "Related Document ID"
+msgstr "相關單據編號"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "7 Days"
+msgstr "7天"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Partner Assignation"
+msgstr "指定業務夥伴"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "類型用於區分線索和商機"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,stage_id:0
+msgid "Stage"
+msgstr "階段"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,model:0
+msgid "Related Document model"
+msgstr "相關單據模組"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
+#, python-format
+msgid "Fwd"
+msgstr "轉發"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr "Geo 定位"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Opportunities Assignment Analysis"
+msgstr "商機指定分析"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,history:0
+msgid "Send history"
+msgstr "發送日誌"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Contact"
+msgstr "聯絡人"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: view:res.partner:0
+msgid "Close"
+msgstr "結束"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,use_template:0
+msgid "Use Template"
+msgstr "使用者範本"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+msgid "Opp. Assignment Analysis"
+msgstr "商機指定分析"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "到期天數"
+
+#. module: crm_partner_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr "重要性"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to open"
+msgstr "延遲開啟"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,grade_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,grade_id:0
+msgid "Grade"
+msgstr "級別"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,opening_date:0
+msgid "Opening Date"
+msgstr "開啟日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subject:0
+msgid "Subject"
+msgstr "主題"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Salesman"
+msgstr "業務員"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "#Opportunities"
+msgstr "#商機"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Team"
+msgstr "團隊"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Referred Partner"
+msgstr "推薦的業務夥伴"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Closed"
+msgstr "已結束"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+msgid "Mass forward to partner"
+msgstr "批量轉發給業務夥伴"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+#: field:res.partner,opportunity_assigned_ids:0
+msgid "Assigned Opportunities"
+msgstr "轉為商機"
+
+#. module: crm_partner_assign
+#: field:crm.lead,date_assign:0
+msgid "Assignation Date"
+msgstr "指定日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability_max:0
+msgid "Max Probability"
+msgstr "最大可能"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_open:0
+msgid "Number of Days to open the case"
+msgstr "業務開啟的天數"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_open:0
+msgid "Delay to Open"
+msgstr "延遲開啟"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,send_to:0
+#: field:crm.lead.forward.to.partner,user_id:0
+#: field:crm.lead.report.assign,user_id:0
+#: field:crm.partner.report.assign,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,active:0
+msgid "Active"
+msgstr "生效"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Extended Filters..."
+msgstr "增加篩選條件"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr "Geo 經度"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,opp:0
+msgid "# of Opportunity"
+msgstr "商機編號"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Lead Assign"
+msgstr "潛在客戶指定"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Assignation"
+msgstr "指定"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_partner_assign
+#: help:crm.lead,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr "這業務的業務夥伴已提出/已指定"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body_html:0
+msgid "Rich-text contents"
+msgstr "Rich-text內容"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Planned Revenues"
+msgstr "已計劃收入"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+msgid "res.partner.grade"
+msgstr "res.partner.grade"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,message_id:0
+msgid "Message-Id"
+msgstr "訊息-Id"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: field:crm.lead.forward.to.partner,attachment_ids:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_cc:0
+msgid "Cc"
+msgstr "副本收件人"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,references:0
+msgid "References"
+msgstr "關聯"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Last 30 Days"
+msgstr "最近30天"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,name:0
+msgid "Grade Name"
+msgstr "級別名稱"
+
+#. module: crm_partner_assign
+#: help:crm.lead,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr "這業務指定/轉發的業務夥伴的最後期限"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+#: view:res.partner:0
+msgid "Open"
+msgstr "開啟"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr "郵件副本收件人"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr "完整的郵件標題，例如僅SMTP會話頭（通常可在入站消息)"
+
+#. module: crm_partner_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr "Geo 定位的日期"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Current"
+msgstr "當前的"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_to:0
+msgid "To"
+msgstr "給"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr "郵件發件人，​​來自使用者的個人設置。如果為空，不發郵件而是發內部消息。"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,nbr:0
+msgid "# of Partner"
+msgstr "# of Partner"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+msgid "Forward to Partner"
+msgstr "轉發給業務夥伴"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,name:0
+msgid "Partner name"
+msgstr "上級名稱"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probable_revenue:0
+msgid "Probable Revenue"
+msgstr "預計收入"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply-To"
+msgstr "回覆給"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr "指定的業務夥伴"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,address_id:0
+msgid "Address"
+msgstr "地址"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr "商機"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send Mail"
+msgstr "發送郵件"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,partner_id:0
+msgid "Customer"
+msgstr "客戶"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,send_to:0
+msgid "Email Address"
+msgstr "電子郵件地址"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,country_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,country_id:0
+msgid "Country"
+msgstr "國家"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,headers:0
+msgid "Message headers"
+msgstr "郵件頭"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "轉換為商機"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_bcc:0
+msgid "Bcc"
+msgstr "密件副本"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr "指定geolocalization"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+msgid "Partnership Analysis"
+msgstr "業務夥伴分析"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Pending"
+msgstr "待處理"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Partner assigned Analysis"
+msgstr "業務夥伴分配分析"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr "客戶關係管理 線索報表"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr "郵件引用，例如前一個郵件的ID"
+
+#. module: crm_partner_assign
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤，您不能建立循環引用的會員用戶"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Case Information"
+msgstr "業務資訊"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+msgid "CRM Partner Report"
+msgstr "CRM業務夥伴報表"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "Email composition wizard"
+msgstr "電子郵件成分嚮導"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,section_id:0
+#: field:crm.partner.report.assign,section_id:0
+msgid "Sales Team"
+msgstr "銷售團隊"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,create_date:0
+msgid "Create Date"
+msgstr "建立日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,filter_id:0
+msgid "Filters"
+msgstr "篩選"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,reply_to:0
+msgid "Preferred response address for the message"
+msgstr "本郵件推薦的回覆地址"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "郵件協同作業"
diff --git a/addons/document/i18n/zh_TW.po b/addons/document/i18n/zh_TW.po
index b49d418b9c6..84e7f3c7cfa 100644
--- a/addons/document/i18n/zh_TW.po
+++ b/addons/document/i18n/zh_TW.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:36+0000\n"
-"PO-Revision-Date: 2011-01-28 03:53+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2012-08-30 11:51+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\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:28+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -35,7 +35,7 @@ msgstr "名稱欄位"
 #. module: document
 #: view:board.board:0
 msgid "Document board"
-msgstr ""
+msgstr "文件佈告欄"
 
 #. module: document
 #: model:ir.model,name:document.model_process_node
@@ -58,7 +58,7 @@ msgstr "用作資源目錄名稱之欄位。如留空，會用該「名稱」。
 #: view:document.directory:0
 #: view:document.storage:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
@@ -79,7 +79,7 @@ msgstr "檔案"
 #. module: document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr ""
+msgstr "當月文件"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -90,12 +90,12 @@ msgstr "三月"
 #. module: document
 #: view:document.configuration:0
 msgid "title"
-msgstr ""
+msgstr "抬頭"
 
 #. module: document
 #: field:document.directory.dctx,expr:0
 msgid "Expression"
-msgstr "表達式"
+msgstr "表達方式"
 
 #. module: document
 #: view:document.directory:0
@@ -111,7 +111,7 @@ msgstr "目錄內容"
 #. module: document
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr ""
+msgstr "動態背景"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -125,11 +125,14 @@ msgid ""
 "You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
 "to the current record, in dynamic folders"
 msgstr ""
+"A python expression used to evaluate the field.\n"
+"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
+"to the current record, in dynamic folders"
 
 #. module: document
 #: view:report.document.user:0
 msgid "This Year"
-msgstr "本年"
+msgstr "今年"
 
 #. module: document
 #: field:document.storage,path:0
@@ -146,7 +149,7 @@ msgstr "目錄名不能重覆！"
 #. module: document
 #: view:ir.attachment:0
 msgid "Filter on my documents"
-msgstr ""
+msgstr "過濾我的文件"
 
 #. module: document
 #: field:ir.attachment,index_content:0
@@ -158,12 +161,12 @@ msgstr "已索引內容"
 msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
-msgstr ""
+msgstr "如果正確，所有符合資源的附件會被發現。如果錯誤，只有符合資源的附件會被歸屬。"
 
 #. module: document
 #: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config
 msgid "Knowledge Management"
-msgstr ""
+msgstr "知識管理"
 
 #. module: document
 #: view:document.directory:0
@@ -175,7 +178,7 @@ msgstr "目錄"
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
 msgid "Files details by Users"
-msgstr "各用戶檔案詳情"
+msgstr "各使用者檔案詳情"
 
 #. module: document
 #: code:addons/document/document_storage.py:573
@@ -187,17 +190,17 @@ msgstr "錯誤！"
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
-msgstr ""
+msgstr "尋找所有資源"
 
 #. module: document
 #: selection:document.directory,type:0
 msgid "Folders per resource"
-msgstr ""
+msgstr "按資源歸類檔案夾"
 
 #. module: document
 #: field:document.directory.content,suffix:0
 msgid "Suffix"
-msgstr "後綴"
+msgstr "字尾"
 
 #. module: document
 #: field:report.document.user,change_date:0
@@ -207,7 +210,7 @@ msgstr "修改日期"
 #. module: document
 #: view:document.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "文管設定"
 
 #. module: document
 #: view:ir.attachment:0
@@ -219,7 +222,7 @@ msgstr "伙伴"
 #. module: document
 #: view:board.board:0
 msgid "Files by Users"
-msgstr "各用戶檔案"
+msgstr "使用者檔案"
 
 #. module: document
 #: field:process.node,directory_id:0
@@ -239,7 +242,7 @@ msgstr "檢驗錯誤"
 #. module: document
 #: model:ir.model,name:document.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.actions.report.xml"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_file_form
@@ -252,13 +255,13 @@ msgstr "文件"
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "錯誤! 您不可以建立循環目錄。"
 
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,storage_id:0
 msgid "Storage"
-msgstr ""
+msgstr "存儲器"
 
 #. module: document
 #: field:document.directory,ressource_type_id:0
@@ -292,28 +295,28 @@ msgstr "類型"
 msgid ""
 "Select an object here and there will be one folder per record of that "
 "resource."
-msgstr ""
+msgstr "在這裡選擇一個目標，這個資源將會是一筆記錄一個檔案夾"
 
 #. module: document
 #: help:document.directory,domain:0
 msgid ""
 "Use a domain if you want to apply an automatic filter on visible resources."
-msgstr ""
+msgstr "請使用一個領域，如果您要將可見的資源自動過濾。"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_partner
 msgid "Files Per Partner"
-msgstr ""
+msgstr "夥伴文件"
 
 #. module: document
 #: field:document.directory,dctx_ids:0
 msgid "Context fields"
-msgstr "脈絡欄位"
+msgstr "內文欄位"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr ""
+msgstr "儲存名稱"
 
 #. module: document
 #: view:document.directory:0
@@ -336,7 +339,7 @@ msgstr "七月"
 #: model:ir.actions.act_window,name:document.open_board_document_manager
 #: model:ir.ui.menu,name:document.menu_reports_document_manager
 msgid "Document Dashboard"
-msgstr "文件儀錶板"
+msgstr "文件控制台"
 
 #. module: document
 #: field:document.directory.content.type,code:0
@@ -346,7 +349,7 @@ msgstr "延伸檔案"
 #. module: document
 #: view:ir.attachment:0
 msgid "Created"
-msgstr ""
+msgstr "已建立"
 
 #. module: document
 #: field:document.directory,content_ids:0
@@ -356,25 +359,25 @@ msgstr "虛擬檔案"
 #. module: document
 #: view:ir.attachment:0
 msgid "Modified"
-msgstr ""
+msgstr "已修改"
 
 #. module: document
 #: code:addons/document/document_storage.py:639
 #, python-format
 msgid "Error at doc write!"
-msgstr ""
+msgstr "文件書寫錯誤!"
 
 #. module: document
 #: view:document.directory:0
 msgid "Generated Files"
-msgstr ""
+msgstr "已產生檔案"
 
 #. module: document
 #: view:document.configuration:0
 msgid ""
 "When executing this wizard, it will configure your directories automatically "
 "according to modules installed."
-msgstr ""
+msgstr "執行這個精靈，它會根據已安裝的模組自動組態您的目錄。"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -397,7 +400,7 @@ msgstr "安全"
 #: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
-msgstr "最後修改用戶"
+msgstr "最後修改使用者"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.act_res_partner_document
@@ -425,7 +428,7 @@ msgstr "各目錄檔案詳情"
 #. module: document
 #: view:report.document.user:0
 msgid "All users files"
-msgstr "所有用戶檔案"
+msgstr "所有使用者檔案"
 
 #. module: document
 #: view:board.board:0
@@ -453,18 +456,18 @@ msgstr "靜態目錄"
 #. module: document
 #: field:document.directory,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "子目錄"
 
 #. module: document
 #: view:document.directory:0
 msgid "Define words in the context, for all child directories and files"
-msgstr ""
+msgstr "在內文中定義所有的子目錄及檔案"
 
 #. module: document
 #: help:document.storage,online:0
 msgid ""
 "If not checked, media is currently offline and its contents not available"
-msgstr ""
+msgstr "如果未檢查，媒體已離線且其內容也無法使用。"
 
 #. module: document
 #: view:document.directory:0
@@ -475,7 +478,7 @@ msgstr ""
 #: field:report.document.user,user_id:0
 #: field:report.document.wall,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "擁有人"
 
 #. module: document
 #: view:document.directory:0
@@ -492,7 +495,7 @@ msgstr "內容"
 #: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "產生的日期"
 
 #. module: document
 #: help:document.directory.content,include_name:0
@@ -501,12 +504,14 @@ msgid ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 msgstr ""
+"如果您要檔案名稱包含記錄名稱，請檢查這個欄位。\n"
+"如果設定, 這個目錄將會是第一個資源"
 
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Configure Directories"
-msgstr ""
+msgstr "目錄組態"
 
 #. module: document
 #: field:document.directory.content,include_name:0
@@ -521,26 +526,26 @@ msgstr "附件"
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
 msgid "Model Id"
-msgstr ""
+msgstr "模型 Id"
 
 #. module: document
 #: field:document.storage,online:0
 msgid "Online"
-msgstr ""
+msgstr "在線上"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
-msgstr ""
+msgstr "檢查這個項目，如果您要在系統中使用相同的樹狀結構當作選擇的目標。"
 
 #. module: document
 #: help:document.directory,ressource_id:0
 msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
-msgstr ""
+msgstr "隨著母模型，這個ID在這個檔案夾附屬在母模型的特定記錄上。"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -551,7 +556,7 @@ msgstr "八月"
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "目錄不能作自己的母目錄!"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -563,7 +568,7 @@ msgstr "六月"
 #: field:report.document.user,user:0
 #: field:report.document.wall,user:0
 msgid "User"
-msgstr "用戶"
+msgstr "使用者"
 
 #. module: document
 #: field:document.directory,group_ids:0
@@ -574,7 +579,7 @@ msgstr "群組"
 #. module: document
 #: field:document.directory.content.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "啟用"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -596,6 +601,8 @@ msgid ""
 "record, just like attachments. Don't put a parent directory if you select a "
 "parent model."
 msgstr ""
+"如果您在這裡放置一個目標，這個目錄範本將會出現下列所有目標。這種目錄是 \"附件\" "
+"於特定的模型或記錄，就像附屬文件。如果您選擇一個母模型，就不要放置母目錄。"
 
 #. module: document
 #: view:document.directory:0
@@ -611,7 +618,7 @@ msgstr "十月"
 #. module: document
 #: view:document.directory:0
 msgid "Seq."
-msgstr ""
+msgstr "Seq."
 
 #. module: document
 #: selection:document.storage,type:0
@@ -637,12 +644,12 @@ msgstr ""
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Dashboard"
-msgstr "儀錶板"
+msgstr "控制台"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
 msgid "Files By Users"
-msgstr "各用戶檔案"
+msgstr "各使用者檔案"
 
 #. module: document
 #: field:document.storage,readonly:0
@@ -652,7 +659,7 @@ msgstr "唯讀"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 msgid "Document Directory"
-msgstr ""
+msgstr "文件目錄"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -663,12 +670,12 @@ msgstr "目錄名不能重覆！"
 #: field:document.directory,create_uid:0
 #: field:document.storage,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "建置者"
 
 #. module: document
 #: field:document.directory.content,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "順序"
 
 #. module: document
 #: view:document.configuration:0
@@ -678,6 +685,8 @@ msgid ""
 "attached to the document, or to print and download any report. This tool "
 "will create directories automatically according to modules installed."
 msgstr ""
+"OpenERP's "
+"文件管理系統支援虛擬檔案夾與文件配對。文件的虛擬檔案夾可以用來管理文件的附件，或列印及下載任何報表。這個工具會根據安裝的模組自動產生目錄。"
 
 #. module: document
 #: view:board.board:0
@@ -695,7 +704,7 @@ msgstr "九月"
 #. module: document
 #: field:document.directory.content,prefix:0
 msgid "Prefix"
-msgstr "前綴"
+msgstr "字尾"
 
 #. module: document
 #: field:report.document.wall,last:0
@@ -710,7 +719,7 @@ msgstr "檔案名稱"
 #. module: document
 #: view:document.configuration:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: document
 #: field:document.directory,ressource_id:0
@@ -720,19 +729,19 @@ msgstr "資源ID"
 #. module: document
 #: selection:document.storage,type:0
 msgid "External file storage"
-msgstr ""
+msgstr "外部檔案儲存"
 
 #. module: document
 #: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_wall
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr ""
+msgstr "排行榜"
 
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "關於檔案儲存，儲存的根路徑"
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
@@ -747,17 +756,17 @@ msgstr "欄位"
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
 msgid "Directory Dynamic Context"
-msgstr ""
+msgstr "目錄動態內文"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr ""
+msgstr "母模型"
 
 #. module: document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr "各用戶檔案"
+msgstr "各使用者檔案"
 
 #. module: document
 #: field:report.document.file,month:0
@@ -771,12 +780,12 @@ msgstr "月"
 #. module: document
 #: view:report.document.user:0
 msgid "This Months Files"
-msgstr ""
+msgstr "當月檔案"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reporting
 msgid "Reporting"
-msgstr "報告"
+msgstr "報表"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -792,29 +801,29 @@ msgstr "五月"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
 msgid "All Users files"
-msgstr "所有用戶檔案"
+msgstr "所有使用者檔案"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr ""
+msgstr "使用者已經一個月未插入文件"
 
 #. module: document
 #: model:ir.actions.act_window,help:document.action_document_file_form
 msgid ""
 "The Documents repository gives you access to all attachments, such as mails, "
 "project documents, invoices etc."
-msgstr ""
+msgstr "文件儲存室讓您可以存取所有附件，如電郵、專案文件、商業發票等"
 
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
-msgstr ""
+msgstr "對於每一輸入，虛擬檔案在檔案夾中出現"
 
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: document
 #: view:board.board:0
@@ -834,7 +843,7 @@ msgstr "各伙伴檔案"
 #. module: document
 #: view:ir.attachment:0
 msgid "Indexed Content - experimental"
-msgstr ""
+msgstr "已索引內容 - 實驗性質"
 
 #. module: document
 #: view:report.document.user:0
@@ -844,12 +853,12 @@ msgstr "本月"
 #. module: document
 #: view:ir.attachment:0
 msgid "Notes"
-msgstr "注解"
+msgstr "備註"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
-msgstr ""
+msgstr "目錄組態"
 
 #. module: document
 #: help:document.directory,type:0
@@ -860,6 +869,8 @@ msgid ""
 "resources automatically possess sub-directories for each of resource types "
 "defined in the parent directory."
 msgstr ""
+"每一個目錄可以是靜態或連接於另一個資源。一個靜態的目錄與其作業系統，是一個典型的目錄可以包含一組檔案。這個目錄連接於系統資源，在母目錄中按資源別自動持有次"
+"目錄。"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -871,14 +882,14 @@ msgstr "二月"
 #: model:ir.actions.act_window,name:document.open_board_document_manager1
 #: model:ir.ui.menu,name:document.menu_reports_document_manager1
 msgid "Statistics by User"
-msgstr "各用戶統計"
+msgstr "各使用者統計"
 
 #. module: document
 #: help:document.directory.dctx,field:0
 msgid ""
 "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
 "what is typed here."
-msgstr ""
+msgstr "這個欄位名稱的字首包含\"dctx_\" 將會根據這裡的輸入預先決定。"
 
 #. module: document
 #: field:document.directory,name:0
@@ -889,7 +900,7 @@ msgstr "名稱"
 #. module: document
 #: sql_constraint:document.storage:0
 msgid "The storage path must be unique!"
-msgstr ""
+msgstr "儲存路徑不能重複!"
 
 #. module: document
 #: view:document.directory:0
@@ -899,7 +910,7 @@ msgstr "欄位"
 #. module: document
 #: help:document.storage,readonly:0
 msgid "If set, media is for reading only"
-msgstr ""
+msgstr "如果設定，媒體只能唯讀。"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -918,21 +929,21 @@ msgstr "檔案數"
 #: code:addons/document/document.py:209
 #, python-format
 msgid "(copy)"
-msgstr ""
+msgstr "(copy)"
 
 #. module: document
 #: view:document.directory:0
 msgid ""
 "Only members of these groups will have access to this directory and its "
 "files."
-msgstr ""
+msgstr "只有這個群組中的數字，才能存取這個目錄及其檔案。"
 
 #. module: document
 #: view:document.directory:0
 msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
-msgstr ""
+msgstr "雖然這些模組沒有子目錄，但是還是要定義它們自己的群組。"
 
 #. module: document
 #: field:document.directory.content.type,mimetype:0
@@ -942,7 +953,7 @@ msgstr "Mime 類型"
 #. module: document
 #: view:report.document.user:0
 msgid "All Months Files"
-msgstr ""
+msgstr "所有月份文件"
 
 #. module: document
 #: field:document.directory.content,name:0
@@ -959,12 +970,12 @@ msgstr "檔案名不能重覆！"
 #. module: document
 #: selection:document.storage,type:0
 msgid "Internal File storage"
-msgstr ""
+msgstr "內部文件儲存"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "目錄必須要有母目錄或儲存"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
@@ -1030,3 +1041,6 @@ msgstr "文件類型"
 
 #~ msgid "Product"
 #~ msgstr "產品"
+
+#~ msgid "Attached To"
+#~ msgstr "附屬於"
diff --git a/addons/document_page/i18n/zh_TW.po b/addons/document_page/i18n/zh_TW.po
index 0ce1ed5d91b..08d9b01e2d3 100644
--- a/addons/document_page/i18n/zh_TW.po
+++ b/addons/document_page/i18n/zh_TW.po
@@ -7,165 +7,165 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-13 12:08+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-30 09:36+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.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 06:43+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
 msgid "Document page Template"
-msgstr ""
+msgstr "文檔頁面範本"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki
 #: model:ir.ui.menu,name:document_page.menu_action_wiki_wiki
 msgid "Document Pages"
-msgstr ""
+msgstr "文檔頁面"
 
 #. module: document_page
 #: field:document.page.type,method:0
 msgid "Display Method"
-msgstr ""
+msgstr "展示方法"
 
 #. module: document_page
 #: view:document.page:0 field:document.page,create_uid:0
 msgid "Author"
-msgstr ""
+msgstr "作者"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_wiki_page_open
 #: view:document.page.page.open:0
 msgid "Open Page"
-msgstr ""
+msgstr "開啓葉面"
 
 #. module: document_page
 #: field:document.page,menu_id:0
 msgid "Menu"
-msgstr ""
+msgstr "選單"
 
 #. module: document_page
 #: help:document.page,type:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr ""
+msgstr "表示，這個頁面至少有一個表的內容"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki_history view:document.page.history:0
 msgid "Document page History"
-msgstr ""
+msgstr "頁面歷史文件"
 
 #. module: document_page
 #: field:document.page,minor_edit:0
 msgid "Minor edit"
-msgstr ""
+msgstr "小編輯"
 
 #. module: document_page
 #: view:document.page:0 field:document.page,content:0
 msgid "Content"
-msgstr ""
+msgstr "內容"
 
 #. module: document_page
 #: field:document.page,child_ids:0
 msgid "Child Pages"
-msgstr ""
+msgstr "子頁面"
 
 #. module: document_page
 #: field:document.page,parent_id:0
 msgid "Parent Page"
-msgstr ""
+msgstr "上級頁面"
 
 #. module: document_page
 #: view:document.page:0 field:document.page,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "最後的貢獻者"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "上級選單"
 
 #. module: document_page
 #: field:document.page,name:0
 msgid "Title"
-msgstr ""
+msgstr "標題"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "嚮導創建選單"
 
 #. module: document_page
 #: field:document.page,history_id:0
 msgid "History Lines"
-msgstr ""
+msgstr "歷史記錄"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Page Content"
-msgstr ""
+msgstr "頁面內容"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "警告！"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:237
 #, python-format
 msgid "There are no changes in revisions"
-msgstr ""
+msgstr "有沒有變化修訂"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "選單名稱"
 
 #. module: document_page
 #: field:document.page.type,notes:0
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #. module: document_page
 #: field:document.page,review:0
 msgid "Needs Review"
-msgstr ""
+msgstr "需要回顧"
 
 #. module: document_page
 #: help:document.page,review:0
 msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
-msgstr ""
+msgstr "表示這個頁面應該檢討，提高其他出資人的注意"
 
 #. module: document_page
 #: view:document.page.create.menu:0 view:document.page.make.index:0
 msgid "Menu Information"
-msgstr ""
+msgstr "選單資訊"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.act_wiki_wiki_history
 msgid "Page History"
-msgstr ""
+msgstr "頁面歷史記錄"
 
 #. module: document_page
 #: selection:document.page.type,method:0
 msgid "Tree"
-msgstr ""
+msgstr "目錄樹"
 
 #. module: document_page
 #: view:document.page.type:0
 msgid "Page Template"
-msgstr ""
+msgstr "頁面模版"
 
 #. module: document_page
 #: field:document.page,tags:0
 msgid "Keywords"
-msgstr ""
+msgstr "關鍵字"
 
 #. module: document_page
 #: model:ir.actions.act_window,help:document_page.action_wiki
@@ -175,173 +175,175 @@ msgid ""
 "(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
 "There is a basic wiki editing for text format."
 msgstr ""
+"Wiki頁面，您可以與您的同事的想法和問題。您可以創建一個新的文件，可以連接到一個或多個應用程序（客戶關係管理（CRM），銷售等）。您可以使用關鍵字，以便"
+"於訪問到您的wiki頁面。有一個基本的的維基編輯為文本格式。"
 
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:54
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: document_page
 #: help:document.page.type,home:0
 msgid "Required to select home page if display method is Home Page"
-msgstr ""
+msgstr "在首頁,需要選擇首頁顯示的方法"
 
 #. module: document_page
 #: field:document.page.history,create_date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: document_page
 #: view:document.page.make.index:0
 msgid "Want to create a Index on Selected Pages ? "
-msgstr ""
+msgstr "要選定的頁面上創建一個索引呢？ "
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff_values
 #: view:wizard.document.page.history.show_diff:0
 msgid "Difference"
-msgstr ""
+msgstr "差異"
 
 #. module: document_page
 #: field:document.page.type,page_ids:0
 msgid "Pages"
-msgstr ""
+msgstr "頁面"
 
 #. module: document_page
 #: view:document.page.type:0
 msgid "Group Description"
-msgstr ""
+msgstr "群組敘述"
 
 #. module: document_page
 #: view:document.page.page.open:0
 msgid "Want to open a wiki page? "
-msgstr ""
+msgstr "要打開一個wiki頁面？ "
 
 #. module: document_page
 #: field:document.page.history,content:0
 msgid "Text area"
-msgstr ""
+msgstr "文本區域"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Meta Information"
-msgstr ""
+msgstr "中繼資訊"
 
 #. module: document_page
 #: field:document.page,create_date:0
 msgid "Created on"
-msgstr ""
+msgstr "建立於"
 
 #. module: document_page
 #: view:document.page.type:0 view:wizard.document.page.history.show_diff:0
 msgid "Notes"
-msgstr ""
+msgstr "備註"
 
 #. module: document_page
 #: selection:document.page.type,method:0
 msgid "List"
-msgstr ""
+msgstr "列表"
 
 #. module: document_page
 #: field:document.page,summary:0 field:document.page.history,edit_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: document_page
 #: field:document.page.groups,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_history
 msgid "All Page Histories"
-msgstr ""
+msgstr "所有頁面的歷史記錄"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki
 msgid "document.page"
-msgstr ""
+msgstr "document.page"
 
 #. module: document_page
 #: help:document.page.type,method:0
 msgid "Define the default behaviour of the menu created on this group"
-msgstr ""
+msgstr "本組創建的選單中定義默認行為"
 
 #. module: document_page
 #: view:wizard.document.page.history.show_diff:0
 msgid "Close"
-msgstr ""
+msgstr "結束"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_wiki_history_show_diff
 msgid "wizard.document.page.history.show_diff"
-msgstr ""
+msgstr "wizard.document.page.history.show_diff"
 
 #. module: document_page
 #: field:document.page.history,wiki_id:0
 msgid "Wiki Id"
-msgstr ""
+msgstr "維基標識"
 
 #. module: document_page
 #: field:document.page.type,home:0 selection:document.page.type,method:0
 msgid "Home Page"
-msgstr ""
+msgstr "首頁"
 
 #. module: document_page
 #: help:document.page,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
+msgstr "允許您與其他頁的鏈接，在當前主題"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Modification Information"
-msgstr ""
+msgstr "修改信息"
 
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_wiki_configuration view:document.page:0
 msgid "Wiki"
-msgstr ""
+msgstr "維基 (Wiki)"
 
 #. module: document_page
 #: field:document.page,write_date:0
 msgid "Modification Date"
-msgstr ""
+msgstr "修改日期"
 
 #. module: document_page
 #: view:document.page.type:0
 msgid "Configuration"
-msgstr ""
+msgstr "設置"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_make_index
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_make_index_values
 #: model:ir.model,name:document_page.model_wiki_make_index view:document.page.make.index:0
 msgid "Create Index"
-msgstr ""
+msgstr "創建索引"
 
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:54
 #, python-format
 msgid "You need to select minimum 1 or maximum 2 history revision!"
-msgstr ""
+msgstr "您需要選擇最小或最大歷史修訂！"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Group By..."
-msgstr ""
+msgstr "分類方式..."
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki_create_menu
 #: view:document.page.create.menu:0 view:document.page.type:0 view:document.page.make.index:0
 msgid "Create Menu"
-msgstr ""
+msgstr "建立選單"
 
 #. module: document_page
 #: field:document.page.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr ""
+msgstr "這是一個主要的編輯嗎？"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki_groups
@@ -349,56 +351,56 @@ msgstr ""
 #: model:ir.model,name:document_page.model_wiki_groups
 #: model:ir.ui.menu,name:document_page.menu_action_wiki_groups view:document.page.type:0
 msgid "Document Types"
-msgstr ""
+msgstr "文件類型"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Topic"
-msgstr ""
+msgstr "主題"
 
 #. module: document_page
 #: field:document.page.history,write_uid:0
 msgid "Modify By"
-msgstr ""
+msgstr "修改者"
 
 #. module: document_page
 #: code:addons/document_page/web/widgets/wikimarkup/__init__.py:1981
 #: field:document.page,type:0
 #, python-format
 msgid "Type"
-msgstr ""
+msgstr "類型"
 
 #. module: document_page
 #: view:document.page.type:0 view:document.page.page.open:0
 msgid "Open Document Page"
-msgstr ""
+msgstr "開啓文件"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki_page_open
 msgid "wiz open page"
-msgstr ""
+msgstr "WIZ打開的頁面"
 
 #. module: document_page
 #: view:document.page.create.menu:0 view:document.page.make.index:0 view:document.page.page.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "刪除"
 
 #. module: document_page
 #: field:wizard.document.page.history.show_diff,file_path:0
 msgid "Diff"
-msgstr ""
+msgstr "差異"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Need Review"
-msgstr ""
+msgstr "需要回顧"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr ""
+msgstr "頁面等待審查"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.act_wiki_group_open
 msgid "Search Page"
-msgstr ""
+msgstr "搜尋頁面"
diff --git a/addons/document_webdav/i18n/zh_TW.po b/addons/document_webdav/i18n/zh_TW.po
new file mode 100644
index 00000000000..121d57b341a
--- /dev/null
+++ b/addons/document_webdav/i18n/zh_TW.po
@@ -0,0 +1,196 @@
+# Chinese (Traditional) 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-08-30 11:51+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\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-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr "建立日期"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_document_props
+msgid "Documents"
+msgstr "文件"
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "錯誤! 您不能建立循環的目錄"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr "搜尋文件目錄"
+
+#. 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 "Namespace"
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr "DAV 內容"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_file_property
+msgid "document.webdav.file.property"
+msgstr "document.webdav.file.property"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Group By..."
+msgstr "群組...."
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr "這些內容將被加到 WebDAV 請求"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
+msgid "DAV Properties for Documents"
+msgstr "文件的DAV 內容"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr "PyWebDAV 匯入錯誤!"
+
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+msgstr "文件"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_folder_props
+msgid "Folders"
+msgstr "檔案夾"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "目錄不能成為自己的母目錄!"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "動態背景"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr "WebDAV 內容"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "目錄名不能重覆！"
+
+#. 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 ""
+"從 http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/，請安裝 PyWebDAV"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
+msgid "DAV Properties for Folders"
+msgstr "DAV 檔案夾內容"
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Properties"
+msgstr "內容"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr "document.webdav.dir.property"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
+msgid "Value"
+msgstr "價值"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "目錄"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr "最後修改使用者"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "路徑"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr "修改日期"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr "建立者"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_properties
+msgid "DAV Properties"
+msgstr "DAV 內容"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "目錄必須要有母目錄或儲存室"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
+msgid "Substitute"
+msgstr "替代項目"
diff --git a/addons/edi/i18n/zh_TW.po b/addons/edi/i18n/zh_TW.po
new file mode 100644
index 00000000000..3ea35742e44
--- /dev/null
+++ b/addons/edi/i18n/zh_TW.po
@@ -0,0 +1,386 @@
+# Chinese (Traditional) 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-08-30 11:51+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\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-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\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 "EDI權杖"
+
+#. module: edi
+#: help:edi.document,name:0
+msgid "Unique identifier for retrieving an EDI document."
+msgstr "接收EDI文件的唯一標識符"
+
+#. 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 "EDI權杖必須唯一"
+
+#. 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 "你要匯入的文件需要OpenERP的 %s 模組。你可以用管理員使用者安裝並打開配置精靈。"
+
+#. module: edi
+#: help:edi.document,document:0
+msgid "EDI document content"
+msgstr "EDI文件內容"
+
+#. 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 "%s是個無效的外部ID"
+
+#. 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-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
+msgid "OpenERP instance address:"
+msgstr ""
+
+#. 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-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
+msgid "Create my new OpenERP instance"
+msgstr ""
+
+#. 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 ""
+
+#. 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-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 ""
+
+#. 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-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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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/email_template/i18n/zh_TW.po b/addons/email_template/i18n/zh_TW.po
new file mode 100644
index 00000000000..9094107915f
--- /dev/null
+++ b/addons/email_template/i18n/zh_TW.po
@@ -0,0 +1,711 @@
+# Chinese (Traditional) 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-08-30 10:19+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\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-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: email_template
+#: field:email.template,subtype:0
+#: field:email_template.preview,subtype:0
+msgid "Message type"
+msgstr "訊息類型"
+
+#. module: email_template
+#: field:email.template,report_name:0
+#: field:email_template.preview,report_name:0
+msgid "Report Filename"
+msgstr "報表檔名"
+
+#. module: email_template
+#: view:email.template:0
+msgid "SMTP Server"
+msgstr "SMTP 伺服器"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove the sidebar button currently displayed on related documents"
+msgstr "移除側邊欄按鈕目前顯示在相關的文件"
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+#: field:email_template.preview,ref_ir_act_window:0
+msgid "Sidebar action"
+msgstr "側邊欄動作"
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Save as a new template"
+msgstr "另存新的範本"
+
+#. module: email_template
+#: help:email.template,subject:0
+#: help:email_template.preview,subject:0
+msgid "Subject (placeholders may be used here)"
+msgstr "主旨 (佔位符可在這裡使用)"
+
+#. module: email_template
+#: help:email.template,email_cc:0
+#: help:email_template.preview,email_cc:0
+msgid "Carbon copy recipients (placeholders may be used here)"
+msgstr "副本收件人 (佔位符可在這裡使用)"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Received"
+msgstr "收到"
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,ref_ir_value:0
+#: field:email_template.preview,ref_ir_value:0
+msgid "Sidebar Button"
+msgstr "側邊欄按鈕"
+
+#. module: email_template
+#: help:email.template,report_name:0
+#: help:email_template.preview,report_name:0
+msgid ""
+"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."
+msgstr ""
+"產生的報表文件命名(可能包含佔位符)\n"
+"可以省略分機號碼然後將會成為報表型態."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attach existing files"
+msgstr "附加現有文件"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content"
+msgstr "郵件內容"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.preview,reply_to:0
+msgid "Reply-To"
+msgstr "回覆給"
+
+#. module: email_template
+#: field:email.template,auto_delete:0
+#: field:email_template.preview,auto_delete:0
+msgid "Auto Delete"
+msgstr "自動刪除"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:218
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: email_template
+#: field:email.template,subject:0
+#: field:email_template.preview,subject:0
+msgid "Subject"
+msgstr "主旨"
+
+#. module: email_template
+#: field:email.template,email_from:0
+#: field:email_template.preview,email_from:0
+msgid "From"
+msgstr "從"
+
+#. module: email_template
+#: field:mail.compose.message,template_id:0
+msgid "Template"
+msgstr "範本"
+
+#. module: email_template
+#: field:email.template,partner_id:0
+#: field:email_template.preview,partner_id:0
+msgid "Related partner"
+msgstr "相關的合作夥伴"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+#: field:email_template.preview,sub_model_object_field:0
+msgid "Sub-field"
+msgstr "子欄位"
+
+#. module: email_template
+#: view:email.template:0
+msgid ""
+"Display a button in the sidebar of related documents to open a composition "
+"wizard with this template"
+msgstr "相關文件螢幕上的精靈列按鈕可打開這範本之精靈"
+
+#. module: email_template
+#: field:email.template,state:0
+#: field:email_template.preview,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Sent"
+msgstr "傳送"
+
+#. module: email_template
+#: help:email.template,subtype:0
+#: help:email_template.preview,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr "訊息類型, 經常是'html'或'plain', 用於選擇 plaintext 或 rich text 做為內容"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "電子郵件成分嚮導"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Dynamic Values Builder"
+msgstr "建立動態值"
+
+#. module: email_template
+#: field:email.template,res_id:0
+msgid "Related Document ID"
+msgstr "相關文件 ID"
+
+#. module: email_template
+#: field:email.template,lang:0
+#: field:email_template.preview,lang:0
+msgid "Language Selection"
+msgstr "語言選擇"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced"
+msgstr "提出"
+
+#. module: email_template
+#: field:email.template,email_to:0
+#: field:email_template.preview,email_to:0
+msgid "To"
+msgstr "給"
+
+#. module: email_template
+#: field:email.template,model:0
+#: field:email_template.preview,model:0
+msgid "Related Document Model"
+msgstr "相關文檔模型"
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+#: help:email_template.preview,model_object_field:0
+msgid ""
+"Select target field from the related document model.\n"
+"If it is a relationship field you will be able to select a target field at "
+"the destination of the relationship."
+msgstr ""
+"從相關文件類型選擇目標\n"
+"若它是關聯欄位，您就可以在這關聯關係中，取得這欄位"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr "預覽範本"
+
+#. module: email_template
+#: field:email.template,null_value:0
+#: field:email_template.preview,null_value:0
+msgid "Null value"
+msgstr "空值"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+#: field:email_template.preview,sub_object:0
+msgid "Sub-model"
+msgstr "子類型"
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+#: help:email_template.preview,track_campaign_item:0
+msgid ""
+"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"
+msgstr "啟用，這是您希望包括一個特殊的追蹤電子郵件標記，這樣您就可以找出答覆並連接到相應的資源記錄。這是有用的，例如CRM的線索"
+
+#. module: email_template
+#: field:mail.compose.message,use_template:0
+msgid "Use Template"
+msgstr "使用範本"
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+#: field:email_template.preview,attachment_ids:0
+msgid "Files to attach"
+msgstr "附加的文件"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr "選項"
+
+#. module: email_template
+#: field:email.template,model_id:0
+#: field:email_template.preview,model_id:0
+msgid "Related document model"
+msgstr "相關文件類型"
+
+#. module: email_template
+#: help:email.template,email_from:0
+#: help:email_template.preview,email_from:0
+msgid "Sender address (placeholders may be used here)"
+msgstr "發信人地址(佔位符可以用在這)"
+
+#. module: email_template
+#: help:res.partner,opt_out:0
+msgid ""
+"If checked, this partner will not receive any automated email notifications, "
+"such as the availability of invoices."
+msgstr "若勾選, 這個合作夥伴將不會收到任何自動郵件回復, 例如有效發票"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr "備註: 這是Raw HTML."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr "分類方式..."
+
+#. module: email_template
+#: field:email.template,user_signature:0
+#: field:email_template.preview,user_signature:0
+msgid "Add Signature"
+msgstr "加入簽名"
+
+#. module: email_template
+#: help:email.template,body_text:0
+#: help:email_template.preview,body_text:0
+msgid "Plaintext version of the message (placeholders may be used here)"
+msgstr "Plaintext 消息版本(佔位符可以用在這)"
+
+#. module: email_template
+#: help:email.template,original:0
+#: help:email_template.preview,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr "消息原始版本, 因為它是在網路上發送"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:230
+#, python-format
+msgid "(copy)"
+msgstr "(副本)"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Outgoing"
+msgstr "外送"
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Use a message template"
+msgstr "使用訊息範本"
+
+#. module: email_template
+#: help:email.template,user_signature:0
+#: help:email_template.preview,user_signature:0
+msgid ""
+"If checked, the user's signature will be appended to the text version of the "
+"message"
+msgstr "若勾選, 使用者的簽名將附加到郵件的文字版本"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.preview:0
+msgid "Body (Rich/HTML)"
+msgstr "內文 (Rich/HTML)"
+
+#. module: email_template
+#: help:email.template,sub_object:0
+#: help:email_template.preview,sub_object:0
+msgid ""
+"When a relationship field is selected as first field, this field shows the "
+"document model the relationship goes to."
+msgstr ""
+"當這相關欄位是選為第一欄位, this field shows the document model the relationship goes to."
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates"
+msgstr "郵件範本"
+
+#. module: email_template
+#: field:email.template,date:0
+#: field:email_template.preview,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr "預覽範本"
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.preview,message_id:0
+msgid "Message-Id"
+msgstr "訊息-Id"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Add sidebar button"
+msgstr "加入側邊欄按鈕"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.preview:0
+msgid "Body (Text)"
+msgstr "內文 (Text)"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr "進階選項"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:183
+#, python-format
+msgid "Send Mail (%s)"
+msgstr "傳送郵件 (%s)"
+
+#. module: email_template
+#: field:email.template,body_html:0
+#: field:email_template.preview,body_html:0
+msgid "Rich-text Contents"
+msgstr "富文本內容"
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+#: field:email_template.preview,copyvalue:0
+msgid "Expression"
+msgstr "表達"
+
+#. module: email_template
+#: field:email.template,original:0
+#: field:email_template.preview,original:0
+msgid "Original"
+msgstr "原作"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr "地址"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+#: help:email_template.preview,copyvalue:0
+msgid ""
+"Final placeholder expression, to be copy-pasted in the desired template "
+"field."
+msgstr "最後的模板欄位，找到要複製-貼上的區塊"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Details"
+msgstr "郵件詳情"
+
+#. module: email_template
+#: field:email.template,email_cc:0
+#: field:email_template.preview,email_cc:0
+msgid "Cc"
+msgstr "副本"
+
+#. module: email_template
+#: field:email.template,body_text:0
+#: field:email_template.preview,body_text:0
+msgid "Text Contents"
+msgstr "文字內容"
+
+#. module: email_template
+#: help:email.template,auto_delete:0
+#: help:email_template.preview,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr "永久刪除已發送的郵件以節省空間"
+
+#. module: email_template
+#: field:email.template,references:0
+#: field:email_template.preview,references:0
+msgid "References"
+msgstr "參考"
+
+#. module: email_template
+#: field:email.template,display_text:0
+#: field:email_template.preview,display_text:0
+msgid "Display Text"
+msgstr "顯示文字"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Close"
+msgstr "關閉"
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+#: help:email_template.preview,attachment_ids:0
+msgid ""
+"You may attach files to this template, to be added to all emails created "
+"from this template"
+msgstr "這個範本您可以加入附件, 從這範本新建所有郵件"
+
+#. module: email_template
+#: help:email.template,headers:0
+#: help:email_template.preview,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr "完整的郵件標題，例如僅SMTP會話頭（通常可在入站消息)"
+
+#. module: email_template
+#: field:email.template,mail_server_id:0
+#: field:email_template.preview,mail_server_id:0
+msgid "Outgoing Mail Server"
+msgstr "發送郵件伺服器"
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+#: help:email_template.preview,ref_ir_act_window:0
+msgid ""
+"Sidebar action to make this template available on records of the related "
+"document model"
+msgstr "側邊欄動作使這個範本記錄相關的文件類型"
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+#: field:email_template.preview,model_object_field:0
+msgid "Field"
+msgstr "欄位"
+
+#. module: email_template
+#: field:email.template,user_id:0
+#: field:email_template.preview,user_id:0
+msgid "Related user"
+msgstr "相關使用者"
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_templates
+msgid "Templates"
+msgstr "範本"
+
+#. module: email_template
+#: field:res.partner,opt_out:0
+msgid "Opt-Out"
+msgstr "不參加"
+
+#. module: email_template
+#: help:email.template,email_bcc:0
+#: help:email_template.preview,email_bcc:0
+msgid "Blind carbon copy recipients (placeholders may be used here)"
+msgstr "密件副本收件人（佔位符可以用在這裡）"
+
+#. module: email_template
+#: help:email.template,lang:0
+#: help:email_template.preview,lang:0
+msgid ""
+"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}."
+msgstr ""
+"選擇翻譯語言（ISO代碼）選擇發送電子郵件時。如果沒有設置，將使用英文版本。通常，這應該是一個佔位符，表達式，提供適當的語言代碼，例如$ "
+"{object.partner_id.lang.code}。"
+
+#. module: email_template
+#: field:email_template.preview,res_id:0
+msgid "Sample Document"
+msgstr "文件範本"
+
+#. module: email_template
+#: help:email.template,email_to:0
+#: help:email_template.preview,email_to:0
+msgid "Comma-separated recipient addresses (placeholders may be used here)"
+msgstr "逗號分隔的收件人地址（佔位符可以用在這裡）"
+
+#. module: email_template
+#: field:email.template,name:0
+#: field:email_template.preview,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+#: field:email_template.preview,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr "資源追蹤"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr "預覽郵件範本"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr "預覽郵件"
+
+#. module: email_template
+#: help:email.template,message_id:0
+#: help:email_template.preview,message_id:0
+msgid ""
+"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!"
+msgstr ""
+"消息ID SMTP頭使用在基於此模板的傳出消息。請注意，這將覆蓋'資源追蹤'選項，所以如果您只需要跟蹤答覆外發郵件，啟用該選項。\n"
+"佔位符必須用在這裡，這個值永遠必須是唯一的！"
+
+#. module: email_template
+#: field:email.template,headers:0
+#: field:email_template.preview,headers:0
+msgid "Message headers"
+msgstr "訊息頂端"
+
+#. module: email_template
+#: field:email.template,email_bcc:0
+#: field:email_template.preview,email_bcc:0
+msgid "Bcc"
+msgstr "密件副本收件人"
+
+#. module: email_template
+#: help:email.template,reply_to:0
+#: help:email_template.preview,reply_to:0
+msgid "Preferred response address (placeholders may be used here)"
+msgstr "首選的回覆地址（佔位符可以用在這裡）"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove sidebar button"
+msgstr "移動側邊欄按鈕"
+
+#. module: email_template
+#: 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 "若欄位是空的需選擇使用值"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Model"
+msgstr "型號"
+
+#. module: email_template
+#: help:email.template,references:0
+#: help:email_template.preview,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr "消息引用，如以前的消息標識符"
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+#: help:email_template.preview,ref_ir_value:0
+msgid "Sidebar button to open the sidebar action"
+msgstr "側邊欄按鈕來打開側邊欄動作"
+
+#. module: email_template
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤 ! 您不行建立相關成員"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:218
+#, python-format
+msgid "Deletion of the action record failed."
+msgstr "刪除的動作記錄失敗"
+
+#. module: email_template
+#: help:email.template,mail_server_id:0
+#: help:email_template.preview,mail_server_id:0
+msgid ""
+"Optional preferred server for outgoing mails. If not set, the highest "
+"priority one will be used."
+msgstr "可選擇伺服器發送的郵件。如果沒有設置，優先級最高的將被使用。"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Delivery Failed"
+msgstr "傳送失敗"
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+#: help:email_template.preview,sub_model_object_field:0
+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 "當相關欄位已被選擇為第一欄位, 這欄位，讓您選擇目標欄位內的目標文件類型（子類型型）。"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attach Report"
+msgstr "附加報表"
+
+#. module: email_template
+#: field:email.template,report_template:0
+#: field:email_template.preview,report_template:0
+msgid "Optional report to print and attach"
+msgstr "選擇報表列印與附加"
+
+#. module: email_template
+#: help:email.template,body_html:0
+#: help:email_template.preview,body_html:0
+msgid "Rich-text/HTML version of the message (placeholders may be used here)"
+msgstr "Rich-text/HTML版本的消息（佔位符可以用在這裡）"
+
+#~ msgid "Sidebar button"
+#~ msgstr "側邊欄按鈕"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "郵件合併精靈"
+
+#~ msgid "Related Document model"
+#~ msgstr "相關文件類型"
+
+#~ msgid "Rich-text contents"
+#~ msgstr "豐富的文字內容"
+
+#~ msgid "Text contents"
+#~ msgstr "文字內容"
+
+#~ msgid "Opt-out"
+#~ msgstr "退出選擇"
diff --git a/addons/event/i18n/zh_TW.po b/addons/event/i18n/zh_TW.po
index 55264e50f48..a6c27495e1c 100644
--- a/addons/event/i18n/zh_TW.po
+++ b/addons/event/i18n/zh_TW.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:36+0000\n"
-"PO-Revision-Date: 2012-08-30 03:33+0000\n"
+"PO-Revision-Date: 2012-08-30 10:20+0000\n"
 "Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
-"Language-Team: \n"
+"Language-Team: Cenoq Corp.\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-30 05:12+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: event
 #: view:event.event:0
@@ -24,55 +24,55 @@ msgstr "發票資訊"
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event Details"
-msgstr "活動詳情"
+msgstr "事件細節"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
 msgid "Main Speaker"
-msgstr "主講者"
+msgstr "主要關注者"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: event
 #: field:event.event,register_min:0
 msgid "Minimum Registrations"
-msgstr "最小登記數"
+msgstr "最少的登記記錄"
 
 #. module: event
 #: model:ir.model,name:event.model_event_confirm_registration
 msgid "Confirmation for Event Registration"
-msgstr "活動登記確認"
+msgstr "確認事件的登記記錄"
 
 #. module: event
 #: field:event.registration.badge,title:0
 msgid "Title"
-msgstr "稱謂"
+msgstr "標題"
 
 #. module: event
 #: field:event.event,mail_registr:0
 msgid "Registration Email"
-msgstr "登記電郵"
+msgstr "登記記錄的郵件"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_confirm_registration
 msgid "Make Invoices"
-msgstr "開立發票"
+msgstr "生成發票"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Registration Date"
-msgstr "登記日期"
+msgstr "登錄日期"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr "結束(_C)"
+msgstr "結束"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -82,17 +82,17 @@ msgstr "Bon Jovi 演唱會"
 #. module: event
 #: view:report.event.registration:0
 msgid "Invoiced Registrations only"
-msgstr ""
+msgstr "僅已開發票的報名者"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "March"
-msgstr "三月"
+msgstr "3月"
 
 #. module: event
 #: field:event.event,mail_confirm:0
 msgid "Confirmation Email"
-msgstr "確認電郵"
+msgstr "確認電子郵件"
 
 #. module: event
 #: field:event.registration,nb_register:0
@@ -103,7 +103,7 @@ msgstr "數量"
 #: code:addons/event/wizard/event_make_invoice.py:63
 #, python-format
 msgid "Registration doesn't have any partner to invoice."
-msgstr ""
+msgstr "登記記錄沒有給任何業務夥伴開發票"
 
 #. module: event
 #: field:event.event,company_id:0
@@ -121,7 +121,7 @@ msgstr "發票日期"
 #. module: event
 #: help:event.event,pricelist_id:0
 msgid "Pricelist version for current event."
-msgstr "當前活動價目表版本"
+msgstr "當前事件的價目表版本"
 
 #. module: event
 #: code:addons/event/wizard/partner_event_registration.py:88
@@ -131,17 +131,17 @@ msgstr "當前活動價目表版本"
 #: view:partner.event.registration:0
 #, python-format
 msgid "Event Registration"
-msgstr "活動登記"
+msgstr "事件登錄"
 
 #. module: event
 #: field:event.event,parent_id:0
 msgid "Parent Event"
-msgstr "上級活動"
+msgstr "上級事件"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_make_invoices
 msgid "Make Invoice"
-msgstr "開立發票"
+msgstr "生成發票"
 
 #. module: event
 #: field:event.registration,price_subtotal:0
@@ -151,27 +151,27 @@ msgstr "小計"
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr "正登記活動"
+msgstr "登錄的事件"
 
 #. module: event
 #: help:event.event,reply_to:0
 msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
-msgstr ""
+msgstr "所有系統的電子郵件在「回覆」填入這郵件地址。"
 
 #. module: event
 #: view:event.registration:0
 msgid "Add Internal Note"
-msgstr "添加內部記事"
+msgstr "新增內部備註"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmed events"
-msgstr ""
+msgstr "已確認的活動"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event Beginning Date"
-msgstr ""
+msgstr "活動開始日期"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_report_event_registration
@@ -179,12 +179,12 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_report_event_registration
 #: view:report.event.registration:0
 msgid "Events Analysis"
-msgstr "活動分析"
+msgstr "事件分析"
 
 #. module: event
 #: field:event.registration,message_ids:0
 msgid "Messages"
-msgstr "郵件"
+msgstr "訊息"
 
 #. module: event
 #: model:ir.model,name:event.model_event_registration_badge
@@ -206,25 +206,25 @@ msgstr "歌劇門票"
 #: view:event.event:0
 #, python-format
 msgid "Confirm Event"
-msgstr "確認活動"
+msgstr "確認事件"
 
 #. module: event
 #: selection:event.event,state:0
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Cancelled"
-msgstr "取消"
+msgstr "已取消"
 
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To"
-msgstr "回覆至"
+msgstr "回覆:"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.open_board_associations_manager
 #: model:ir.ui.menu,name:event.menu_board_associations_manager
 msgid "Event Dashboard"
-msgstr "活動儀錶板"
+msgstr "事件控制台"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -234,40 +234,40 @@ msgstr "威爾第歌劇"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "July"
-msgstr "七月"
+msgstr "7月"
 
 #. module: event
 #: help:event.event,register_prospect:0
 msgid "Total of Prospect Registrations"
-msgstr ""
+msgstr "意向報名者合計"
 
 #. module: event
 #: help:event.event,mail_auto_confirm:0
 msgid ""
 "Check this box if you want to use automatic confirmation emailing or "
 "reminder."
-msgstr ""
+msgstr "如果你想用自動確認郵件或提醒請勾選這裡。"
 
 #. module: event
 #: field:event.registration,ref:0
 msgid "Reference"
-msgstr "參照"
+msgstr "關聯"
 
 #. module: event
 #: help:event.event,date_end:0
 #: help:partner.event.registration,end_date:0
 msgid "Closing Date of Event"
-msgstr "活動結束日期"
+msgstr "事件的結束日期"
 
 #. module: event
 #: view:event.registration:0
 msgid "Emails"
-msgstr "電郵"
+msgstr "電子郵件"
 
 #. module: event
 #: view:event.registration:0
 msgid "Extra Info"
-msgstr "額外資訊"
+msgstr "附加資訊"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:83
@@ -279,17 +279,17 @@ msgstr "客戶發票"
 #: selection:event.event,state:0
 #: selection:report.event.registration,state:0
 msgid "Draft"
-msgstr "草案"
+msgstr "草稿"
 
 #. module: event
 #: field:event.type,name:0
 msgid "Event type"
-msgstr "活動類型"
+msgstr "事件類型"
 
 #. module: event
 #: model:ir.model,name:event.model_event_type
 msgid " Event Type "
-msgstr " 活動類型 "
+msgstr " 事件類型 "
 
 #. module: event
 #: view:event.event:0
@@ -301,13 +301,13 @@ msgstr " 活動類型 "
 #: field:report.event.registration,event_id:0
 #: view:res.partner:0
 msgid "Event"
-msgstr "活動"
+msgstr "事件"
 
 #. module: event
 #: view:event.registration:0
 #: field:event.registration,badge_ids:0
 msgid "Badges"
-msgstr "襟章"
+msgstr "標記"
 
 #. module: event
 #: view:event.event:0
@@ -316,17 +316,17 @@ msgstr "襟章"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Confirmed"
-msgstr "確認"
+msgstr "已確認"
 
 #. module: event
 #: view:event.confirm.registration:0
 msgid "Registration Confirmation"
-msgstr "登記確認"
+msgstr "確認登記記錄"
 
 #. module: event
 #: view:event.event:0
 msgid "Events in New state"
-msgstr ""
+msgstr "在新建狀態的活動"
 
 #. module: event
 #: view:report.event.registration:0
@@ -337,17 +337,17 @@ msgstr "確認"
 #: view:event.event:0
 #: field:event.event,speaker_ids:0
 msgid "Other Speakers"
-msgstr "其他講者"
+msgstr "其他關注者"
 
 #. module: event
 #: model:ir.model,name:event.model_event_make_invoice
 msgid "Event Make Invoice"
-msgstr "活動開立發票"
+msgstr "事件建立發票"
 
 #. module: event
 #: help:event.registration,nb_register:0
 msgid "Number of Registrations or Tickets"
-msgstr "登記或門票數量"
+msgstr "登錄編號或票"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:50
@@ -361,30 +361,30 @@ msgstr "警告！"
 #. module: event
 #: view:event.registration:0
 msgid "Send New Email"
-msgstr "發送新電郵"
+msgstr "發送新電子郵件"
 
 #. module: event
 #: help:event.event,register_min:0
 msgid "Provide Minimum Number of Registrations"
-msgstr ""
+msgstr "提供最小的報名人數"
 
 #. module: event
 #: view:event.event:0
 msgid "Location"
-msgstr "地點"
+msgstr "位置"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "New"
-msgstr ""
+msgstr "新建"
 
 #. module: event
 #: field:event.event,register_current:0
 #: view:report.event.registration:0
 msgid "Confirmed Registrations"
-msgstr "已確認登記"
+msgstr "確認登記記錄"
 
 #. module: event
 #: field:event.event,mail_auto_registr:0
@@ -400,7 +400,7 @@ msgstr "類型"
 #. module: event
 #: field:event.registration,email_from:0
 msgid "Email"
-msgstr "電郵"
+msgstr "電子郵件"
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -408,17 +408,17 @@ msgid ""
 "This email will be sent when the event gets confirmed or when someone "
 "subscribes to a confirmed event. This is also the email sent to remind "
 "someone about the event."
-msgstr ""
+msgstr "這封郵件會在活動已確認或有人註冊了已確認的郵件時發送。此郵件也會發送關於本活動的提醒。"
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
 msgid "To be Invoiced"
-msgstr ""
+msgstr "待開票"
 
 #. module: event
 #: view:event.event:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "我的銷售團隊"
 
 #. module: event
 #: code:addons/event/event.py:398
@@ -430,55 +430,55 @@ msgstr "錯誤！"
 #: field:event.event,name:0
 #: field:event.registration,name:0
 msgid "Summary"
-msgstr "摘要"
+msgstr "概要"
 
 #. module: event
 #: field:event.registration,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:res.partner:0
 msgid "Cancel Registration"
-msgstr "取消登記"
+msgstr "取消登記記錄"
 
 #. module: event
 #: code:addons/event/event.py:399
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "要開票的登記記錄裡的業務夥伴沒地址"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in last month"
-msgstr ""
+msgstr "上個月新建的活動"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current year"
-msgstr ""
+msgstr "本年新建的活動"
 
 #. module: event
 #: help:event.event,type:0
 msgid "Type of Event like Seminar, Exhibition, Conference, Training."
-msgstr "活動類型，如座談會、展覽、會議、培訓"
+msgstr "事件類型如：研討會，展覽，會議，培訓。"
 
 #. module: event
 #: view:event.registration:0
 msgid "Confirmed registrations"
-msgstr ""
+msgstr "確認報名者"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Organization"
-msgstr "活動組織"
+msgstr "事件結構"
 
 #. module: event
 #: view:event.registration:0
 msgid "History Information"
-msgstr "歷史資訊"
+msgstr "日誌資訊"
 
 #. module: event
 #: view:event.registration:0
@@ -489,18 +489,18 @@ msgstr "日期"
 #: view:event.confirm:0
 #: view:event.confirm.registration:0
 msgid "Confirm Anyway"
-msgstr "無論如何確認"
+msgstr "總是確認"
 
 #. module: event
 #: code:addons/event/wizard/event_confirm_registration.py:54
 #, python-format
 msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
-msgstr ""
+msgstr "警告：這事件 '%s'已達到最高極限 (%s)。"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    上月    "
 
 #. module: event
 #: view:event.event:0
@@ -508,17 +508,17 @@ msgstr ""
 #: field:event.registration.badge,registration_id:0
 #: model:ir.actions.act_window,name:event.act_event_list_register_event
 msgid "Registration"
-msgstr "登記"
+msgstr "登記記錄"
 
 #. module: event
 #: field:report.event.registration,nbevent:0
 msgid "Number Of Events"
-msgstr "活動數目"
+msgstr "事件數"
 
 #. module: event
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who will be giving speech at the event."
-msgstr ""
+msgstr "要在這次活動上發言的演講者"
 
 #. module: event
 #: help:event.event,state:0
@@ -527,17 +527,18 @@ msgid ""
 "particular dates the state is set to 'Confirmed'. If the event is over, the "
 "state is set to 'Done'.If event is cancelled the state is set to 'Cancelled'."
 msgstr ""
+"如果事件剛建立狀態是「草稿」。如果事件在具體的日期已確認狀態是「已確認」。如果事件結束狀態設為「完成」。如果事件已經取消狀態是「已取消」。"
 
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
-msgstr "取消活動"
+msgstr "取消事件"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Contact"
-msgstr "聯絡人"
+msgstr "聯繫方式"
 
 #. module: event
 #: view:event.event:0
@@ -545,45 +546,45 @@ msgstr "聯絡人"
 #: field:event.registration,partner_id:0
 #: model:ir.model,name:event.model_res_partner
 msgid "Partner"
-msgstr "伙伴"
+msgstr "業務夥伴"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
 msgid "Events Filling Status"
-msgstr ""
+msgstr "事件填充狀態"
 
 #. module: event
 #: field:event.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr "發票分類"
+msgstr "發票組"
 
 #. module: event
 #: view:event.event:0
 msgid "Mailing"
-msgstr ""
+msgstr "郵遞"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events States"
-msgstr ""
+msgstr "活動狀態"
 
 #. module: event
 #: view:board.board:0
 #: field:event.event,register_prospect:0
 msgid "Unconfirmed Registrations"
-msgstr "未確認登記"
+msgstr "不確認登記記錄"
 
 #. module: event
 #: field:event.registration,partner_invoice_id:0
 msgid "Partner Invoiced"
-msgstr ""
+msgstr "已開票業務夥伴"
 
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximum Number of Registrations"
-msgstr ""
+msgstr "提供本次報名的最大人數"
 
 #. module: event
 #: field:event.registration,log_ids:0
@@ -598,17 +599,17 @@ msgstr "日誌"
 #: view:report.event.registration:0
 #: field:report.event.registration,state:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "December"
-msgstr "十二月"
+msgstr "12月"
 
 #. module: event
 #: field:event.registration,event_product:0
@@ -618,28 +619,28 @@ msgstr "發票名稱"
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
-msgstr ""
+msgstr " # 沒草稿狀態的登記記錄"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,month:0
 msgid "Month"
-msgstr "月"
+msgstr "月份"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Done"
-msgstr "活動完結"
+msgstr "事件完成"
 
 #. module: event
 #: view:event.registration:0
 msgid "Registrations in unconfirmed state"
-msgstr ""
+msgstr "未確認狀態的報名者"
 
 #. module: event
 #: help:event.event,register_current:0
 msgid "Total of Open and Done Registrations"
-msgstr "開放及完成登記總數"
+msgstr "開啟和完成的登記記錄共有"
 
 #. module: event
 #: field:event.confirm.registration,msg:0
@@ -649,35 +650,35 @@ msgstr "訊息"
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "錯誤！你不能建立互相調用的事件。"
 
 #. module: event
 #: field:event.registration,ref2:0
 msgid "Reference 2"
-msgstr "參照 2"
+msgstr "關聯2"
 
 #. module: event
 #: code:addons/event/event.py:361
 #: view:report.event.registration:0
 #, python-format
 msgid "Invoiced"
-msgstr "已開發票"
+msgstr "已開票"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 msgid "My Events"
-msgstr "我的活動"
+msgstr "我的事件"
 
 #. module: event
 #: view:event.event:0
 msgid "Speakers"
-msgstr "講者"
+msgstr "關注者"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "開立發票"
 
 #. module: event
 #: help:event.registration,email_cc:0
@@ -685,12 +686,12 @@ msgid ""
 "These email addresses will be added to the CC field of all inbound and "
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
-msgstr ""
+msgstr "這些郵箱地址將添加到所有接收的發送郵件的副本欄位，用逗號分隔多個郵件地址。"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "你真的要生成發票嗎 ？"
 
 #. module: event
 #: view:event.event:0
@@ -700,12 +701,12 @@ msgstr "開始日期"
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Closed"
-msgstr "結束"
+msgstr "已結束"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in New state"
-msgstr ""
+msgstr "新建狀態的活動"
 
 #. module: event
 #: view:event.event:0
@@ -714,28 +715,28 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_event_event_assiciation
 #: view:res.partner:0
 msgid "Events"
-msgstr "活動"
+msgstr "事件"
 
 #. module: event
 #: field:partner.event.registration,nb_register:0
 msgid "Number of Registration"
-msgstr "登記數量"
+msgstr "登記記錄數"
 
 #. module: event
 #: field:event.event,child_ids:0
 msgid "Child Events"
-msgstr "子活動"
+msgstr "子事件"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "August"
-msgstr "八月"
+msgstr "8月"
 
 #. module: event
 #: field:res.partner,event_ids:0
 #: field:res.partner,event_registration_ids:0
 msgid "unknown"
-msgstr "不詳"
+msgstr "未知的"
 
 #. module: event
 #: help:event.event,product_id:0
@@ -743,39 +744,39 @@ msgid ""
 "The invoices of this event registration will be created with this Product. "
 "Thus it allows you to set the default label and the accounting info you want "
 "by default on these invoices."
-msgstr ""
+msgstr "將建立這事件登記記錄的產品發票。因此對這些預設發票它允許你設置預設的標籤和會計資訊。"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "June"
-msgstr "六月"
+msgstr "6月"
 
 #. module: event
 #: model:product.template,name:event.event_product_0_product_template
 msgid "Ticket for Concert"
-msgstr ""
+msgstr "合作的門票"
 
 #. module: event
 #: field:event.registration,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "寫入日期"
 
 #. module: event
 #: view:event.registration:0
 msgid "My Registrations"
-msgstr "我的登記"
+msgstr "我的登記記錄"
 
 #. module: event
 #: view:event.confirm:0
 msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
-msgstr "警告：本活動未達最少登記限制。是否確認？"
+msgstr "警告：這事件沒有達到最低登記記錄的規定，你肯定要確認它？"
 
 #. module: event
 #: field:event.registration,active:0
 msgid "Active"
-msgstr ""
+msgstr "生效"
 
 #. module: event
 #: field:event.registration,date:0
@@ -785,12 +786,12 @@ msgstr "開始日期"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "November"
-msgstr "十一月"
+msgstr "11月"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加篩選條件"
 
 #. module: event
 #: field:partner.event.registration,start_date:0
@@ -800,7 +801,7 @@ msgstr "開始日期"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
-msgstr "十月"
+msgstr "10月"
 
 #. module: event
 #: field:event.event,language:0
@@ -811,22 +812,22 @@ msgstr "語言"
 #: view:event.registration:0
 #: field:event.registration,email_cc:0
 msgid "CC"
-msgstr "副本(CC)"
+msgstr "抄送"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "January"
-msgstr "一月"
+msgstr "1月"
 
 #. module: event
 #: help:event.registration,email_from:0
 msgid "These people will receive email."
-msgstr "此等人士會收到電郵"
+msgstr "這些人將收到電子郵件。"
 
 #. module: event
 #: view:event.event:0
 msgid "Set To Draft"
-msgstr "設為草案"
+msgstr "設為草稿"
 
 #. module: event
 #: code:addons/event/event.py:499
@@ -835,7 +836,7 @@ msgstr "設為草案"
 #: view:res.partner:0
 #, python-format
 msgid "Confirm Registration"
-msgstr "確認登記"
+msgstr "確認登記記錄"
 
 #. module: event
 #: view:event.event:0
@@ -847,39 +848,39 @@ msgstr "日期"
 #. module: event
 #: view:event.event:0
 msgid "Registration Email Body"
-msgstr "登記電郵內容"
+msgstr "登記記錄的郵件內容"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmation Email Body"
-msgstr "確認電郵內容"
+msgstr "確認郵件內容"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
-msgstr ""
+msgstr "在已確認或已完成狀態的報名者"
 
 #. module: event
 #: view:event.registration:0
 #: view:res.partner:0
 msgid "History"
-msgstr "歷史"
+msgstr "日誌"
 
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
-msgstr "地點位址"
+msgstr "地址"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_type
 #: model:ir.ui.menu,name:event.menu_event_type
 msgid "Types of Events"
-msgstr "活動類型"
+msgstr "事件類型"
 
 #. module: event
 #: field:event.registration,contact_id:0
 msgid "Partner Contact"
-msgstr "伙伴聯絡人"
+msgstr "業務夥伴聯繫方式"
 
 #. module: event
 #: field:event.event,pricelist_id:0
@@ -890,12 +891,12 @@ msgstr "價目表"
 #: code:addons/event/wizard/event_make_invoice.py:59
 #, python-format
 msgid "Event related doesn't have any product defined"
-msgstr ""
+msgstr "事件沒關聯任何定義的產品"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Confirmation Email"
-msgstr "自動確認電郵"
+msgstr "自動確認郵件"
 
 #. module: event
 #: view:event.registration:0
@@ -905,7 +906,7 @@ msgstr "雜項"
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr "錯誤！結束日期不能早於開始日期"
+msgstr "錯誤！結束日期不能在開始日期前。"
 
 #. module: event
 #: code:addons/event/event.py:446
@@ -932,7 +933,7 @@ msgstr "發票"
 #: view:report.event.registration:0
 #: field:report.event.registration,year:0
 msgid "Year"
-msgstr "年份"
+msgstr "年"
 
 #. module: event
 #: code:addons/event/event.py:465
@@ -945,30 +946,30 @@ msgstr "取消"
 #: view:event.confirm.registration:0
 #: view:event.make.invoice:0
 msgid "Close"
-msgstr "關閉"
+msgstr "結束"
 
 #. module: event
 #: view:event.event:0
 msgid "Event by Registration"
-msgstr "各登記活動"
+msgstr "事件登記記錄"
 
 #. module: event
 #: code:addons/event/event.py:436
 #, python-format
 msgid "Open"
-msgstr "開放"
+msgstr "開啟"
 
 #. module: event
 #: field:event.event,user_id:0
 msgid "Responsible User"
-msgstr "負責用戶"
+msgstr "責任用戶"
 
 #. module: event
 #: code:addons/event/event.py:561
 #: code:addons/event/event.py:568
 #, python-format
 msgid "Auto Confirmation: [%s] %s"
-msgstr "自動確認：[%s] %s"
+msgstr "自動確認： [%s] %s"
 
 #. module: event
 #: view:event.event:0
@@ -977,14 +978,14 @@ msgstr "自動確認：[%s] %s"
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Responsible"
-msgstr "負責"
+msgstr "負責人"
 
 #. module: event
 #: field:event.event,unit_price:0
 #: view:event.registration:0
 #: field:partner.event.registration,unit_price:0
 msgid "Registration Cost"
-msgstr "登記成本"
+msgstr "登記記錄的成本"
 
 #. module: event
 #: field:event.registration,unit_price:0
@@ -996,7 +997,7 @@ msgstr "單價"
 #: field:report.event.registration,speaker_id:0
 #: field:res.partner,speaker:0
 msgid "Speaker"
-msgstr "講者"
+msgstr "關注者"
 
 #. module: event
 #: model:event.event,name:event.event_2
@@ -1011,13 +1012,13 @@ msgstr "回覆"
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "本月新建的活動"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
 msgid ""
 "Check this box if you want to use automatic emailing for new registration."
-msgstr ""
+msgstr "如果你要自動發郵件給新的報名者請勾選此項。"
 
 #. module: event
 #: field:event.event,date_end:0
@@ -1038,12 +1039,12 @@ msgstr "產品"
 #: view:event.registration:0
 #: field:event.registration,description:0
 msgid "Description"
-msgstr "說明"
+msgstr "描述"
 
 #. module: event
 #: field:report.event.registration,confirm_state:0
 msgid " # No of Confirmed Registrations"
-msgstr " # 已確認登記數"
+msgstr " # 沒確認登記記錄"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_register_event_partner
@@ -1053,17 +1054,17 @@ msgstr "訂閱"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "May"
-msgstr "五月"
+msgstr "5月"
 
 #. module: event
 #: view:res.partner:0
 msgid "Events Registration"
-msgstr "活動登記"
+msgstr "事件登記記錄"
 
 #. module: event
 #: help:event.event,mail_registr:0
 msgid "This email will be sent when someone subscribes to the event."
-msgstr ""
+msgstr "當有人讚同這事件時將發送這郵件"
 
 #. module: event
 #: model:product.template,name:event.event_product_2_product_template
@@ -1073,34 +1074,34 @@ msgstr "會議門票"
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type_association
 msgid "Events Type"
-msgstr ""
+msgstr "活動類型"
 
 #. module: event
 #: field:event.registration.badge,address_id:0
 msgid "Address"
-msgstr "地址"
+msgstr "地址:"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_view
 msgid "Next Events"
-msgstr "下個活動"
+msgstr "下一個事件"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Subcribe"
-msgstr "訂閱(_S)"
+msgstr "訂閱"
 
 #. module: event
 #: model:ir.model,name:event.model_partner_event_registration
 msgid "  event Registration "
-msgstr "  活動登記 "
+msgstr "  事件登記記錄 "
 
 #. module: event
 #: help:event.event,date_begin:0
 #: help:partner.event.registration,start_date:0
 msgid "Beginning Date of Event"
-msgstr "活動開始日"
+msgstr "事件開始日期"
 
 #. module: event
 #: selection:event.registration,state:0
@@ -1111,22 +1112,22 @@ msgstr "未確認"
 #: code:addons/event/event.py:565
 #, python-format
 msgid "Auto Registration: [%s] %s"
-msgstr "自動登記：[%s] %s"
+msgstr "自動登記記錄： [%s] %s"
 
 #. module: event
 #: field:event.registration,date_deadline:0
 msgid "End Date"
-msgstr "結束日"
+msgstr "結束日期"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "February"
-msgstr "二月"
+msgstr "2月"
 
 #. module: event
 #: view:board.board:0
 msgid "Association Dashboard"
-msgstr ""
+msgstr "商會控制台"
 
 #. module: event
 #: view:event.event:0
@@ -1140,18 +1141,18 @@ msgstr "名稱"
 #: view:report.event.registration:0
 #: field:report.event.registration,section_id:0
 msgid "Sale Team"
-msgstr "業務團隊"
+msgstr "銷售團隊"
 
 #. module: event
 #: field:event.event,country_id:0
 msgid "Country"
-msgstr "國家或地區"
+msgstr "國家"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:55
 #, python-format
 msgid "Registration is set as Cannot be invoiced"
-msgstr ""
+msgstr "登記記錄設置為不能開發票"
 
 #. module: event
 #: code:addons/event/event.py:527
@@ -1160,24 +1161,24 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Close Registration"
-msgstr "結束登記"
+msgstr "結束登記記錄"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "April"
-msgstr "四月"
+msgstr "4月"
 
 #. module: event
 #: help:event.event,unit_price:0
 msgid ""
 "This will be the default price used as registration cost when invoicing this "
 "event. Note that you can specify a specific amount for each registration."
-msgstr ""
+msgstr "這裡是開發票是預設的報名價格，注意你可以對每個報名者用不同的價格。"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in confirm state"
-msgstr ""
+msgstr "已確認狀態的活動"
 
 #. module: event
 #: view:event.event:0
@@ -1185,7 +1186,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,type:0
 msgid "Event Type"
-msgstr "活動類型"
+msgstr "事件類型"
 
 #. module: event
 #: view:event.event:0
@@ -1194,51 +1195,51 @@ msgstr "活動類型"
 #: model:ir.ui.menu,name:event.menu_action_registration
 #: model:ir.ui.menu,name:event.menu_action_registration_association
 msgid "Registrations"
-msgstr "登記"
+msgstr "登記記錄"
 
 #. module: event
 #: field:event.registration,id:0
 msgid "ID"
-msgstr ""
+msgstr "標識"
 
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
 msgid "Maximum Registrations"
-msgstr "最大登記數"
+msgstr "最多的登記記錄"
 
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "錯誤，您不能建立循環引用的會員用戶"
 
 #. module: event
 #: field:report.event.registration,date:0
 msgid "Event Start Date"
-msgstr "活動開始日"
+msgstr "事件開始日期"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event For Registration"
-msgstr "可登記活動"
+msgstr "登記記錄引起的事件"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:51
 #, python-format
 msgid "Invoice cannot be created if the registration is in %s state."
-msgstr ""
+msgstr "如果登記記錄在 %s 狀態，不能開發票。"
 
 #. module: event
 #: view:event.confirm:0
 #: model:ir.actions.act_window,name:event.action_event_confirm
 #: model:ir.model,name:event.model_event_confirm
 msgid "Event Confirmation"
-msgstr "活動確認"
+msgstr "事件確認"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Registration Email"
-msgstr "自動登記電郵"
+msgstr "自動登記記錄郵件"
 
 #. module: event
 #: view:event.registration:0
@@ -1250,7 +1251,7 @@ msgstr "總計"
 #. module: event
 #: field:event.event,speaker_confirmed:0
 msgid "Speaker Confirmed"
-msgstr "已確認講者"
+msgstr "關注者確認"
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
@@ -1259,7 +1260,7 @@ msgid ""
 "should be synchronized with mobile devices or calendar applications through "
 "caldav. Most of the users should work in the Calendar menu, and not in the "
 "list of events."
-msgstr ""
+msgstr "事件是低層對象用於會議和其它文檔通過caldar同步移動設備或日程表應用程序。大多數用戶將使用日程表菜單而不是事件列表。"
 
 #~ msgid "Provide Maximun Number of Registrations"
 #~ msgstr "提供登記最大數"
diff --git a/addons/event_project/i18n/zh_TW.po b/addons/event_project/i18n/zh_TW.po
index e32df5eb306..764a9d8957f 100644
--- a/addons/event_project/i18n/zh_TW.po
+++ b/addons/event_project/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-30 05:12+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index 70986bfa1df..4beb8951849 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.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:37+0000\n"
-"PO-Revision-Date: 2011-03-16 07:09+0000\n"
+"PO-Revision-Date: 2012-08-30 18: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:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -376,7 +376,7 @@ msgstr "Ссылки"
 #: view:product.product:0
 #: field:product.product,orderpoint_ids:0
 msgid "Minimum Stock Rule"
-msgstr ""
+msgstr "Правило минимальных запасов"
 
 #. module: procurement
 #: view:res.company:0
@@ -390,6 +390,8 @@ msgid ""
 "Please check the quantity in procurement order(s), it should not be 0 or "
 "less!"
 msgstr ""
+"Пожалуйста, проверьте количество в заказе на снабжение, оно не должно быть "
+"нулевым или отрицательным!"
 
 #. module: procurement
 #: help:procurement.order,procure_method:0
@@ -615,7 +617,7 @@ msgstr "Правило минимума ТМЦ"
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will be rounded up to this multiple."
-msgstr ""
+msgstr "Количество в заказе будет округляться до этого значения."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
@@ -655,7 +657,7 @@ msgstr "Заказ по максимуму"
 #. module: procurement
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка должна быть уникальна для каждой компании!"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
@@ -896,7 +898,7 @@ msgstr ""
 #. module: procurement
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Название компании должно быть уникальным!"
 
 #. module: procurement
 #: field:mrp.property,name:0
@@ -995,7 +997,7 @@ msgstr ""
 #. module: procurement
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Ошибка: Неверный штрих-код"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:152
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 1576d2f8314..5762449e179 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/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 00:37+0000\n"
-"PO-Revision-Date: 2012-07-26 16:28+0000\n"
-"Last-Translator: Michael Otcheskih <otma@mail.ru>\n"
+"PO-Revision-Date: 2012-08-30 18:22+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 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -968,7 +968,7 @@ msgstr "Итоговый вес пакета"
 #. module: product
 #: field:product.template,seller_info_id:0
 msgid "unknown"
-msgstr ""
+msgstr "неизвесно"
 
 #. module: product
 #: help:product.packaging,code:0
@@ -1893,7 +1893,7 @@ msgstr "Другие ТМЦ"
 #. module: product
 #: field:product.product,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Цветовая палитра"
 
 #. module: product
 #: view:product.product:0
@@ -1919,7 +1919,7 @@ msgstr "Каталог поставщика"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Внимание"
 
 #. module: product
 #: field:product.pricelist.item,base:0
@@ -2007,7 +2007,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "Категории единиц"
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -2088,7 +2088,7 @@ msgstr "Поставщик ТМЦ"
 #. module: product
 #: field:product.product,product_image:0
 msgid "Image"
-msgstr ""
+msgstr "Изображение"
 
 #. module: product
 #: field:product.uom,uom_type:0

From 7d96e13e2333ad1166aaf14fdea9073f02918d92 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 31 Aug 2012 12:15:41 +0530
Subject: [PATCH 153/288] [FIX] Removed Unused File reference from __openerp__
 and unneccesasry tier check on Do nto translate

bzr revid: jam@tinyerp.com-20120831064541-1fd5h47xh8p7pb81
---
 addons/base_gengo/__openerp__.py    | 2 --
 addons/base_gengo/ir_translation.py | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index b60d3db9682..89262afc457 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -32,8 +32,6 @@ Automated Translations through Gengo API
     'update_xml': [
         'ir_translation.xml',
         'res_company_view.xml',
-        'res_lang_view.xml',
-
         'wizard/base_gengo_translations_view.xml',
            ],
     'demo_xml': [],
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 8f896ec561d..7a64c5ec305 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -79,6 +79,8 @@ class ir_translation(osv.Model):
         supported_langs = self._get_all_supported_languages(cr, uid, context=context)
         if supported_langs:
             for term in self.browse(cr, uid, ids, context=context):
+                if term.gengo_translation == "":
+                    continue
                 tier = "nonprofit" if term.gengo_translation == 'machine' else term.gengo_translation
                 language = self._get_gengo_corresponding_language(term.lang)
                 if tier not in supported_langs.get(language,[]):

From 40339ae0258c73906d7d3f2a951c6d5aad7ceb89 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 31 Aug 2012 09:55:05 +0200
Subject: [PATCH 154/288] [IMP] boms on products

bzr revid: fp@tinyerp.com-20120831075505-n3478j5h7jqsu72j
---
 addons/mrp/mrp_view.xml | 1 -
 addons/mrp/product.py   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 99c8befbb6c..a785d022b53 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -1006,7 +1006,6 @@
                     <field name="bom_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
                         <tree string="Bill of Materials">
                             <field name="name" string="Component Name"/>
-                            <field name="bom_id"/>
                             <field name="product_qty" string="Quantity of Product"/>
                             <field name="type"/>
                             <field name="date_start"/>
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index 1bc3bb749ce..c6cd4a7f51c 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -26,7 +26,7 @@ from tools.translate import _
 class product_product(osv.osv):
     _inherit = "product.product"    
     _columns = {
-        "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials'),
+        "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials', [('bom_id','=',False)]),
     }
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:

From 39ed85c18dc3b3226ddc62ed73391fce714d2d9a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 31 Aug 2012 10:39:09 +0200
Subject: [PATCH 155/288] fix

bzr revid: fp@tinyerp.com-20120831083909-suttma1sjdz7uu0m
---
 .../account_analytic_analysis_view.xml        |  1 -
 addons/mrp/mrp_view.xml                       | 55 ++++++++-----------
 addons/mrp/product.py                         |  2 +-
 addons/procurement/procurement_view.xml       | 41 +++++---------
 addons/product/product_view.xml               |  2 +
 5 files changed, 40 insertions(+), 61 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 8f051b33bf9..63a8e6c7add 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -23,7 +23,6 @@
                     <label for="quantity_max"/>
                     <div>
                         <field name="quantity_max" class="oe_inline"/>
-                        <field name="company_uom_id" readonly="1" class="oe_inline"/>
                     </div>
                 </xpath>
                 <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index a785d022b53..52b79e2ade0 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -985,42 +985,14 @@
                </data>
             </field>
         </record>
-		<record id="product_normal_form_supply_view" model="ir.ui.view">
+        <record id="product_normal_form_supply_view" model="ir.ui.view">
             <field name="name">product.normal.form.mrp.inherit</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-            	<xpath expr="//field[@name='procure_method']" position="after">
-            		<field name="supply_method" groups="base.group_user"/>
-            	</xpath>
-            </field>
-        </record>
-
-        <record id="product_normal_form_view" model="ir.ui.view">
-            <field name="name">product.normal.form.mrp.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
-            <field name="arch" type="xml">
-                <page string="Procurement &amp; Locations" position="inside">
-                    <separator string="Bill of Materials"/>
-                    <field name="bom_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
-                        <tree string="Bill of Materials">
-                            <field name="name" string="Component Name"/>
-                            <field name="product_qty" string="Quantity of Product"/>
-                            <field name="type"/>
-                            <field name="date_start"/>
-                            <field name="date_stop"/>
-                        </tree>
-                        <form string="Bill of Material">
-                            <field name="name" string="Component Name"/>
-                            <field name="bom_id"/>
-                            <field name="product_qty" string="Quantity of Product"/>
-                            <field name="type"/>
-                            <field name="date_start"/>
-                            <field name="date_stop"/>
-                        </form>
-                    </field>
-                </page>
+                <xpath expr="//field[@name='procure_method']" position="after">
+                    <field name="supply_method" groups="base.group_user"/>
+                </xpath>
             </field>
         </record>
 
@@ -1078,5 +1050,24 @@
                 id="menu_mrp_production_order_action" name="Orders Planning"
                 parent="menu_mrp_planning" sequence="1"/>
 
+
+        <record model="ir.actions.act_window" id="product_open_bom">
+            <field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
+            <field name="name">Bill of Materials</field>
+            <field name="res_model">mrp.bom</field>
+        </record>
+
+        <record model="ir.ui.view" id="product_form_view_bom_button">
+            <field name="name">product.product.procurement</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button string="Bill of Materials" name="%(product_open_bom)d" type="action"/>
+                </xpath>
+            </field>
+        </record>
+
+
     </data>
 </openerp>
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index c6cd4a7f51c..1fa0f2c8a97 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -26,7 +26,7 @@ from tools.translate import _
 class product_product(osv.osv):
     _inherit = "product.product"    
     _columns = {
-        "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials', [('bom_id','=',False)]),
+        "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials', domain=[('bom_id','=',False)]),
     }
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index f2a8dc98cb0..432ff13aaa5 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -261,12 +261,12 @@
         </record>
 
         <act_window
-        context="{'search_default_warehouse_id': active_id, 'default_warehouse_id': active_id}"
-        id="act_stock_warehouse_2_stock_warehouse_orderpoint"
-        name="Reordering Rules"
-        res_model="stock.warehouse.orderpoint"
-        src_model="stock.warehouse"
-        groups="stock.group_stock_user"/>
+            context="{'search_default_warehouse_id': active_id, 'default_warehouse_id': active_id}"
+            id="act_stock_warehouse_2_stock_warehouse_orderpoint"
+            name="Reordering Rules"
+            res_model="stock.warehouse.orderpoint"
+            src_model="stock.warehouse"
+            groups="stock.group_stock_user"/>
 
         <act_window
             context="{'product_uom': locals().has_key('uom_id') and uom_id, 'default_procurement_id': active_id}"
@@ -283,23 +283,11 @@
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/>
             <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="stock.menu_stock_configuration" sequence="10"/>
 
-        <record id="product_normal_form_view" model="ir.ui.view">
-            <field name="name">product.normal.form.orderpoint.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
-            <field name="arch" type="xml">
-                <page string="Procurement &amp; Locations" position="inside">
-                    <separator string="Minimum Stock Rules"/>
-                        <field name="orderpoint_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
-                            <tree string="Reordering Rules">
-                                <field name="name"/>
-                                <field name="warehouse_id"/>
-                                <field name="product_min_qty"/>
-                                <field name="product_max_qty"/>
-                            </tree>
-                        </field>
-                </page>
-            </field>
+
+        <record model="ir.actions.act_window" id="product_open_orderpoint">
+            <field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
+            <field name="name">Orderpoints</field>
+            <field name="res_model">stock.warehouse.orderpoint</field>
         </record>
 
         <record model="ir.ui.view" id="product_form_view_procurement_button">
@@ -307,10 +295,9 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='image_medium']" position="after">
-                    <div class='oe_right oe_button_box'>
-                        <button string="Procurement Request" name="%(act_make_procurement)d" type="action"/>
-                    </div>
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button string="Request Procurement" name="%(act_make_procurement)d" type="action"/>
+                    <button string="Orderpoints" name="%(product_open_orderpoint)d" type="action"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 17b4a7ecc68..d341b5883d6 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -72,6 +72,8 @@
                             <label for="categ_id" class="oe_edit_only"/>
                             <h2><field name="categ_id"/></h2>
                         </div>
+                        <div class="oe_right oe_button_box" name="buttons">
+                        </div>
                         <notebook>
                             <page string="Information">
                                 <group>

From 48b6fc09b3f2063a2a3febc8fabd4eca5f6885ca Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 31 Aug 2012 11:02:49 +0200
Subject: [PATCH 156/288] [FIX] base_gengo: removed required=True on
 gengo_translation field as the way to create translation is a bit unusual
 (created in a temporary table for mass import then using SQL queries to
 update the right table), it would be tricky to inherit at the right spot to
 apply the default value

bzr revid: qdp-launchpad@openerp.com-20120831090249-v0meyp1luf29eddn
---
 addons/base_gengo/ir_translation.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 7a64c5ec305..561938a28e1 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -48,15 +48,11 @@ class ir_translation(osv.Model):
     _inherit = "ir.translation"
     _columns = {
         'gengo_comment': fields.text("Comments & Activity Linked to Gengo"),
-        'job_id': fields.char('Gengo JobId', size=32),
-        "gengo_translation": fields.selection([('', 'Do not translate this term by Gengo'),
-                                            ('machine', 'Translation By Machine'),
+        'job_id': fields.char('Gengo Job ID', size=32),
+        "gengo_translation": fields.selection([('machine', 'Translation By Machine'),
                                             ('standard', 'Standard'),
                                             ('pro', 'Pro'),
-                                            ('ultra', 'Ultra')], "Gengo Translation Service Level", help='You can select here the service level you want for an automatic translation using Gengo.', required=True),
-    }
-    _defaults = {
-        'gengo_translation': '',
+                                            ('ultra', 'Ultra')], "Gengo Translation Service Level", help='You can select here the service level you want for an automatic translation using Gengo.'),
     }
 
     def _get_all_supported_languages(self, cr, uid, context=None):
@@ -79,7 +75,7 @@ class ir_translation(osv.Model):
         supported_langs = self._get_all_supported_languages(cr, uid, context=context)
         if supported_langs:
             for term in self.browse(cr, uid, ids, context=context):
-                if term.gengo_translation == "":
+                if not term.gengo_translation:
                     continue
                 tier = "nonprofit" if term.gengo_translation == 'machine' else term.gengo_translation
                 language = self._get_gengo_corresponding_language(term.lang)

From 0491bffbe33151e95852f22b09031a3cf628564a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 31 Aug 2012 11:18:51 +0200
Subject: [PATCH 157/288] [IMP] base_gengo: removal of restart_fetch_job field
 in wizard (not useful)

bzr revid: qdp-launchpad@openerp.com-20120831091851-wq4wxw3h5mbc6wjw
---
 addons/base_gengo/wizard/base_gengo_translations.py       | 4 +---
 addons/base_gengo/wizard/base_gengo_translations_view.xml | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/base_gengo/wizard/base_gengo_translations.py b/addons/base_gengo/wizard/base_gengo_translations.py
index e91be00ec47..1e3637e7b56 100644
--- a/addons/base_gengo/wizard/base_gengo_translations.py
+++ b/addons/base_gengo/wizard/base_gengo_translations.py
@@ -48,7 +48,6 @@ class base_gengo_translations(osv.osv_memory):
     _name = 'base.gengo.translations'
     _columns = {
         'restart_send_job': fields.boolean("Restart Sending Job"),
-        'restart_fetch_job': fields.boolean("Restart Fetching Job"),
         'lang_id': fields.many2one('res.lang', 'Language', help="Leave empty if you don't want to restrict the request to a single language"),
     }
 
@@ -118,8 +117,7 @@ class base_gengo_translations(osv.osv_memory):
             #check the cron jobs and eventually restart/recreate them
             if wizard.restart_send_job:
                 self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', _('Gengo Sync Translation (Request)'), '_sync_request', context=context)
-            if wizard.restart_fetch_job:
-                self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', _('Gengo Sync Translation (Response)'), '_sync_response', context=context)
+            self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', _('Gengo Sync Translation (Response)'), '_sync_response', context=context)
         return {'type': 'ir.actions.act_window_close'}
 
     def _sync_response(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
diff --git a/addons/base_gengo/wizard/base_gengo_translations_view.xml b/addons/base_gengo/wizard/base_gengo_translations_view.xml
index 88ce7788d24..378d270f6aa 100644
--- a/addons/base_gengo/wizard/base_gengo_translations_view.xml
+++ b/addons/base_gengo/wizard/base_gengo_translations_view.xml
@@ -8,11 +8,10 @@
                 <form string="Gengo Request Form" version="7.0">
                    <group col="4">
                         <group>
+                            <field name="lang_id"/>
                             <field name="restart_send_job"/>
-                            <field name="restart_fetch_job"/>
                         </group>
                         <group>
-                            <field name="lang_id"/>
                             <label colspan="2" string="Leave empty for requesting all the terms to Gengo that needs it, regardless of their language"/>
                         </group>
                     </group>

From 7c540602f543fc1c3c6a4969f1ee48e4bdecadae Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 31 Aug 2012 11:50:48 +0200
Subject: [PATCH 158/288] [FIX] base_gengo: added missing import statement

bzr revid: qdp-launchpad@openerp.com-20120831095048-0yn1vgataftgadhx
---
 addons/base_gengo/ir_translation.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 561938a28e1..c7343159ddf 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
+from tools.translate import _
 
 LANG_CODE_MAPPING = {
     'ar_SA': ('ar', 'Arabic'),

From 61a1ab40955a30cf15d50407900073537a93f47c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 31 Aug 2012 11:53:12 +0200
Subject: [PATCH 159/288] [FIX] base_gengo: typo

bzr revid: qdp-launchpad@openerp.com-20120831095312-pbi55dof1zrxzdsf
---
 addons/base_gengo/ir_translation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
index 6725504df8a..ba9667d979e 100644
--- a/addons/base_gengo/ir_translation.xml
+++ b/addons/base_gengo/ir_translation.xml
@@ -21,7 +21,7 @@
                  <xpath expr="//form[@string='Translations']/sheet" position="inside">
                     <group string="Gengo Translation Service" col="4" colspan="4">
                         <field name="gengo_translation" />
-                        <label string="Note: If the translation state is 'In Progress', it means that the translation has to be approved to be uploaded in this system. You are suppose to do that directly by using your Gengo Account"/>
+                        <label string="Note: If the translation state is 'In Progress', it means that the translation has to be approved to be uploaded in this system. You are supposed to do that directly by using your Gengo Account"/>
                         <field name="gengo_comment" nolabel="1" placeholder="Gengo Comments &amp; Activity..." colspan="4"/>
                     </group>
                 </xpath>

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 160/288] [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 ea60ca1e27cb469fca4fa9a33bc7bd59e1683088 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 31 Aug 2012 15:31:43 +0530
Subject: [PATCH 161/288] [FIX] Usability Fix,  missing import and added the
 resquest process call

bzr revid: jam@tinyerp.com-20120831100143-rgx1ntdkzqcngov9
---
 addons/base_gengo/wizard/base_gengo_translations.py       | 1 +
 addons/base_gengo/wizard/base_gengo_translations_view.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base_gengo/wizard/base_gengo_translations.py b/addons/base_gengo/wizard/base_gengo_translations.py
index 1e3637e7b56..d8a96a2ced9 100644
--- a/addons/base_gengo/wizard/base_gengo_translations.py
+++ b/addons/base_gengo/wizard/base_gengo_translations.py
@@ -114,6 +114,7 @@ class base_gengo_translations(osv.osv_memory):
             ctx = context.copy()
             ctx['gengo_language'] = wizard.lang_id.id
             self._sync_request(cr, uid, limit=GENGO_DEFAULT_LIMIT, context=ctx)
+            self._sync_response( cr, uid, limit=GENGO_DEFAULT_LIMIT, context=ctx)
             #check the cron jobs and eventually restart/recreate them
             if wizard.restart_send_job:
                 self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', _('Gengo Sync Translation (Request)'), '_sync_request', context=context)
diff --git a/addons/base_gengo/wizard/base_gengo_translations_view.xml b/addons/base_gengo/wizard/base_gengo_translations_view.xml
index 378d270f6aa..09c3a77b1d5 100644
--- a/addons/base_gengo/wizard/base_gengo_translations_view.xml
+++ b/addons/base_gengo/wizard/base_gengo_translations_view.xml
@@ -8,7 +8,7 @@
                 <form string="Gengo Request Form" version="7.0">
                    <group col="4">
                         <group>
-                            <field name="lang_id"/>
+                            <field name="lang_id" required="1"/>
                             <field name="restart_send_job"/>
                         </group>
                         <group>

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 162/288] [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 163/288] [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 bf513b5919006080b7a48825d3a63861fc6ff25f Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 31 Aug 2012 12:25:09 +0200
Subject: [PATCH 164/288] [IMP] point_of_sale: Add a description when the
 session is in progress

bzr revid: stw@openerp.com-20120831102509-yv3bc68gii0sexfk
---
 .../point_of_sale/wizard/pos_session_opening.py   | 15 ++++++++++++---
 .../point_of_sale/wizard/pos_session_opening.xml  |  9 +++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py
index d3b6ea28b17..4364998b6a4 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.py
+++ b/addons/point_of_sale/wizard/pos_session_opening.py
@@ -15,6 +15,10 @@ class pos_session_opening(osv.osv_memory):
         'pos_state' : fields.selection(pos_session.POS_SESSION_STATE,
                                        'Session State', 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),
+        'pos_session_username' : fields.related('pos_session_id', 'user_id', 'name',
+                                                type='char', size=64, readonly=True)
     }
 
     def open_ui(self, cr, uid, ids, context=None):
@@ -66,7 +70,9 @@ class pos_session_opening(osv.osv_memory):
     def on_change_config(self, cr, uid, ids, config_id, context=None):
         result = {
             'pos_session_id': False,
-            'pos_state': False
+            'pos_state': False,
+            'pos_session_username' : False,
+            'pos_session_name' : False,
         }
         if not config_id:
             return {'value': result}
@@ -76,8 +82,11 @@ class pos_session_opening(osv.osv_memory):
             ('config_id', '=', config_id),
         ], context=context)
         if session_ids:
-            result['pos_state'] = proxy.browse(cr, uid, session_ids[0], context=context).state
-            result['pos_session_id'] = session_ids[0]
+            session = proxy.browse(cr, uid, session_ids[0], context=context)
+            result['pos_state'] = 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 948f1db8c61..9279d5fce45 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.xml
+++ b/addons/point_of_sale/wizard/pos_session_opening.xml
@@ -44,6 +44,15 @@
                           interface.
                         </p>
                     </div>
+                    <div attrs="{'invisible' : [('pos_state', '!=', 'opened')]}" class="oe_view_nocontent">
+                        <p class="oe_view_nocontent_create">
+                            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 ?
+                        </p>
+                    </div>
 
                 </form>
             </field>

From 34fcb826028538f09e58c72d8ac4ce22fbc04de9 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Fri, 31 Aug 2012 12:50:42 +0200
Subject: [PATCH 165/288] [FIX] Fixed autosize behaviour.

bzr revid: vta@openerp.com-20120831105042-fuwhrbdgs51x76u6
---
 addons/web/__openerp__.py                     | 59 +------------------
 .../lib/jquery.autosize/jquery.autosize.js    |  7 ++-
 addons/web/static/src/js/view_form.js         | 15 +++--
 3 files changed, 19 insertions(+), 62 deletions(-)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 38e3328bf8b..44a3caaf8ec 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -23,6 +23,7 @@ This module provides the core of the OpenERP Web Client.
         "static/lib/jquery.validate/jquery.validate.js",
         "static/lib/jquery.ba-bbq/jquery.ba-bbq.js",
         "static/lib/spinjs/spin.js",
+        "static/lib/jquery.autosize/jquery.autosize.js",
         "static/lib/jquery.blockUI/jquery.blockUI.js",
         "static/lib/jquery.ui/js/jquery-ui-1.8.17.custom.min.js",
         "static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js",
@@ -37,8 +38,7 @@ This module provides the core of the OpenERP Web Client.
         "static/lib/underscore/underscore.string.js",
         "static/lib/backbone/backbone.js",
         "static/lib/cleditor/jquery.cleditor.js",
-        "static/lib/py.js/lib/py.js",
-        "static/lib/jquery.autosize/jquery.autosize.js",
+        "static/lib/py.js/lib/py.js",        
         "static/src/js/boot.js",
         "static/src/js/corelib.js",
         "static/src/js/coresetup.js",
@@ -68,60 +68,5 @@ This module provides the core of the OpenERP Web Client.
     ],
     'qweb' : [
         "static/src/xml/*.xml",
-        'static/lib/datejs/globalization/en-US.js',
-        'static/lib/datejs/core.js',
-        'static/lib/datejs/parser.js',
-        'static/lib/datejs/sugarpak.js',
-        'static/lib/datejs/extras.js',
-        'static/lib/jquery/jquery-1.7.2.js',
-        'static/lib/jquery.MD5/jquery.md5.js',
-        'static/lib/jquery.form/jquery.form.js',
-        'static/lib/jquery.validate/jquery.validate.js',
-        'static/lib/jquery.ba-bbq/jquery.ba-bbq.js',
-        'static/lib/spinjs/spin.js',
-        'static/lib/jquery.blockUI/jquery.blockUI.js',
-        'static/lib/jquery.ui/js/jquery-ui-1.8.17.custom.min.js',
-        'static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js',
-        'static/lib/jquery.ui.notify/js/jquery.notify.js',
-        'static/lib/jquery.deferred-queue/jquery.deferred-queue.js',
-        'static/lib/jquery.scrollTo/jquery.scrollTo-min.js',
-        'static/lib/jquery.tipsy/jquery.tipsy.js',
-        'static/lib/jquery.textext/jquery.textext.js',
-        'static/lib/jquery.timeago/jquery.timeago.js',
-        'static/lib/qweb/qweb2.js',
-        'static/lib/underscore/underscore.js',
-        'static/lib/underscore/underscore.string.js',
-        'static/lib/backbone/backbone.js',
-        'static/lib/cleditor/jquery.cleditor.js',
-        'static/lib/py.js/lib/py.js',
-        'static/src/js/boot.js',
-        'static/src/js/corelib.js',
-        'static/src/js/coresetup.js',
-        'static/src/js/dates.js',
-        'static/src/js/formats.js',
-        'static/src/js/chrome.js',
-        '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',
-        'static/src/js/view_list_editable.js',
-        'static/src/js/view_tree.js',
-    ],
-    'css': [
-        'static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.8.16.custom.css',
-        'static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css',
-        'static/lib/jquery.ui.notify/css/ui.notify.css',
-        'static/lib/jquery.tipsy/tipsy.css',
-        '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': [
-        'static/src/xml/*.xml',
     ],
 }
diff --git a/addons/web/static/lib/jquery.autosize/jquery.autosize.js b/addons/web/static/lib/jquery.autosize/jquery.autosize.js
index 29729d2fd42..9d972e96a57 100644
--- a/addons/web/static/lib/jquery.autosize/jquery.autosize.js
+++ b/addons/web/static/lib/jquery.autosize/jquery.autosize.js
@@ -59,7 +59,12 @@
 				} else {
 					mirror = $(copy).data('ismirror', true).addClass(className || 'autosizejs')[0];
 
-					resize = $ta.css('resize') === 'none' ? 'none' : 'horizontal';
+					// Changed allowed resize only in edit mode by VTA (31/8/2012)
+					if ($ta.attr('disabled')) {
+						$ta.css('resize', 'none');
+					}
+					// Changed horizontal to vertical by VTA (31/8/2012)
+					resize = $ta.css('resize') === 'none' ? 'none' : 'vertical';
 
 					$ta.data('mirror', $(mirror)).css({
 						overflow: hidden,
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0b0366a9ee4..db144f3976d 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2322,12 +2322,16 @@ instance.web.form.FieldDate = instance.web.form.FieldDatetime.extend({
 
 instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldText',
+    init: function (field_manager, node) {
+        this._super(field_manager, node);
+    },
     initialize_content: function() {
+        var self = this;
         this.$textarea = this.$el.find('textarea');
         this.default_height = this.$textarea.css('height');
         if (!this.get("effective_readonly")) {
             this.$textarea.change(_.bind(function() {
-                this.set({'value': instance.web.parse_value(this.$textarea.val(), this)});
+                self.set({'value': instance.web.parse_value(self.$textarea.val(), self)});
             }, this));
         } else {
             this.$textarea.attr('disabled', 'disabled');
@@ -2340,14 +2344,17 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
         this.setupFocus(this.$textarea);
     },
     set_value: function(value_) {
-        this._super.apply(this, arguments);
+        this._super(value_);
         this.render_value();
+        $(window).resize();
     },
     render_value: function() {
         var show_value = instance.web.format_value(this.get('value'), this, '');
+        if (show_value === '') {
+            this.$textarea.css('height', parseInt(this.default_height)+"px");
+        }
         this.$textarea.val(show_value);
-        this.$textarea.autosize();
-        this.$textarea.css('height', parseInt(this.default_height)+"px");
+        this.$textarea.autosize();        
     },
     is_syntax_valid: function() {
         if (!this.get("effective_readonly")) {

From 422e3f1fbc6857e82a321fe75903aa11017b77dd Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 31 Aug 2012 16:25:40 +0530
Subject: [PATCH 166/288] [FIX] Set cron job to the false by default and module
 decrpation to use it.

bzr revid: jam@tinyerp.com-20120831105540-hnt2zbx8fz8i6i01
---
 addons/base_gengo/__openerp__.py                | 7 +++++++
 addons/base_gengo/gengo_sync_schedular_data.xml | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index 89262afc457..1f002b3de43 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -24,6 +24,13 @@
     'category': 'Tools',
     'description': """
 Automated Translations through Gengo API
+----------------------------------------
+    The module will install passive Scheduler job for Automated Translations 
+using Gnego API. To active translation Configure your gengo authentication 
+parameters under `Settings > Companies > Gengo Parameters1 and Launch the 
+Gengo Language Sync Wizard under `Settings > Application Terms > 
+Gengo: Manual Request of Translation` and follow the wizard. This wizard will
+active the Scheduler and will start active translation via Gengo Services,
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
diff --git a/addons/base_gengo/gengo_sync_schedular_data.xml b/addons/base_gengo/gengo_sync_schedular_data.xml
index bd52a9697d3..823ca8f14db 100644
--- a/addons/base_gengo/gengo_sync_schedular_data.xml
+++ b/addons/base_gengo/gengo_sync_schedular_data.xml
@@ -4,7 +4,7 @@
         <!--Scheduler sync Receive Request-->
         <record id="gengo_sync_receive_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Response)</field>
-            <field eval="True" name="active"/>
+            <field eval="False" name="active"/>
             <field name="interval_number">20</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
@@ -16,7 +16,7 @@
         <!--Scheduler Sync Send Request-->
         <record id="gengo_sync_send_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Request)</field>
-            <field eval="True" name="active"/>
+            <field eval="False" name="active"/>
             <field name="interval_number">20</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>

From decd215edcbe6a30841780861c7b1e47be09c3b5 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 31 Aug 2012 17:11:06 +0530
Subject: [PATCH 167/288] [FIX] _check_lang_support constrain

bzr revid: jam@tinyerp.com-20120831114106-tjnrcwj4nslaamxz
---
 addons/base_gengo/ir_translation.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index c7343159ddf..7b864aba8ce 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -73,15 +73,14 @@ class ir_translation(osv.Model):
         return lang in LANG_CODE_MAPPING and LANG_CODE_MAPPING[lang][0] or lang
 
     def _check_lang_support(self, cr, uid, ids, context=None):
-        supported_langs = self._get_all_supported_languages(cr, uid, context=context)
-        if supported_langs:
-            for term in self.browse(cr, uid, ids, context=context):
-                if not term.gengo_translation:
-                    continue
-                tier = "nonprofit" if term.gengo_translation == 'machine' else term.gengo_translation
-                language = self._get_gengo_corresponding_language(term.lang)
-                if tier not in supported_langs.get(language,[]):
-                    return False
+        for term in self.browse(cr, uid, ids, context=context):
+            if term.gengo_translation:
+                supported_langs = self._get_all_supported_languages(cr, uid, context=context)
+                if supported_langs:
+                    tier = "nonprofit" if term.gengo_translation == 'machine' else term.gengo_translation
+                    language = self._get_gengo_corresponding_language(term.lang)
+                    if tier not in supported_langs.get(language,[]):
+                        return False
         return True
 
     _constraints = [

From c0d5a806824986284dd022e0478e57fc1e59feb7 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 31 Aug 2012 15:12:16 +0200
Subject: [PATCH 168/288] Random generation of default avatar

bzr revid: mit@openerp.com-20120831131216-c5j02m8q7kwnn5pv
---
 openerp/addons/base/module/module_view.xml    |   2 +-
 openerp/addons/base/res/res_partner.py        |  31 ++++++++++++++++--
 openerp/addons/base/res/res_partner_view.xml  |   8 ++---
 openerp/addons/base/static/src/img/avatar.png | Bin 0 -> 10341 bytes
 .../addons/base/static/src/img/avatar0.png    | Bin 6910 -> 0 bytes
 .../addons/base/static/src/img/avatar1.png    | Bin 5279 -> 0 bytes
 .../addons/base/static/src/img/avatar2.png    | Bin 5340 -> 0 bytes
 .../addons/base/static/src/img/avatar3.png    | Bin 5317 -> 0 bytes
 .../addons/base/static/src/img/avatar4.png    | Bin 5323 -> 0 bytes
 .../addons/base/static/src/img/avatar5.png    | Bin 5374 -> 0 bytes
 .../addons/base/static/src/img/avatar6.png    | Bin 5452 -> 0 bytes
 .../base/static/src/img/partner_image.png     | Bin 2723 -> 0 bytes
 setup.py                                      |   2 +-
 13 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 openerp/addons/base/static/src/img/avatar.png
 delete mode 100644 openerp/addons/base/static/src/img/avatar0.png
 delete mode 100644 openerp/addons/base/static/src/img/avatar1.png
 delete mode 100644 openerp/addons/base/static/src/img/avatar2.png
 delete mode 100644 openerp/addons/base/static/src/img/avatar3.png
 delete mode 100644 openerp/addons/base/static/src/img/avatar4.png
 delete mode 100644 openerp/addons/base/static/src/img/avatar5.png
 delete mode 100644 openerp/addons/base/static/src/img/avatar6.png
 delete mode 100644 openerp/addons/base/static/src/img/partner_image.png

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 27eccf020b2..729d3ef7b4c 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -69,7 +69,7 @@
                         <t t-set="installed" t-value="record.state.raw_value == 'installed'"/>
                         <img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
                         <div class="oe_module_desc">
-                          <h4><a type="edit"><field name="shortdesc"/></a></h4>
+                          <h4><a type="open"><field name="shortdesc"/></a></h4>
                           <p class="oe_module_name">
                              <t t-if="record.summary.raw_value"><field name="summary"/><br/></t>
                              <i><field name="name" groups="base.group_no_one"/></i>
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 93d12228ebe..f282466b989 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -227,10 +227,35 @@ class res_partner(osv.osv):
 
     def _get_default_image(self, cr, uid, is_company, context=None):
         if is_company:
-            image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')
+            image = open(openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')).read()
         else:
-            image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'partner_image.png')
-        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
+<<<<<<< TREE
+            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))
+            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 tools.image_resize_image_big(image.encode('base64'))
+=======
+            from PIL import Image
+            from StringIO import StringIO
+            from random import random
+            color = (int(random() * 256), int(random() * 256), int(random() * 256))
+            face = open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png')).read()
+            avatar = Image.new('RGB', face.size)
+            avatar.paste(color)
+            avatar.paste(face, mask=face)
+            buffer = StringIO()
+            avatar.save(buffer, 'PNG')
+            image = buffer.getvalue()
+        return tools.image_resize_image_big(image.encode('base64'))
+>>>>>>> MERGE-SOURCE
 
     _defaults = {
         'active': True,
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 92a264f0089..7e70e68c35c 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -176,7 +176,7 @@
                                             <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')" style="position: relative">
                                                 <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
                                                 <div class="oe_module_vignette">
-                                                <a type="edit">
+                                                <a type="open">
                                                     <img t-att-src="kanban_image('res.partner', 'image', record.id.value, {'preview_image': 'image_small'})" class="oe_avatar oe_kanban_avatar_smallbox"/>
                                                 </a>
                                                     <div class="oe_module_desc">
@@ -184,7 +184,7 @@
                                                             <table class="oe_kanban_table">
                                                                 <tr>
                                                                     <td class="oe_kanban_title1" align="left" valign="middle">
-                                                                        <h4><a type="edit"><field name="name"/></a></h4>
+                                                                        <h4><a type="open"><field name="name"/></a></h4>
                                                                         <i><div t-if="record.function.raw_value">
                                                                             <field name="function"/><br/></div></i>
                                                                     </td>
@@ -302,11 +302,11 @@
                     <templates>
                         <t t-name="kanban-box">
                             <div class="oe_kanban_vignette">
-                                <a type="edit">
+                                <a type="open">
                                     <img t-att-src="kanban_image('res.partner', 'image_small', record.id.value)" class="oe_kanban_image"/>
                                 </a>
                                 <div class="oe_kanban_details">
-                                    <h4 class="oe_partner_heading"><a type="edit"><field name="name"/></a></h4>
+                                    <h4 class="oe_partner_heading"><a type="open"><field name="name"/></a></h4>
                                     <div class="oe_kanban_partner_categories"/>
                                     <div class="oe_kanban_partner_links"/>
                                     <ul>
diff --git a/openerp/addons/base/static/src/img/avatar.png b/openerp/addons/base/static/src/img/avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..93235db8afa7085e727ea6dc04fb3170ee0d92c1
GIT binary patch
literal 10341
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

literal 0
HcmV?d00001

diff --git a/openerp/addons/base/static/src/img/avatar0.png b/openerp/addons/base/static/src/img/avatar0.png
deleted file mode 100644
index 2bcc7c8d2e477a359296fbb8461c6cdb091dfdaf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/openerp/addons/base/static/src/img/avatar1.png b/openerp/addons/base/static/src/img/avatar1.png
deleted file mode 100644
index 4f6d2f7e8183ec27b29da9a3f7c3f3283034dca9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5279
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
TT)_e7i6DI)W9<qpyU70l6|~ko

diff --git a/openerp/addons/base/static/src/img/avatar2.png b/openerp/addons/base/static/src/img/avatar2.png
deleted file mode 100644
index 70d5df7ee60257cfd927fc6e9f4e8adc5114d22f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/openerp/addons/base/static/src/img/avatar3.png b/openerp/addons/base/static/src/img/avatar3.png
deleted file mode 100644
index 053768aa0350fd973ded62ec2ffbd362d59cd5d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5317
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
Z;}uHVztD9(13YzvsHtcv7b{wZ{TJkF>NWrX

diff --git a/openerp/addons/base/static/src/img/avatar4.png b/openerp/addons/base/static/src/img/avatar4.png
deleted file mode 100644
index 1b2a99f05c314245013d41b663059fc87e126684..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5323
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
EKfVga!vFvP

diff --git a/openerp/addons/base/static/src/img/avatar5.png b/openerp/addons/base/static/src/img/avatar5.png
deleted file mode 100644
index 0f6c416ecf017631a4f95d2fe8eda439a6e41cf2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5374
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
M54BZFm8@R<2b>c9f&c&j

diff --git a/openerp/addons/base/static/src/img/avatar6.png b/openerp/addons/base/static/src/img/avatar6.png
deleted file mode 100644
index d6a18c2779e4bf8b582183a483a22e612f5d87c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5452
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
bGmhzU%<$Z@vCf}>%TEweO;5E-#SZ%)_s%9~

diff --git a/openerp/addons/base/static/src/img/partner_image.png b/openerp/addons/base/static/src/img/partner_image.png
deleted file mode 100644
index 87fdbc5af55a640792e97a49e80b0e7e47dfcd8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/setup.py b/setup.py
index 77a59d52cf7..a26b74e255d 100755
--- a/setup.py
+++ b/setup.py
@@ -95,7 +95,7 @@ setuptools.setup(
           'docutils',
           'feedparser',
           'gdata',
-          'lxml',
+          'lxml < 3',
           'mako',
           'psycopg2',
           'pydot',

From a57ee611c4129f50797ef462e8dcb2b528f4669f Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 31 Aug 2012 15:31:33 +0200
Subject: [PATCH 169/288] fix merge crap

bzr revid: mit@openerp.com-20120831133133-5u2jvawyn6xkth91
---
 openerp/addons/base/res/res_partner.py | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index f282466b989..e4d6d0341b0 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -229,7 +229,6 @@ class res_partner(osv.osv):
         if is_company:
             image = open(openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')).read()
         else:
-<<<<<<< TREE
             from PIL import Image
             from StringIO import StringIO
             from random import random
@@ -242,20 +241,6 @@ class res_partner(osv.osv):
             avatar.save(buffer, 'PNG')
             image = buffer.getvalue()
         return tools.image_resize_image_big(image.encode('base64'))
-=======
-            from PIL import Image
-            from StringIO import StringIO
-            from random import random
-            color = (int(random() * 256), int(random() * 256), int(random() * 256))
-            face = open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png')).read()
-            avatar = Image.new('RGB', face.size)
-            avatar.paste(color)
-            avatar.paste(face, mask=face)
-            buffer = StringIO()
-            avatar.save(buffer, 'PNG')
-            image = buffer.getvalue()
-        return tools.image_resize_image_big(image.encode('base64'))
->>>>>>> MERGE-SOURCE
 
     _defaults = {
         'active': True,

From ad051ebf45cc28e94ad8a5aa0d1fa41b3571b7c1 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 31 Aug 2012 15:49:41 +0200
Subject: [PATCH 170/288] fix old avatar code

bzr revid: mit@openerp.com-20120831134941-w0xui7l1pj3ulv71
---
 openerp/addons/base/res/res_users.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index cddc02673b8..f802a7065bd 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -206,11 +206,6 @@ class res_users(osv.osv):
         ('login_key', 'UNIQUE (login)',  'You can not have two users with the same login !')
     ]
 
-    def _get_default_image(self, cr, uid, context=None):
-        """ Override of res.partner: multicolor avatars ! """
-        image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'avatar%d.png' % random.randint(0, 6))
-        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
-
     def _get_company(self,cr, uid, context=None, uid2=False):
         if not uid2:
             uid2 = uid

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 171/288] [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 172/288] [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 1eac0fbe525eea0cca7ba137878d31124b648535 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 31 Aug 2012 15:51:36 +0200
Subject: [PATCH 173/288] [REF] Replace the user id 1 by openerp.SUPERUSER_ID

bzr revid: stw@openerp.com-20120831135136-8k2wjeiixqt6tnkr
---
 addons/account/account.py                     | 10 +++---
 addons/audittrail/audittrail.py               | 35 ++++++++++---------
 addons/auth_oauth/controllers/main.py         |  5 +--
 addons/auth_oauth/res_users.py                |  3 +-
 addons/auth_openid/controllers/main.py        |  9 ++---
 .../auth_reset_password.py                    |  7 ++--
 addons/auth_signup/controllers/main.py        |  3 +-
 addons/auth_signup/res_users.py               |  5 +--
 addons/decimal_precision/decimal_precision.py |  3 +-
 addons/document_webdav/nodes.py               |  4 ++-
 addons/document_webdav/test_davclient.py      |  3 +-
 addons/l10n_br/account.py                     |  5 +--
 addons/mail/mail_alias.py                     |  3 +-
 addons/mail/res_users.py                      |  2 +-
 addons/project/project.py                     |  3 +-
 addons/share/wizard/share_wizard.py           |  3 +-
 16 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 9383913abbb..e11479e4dc0 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -30,6 +30,8 @@ from osv import fields, osv
 import decimal_precision as dp
 from tools.translate import _
 from tools.float_utils import float_round
+from openerp import SUPERUSER_ID
+
 
 _logger = logging.getLogger(__name__)
 
@@ -819,7 +821,7 @@ class account_journal(osv.osv):
         if not 'sequence_id' in vals or not vals['sequence_id']:
             # if we have the right to create a journal, we should be able to
             # create it's sequence.
-            vals.update({'sequence_id': self.create_sequence(cr, 1, vals, context)})
+            vals.update({'sequence_id': self.create_sequence(cr, SUPERUSER_ID, vals, context)})
         return super(account_journal, self).create(cr, uid, vals, context)
 
     def name_get(self, cr, user, ids, context=None):
@@ -1858,7 +1860,7 @@ class account_tax(osv.osv):
 
     def get_precision_tax():
         def change_digit_tax(cr):
-            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account')
             return (16, res+2)
         return change_digit_tax
 
@@ -3349,9 +3351,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         # write values of default taxes for product as super user
         if obj_wizard.sale_tax and taxes_ref:
-            ir_values_obj.set_default(cr, 1, 'product.product', "taxes_id", [taxes_ref[obj_wizard.sale_tax.id]], for_all_users=True, company_id=company_id)
+            ir_values_obj.set_default(cr, SUPERUSER_ID, 'product.product', "taxes_id", [taxes_ref[obj_wizard.sale_tax.id]], for_all_users=True, company_id=company_id)
         if obj_wizard.purchase_tax and taxes_ref:
-            ir_values_obj.set_default(cr, 1, 'product.product', "supplier_taxes_id", [taxes_ref[obj_wizard.purchase_tax.id]], for_all_users=True, company_id=company_id)
+            ir_values_obj.set_default(cr, SUPERUSER_ID, 'product.product', "supplier_taxes_id", [taxes_ref[obj_wizard.purchase_tax.id]], for_all_users=True, company_id=company_id)
 
         # Create Bank journals
         self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index aee9fbd9305..3dff7c1cb00 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -25,6 +25,7 @@ from tools.translate import _
 import pooler
 import time
 import tools
+from openerp import SUPERUSER_ID
 
 class audittrail_rule(osv.osv):
     """
@@ -252,10 +253,10 @@ class audittrail_objects_proxy(object_proxy):
         pool = pooler.get_pool(cr.dbname)
         resource_pool = pool.get(model)
         model_pool = pool.get('ir.model')
-        model_ids = model_pool.search(cr, 1, [('model', '=', model)])
+        model_ids = model_pool.search(cr, SUPERUSER_ID, [('model', '=', model)])
         model_id = model_ids and model_ids[0] or False
         assert model_id, _("'%s' Model does not exist..." %(model))
-        model = model_pool.browse(cr, 1, model_id)
+        model = model_pool.browse(cr, SUPERUSER_ID, model_id)
 
         # fields to log. currently only used by log on read()
         field_list = []
@@ -322,7 +323,7 @@ class audittrail_objects_proxy(object_proxy):
         data = {}
         resource_pool = pool.get(model.model)
         # read all the fields of the given resources in super admin mode
-        for resource in resource_pool.read(cr, 1, res_ids):
+        for resource in resource_pool.read(cr, SUPERUSER_ID, res_ids):
             values = {}
             values_text = {}
             resource_id = resource['id']
@@ -332,19 +333,19 @@ class audittrail_objects_proxy(object_proxy):
                     continue
                 values[field] = resource[field]
                 # get the textual value of that field for this record
-                values_text[field] = self.get_value_text(cr, 1, pool, resource_pool, method, field, resource[field])
+                values_text[field] = self.get_value_text(cr, SUPERUSER_ID, pool, resource_pool, method, field, resource[field])
 
                 field_obj = resource_pool._all_columns.get(field).column
                 if field_obj._type in ('one2many','many2many'):
                     # check if an audittrail rule apply in super admin mode
-                    if self.check_rules(cr, 1, field_obj._obj, method):
+                    if self.check_rules(cr, SUPERUSER_ID, field_obj._obj, method):
                         # check if the model associated to a *2m field exists, in super admin mode
-                        x2m_model_ids = pool.get('ir.model').search(cr, 1, [('model', '=', field_obj._obj)])
+                        x2m_model_ids = pool.get('ir.model').search(cr, SUPERUSER_ID, [('model', '=', field_obj._obj)])
                         x2m_model_id = x2m_model_ids and x2m_model_ids[0] or False
                         assert x2m_model_id, _("'%s' Model does not exist..." %(field_obj._obj))
-                        x2m_model = pool.get('ir.model').browse(cr, 1, x2m_model_id)
+                        x2m_model = pool.get('ir.model').browse(cr, SUPERUSER_ID, x2m_model_id)
                         #recursive call on x2m fields that need to be checked too
-                        data.update(self.get_data(cr, 1, pool, resource[field], x2m_model, method))
+                        data.update(self.get_data(cr, SUPERUSER_ID, pool, resource[field], x2m_model, method))
             data[(model.id, resource_id)] = {'text':values_text, 'value': values}
         return data
 
@@ -389,12 +390,12 @@ class audittrail_objects_proxy(object_proxy):
             field_obj = field_definition.column
             if field_obj._type in ('one2many','many2many'):
                 # checking if an audittrail rule apply in super admin mode
-                if self.check_rules(cr, 1, field_obj._obj, method):
+                if self.check_rules(cr, SUPERUSER_ID, field_obj._obj, method):
                     # checking if the model associated to a *2m field exists, in super admin mode
-                    x2m_model_ids = pool.get('ir.model').search(cr, 1, [('model', '=', field_obj._obj)])
+                    x2m_model_ids = pool.get('ir.model').search(cr, SUPERUSER_ID, [('model', '=', field_obj._obj)])
                     x2m_model_id = x2m_model_ids and x2m_model_ids[0] or False
                     assert x2m_model_id, _("'%s' Model does not exist..." %(field_obj._obj))
-                    x2m_model = pool.get('ir.model').browse(cr, 1, x2m_model_id)
+                    x2m_model = pool.get('ir.model').browse(cr, SUPERUSER_ID, x2m_model_id)
                     # the resource_ids that need to be checked are the sum of both old and previous values (because we
                     # need to log also creation or deletion in those lists).
                     x2m_old_values_ids = old_values.get(key, {'value': {}})['value'].get(field_name, [])
@@ -402,7 +403,7 @@ class audittrail_objects_proxy(object_proxy):
                     # We use list(set(...)) to remove duplicates.
                     res_ids = list(set(x2m_old_values_ids + x2m_new_values_ids))
                     for res_id in res_ids:
-                        lines.update(self.prepare_audittrail_log_line(cr, 1, pool, x2m_model, res_id, method, old_values, new_values, field_list))
+                        lines.update(self.prepare_audittrail_log_line(cr, SUPERUSER_ID, pool, x2m_model, res_id, method, old_values, new_values, field_list))
             # if the value value is different than the old value: record the change
             if key not in old_values or key not in new_values or old_values[key]['value'][field_name] != new_values[key]['value'][field_name]:
                 data = {
@@ -459,9 +460,9 @@ class audittrail_objects_proxy(object_proxy):
                     vals.update({'method': 'unlink'})
                 # create the audittrail log in super admin mode, only if a change has been detected
                 if lines[(model_id, resource_id)]:
-                    log_id = pool.get('audittrail.log').create(cr, 1, vals)
+                    log_id = pool.get('audittrail.log').create(cr, SUPERUSER_ID, vals)
                     model = pool.get('ir.model').browse(cr, uid, model_id)
-                    self.create_log_line(cr, 1, log_id, model, lines[(model_id, resource_id)])
+                    self.create_log_line(cr, SUPERUSER_ID, log_id, model, lines[(model_id, resource_id)])
         return True
 
     def check_rules(self, cr, uid, model, method):
@@ -475,11 +476,11 @@ class audittrail_objects_proxy(object_proxy):
         """
         pool = pooler.get_pool(cr.dbname)
         if 'audittrail.rule' in pool.models:
-            model_ids = pool.get('ir.model').search(cr, 1, [('model', '=', model)])
+            model_ids = pool.get('ir.model').search(cr, SUPERUSER_ID, [('model', '=', model)])
             model_id = model_ids and model_ids[0] or False
             if model_id:
-                rule_ids = pool.get('audittrail.rule').search(cr, 1, [('object_id', '=', model_id), ('state', '=', 'subscribed')])
-                for rule in pool.get('audittrail.rule').read(cr, 1, rule_ids, ['user_id','log_read','log_write','log_create','log_unlink','log_action','log_workflow']):
+                rule_ids = pool.get('audittrail.rule').search(cr, SUPERUSER_ID, [('object_id', '=', model_id), ('state', '=', 'subscribed')])
+                for rule in pool.get('audittrail.rule').read(cr, SUPERUSER_ID, rule_ids, ['user_id','log_read','log_write','log_create','log_unlink','log_action','log_workflow']):
                     if len(rule['user_id']) == 0 or uid in rule['user_id']:
                         if rule.get('log_'+method,0):
                             return True
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 2959fa45db1..5d939f19db1 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -7,6 +7,7 @@ import werkzeug.utils
 import openerp.modules.registry
 import openerp.addons.web.controllers.main
 import openerp.addons.web.common.http as openerpweb
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -18,7 +19,7 @@ class OAuthController(openerpweb.Controller):
         registry = openerp.modules.registry.RegistryManager.get(dbname)
         with registry.cursor() as cr:
             providers = registry.get('auth.oauth.provider')
-            l = providers.read(cr, 1, providers.search(cr, 1, [('enabled','=',True)]))
+            l = providers.read(cr, SUPERUSER_ID, providers.search(cr, SUPERUSER_ID, [('enabled','=',True)]))
         return l
 
     @openerpweb.httprequest
@@ -30,7 +31,7 @@ class OAuthController(openerpweb.Controller):
         with registry.cursor() as cr:
             try:
                 u = registry.get('res.users')
-                credentials = u.auth_oauth(cr, 1, provider, kw)
+                credentials = u.auth_oauth(cr, SUPERUSER_ID, provider, kw)
                 cr.commit()
                 return openerp.addons.web.controllers.main.login_and_redirect(req, *credentials)
             except AttributeError:
diff --git a/addons/auth_oauth/res_users.py b/addons/auth_oauth/res_users.py
index 3dbab849942..b4f62612746 100644
--- a/addons/auth_oauth/res_users.py
+++ b/addons/auth_oauth/res_users.py
@@ -6,6 +6,7 @@ import simplejson
 
 import openerp
 from openerp.osv import osv, fields
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -63,7 +64,7 @@ class res_users(osv.Model):
         try:
             return super(res_users, self).check_credentials(cr, uid, password)
         except openerp.exceptions.AccessDenied:
-            res = self.search(cr, 1, [('id','=',uid),('oauth_access_token','=',password)])
+            res = self.search(cr, SUPERUSER_ID, [('id','=',uid),('oauth_access_token','=',password)])
             if not res:
                 raise
 
diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py
index eba711dae7a..ebcaab4bf25 100644
--- a/addons/auth_openid/controllers/main.py
+++ b/addons/auth_openid/controllers/main.py
@@ -23,6 +23,7 @@ import logging
 import os
 import tempfile
 import urllib
+from openerp import SUPERUSER_ID
 
 import werkzeug.urls
 import werkzeug.exceptions
@@ -176,7 +177,7 @@ class OpenIDController(openerpweb.Controller):
             with registry.cursor() as cr:
                 Modules = registry.get('ir.module.module')
 
-                installed = Modules.search_count(cr, 1, ['&', ('name', '=', 'auth_openid'), ('state', '=', 'installed')]) == 1
+                installed = Modules.search_count(cr, SUPERUSER_ID, ['&', ('name', '=', 'auth_openid'), ('state', '=', 'installed')]) == 1
                 if installed:
 
                     Users = registry.get('res.users')
@@ -196,13 +197,13 @@ class OpenIDController(openerpweb.Controller):
 
                     domain += [('openid_url', '=', openid_url), ('active', '=', True)]
 
-                    ids = Users.search(cr, 1, domain)
+                    ids = Users.search(cr, SUPERUSER_ID, domain)
                     assert len(ids) < 2
                     if ids:
                         user_id = ids[0]
-                        login = Users.browse(cr, 1, user_id).login
+                        login = Users.browse(cr, SUPERUSER_ID, user_id).login
                         key = randomString(utils.KEY_LENGTH, '0123456789abcdef')
-                        Users.write(cr, 1, [user_id], {'openid_key': key})
+                        Users.write(cr, SUPERUSER_ID, [user_id], {'openid_key': key})
                         # TODO fill empty fields with the ones from sreg/ax
                         cr.commit()
 
diff --git a/addons/auth_reset_password/auth_reset_password.py b/addons/auth_reset_password/auth_reset_password.py
index 3d1bcbbfa7b..ff208c89b9c 100644
--- a/addons/auth_reset_password/auth_reset_password.py
+++ b/addons/auth_reset_password/auth_reset_password.py
@@ -6,6 +6,7 @@ import urlparse
 
 from openerp.tools import config
 from openerp.osv import osv, fields
+from openerp import SUPERUSER_ID
 
 TWENTY_FOUR_HOURS = 24 * 60 * 60
 
@@ -76,9 +77,9 @@ class res_users(osv.osv):
         MailMessage.send(cr, uid, [msg_id], context=context)
 
     def send_reset_password_request(self, cr, uid, email, context=None):
-        ids = self.pool.get('res.users').search(cr, 1, [('user_email', '=', email)], context=context)
+        ids = self.pool.get('res.users').search(cr, SUPERUSER_ID, [('user_email', '=', email)], context=context)
         if ids:
-            self._auth_reset_password_send_email(cr, 1, email, 'reset_password_email', ids[0], context=context)
+            self._auth_reset_password_send_email(cr, SUPERUSER_ID, email, 'reset_password_email', ids[0], context=context)
             return True
         #else:
         #    _m, company_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'main_company')
@@ -109,7 +110,7 @@ class auth_reset_password(osv.TransientModel):
         Users = self.pool.get('res.users')
         data = Users._auth_reset_password_check_token(cr, uid, values.get('token', ''))
         if data:
-            Users.write(cr, 1, data['uid'], {'password': pw}, context=context)
+            Users.write(cr, SUPERUSER_ID, data['uid'], {'password': pw}, context=context)
         else:
             raise osv.except_osv('Error', 'Invalid token')
 
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 0ed2151d12b..821ef44f459 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -5,6 +5,7 @@ import werkzeug.urls
 from openerp.modules.registry import RegistryManager
 from openerp.addons.web.controllers.main import login_and_redirect
 import openerp.addons.web.common.http as openerpweb
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -18,7 +19,7 @@ class OpenIDController(openerpweb.Controller):
         with registry.cursor() as cr:
             try:
                 Users = registry.get('res.users')
-                credentials = Users.auth_signup(cr, 1, name, login, password)
+                credentials = Users.auth_signup(cr, SUPERUSER_ID, name, login, password)
                 cr.commit()
                 return login_and_redirect(req, *credentials)
             except AttributeError:
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 1d77a3f9473..5f6463508b6 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -1,5 +1,6 @@
 import openerp
 from openerp.osv import osv
+from openerp import SUPERUSER_ID
 
 class res_users(osv.Model):
     _inherit = 'res.users'
@@ -15,9 +16,9 @@ class res_users(osv.Model):
         #
         user_template_id = self.pool.get('ir.config_parameter').get_param(cr, uid, 'auth.signup_template_user_id', 0)
         if user_template_id:
-            self.pool.get('res.users').copy(cr, 1, user_template_id, new_user, context=context)
+            self.pool.get('res.users').copy(cr, SUPERUSER_ID, user_template_id, new_user, context=context)
         else:
-            self.pool.get('res.users').create(cr, 1, new_user, context=context)
+            self.pool.get('res.users').create(cr, SUPERUSER_ID, new_user, context=context)
 
     def auth_signup(self, cr, uid, name, login, password, context=None):
         r = (cr.dbname, login, password)
diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index d9f6aa7b8db..93d69eb3093 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -22,6 +22,7 @@
 from osv import osv, fields
 import tools
 import pooler
+from openerp import SUPERUSER_ID
 
 class decimal_precision(osv.osv):
     _name = 'decimal.precision'
@@ -56,7 +57,7 @@ decimal_precision()
 
 def get_precision(application):
     def change_digit(cr):
-        res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, application)
+        res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, application)
         return (16, res)
     return change_digit
 
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index d6ceca458cd..a8fedee4fe3 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -25,6 +25,8 @@ from tools.safe_eval import safe_eval as eval
 import time
 import urllib
 import uuid
+from openerp import SUPERUSER_ID
+
 try:
     from tools.dict_tools import dict_filter
 except ImportError:
@@ -233,7 +235,7 @@ class node_acl_mixin(object):
         
         if props_to_delete:
             # explicitly delete, as admin, any of the ids we have identified.
-            propobj.unlink(cr, 1, props_to_delete)
+            propobj.unlink(cr, SUPERUSER_ID, props_to_delete)
         
         if lock_data.get('unlock_mode', False):
             return lock_found and True
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index f1f2e58c835..0f66363c553 100755
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -42,6 +42,7 @@ from tools import config
 from xmlrpclib import Transport, ProtocolError
 import StringIO
 import base64
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -361,7 +362,7 @@ class DAVClient(object):
         to break if "base_crypt" is used.
         """
         ruob = obj.pool.get('res.users')
-        res = ruob.read(cr, 1, [uid,], ['login', 'password'])
+        res = ruob.read(cr, SUPERUSER_ID, [uid,], ['login', 'password'])
         assert res, "uid %s not found" % uid
         self.user = res[0]['login']
         self.passwd = res[0]['password']
diff --git a/addons/l10n_br/account.py b/addons/l10n_br/account.py
index 6e38aaa690f..64d3c2cda79 100644
--- a/addons/l10n_br/account.py
+++ b/addons/l10n_br/account.py
@@ -29,6 +29,7 @@ import decimal_precision as dp
 from tools.misc import currency
 from tools.translate import _
 from tools import config
+from openerp import SUPERUSER_ID
 
 class account_tax_code_template(osv.osv):
 
@@ -53,7 +54,7 @@ class account_tax_template(osv.osv):
     
     def get_precision_tax():
         def change_digit_tax(cr):
-            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account')
             return (16, res+2)
         return change_digit_tax
     
@@ -91,7 +92,7 @@ class account_tax(osv.osv):
     
     def get_precision_tax():
         def change_digit_tax(cr):
-            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account')
             return (16, res+2)
         return change_digit_tax
     
diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 5bcce0b8927..27eb29051b9 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -92,9 +92,8 @@ class mail_alias(osv.Model):
     _defaults = {
         'alias_defaults': '{}',
         'alias_user_id': lambda self,cr,uid,context: uid,
-        
         # looks better when creating new aliases - even if the field is informative only
-        'alias_domain': lambda self,cr,uid,context: self._get_alias_domain(cr,1,[1],None,None)[1]
+        'alias_domain': lambda self,cr,uid,context: self._get_alias_domain(cr, SUPERUSER_ID,[1],None,None)[1]
     }
 
     _sql_constraints = [
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index d9c77cb83f4..63280bbaf6c 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -88,7 +88,7 @@ class res_users(osv.Model):
         subject = '''%s has joined %s.''' % (user.name, company_name)
         body = '''Welcome to OpenERP !''' 
         # TODO change 1 into user.id but catch errors
-        return self.pool.get('res.partner').message_append_note(cr, 1, [user.partner_id.id],
+        return self.pool.get('res.partner').message_append_note(cr, SUPERUSER_ID, [user.partner_id.id],
             subject=subject, body=body, type='comment', content_subtype='html', context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
diff --git a/addons/project/project.py b/addons/project/project.py
index 904e19671cb..f16cb905807 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -26,6 +26,7 @@ from osv import fields, osv
 from openerp.addons.resource.faces import task as Task
 import time
 from tools.translate import _
+from openerp import SUPERUSER_ID
 
 _TASK_STATE = [('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')]
 
@@ -877,7 +878,7 @@ class task(base_stage, osv.osv):
         if context is None: context = {}
         # read uom as admin to avoid access rights issues, e.g. for portal/share users,
         # this should be safe (no context passed to avoid side-effects)
-        obj_tm = users_obj.browse(cr, 1, uid, context=context).company_id.project_time_mode_id
+        obj_tm = users_obj.browse(cr, SUPERUSER_ID, uid, context=context).company_id.project_time_mode_id
         tm = obj_tm and obj_tm.name or 'Hours'
 
         res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 598bb085967..204ca1e92e1 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -23,6 +23,7 @@ import random
 import time
 from urllib import quote_plus
 import uuid
+from openerp import SUPERUSER_ID
 
 import simplejson
 
@@ -545,7 +546,7 @@ class share_wizard(osv.TransientModel):
                             _logger.debug("Copying rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
                         else:
                             # otherwise we can simply link the rule to keep it dynamic
-                            rule_obj.write(cr, 1, [rule.id], {
+                            rule_obj.write(cr, SUPERUSER_ID, [rule.id], {
                                     'groups': [(4,group_id)]
                                 })
                             _logger.debug("Linking rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)

From b3988436cb09b41a9d303602f36a88f9f8ed4df4 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 31 Aug 2012 15:53:09 +0200
Subject: [PATCH 174/288] [REF] Replace the user id 1 by openerp.SUPERUSER_ID

bzr revid: stw@openerp.com-20120831135309-o4plzf5wp0kyuzgf
---
 openerp/addons/base/ir/ir_actions.py          |  3 +-
 openerp/addons/base/ir/ir_config_parameter.py |  5 ++-
 openerp/addons/base/ir/ir_rule.py             |  4 +-
 openerp/addons/base/ir/ir_ui_menu.py          |  3 +-
 openerp/addons/base/res/res_company.py        |  3 +-
 openerp/addons/base/res/res_users.py          | 19 ++++-----
 openerp/modules/loading.py                    |  3 +-
 openerp/osv/fields.py                         | 11 +++---
 openerp/osv/orm.py                            |  3 +-
 openerp/service/web_services.py               |  5 ++-
 openerp/tools/translate.py                    |  5 ++-
 openerp/tools/yaml_import.py                  | 39 ++++++++++---------
 12 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index a5d04d7f1bc..019ef62a6bd 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -35,6 +35,7 @@ from tools.config import config
 from tools.safe_eval import safe_eval as eval
 from tools.translate import _
 from socket import gethostname
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -271,7 +272,7 @@ class act_window(osv.osv):
         :return: A read() view of the ir.actions.act_window
         """
         dataobj = self.pool.get('ir.model.data')
-        data_id = dataobj._get_id (cr, 1, module, xml_id)
+        data_id = dataobj._get_id (cr, SUPERUSER_ID, module, xml_id)
         res_id = dataobj.browse(cr, uid, data_id, context).res_id
         return self.read(cr, uid, res_id, [], context)
 
diff --git a/openerp/addons/base/ir/ir_config_parameter.py b/openerp/addons/base/ir/ir_config_parameter.py
index f21c2db8d0a..120fcfca554 100644
--- a/openerp/addons/base/ir/ir_config_parameter.py
+++ b/openerp/addons/base/ir/ir_config_parameter.py
@@ -26,6 +26,7 @@ from osv import osv,fields
 import uuid
 import datetime
 from tools import misc, config
+from openerp import SUPERUSER_ID
 
 """
 A dictionary holding some configuration parameters to be initialized when the database is created.
@@ -55,9 +56,9 @@ class ir_config_parameter(osv.osv):
         Initializes the parameters listed in _default_parameters.
         """
         for key, func in _default_parameters.iteritems():
-            ids = self.search(cr, 1, [('key','=',key)])
+            ids = self.search(cr, SUPERUSER_ID, [('key','=',key)])
             if not ids:
-                self.set_param(cr, 1, key, func())
+                self.set_param(cr, SUPERUSER_ID, key, func())
 
     def get_param(self, cr, uid, key, default=False, context=None):
         """Retrieve the value for a given key.
diff --git a/openerp/addons/base/ir/ir_rule.py b/openerp/addons/base/ir/ir_rule.py
index 2b864a7f8c6..75882051e6b 100644
--- a/openerp/addons/base/ir/ir_rule.py
+++ b/openerp/addons/base/ir/ir_rule.py
@@ -44,7 +44,7 @@ class ir_rule(osv.osv):
     def _eval_context(self, cr, uid):
         """Returns a dictionary to use as evaluation context for
            ir.rule domains."""
-        return {'user': self.pool.get('res.users').browse(cr, 1, uid),
+        return {'user': self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid),
                 'time':time}
 
     def _domain_force_get(self, cr, uid, ids, field_name, arg, context=None):
@@ -152,7 +152,7 @@ class ir_rule(osv.osv):
             # involve objects on which the real uid has no acces rights.
             # This means also there is no implicit restriction (e.g. an object
             # references another object the user can't see).
-            query = self.pool.get(model_name)._where_calc(cr, 1, dom, active_test=False)
+            query = self.pool.get(model_name)._where_calc(cr, SUPERUSER_ID, dom, active_test=False)
             return query.where_clause, query.where_clause_params, query.tables
         return [], [], ['"'+self.pool.get(model_name)._table+'"']
 
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index 77c0c4d738a..add4a39a182 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -28,6 +28,7 @@ import tools
 import openerp.modules
 from osv import fields, osv
 from tools.translate import _
+from openerp import SUPERUSER_ID
 
 def one_in(setA, setB):
     """Check the presence of an element of setA in setB
@@ -59,7 +60,7 @@ class ir_ui_menu(osv.osv):
         """
         with self.cache_lock:
             modelaccess = self.pool.get('ir.model.access')
-            user_groups = set(self.pool.get('res.users').read(cr, 1, uid, ['groups_id'])['groups_id'])
+            user_groups = set(self.pool.get('res.users').read(cr, SUPERUSER_ID, uid, ['groups_id'])['groups_id'])
             result = []
             for menu in self.browse(cr, uid, ids, context=context):
                 # this key works because user access rights are all based on user's groups (cfr ir_model_access.check)
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index c1062f2af2c..f6f0d1808e4 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
 
@@ -156,7 +157,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,
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index f802a7065bd..6394a703811 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -26,6 +26,7 @@ import logging
 from lxml import etree
 from lxml.builder import E
 import netsvc
+from openerp import SUPERUSER_ID
 import openerp
 import openerp.exceptions
 from osv import fields,osv
@@ -233,9 +234,9 @@ class res_users(osv.osv):
         dataobj = self.pool.get('ir.model.data')
         result = []
         try:
-            dummy,group_id = dataobj.get_object_reference(cr, 1, 'base', 'group_user')
+            dummy,group_id = dataobj.get_object_reference(cr, SUPERUSER_ID, 'base', 'group_user')
             result.append(group_id)
-            dummy,group_id = dataobj.get_object_reference(cr, 1, 'base', 'group_partner_manager')
+            dummy,group_id = dataobj.get_object_reference(cr, SUPERUSER_ID, 'base', 'group_partner_manager')
             result.append(group_id)
         except ValueError:
             # If these groups does not exists anymore
@@ -275,7 +276,7 @@ class res_users(osv.osv):
                     break
             else:
                 if 'company_id' in values:
-                    if not (values['company_id'] in self.read(cr, 1, uid, ['company_ids'], context=context)['company_ids']):
+                    if not (values['company_id'] in self.read(cr, SUPERUSER_ID, uid, ['company_ids'], context=context)['company_ids']):
                         del values['company_id']
                 uid = 1 # safe fields only, so we write as super-user to bypass access rights
 
@@ -327,7 +328,7 @@ class res_users(osv.osv):
         return super(res_users, self).copy(cr, uid, id, copydef, context)
 
     def context_get(self, cr, uid, context=None):
-        user = self.browse(cr, 1, uid, context)
+        user = self.browse(cr, SUPERUSER_ID, uid, context)
         result = {}
         for k in self._all_columns.keys():
             if k.startswith('context_'):
@@ -345,7 +346,7 @@ class res_users(osv.osv):
 
     def action_get(self, cr, uid, context=None):
         dataobj = self.pool.get('ir.model.data')
-        data_id = dataobj._get_id(cr, 1, 'base', 'action_res_users_my')
+        data_id = dataobj._get_id(cr, SUPERUSER_ID, 'base', 'action_res_users_my')
         return dataobj.browse(cr, uid, data_id, context=context).res_id
 
     def check_super(self, passwd):
@@ -356,7 +357,7 @@ class res_users(osv.osv):
 
     def check_credentials(self, cr, uid, password):
         """ Override this method to plug additional authentication methods"""
-        res = self.search(cr, 1, [('id','=',uid),('password','=',password)])
+        res = self.search(cr, SUPERUSER_ID, [('id','=',uid),('password','=',password)])
         if not res:
             raise openerp.exceptions.AccessDenied()
 
@@ -372,7 +373,7 @@ class res_users(osv.osv):
             # of them rolled back due to a concurrent access.)
             cr.autocommit(True)
             # check if user exists
-            res = self.search(cr, 1, [('login','=',login)])
+            res = self.search(cr, SUPERUSER_ID, [('login','=',login)])
             if res:
                 user_id = res[0]
                 # check credentials
@@ -537,7 +538,7 @@ class groups_implied(osv.osv):
             return memo[g]
 
         res = {}
-        for g in self.browse(cr, 1, ids, context):
+        for g in self.browse(cr, SUPERUSER_ID, ids, context):
             res[g.id] = map(int, computed_set(g))
         return res
 
@@ -682,7 +683,7 @@ class groups_view(osv.osv):
 
     def get_user_groups_view(self, cr, uid, context=None):
         try:
-            view = self.pool.get('ir.model.data').get_object(cr, 1, 'base', 'user_groups_view', context)
+            view = self.pool.get('ir.model.data').get_object(cr, SUPERUSER_ID, 'base', 'user_groups_view', context)
             assert view and view._table_name == 'ir.ui.view'
         except Exception:
             view = False
diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index 8a2c43e6ed2..86e69fa64ba 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -39,6 +39,7 @@ import openerp.pooler as pooler
 import openerp.release as release
 import openerp.tools as tools
 import openerp.tools.assertion_report as assertion_report
+from openerp import SUPERUSER_ID
 
 from openerp import SUPERUSER_ID
 from openerp.tools.translate import _
@@ -296,7 +297,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
             modobj = pool.get('ir.module.module')
             if ('base' in tools.config['init']) or ('base' in tools.config['update']):
                 _logger.info('updating modules list')
-                modobj.update_list(cr, 1)
+                modobj.update_list(cr, SUPERUSER_ID)
 
             _check_module_names(cr, itertools.chain(tools.config['init'].keys(), tools.config['update'].keys()))
 
diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 5a47601f8a5..b6b43f3f4c9 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -46,6 +46,7 @@ from openerp.tools.translate import _
 from openerp.tools import float_round, float_repr
 import simplejson
 from openerp.tools.html_sanitize import html_sanitize
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -444,7 +445,7 @@ class many2one(_column):
         # build a dictionary of the form {'id_of_distant_resource': name_of_distant_resource}
         # we use uid=1 because the visibility of a many2one field value (just id and name)
         # must be the access right of the parent form and not the linked object itself.
-        records = dict(obj.name_get(cr, 1,
+        records = dict(obj.name_get(cr, SUPERUSER_ID,
                                     list(set([x for x in res.values() if isinstance(x, (int,long))])),
                                     context=context))
         for id in res:
@@ -1200,7 +1201,7 @@ class related(function):
         else:
             res = {}.fromkeys(ids, False)
 
-        objlst = obj.browse(cr, 1, ids, context=context)
+        objlst = obj.browse(cr, SUPERUSER_ID, ids, context=context)
         for data in objlst:
             if not data:
                 continue
@@ -1230,7 +1231,7 @@ class related(function):
                 # name_get as root, as seeing the name of a related
                 # object depends on access right of source document,
                 # not target, so user may not have access.
-                ng = dict(obj.pool.get(self._obj).name_get(cr, 1, ids, context=context))
+                ng = dict(obj.pool.get(self._obj).name_get(cr, SUPERUSER_ID, ids, context=context))
                 for r in res:
                     if res[r]:
                         res[r] = (res[r], ng[res[r]])
@@ -1495,7 +1496,7 @@ class property(function):
                 # not target, so user may not have access) in order to avoid
                 # pointing on an unexisting record.
                 if property_destination_obj:
-                    if res[id][prop_name] and obj.pool.get(property_destination_obj).exists(cr, 1, res[id][prop_name].id):
+                    if res[id][prop_name] and obj.pool.get(property_destination_obj).exists(cr, SUPERUSER_ID, res[id][prop_name].id):
                         name_get_ids[id] = res[id][prop_name].id
                     else:
                         res[id][prop_name] = False
@@ -1503,7 +1504,7 @@ class property(function):
                 # name_get as root (as seeing the name of a related
                 # object depends on access right of source document,
                 # not target, so user may not have access.)
-                name_get_values = dict(obj.pool.get(property_destination_obj).name_get(cr, 1, name_get_ids.values(), context=context))
+                name_get_values = dict(obj.pool.get(property_destination_obj).name_get(cr, SUPERUSER_ID, name_get_ids.values(), context=context))
                 # the property field is a m2o, we need to return a tuple with (id, name)
                 for k, v in name_get_ids.iteritems():
                     if res[k][prop_name]:
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 7c8085ea8ed..a9be954b5ac 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -63,6 +63,7 @@ from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools.translate import _
 from openerp import SUPERUSER_ID
 from query import Query
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 _schema = logging.getLogger(__name__ + '.schema')
@@ -773,7 +774,7 @@ class BaseModel(object):
             }
             if getattr(f, 'serialization_field', None):
                 # resolve link to serialization_field if specified by name
-                serialization_field_id = ir_model_fields_obj.search(cr, 1, [('model','=',vals['model']), ('name', '=', f.serialization_field)])
+                serialization_field_id = ir_model_fields_obj.search(cr, SUPERUSER_ID, [('model','=',vals['model']), ('name', '=', f.serialization_field)])
                 if not serialization_field_id:
                     raise except_orm(_('Error'), _("Serialization field `%s` not found for sparse field `%s`!") % (f.serialization_field, k))
                 vals['serialization_field_id'] = serialization_field_id[0]
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 7c08003bf7a..d8a7c663dbe 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -40,6 +40,7 @@ import openerp.tools as tools
 import openerp.modules
 import openerp.exceptions
 from openerp.service import http_server
+from openerp import SUPERUSER_ID
 
 #.apidoc title: Exported Service methods
 #.apidoc module-mods: member-order: bysource
@@ -72,8 +73,8 @@ def _initialize_db(serv, id, db_name, demo, lang, user_password):
 
         if lang:
             modobj = pool.get('ir.module.module')
-            mids = modobj.search(cr, 1, [('state', '=', 'installed')])
-            modobj.update_translations(cr, 1, mids, lang)
+            mids = modobj.search(cr, SUPERUSER_ID, [('state', '=', 'installed')])
+            modobj.update_translations(cr, SUPERUSER_ID, mids, lang)
 
         cr.execute('UPDATE res_users SET password=%s, lang=%s, active=True WHERE login=%s', (
             user_password, lang, 'admin'))
diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py
index eb5dbe24077..5239b37bd2d 100644
--- a/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@ -43,6 +43,7 @@ import misc
 from misc import UpdateableStr
 from misc import SKIPPED_ELEMENT_TYPES
 import osutil
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -214,7 +215,7 @@ class GettextAlias(object):
                 if cr:
                     # Try to use ir.translation to benefit from global cache if possible
                     pool = pooler.get_pool(cr.dbname)
-                    res = pool.get('ir.translation')._get_source(cr, 1, None, ('code','sql_constraint'), lang, source)
+                    res = pool.get('ir.translation')._get_source(cr, SUPERUSER_ID, None, ('code','sql_constraint'), lang, source)
                 else:
                     _logger.debug('no context cursor detected, skipping translation for "%r"', source)
             else:
@@ -872,7 +873,7 @@ def trans_load_data(cr, fileobj, fileformat, lang, lang_name=None, verbose=True,
 
         if not ids:
             # lets create the language with locale information
-            lang_obj.load_lang(cr, 1, lang=lang, lang_name=lang_name)
+            lang_obj.load_lang(cr, SUPERUSER_ID, lang=lang, lang_name=lang_name)
 
 
         # now, the serious things: we read the language file
diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 57af9e45e89..6171b2ebd21 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -13,6 +13,7 @@ import yaml_tag
 import yaml
 import re
 from lxml import etree
+from openerp import SUPERUSER_ID
 
 # YAML import needs both safe and unsafe eval, but let's
 # default to /safe/.
@@ -286,20 +287,20 @@ class YamlInterpreter(object):
 
         view_id = record.view
         if view_id and (view_id is not True):
-            view_id = self.pool.get('ir.model.data').get_object_reference(self.cr, 1, self.module, record.view)[1]
+            view_id = self.pool.get('ir.model.data').get_object_reference(self.cr, SUPERUSER_ID, self.module, record.view)[1]
 
         if model.is_transient():
             record_dict=self.create_osv_memory_record(record, fields)
         else:
             self.validate_xml_id(record.id)
             try:
-                self.pool.get('ir.model.data')._get_id(self.cr, 1, self.module, record.id)
+                self.pool.get('ir.model.data')._get_id(self.cr, SUPERUSER_ID, self.module, record.id)
                 default = False
             except ValueError:
                 default = True
 
             if self.isnoupdate(record) and self.mode != 'init':
-                id = self.pool.get('ir.model.data')._update_dummy(self.cr, 1, record.model, self.module, record.id)
+                id = self.pool.get('ir.model.data')._update_dummy(self.cr, SUPERUSER_ID, record.model, self.module, record.id)
                 # check if the resource already existed at the last update
                 if id:
                     self.id_map[record] = int(id)
@@ -315,12 +316,12 @@ class YamlInterpreter(object):
             if view_id:
                 varg = view_id
                 if view_id is True: varg = False
-                view = model.fields_view_get(self.cr, 1, varg, 'form', context)
+                view = model.fields_view_get(self.cr, SUPERUSER_ID, varg, 'form', context)
                 view_id = etree.fromstring(view['arch'].encode('utf-8'))
 
             record_dict = self._create_record(model, fields, view_id, default=default)
             _logger.debug("RECORD_DICT %s" % record_dict)
-            id = self.pool.get('ir.model.data')._update(self.cr, 1, record.model, \
+            id = self.pool.get('ir.model.data')._update(self.cr, SUPERUSER_ID, record.model, \
                     self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode, context=context)
             self.id_map[record.id] = int(id)
             if config.get('import_partial'):
@@ -328,8 +329,8 @@ class YamlInterpreter(object):
 
     def _create_record(self, model, fields, view=False, parent={}, default=True):
         if view is not False:
-            defaults = default and model._add_missing_default_values(self.cr, 1, {}, context=self.context) or {}
-            fg = model.fields_get(self.cr, 1, context=self.context)
+            defaults = default and model._add_missing_default_values(self.cr, SUPERUSER_ID, {}, context=self.context) or {}
+            fg = model.fields_get(self.cr, SUPERUSER_ID, context=self.context)
         else:
             defaults = {}
             fg = {}
@@ -360,7 +361,7 @@ class YamlInterpreter(object):
                     if (view is not False) and (fg[field_name]['type']=='one2many'):
                         view2 = view.find("field[@name='%s']/form"%(field_name,))
                         if not view2:
-                            view2 = self.pool.get(fg[field_name]['relation']).fields_view_get(self.cr, 1, False, 'form', self.context)
+                            view2 = self.pool.get(fg[field_name]['relation']).fields_view_get(self.cr, SUPERUSER_ID, False, 'form', self.context)
                             view2 = etree.fromstring(view2['arch'].encode('utf-8'))
 
                     field_value = self._eval_field(model, field_name, fields[field_name], view2, parent=record_dict, default=default)
@@ -395,7 +396,7 @@ class YamlInterpreter(object):
 
                 # Evaluation args
                 args = map(lambda x: eval(x, ctx), match.group(2).split(','))
-                result = getattr(model, match.group(1))(self.cr, 1, [], *args)
+                result = getattr(model, match.group(1))(self.cr, SUPERUSER_ID, [], *args)
                 for key, val in (result or {}).get('value', {}).items():
                     if key not in fields:
                         assert key in fg, "The returning field '%s' from your on_change call '%s' does not exist on the object '%s'" % (key, match.group(1), model._name)
@@ -491,7 +492,7 @@ class YamlInterpreter(object):
         python, statements = node.items()[0]
         model = self.get_model(python.model)
         statements = statements.replace("\r\n", "\n")
-        code_context = {'model': model, 'cr': self.cr, 'uid': self.uid, 'log': self._log, 'context': self.context}
+        code_context = { 'model': model, 'cr': self.cr, 'uid': self.uid, 'log': self._log, 'context': self.context }
         code_context.update({'self': model}) # remove me when no !python block test uses 'self' anymore
         try:
             code_obj = compile(statements, self.filename, 'exec')
@@ -655,7 +656,7 @@ class YamlInterpreter(object):
 
         self._set_group_values(node, values)
 
-        pid = self.pool.get('ir.model.data')._update(self.cr, 1, \
+        pid = self.pool.get('ir.model.data')._update(self.cr, SUPERUSER_ID, \
                 'ir.ui.menu', self.module, values, node.id, mode=self.mode, \
                 noupdate=self.isnoupdate(node), res_id=res and res[0] or False)
 
@@ -666,7 +667,7 @@ class YamlInterpreter(object):
             action_type = node.type or 'act_window'
             action_id = self.get_id(node.action)
             action = "ir.actions.%s,%d" % (action_type, action_id)
-            self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', \
+            self.pool.get('ir.model.data').ir_set(self.cr, SUPERUSER_ID, 'action', \
                     'tree_but_open', 'Menuitem', [('ir.ui.menu', int(parent_id))], action, True, True, xml_id=node.id)
 
     def process_act_window(self, node):
@@ -700,7 +701,7 @@ class YamlInterpreter(object):
 
         if node.target:
             values['target'] = node.target
-        id = self.pool.get('ir.model.data')._update(self.cr, 1, \
+        id = self.pool.get('ir.model.data')._update(self.cr, SUPERUSER_ID, \
                 'ir.actions.act_window', self.module, values, node.id, mode=self.mode)
         self.id_map[node.id] = int(id)
 
@@ -708,7 +709,7 @@ class YamlInterpreter(object):
             keyword = 'client_action_relate'
             value = 'ir.actions.act_window,%s' % id
             replace = node.replace or True
-            self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', keyword, \
+            self.pool.get('ir.model.data').ir_set(self.cr, SUPERUSER_ID, 'action', keyword, \
                     node.id, [node.src_model], value, replace=replace, noupdate=self.isnoupdate(node), isobject=True, xml_id=node.id)
         # TODO add remove ir.model.data
 
@@ -729,7 +730,7 @@ class YamlInterpreter(object):
 
         res = {'name': node.name, 'url': node.url, 'target': node.target}
 
-        id = self.pool.get('ir.model.data')._update(self.cr, 1, \
+        id = self.pool.get('ir.model.data')._update(self.cr, SUPERUSER_ID, \
                 "ir.actions.url", self.module, res, node.id, mode=self.mode)
         self.id_map[node.id] = int(id)
         # ir_set
@@ -737,7 +738,7 @@ class YamlInterpreter(object):
             keyword = node.keyword or 'client_action_multi'
             value = 'ir.actions.url,%s' % id
             replace = node.replace or True
-            self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', \
+            self.pool.get('ir.model.data').ir_set(self.cr, SUPERUSER_ID, 'action', \
                     keyword, node.url, ["ir.actions.url"], value, replace=replace, \
                     noupdate=self.isnoupdate(node), isobject=True, xml_id=node.id)
 
@@ -752,7 +753,7 @@ class YamlInterpreter(object):
             else:
                 value = expression
             res[fieldname] = value
-        self.pool.get('ir.model.data').ir_set(self.cr, 1, res['key'], res['key2'], \
+        self.pool.get('ir.model.data').ir_set(self.cr, SUPERUSER_ID, res['key'], res['key2'], \
                 res['name'], res['models'], res['value'], replace=res.get('replace',True), \
                 isobject=res.get('isobject', False), meta=res.get('meta',None))
 
@@ -781,7 +782,7 @@ class YamlInterpreter(object):
 
         self._set_group_values(node, values)
 
-        id = self.pool.get('ir.model.data')._update(self.cr, 1, "ir.actions.report.xml", \
+        id = self.pool.get('ir.model.data')._update(self.cr, SUPERUSER_ID, "ir.actions.report.xml", \
                 self.module, values, xml_id, noupdate=self.isnoupdate(node), mode=self.mode)
         self.id_map[xml_id] = int(id)
 
@@ -789,7 +790,7 @@ class YamlInterpreter(object):
             keyword = node.keyword or 'client_print_multi'
             value = 'ir.actions.report.xml,%s' % id
             replace = node.replace or True
-            self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', \
+            self.pool.get('ir.model.data').ir_set(self.cr, SUPERUSER_ID, 'action', \
                     keyword, values['name'], [values['model']], value, replace=replace, isobject=True, xml_id=xml_id)
 
     def process_none(self):

From 31025afe28c289daa5a0c58096c75da316182800 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 31 Aug 2012 16:14:15 +0200
Subject: [PATCH 175/288] [FIX] base: Remove the default value for the image

bzr revid: stw@openerp.com-20120831141415-gqsvhh08fum874gn
---
 openerp/addons/base/res/res_users.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 0769a0c4166..ca45f03258c 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -251,7 +251,6 @@ class res_users(osv.osv):
         'company_id': _get_company,
         'company_ids': _get_companies,
         'groups_id': _get_group,
-        'image': lambda self, cr, uid, context: self._get_default_image(cr, uid, context),
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):

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 176/288] [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 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 177/288] [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 178/288] [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 179/288] 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 180/288] 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 181/288] [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 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 182/288] [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 183/288] 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 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 184/288] [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">/9j/4AAQSkZJRgABAgAAAQABAAD//gAEKgD/4gv4SUNDX1BST0ZJTEUAAQEAAAvoAAAAAAIAAABtbnRyUkdCIFhZWiAH2QADABsAFQAkAB9hY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAA9tYAAQAAAADTLQAAAAAp+D3er/JVrnhC+uTKgzkNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBkZXNjAAABRAAAAHliWFlaAAABwAAAABRiVFJDAAAB1AAACAxkbWRkAAAJ4AAAAIhnWFlaAAAKaAAAABRnVFJDAAAB1AAACAxsdW1pAAAKfAAAABRtZWFzAAAKkAAAACRia3B0AAAKtAAAABRyWFlaAAAKyAAAABRyVFJDAAAB1AAACAx0ZWNoAAAK3AAAAAx2dWVkAAAK6AAAAId3dHB0AAALcAAAABRjcHJ0AAALhAAAADdjaGFkAAALvAAAACxkZXNjAAAAAAAAAB9zUkdCIElFQzYxOTY2LTItMSBibGFjayBzY2FsZWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAACSgAAAPhAAAts9jdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//2Rlc2MAAAAAAAAALklFQyA2MTk2Ni0yLTEgRGVmYXVsdCBSR0IgQ29sb3VyIFNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAAAABQAAAAAAAAbWVhcwAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACWFlaIAAAAAAAAAMWAAADMwAAAqRYWVogAAAAAAAAb6IAADj1AAADkHNpZyAAAAAAQ1JUIGRlc2MAAAAAAAAALVJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUMgNjE5NjYtMi0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLXRleHQAAAAAQ29weXJpZ2h0IEludGVybmF0aW9uYWwgQ29sb3IgQ29uc29ydGl1bSwgMjAwOQAAc2YzMgAAAAAAAQxEAAAF3///8yYAAAeUAAD9j///+6H///2iAAAD2wAAwHX/2wBDAAUEBAUEAwUFBAUGBgUGCA4JCAcHCBEMDQoOFBEVFBMRExMWGB8bFhceFxMTGyUcHiAhIyMjFRomKSYiKR8iIyL/2wBDAQYGBggHCBAJCRAiFhMWIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiL/wgARCACvALQDACIAAREBAhEB/8QAHAAAAQUBAQEAAAAAAAAAAAAABgIDBAUHAQAI/8QAGQEAAwEBAQAAAAAAAAAAAAAAAQIDAAQF/8QAGQEAAwEBAQAAAAAAAAAAAAAAAQIDAAQF/9oADAMAAAERAhEAAAHJi4NLM9joubaLWJH5KivIcgZQuiC7fnsLxL2EGq4E+uEpUupdwu/Vy2MpTK6G6MM2Uywau8QrBhOOXxpaWtSy8iJIt5GJJwhaTBtdwoa9g7U2lG2lUNrWnngRlRxGcuC6Mdx1DdMZQrTOMTb0CwIzq6o7UXIX45DSFT4v8uBJZhUo5BT1wCnQWVqqU6zTXWLTqlcSkIjrElsbSqgcY6HHmZ1seqj3G2PTIb46CklGiKvMR9R0BUCdADSxCIOx7dPA4MQpbLqLUrWQCYX3MiVFeOKq6KaK03PCWzpu29YoDLiFnVN0ELk+BXmqoUuGAr3FDZhBIwqdySBDi4ySUQuil+Ca3kmnx53oeTdURYUmQi2JVVuC7WwVrWQ6RHs1amtau/JRhJlkqterH9DwEo80WnWXx5IL0OH0qVjJ9n9Jrdj+V9Et8kcBPKahLs42iW03NVXcaRzex9BV+Z0FYH+XIU/PzQs8P3hVB5mGKZLL8FWa8rpXSc007MqLzvvI3lJ4GlWlT6fXIRH9XhKKe6Ho9klhaZei2tlVuBR4BbZfhCg36SBwcxhmntgZJU6QXY3v2QEDvFpRuc97ZcuFPWilEL7wH4EbyVdm1smXf5bfGm79K/P2/wB+Ga2w6whsWtGdXrjuuq87PgFcCI7yNE+50ZRYJWjA4bsuPPL2rBMOuukqa2savjeN7pGN24r9Evhhjfk7Tz0vOu7fihCAc3Edsx773PRHU92UpCti5dTKdKVpSZuhDjO3kqTj2VE6GNNWxc+pY4lDt/XjWOT64jo/fQdsU57nPT3OpBV5Pjl9T3D/xAAtEAABBAIBBAAFAwUBAAAAAAABAAIDBAUREgYQEyEUICIjMRUlMyQyNDVBRf/aAAgBAAABBQJh1JGfpCxR/oOxOkLDXLIz8VNYc5GYlhl+kva5OPKXn6hd6XrvXvSwKvehnV+3K+6ojtiw/uh2fotmi4t3JalGPZGyUaTWMcbdbxmJnJzzxlZJxlEpLmShy5hB7V5GryNThC8qA/a/7Dkpqcf65aRzdpHLW3ts2nDH0YRXhsTMEVg8iXoHk1v0Sl6L0yQ8g9zZI2hsPxtVCMSI26rXeWKROGjV9wKX89gVU1NdUrXEWQGNKCuDRHvsCg7k9v8AqCVW/wAb/wBCoNxE7VP+MIVZLC/TJ1+lzqfHWGqm0xZQysiFjKQKW0HiSw0IWmFWvdaP0bHaL3JVgZJX+AgQrMAOPgKFONvakfqCota5eJi8Ma8MadCGZbIw2JHOY/dSo+WOWN3NrHKQf0uuInP0KEbe0luKbZn5M/xjasB+Oc59RVTqwPzjvz3s/ShKArb4nzNDK+LemuCIMql1G5xJ7M9IyMONZQeW/ir4WF2O9UlEdTLHf3d7g3TltFwMp5zTc38ncmOPOk/+vzEXjuL/AKoP5MhJFFiqEXmi+AroVY2gKlibN6CvjYBjzSrxxWIfE7sfavxOq2IH7lmglEbSQnS7dhmfdyTfPiP+FEaAOqkcj7EYbLE2KHJyJld4ZbpfDu6XjDcY6bipJtqWUkdyHZOsdxP+KeWOk2o2GR3xPwsnKP8ATAoY+T5g1pGzWpY15aC2JS3mtD8k7kXue7pJw8EganjRtTsrxTZzZGVtcMbA/JZiO0/HWp5obTjChEuQjD5A919s2Pdy0BK4JkrQ7HWqETZMnXBnyYIbBbup0WnBYCWSvbeNh6yMZkpaDe3SY/ds3H+98SEyUCOScaJ32zbfJjfkb2xtmRleT+QKDflbLuCxO0K7kI42H8rpL/adQt1nzoKN3ht2HeabWu1r7nSfyN/KgnbHA6Zpdeg8F3fjrHOWBWkuTTlzi+Tt0p6y3Uzf3/x+w2SaUk79lcUBz6O+YtJXicsuzcsqaPtnij36V9ZfqYfvbf761yaonvMkmwtqnC2XowjXygoO0A7ayB4RlRJ2gt7W+2ArEYeWlWsx2uma3OTptzXO6YlCPT9kKLA2HPqV2w47KUhj7x+VkEjlFj4XxXpfJO53EQkmVwG/WtIDk+GIV64PvW06vyM+o2s+okpjtO6naBlz8uKsfS7HQPIOkGl5cfe+TQPZesPH5szz97+246kJ9WXaQTvTF1J/P2PejL4rvkK4enPTWFx8Lk8fbLOKx04q3YuoYy6Jwfj5PcO/UkfJ0EBlfaI866jH2+x7j0WzyOa5zFzDV5XIyOXkcVvaB0WO2MLfjOPHuqw/TI3kowI4i7k9dQDeO+aCwGxH8u9/NA/Tqj+Ela6A2M9rD9V+2YbyxHbX099po2SnI/LWfyDXbjrz67WX7W+1tvko9t/T8n//xAAjEQABBAICAgIDAAAAAAAAAAABAAIQEQMSBDEgIRMiI0FR/9oACAECEQE/AXoyzESLRxIiouKh/SC1C190qRTxJMWn9RssZtyddp10vdeNp3UsNFbBFyc71LQD2iILvrfgbai9GyIDfraulsrK0LmGoBj5LFFekXILYpuNj3LNgGNuwjhamy7oIcIn2Ss2MM6gJ0Nhhorke2Q3LphI/qxHbACuVRFw3tEwJ+T6alWnLiZwGlhXJeC2vFsnqNG/ty/EFkyB56WEMeKIWRmjqlvfhXgx2rrXK9kGCh4//8QAIREAAgICAgMAAwAAAAAAAAAAAAECEBExEiEDIEETMlH/2gAIAQERAT8Bju5Nom8s4o48SPTOXdKWKjsb6Ms5PIq2hGCKyJHFC3WCUfpG/tIVK3oSvGKbawkfq6j2YHWzB9HUdnE4xE8Omu641gkuzBlxQptup/MH5kiM+V4VTp6IbqMctEupHjENHH6YHeO81HpHki85IIjSqerVcv4diWBykiLys19Ja9M+j7PDqkPXr//EADkQAAEDAgMFBQUGBwEAAAAAAAEAAhEDIRASMSAyQVFhBBMicZFScoGhsSMwQoKSwRRDYnPR4fCi/9oACAEAAAY/AghgPM7FvReExZWMNKAdwRAHFMBwg7VjLfZKAnK/kU85yOmAw/NjB4rPTMcV3bDPtPUtZJ5laKKgQLD4UDKE6K+FirrVarVS4AnBqCyUsmU3uF/L/St5v6UWmpwjQKi0Eklg8SaOPFQ0Xxyu0Kex3AWV9g1X3bC0PomPZurKTdTTNvJdEEEMT5Kkzg2+0yoNdEcQvIfuneSZ5JyPvYEdcPs4tqtQtR6JuQF3ujRNaRfKpquhFragVl4jhI54A4N81eSOUrdUAv8A1FbvzUNzAdDg4YPzAFbjfRbjfRbjfRUXNEBzSFmp08zY5q4Ce46MGHD0UFdUydcBKeW/BDxn1TZ9lEB5jzUvMmcB1QVT4bFN/suUuROnknXbcSbqcBTZvOMIsI8Q5oTh8EWNQqNY8t4GF+RXdrqm4N88KmxUjUXVjwV1LBFrxhdUneyZU8KgnYbI8JdCbQY05iU7vZLRpdbnzUDMB72D6vZg0hh0J1TabqcZh4p1WSlTDf6uK8M5eeMcEaZ3TdpV1na0QvFGD6r9MpDf3XZ6zJJZrjqFPHMI9FSFSHOLiBPwTpcwANs1o4q8NHVAVHtLl9m7M3mi/u4LnHx810RUcNjtOffZU8PRRxCgnDoqRa1rmt/A4SE40mhtPupAjCfwjVQ1ZeOb9lTdUzMDDI5qW0785koz81ZS8knqu0tvMjyxz1TDVHZqfxciHOZJ4huio0qz3OYTLr8FVpVGzByO+CkCCrFXx7plV3dVGacOqthLmz5r2avN6jvQfJfZX+CzU2HLzUHXBtGpXIpv/lC914cKjWiSRYK2FQ8qJ+oXa517w4faLwY9krf9cbN8K8ulrW+GeaPTBtTMQ6ZkcE19iCOChFs+Iq2Fb+yfqF2rzB/8jBrnMztbwRc1mUY03ey1v+NtzXficEVUaN3UIEawmta1jDFyG6qX1HH4rXGp/ZP1Cq+636YOFCm5518IlXx/L9HbdsKbxxsgwaK87LutI/UJ3uBN80/uXQHiHSnPfEnF/Pu6n7/cWBVOTJldSiMbYUXE7xJWXtFJtT3kHdmqPp303grdqn8n+14e0MP5Vv0j8T/hfaOYxnOZX8CHS1zXNzHqjQD89pnLG0zLTJzaJrqvamtceHJBsyGfVX3l5q6jCG6nRUqI0pMDU3DUqJvyhXVkCg8fjpA/XadQeMzNVPd+hUqSrLW+Fl2Vp9vN6XT/ACTHdV54dTgOuHZz/RH/AHrtU3dYW781LlDdFZfh/UFlHJaj1TK28W8F46LhLYs6UxzdDdNdgXO0VtFlbusth2V3vD6bYdm16r/Ss354WKucZQ7PUMPabI7BPPCkeVT9tvK7h9xHNBZKu7zxd6Y1f6SD88Z2ev3AOADtMAMe0M5sOI2f/8QAJxABAAICAQMDBAMBAAAAAAAAAQARITFBUWFxEIGRobHB8CDR8eH/2gAIAQAAAT8hufeWQUv7Er9AFsqF315EwBFtnMx28VfvLTq6IHBbZgWQpUwRQGNxd+5AcHgnLBQcM3Besqz45/5CEvfuMrTroDgzol030l57QcnvFZ5/Y9SnThGI1suDP9zIMBm4vifMAFzWSVvEYgp5iWLffTzFpdt4YyHaOu4COGNRBWQlxsnVU9J/jyv/AIZi/rO4LE9GbuhB+p+JTaxvLfz2ijinu/uZeDwJhdKVFx1qCXfyzaF35jmM897AHcGWiSgogrkxQm7p5SwyvPxHdcTcLxAVYvMaErNBdegCcB7E3GoKbKgLtEjgb6o/BxCPo5zC/rAq2rfEv8xXv6TCMwtqYC2wO2Kdba0CcWqxEw8YlaRlXvDGDDkIPScJlt+79pb+6Js612jvovRyrrzTrxuP1fWB5CsFZY1RlEJ4uUk6dZ0kZSUB0idZrrGBopCZNSpQFvJDQwUHAi2ZuY8tT9bKgh0JLWu2C/DFPT2cMeTz+GC4pVWX1n+Yn+AleviQluFOpHJh24e0M8s3hmBm43EOtS+beYXt0+8sl7cDFec3iLQVABpT9orNOLXFFiWHl6K/ErFziAL32XsTiUjoSL9PMV/o5/hntxQ+GGqe0UKK97MPL2spdsqXh8xBZNrKQgyQ9moQVddPRjthGNULBhWkLXPnPwjZ7N5agwOsNS5+EOHoxfAfmDLlxuJae2YlIKNCxhLcA5d4LbEttCU8L7CC5NHRzz+95nFytGaqdXGVvzMAyt4ARmxqB2PJ+9Yt/wBpeEnAvRRtFgq6EwTw858+YD8RWvfcIS6m3WXLgoqrHMyKe2IKHOC7GWWkGcdcQvbzMFV5hr8iKYoBB2p+pL2m1w9s9pfHtXlcA+/iwBoU1W0yNly4fG7bYXnNJiVa93T09q8QFUCgalzu3oTjmKK+iqwfSByw0qHIaj6T6oMXdPX+oe8OwaeMLqUulxEKlobVKBeW7uAAMtjsD+5c66/Ccf1LOzz/ADERkjD3nXmMmvariKRtry39dzgMsLbI8pT0uXGf+uI3ogC4y4aa1ynvr3h6k3dtUSr788JMu0xjiEuc8wfjapyarF+feFihbywuuHtGN+lUrgET4v2j+y8n7RZ8hDTkG+JbKo3mZMux9VVvfr2ljZYHmOlrAgCjCCsg86qtRyT5JfbXdFG4ikorYE8yBfufj+CdJkdUMaZcdhCustTEDsiRE4hXLRM5StqNnR7wIwpLxK4qMVn3lLcO/ot0M7jh9EICKyW5w/nMyinARexCC+39Gn8Sl3Ob4PgjEq28Qt7OusMHxCrmUxVqsutRZ1Jp9IoVPmMqGI7+6n0QsS9szxexUHXEtgImElcTFBklrXC/X2/jqXNGnYhO73PsJ+ZdNRtg8zu6lerGDSu4yosvgwycV8X7xGsEAG47afNFSiZ6JUGB79KiL+NbnUHLEFrOxGxcP0P8i+5KObXEBXWY9CdIzG+sZWV4eX+oIOGkWnh2Tvu7g8c/WUoO+XTkvKIxj25Ag5J9of5HLkjcZ3j3mALL6n3YM+j6eYHQbaYa/WGSK3E8MsMsAymur7B7TMbPpAG+Et7cT3HWBMxCJWoHWVO0D2K/E90siC3sxDvRzOvPQi63xUK+k3Ov43NAn1ofiPPo+hFtGgVddfafSqgfAzde0Y6eYAeiBse4RWwY6wrqA0gC/TtG3YT8TKT4Mz3Ey6g0zA2ufos/lD2bi8+nD1c682h0Y9X8IUGA7y80Ri/8QtzAiNtRbx8xzn2Qwk7PTsr8xTzt+RqJtZUZ3kQveWToSpijtjDqKR1L+nf0e3rt6ESCQMLC42UXof8AVxZh9/6VF6cHgv7y8Kj8RRdj3zFbRTTZK8SxSBfSb/v0a6KNcS9GCrjL8r9PGL9Xozn1Mw+DamZt0S2N8x3iXK9cn1D+VL2UzHTMO5tCYY7whr0z/YfwPyxjqae6vWpjuBl7CLZOHzFmceo02TqldMqfEq8B8Qee0odP0XDc6LzWI7nEcDv6VMks5J//2gAMAwAAARECEQAAEBdEOjLEJ/si44FIY7sRfZh+We9X51X0GL/Me04gpkGvqiG2MaP/AK53RzpXcZRfettJIrv0dBr4MUxqzvmNNzBW+fC9FStO0Gg8a5N8Dj9HtAVqRV22QzmNXu5/d5fhG5AHJyv/xAAjEQADAAICAgICAwAAAAAAAAAAAREQITFBUWGBkSAwccHh/9oACAECEQE/EF1kiiaRDSKILJqyLEibjPWJGqDTSXQ1LqkxBaG3Lgps2ihiEMtIbgGqXNLNkCUPEdjUivR1c1PA6SEoFGLZoHahKmIbTrSHs3BNwsd4ulyMWlxs9iYBpFTwDXZqj2iOd+/8K1+ysRG6is16V3BOk2x8C1oZ1+McMR2In/yhJIkfMr4IWl8+hIA+Bkkfs6Coa5uikfaSFc91GiN/0NOHAxs5ZWisnxfCbL5H9IXnpNcnPgWfHDUX6S9S9EJeGh4cvx//xAAfEQEBAQADAAMBAQEAAAAAAAABABEQITFBUWEgccH/2gAIAQERAT8Qk48Ty9KG7mj2TvpDsk1++BDRftPUfqUSdUJgiBc5LNLNkQGR7ab1Cup8gpDbP26M8HUcQZBrkF5PcoH1y0QlGw41DODEkfaMOke+peyChDcf+N2VeuAAImfxfEndI2JliTeVlinh/wCjeANkXnD1Gm/Nl6ODuLpO7afBDUbY5DWR8jL07tfUXreTOFjCFATDvAOAHsd1ysbC1mC7s/yu5GxJ5Ds9uT+Qxl2Z9Sce6P42/8QAJxABAAICAQMEAwEBAQEAAAAAAQARITFBUWFxgZGhscHR8BDhIPH/2gAIAQAAAT8QyW4EtVIVpYQ+YVt0vm/zKJj/ADIir4gAgFCb/wCmsd4iAQtQyaCnZv56RDmzea5dXG4WV5AsVdH4MQJZ0EZOfuVNWmisr3413xGAbGjtnv3rEzb3RvKbHthIFFtSlzrj3meWk8wgLUyDeZamveULLLzA1T21+h36PZmFji4Bemh8Ye0y7wCpEFnBLCN5ToJQ+Zjep+EoPAfy/mVDH7hALmVvO/HmIML2WBh1KFa1004RGviyDoHlynAXiYoEtOy7zMJY9QvC48/ESqqo4T/kEpQrnlg/aehGVhbVNa+IE1tUVZA466jZ18hd1R/cRJKpa2o9DtAdgoFZOmvSYDwgXEFT7Lynya4/RF/2Jd1TLrY6qMAq2+CewwWvpSQQF2DGH8xMq66DA8n85ib4Geiz1vJ+JgT4Ot8BYxycxuJgUxgqugOFy2Zg1KLnKtXcopZ2YKTglujOMYsgNcOrl24LDGeKS4YPN/3aMF1LFO1n/wA9YoFg6uczAWNHpWT6lB2gqcX/AN+IvcVVRbbuuTXSGRo5bP7lFxFHHLH1DEXRDY+JTjXLfP8AVAWYwBH6xFDdrfk/8m3Vn5qYeg+YJpd7z0/5zEGqzw78nruEcNQUfcemJY4muDYGH1MKctlRQUa2kpGZyhUDYYvdRSpqLZTyJAoZpYXnfETQ0DmMm837wxZYT4qIcu1MmlTZF7R7/wDIKr0s2A9LL/LnyaniKlyCgt06ENTn9kP1KKefwxJAx+XVe0G0fSzvz0nVIoGzAChcwmgK5iESTK0XrjZHvVcy+kAAisE9NS/K0u+ubjFFak5fJmuDzEWEoJyQgrBtL73GxxbdWW08Z+WWAZpuAlogcC5fuWVI4YC3q84R9YqGN+f7gOi6AD2uJdgLa2L7UrRL67iYGUOvIPRT8zB3lECThd09Xifz34my/wCrtOI/H6oqanSjI3XcT2gkxmO1z1e0IAtQLrleBLKjOju79pxCO0upRLo4ofe4hIW89kxaWu45eSAD2IUJnEby2YRF2qfKvmKcPBoiUdcdfWJKuigyXmOJK3C3msJGWDiXjmNnuqlgaxnHDv3+JQnf8ftLFkQwuD/CWDoMOwi/UBkAWwkAIovsREbHBrQq7ukJjAjlICJfcmsJb1q9okEoKAu7zT04IBDQdH9/XFcDEFqWwObz/wAlqxdNXVz3rHpFJqvC7lwZBH2loWUa7NJnLyC6oZXg13ZU8hX0H+V14AL1x+YVKUo/X5igdVjBCCGoKAgvY+gxDJYDMokB268sW0IihgHqihgebbuATJu+Lmf27g1VLfa0hkqe+dLN5yXrgcSsAaND0mkMTJo+sJZnChZYjDurhDdPbXm76ta29oli6CwI6HIUPa0UdFcoH5g/XwcPn/BgPsO9yYukcod7xMFECjirZONK4iRfFnFdXk+WYPkGn3U4+PthYJSpTVMEFv61OAAMo7fIlekowwC+8bLJUGvFxJVbTMxQpKd3WBfEYXg6vHvQKB24ohPEBNzedw9SioDvZVfHmw/MAq1ZWaV/oTtnjCABM8vxKKnFrymay0nv6yoGiRV11w18kJ1Gaxb7D9sG2VlAVXAOTvWM3woVtwaoIZJdLhdnrYWKdQkMC9BTiBWYEzi/EErn0iKHM2kMM6mUB0duYeMvW3mX2uD5uaHTF6lmNLmX4tkjXEoSXWQdYYFMTbKaG/LQjTshVwKr5lCy+1z2GnMXCMK93wM4eCXVWLkqg9vtCmEB2Sr5Snl7QCwKttVXNK1ooqAE62Gs9K5+IjMnAqL74iFRtRfMKVqWkKAHTku8VVU2NsAepdRqRbvrK9qFtlugI9iZBUnmn7gFWkouzr3GWaRLgwrpQpWkQKKgYUg7KU12XcQoC8KV/v7iJfsHMByI6SkQJwEosoYaHrKzRLHSGAtvDQekQtgMF1EWDu0+TMu4VZAXF8NnGWu8WSYFhZ6sweWnpzGYFi6L6hH3hKDDmX4Ny5FUtLPQWvi5Y11JtmXAC10S4IgVhWXlou7uKcQmUrnb63KoD/szkXAtuFK5BXvraRMU6u19YFzcI4tIvFhcDKBV5EWz4jtjRARc5I4Z2VWPeEBc7UySzKsfHEAQtsDpnfH/ADBWPeYeJyKkyMS1lHf+7S2CHmZLJURimWhawdojXqe0D8RmaVZEEQRUQ2M9uoQL4JgQTArHtOEvcceZXBWDKcKLDH2cy+wtsIBfQ1G+OIlC3IwBCjW1flYsg6zUtjCmIqLrW3sgAVDXPoz7QYWPMHOPEJAqt9/pl/8AIAOsF4PrBZvPqq269WvaKEkbG8wA0yRcmg7NnpEIK5oZLZ+MRFfIVgzdi3xXSoFUu6o+xD0mUUYVbUy4ilw1Nxu4iIFBxrmr8Q0swMyhDLHRlAULd95dAVgpE4ijZ6QI+pOfF3XaxzOZ0jLsJszNrDs94QLJL/3T9yxBTUTFDnyvWK0ShfdlQwK62Jp4mRboOIijNjnROzXaXlG0M82/iNxr9+mIDdmQ9EJzkqEbHJvee8JA5RDVcRIyiqwfmI4t1GkNZ7TOPeM6RY59olCtN3GndZRO52gl92a1WXEOxYtr4iUeVjV6PQmXMBYE3NiO5hLy4l8EnACrmRGYBqr9/UhCPcA9fpElFOXRphZlQ9VKAZOQrtVpkLVlKr0WU+n4HfP5QjOcafgDL5YI2wZcLAYo0Fe6y4aeMFLCvycwTDXSczRhMeEYrL0dAtRaHXLhgCVtWsbAtnipQCRvlWHYP08INDddL/EI7oGhm+h7ywBRp3mbAF8U47wmQso2CtBMlgA00W+XvAAvB+thOMyokWOij9kVUkKAWu+IrIBbgqDZYyrrLs013zcoIbD1T6Jln+HidK/wZGrTWXkU7OfMxnBMDXOABvpBCVug9esQF5J5gS6sVAJMqacye1cEzV7SgquHSFr9fWVYfqQBBDOnk6IEZUaInmUGqgqqaNSxHO5lINY9jLBAxGWlJxGyuLFB0mqhIouSrw780+kW/Z+yJnmWPR/2KAU/MLFrtVAeVoIWzHn90MoHkJIi5djrEirPKew3EmScd7ds92uJRKXRZLmlJQ3s3JhioXSMAeCZlqdjUCWFl4P3CaoIHXb8s4I9Jhh8iPtL/wAVj/WAlER7xPELBEyEt2h+1T2lsQ1ZnAhmANgGHujwuu6fwjFGld3vFcCzoRg8kNNh+GGdrKy8C+G32EdbktPeKR2lBbeISyPQZmRdW3mOT9xwDUq4FfwRscxYGXY/1Uq8xvBAJ0uz7go5SrtnUoJ0pbxKWFq9ZKpjmYHeJ1VLj3lgvSvhmVMUYgvibMjn15gOITNI2JB8pNOE/tgq0dJArPRFsPtBC9O3+L3ay74JZBJd0wWOTEmWlmb6Z9JyVmXyf35iW9ucj+e0swp0xVWM3HXadInIGZ0CwOgcogLFxYzlzKa9D1lL3StI4URvfWCz17gJXuR5FZGmLnLOlT71DJ/gswwbkZ//2Q==</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 185/288] [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 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 186/288] [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 187/288] [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 188/288] [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 189/288] [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 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 190/288] .

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 191/288] [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 192/288] [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 77e92aeaad00b5ac2500cc9267f9a208577ac14e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 1 Sep 2012 02:37:12 +0200
Subject: [PATCH 193/288] [FIX] FieldTextHtml: allow using widget=html on
 regular char/text fields

This is required when we want to easily preview arbitrary
HTML content, such as the body of the email templates
used in marketing_campaign modules

bzr revid: odo@openerp.com-20120901003712-m1h9s5tlbn2kyvnn
---
 addons/web/static/src/js/view_form.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 893056419ca..24584413fee 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2385,13 +2385,6 @@ 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') {
-            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 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 194/288] [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 703ba01954bef5a8a7618e6d38d8e1b1630e0541 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Sat, 1 Sep 2012 16:17:19 +0200
Subject: [PATCH 195/288] [ADD] Add a script to install all the modules in a
 trunk database with the tests

bzr revid: stw@openerp.com-20120901141719-zsc2ow2u93kovri7
---
 scripts/run_all_with_tests.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100755 scripts/run_all_with_tests.sh

diff --git a/scripts/run_all_with_tests.sh b/scripts/run_all_with_tests.sh
new file mode 100755
index 00000000000..4103b6243e2
--- /dev/null
+++ b/scripts/run_all_with_tests.sh
@@ -0,0 +1,17 @@
+DATABASE=trunk
+dropdb ${DATABASE}
+REPOSITORIES=../../addons/trunk
+MODULES=`python -c "import os; print ','.join(os.listdir('${REPOSITORIES}'))"`
+createdb ${DATABASE}
+rm openerp-server.log
+./openerp-server \
+    --log-level=debug \
+    --addons=${REPOSITORIES},../../web/trunk/addons \
+    -d ${DATABASE} \
+    -i ${MODULES} \
+    --stop-after-init \
+    --no-xmlrpc \
+    --no-xmlrpcs \
+    --no-netrpc \
+    --test-enable \
+    --logfile=openerp-server.log 

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 196/288] 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 972306d0157ca92b57462f3e3735767e5a3618fa Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 2 Sep 2012 14:58:05 +0200
Subject: [PATCH 197/288] [IMP] CSS

bzr revid: fp@openerp.com-20120902125805-jeivl4whuzzubv7l
---
 addons/web/static/src/css/base.css  | 5 +++--
 addons/web/static/src/css/base.sass | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 06a37a54727..5ce814ef011 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -85,7 +85,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;
@@ -503,6 +503,7 @@
   -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
   border: none;
+  margin-bottom: 10px;
 }
 .openerp .oe_avatar + div {
   margin-left: 5px;
@@ -2157,7 +2158,7 @@
 .openerp .oe_form td.oe_form_group_cell_label label {
   line-height: 18px;
   display: block;
-  min-width: 160px;
+  min-width: 140px;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
   padding-left: 6px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c238ef6ee07..f16e369f531 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -422,6 +422,7 @@ $sheet-max-width: 860px
             @include radius(3px)
             @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3))
             border: none
+            margin-bottom: 10px
     .oe_avatar + div
         margin-left: 5px
     .oe_image_small > img
@@ -1650,7 +1651,7 @@ $sheet-max-width: 860px
             label
                 line-height: 18px
                 display: block
-                min-width: 160px
+                min-width: 140px
         td.oe_form_group_cell + .oe_form_group_cell
             padding-left: 6px
         .oe_form_group

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 198/288] [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 199/288] 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 200/288] [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 d7a2ea78dc50f17813e2d20712c146a427dece0b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 2 Sep 2012 15:30:23 +0200
Subject: [PATCH 201/288] [IMP] CSS

bzr revid: fp@openerp.com-20120902133023-dgdicbx0xnlht2l5
---
 addons/web/static/src/css/base.css  | 3 +++
 addons/web/static/src/css/base.sass | 1 +
 2 files changed, 4 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 5ce814ef011..dd168653f03 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -576,6 +576,9 @@
   background: #7c7bad;
   color: #eeeeee;
 }
+.openerp .oe_tags {
+  margin-bottom: 1px;
+}
 .openerp .oe_tags.oe_inline {
   min-width: 250px;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index f16e369f531..537988e9c4a 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -476,6 +476,7 @@ $sheet-max-width: 860px
         .text-core .text-wrap .text-dropdown .text-list .text-suggestion em
             font-style: italic
             text-decoration: none
+        margin-bottom: 1px
     // }}}
     // Tooltips {{{
     &.oe_tooltip

From 1699e4dc97f4472dee01852dcd131f60d1817771 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 2 Sep 2012 19:05:56 +0200
Subject: [PATCH 202/288] [IMP] determine openerp_addons_namespace dynamically

bzr revid: al@openerp.com-20120902170556-vkt2a936am4vrmmc
---
 addons/web/common/http.py | 8 ++++----
 openerp-web               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 9c3664c8da0..6dc99f2c997 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -461,7 +461,7 @@ class Root(object):
                       only used in case the list of databases is requested
                       by the server, will be filtered by this pattern
     """
-    def __init__(self, options, openerp_addons_namespace=True):
+    def __init__(self, options):
         self.config = options
 
         if not hasattr(self.config, 'connector'):
@@ -474,7 +474,7 @@ class Root(object):
         self.httpsession_cookie = 'httpsessionid'
         self.addons = {}
 
-        static_dirs = self._load_addons(openerp_addons_namespace)
+        static_dirs = self._load_addons()
         if options.serve_static:
             app = werkzeug.wsgi.SharedDataMiddleware( self.dispatch, static_dirs)
             self.dispatch = DisableCacheMiddleware(app)
@@ -520,7 +520,7 @@ class Root(object):
 
         return response(environ, start_response)
 
-    def _load_addons(self, openerp_addons_namespace=True):
+    def _load_addons(self):
         """
         Loads all addons at the specified addons path, returns a mapping of
         static URLs to the corresponding directories
@@ -535,7 +535,7 @@ class Root(object):
                         manifest = ast.literal_eval(open(manifest_path).read())
                         manifest['addons_path'] = addons_path
                         _logger.debug("Loading %s", module)
-                        if openerp_addons_namespace:
+                        if 'openerp.addons' in sys.modules:
                             m = __import__('openerp.addons.' + module)
                         else:
                             m = __import__(module)
diff --git a/openerp-web b/openerp-web
index 3340b95646e..7e536a99442 100755
--- a/openerp-web
+++ b/openerp-web
@@ -105,7 +105,7 @@ if __name__ == "__main__":
     else:
         logging.basicConfig(level=getattr(logging, options.log_level.upper()))
 
-    app = web.common.http.Root(options, openerp_addons_namespace=False)
+    app = web.common.http.Root(options)
 
     if options.proxy_mode:
         app = werkzeug.contrib.fixers.ProxyFix(app)

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 203/288] [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 310aab1a572b05f2c82808da77e7e873af7143ac Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 2 Sep 2012 21:17:26 +0200
Subject: [PATCH 204/288] [IMP] usability partner logo as avatar class

bzr revid: fp@openerp.com-20120902191726-7zacp4mctooxao51
---
 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 7e70e68c35c..a369be28dc9 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -95,7 +95,7 @@
             <field name="arch" type="xml">
                 <form string="Partners" version="7.0">
                 <sheet>
-                    <field name="image" widget='image' class="oe_left" options='{"preview_image": "image_medium", "size": [90, 90]}'/>
+                    <field name="image" widget='image' class="oe_left oe_avatar" options='{"preview_image": "image_medium", "size": [90, 90]}'/>
                     <div class="oe_title">
                         <div class="oe_edit_only">
                             <label for="name"/> (

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 205/288] [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 206/288] [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 207/288] [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 208/288] 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 e3f1c26e6afcf7c3df9bd98166614778e27645ea Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 3 Sep 2012 05:21:17 +0000
Subject: [PATCH 209/288] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120901045519-l6nqaovtdathorsj
bzr revid: launchpad_translations_on_behalf_of_openerp-20120903052117-yz3n1mkbu0qpbnfo
---
 addons/account_analytic_plans/i18n/nb.po |  546 +++++
 addons/import_google/i18n/mn.po          |  217 ++
 addons/point_of_sale/i18n/nb.po          | 2720 ++++++++++++++++++++++
 addons/sale_crm/i18n/zh_CN.po            |   20 +-
 addons/sale_mrp/i18n/zh_CN.po            |   12 +-
 5 files changed, 3499 insertions(+), 16 deletions(-)
 create mode 100644 addons/account_analytic_plans/i18n/nb.po
 create mode 100644 addons/import_google/i18n/mn.po
 create mode 100644 addons/point_of_sale/i18n/nb.po

diff --git a/addons/account_analytic_plans/i18n/nb.po b/addons/account_analytic_plans/i18n/nb.po
new file mode 100644
index 00000000000..27a6c0d9e24
--- /dev/null
+++ b/addons/account_analytic_plans/i18n/nb.po
@@ -0,0 +1,546 @@
+# 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:35+0000\n"
+"PO-Revision-Date: 2012-09-02 09:46+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-03 05:21+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid ""
+"This distribution model has been saved.You will be able to reuse it later."
+msgstr ""
+"Denne fordeling modellen har vært lagret. Du vil kunne bruke den senere."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr "Plan ID"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr "Fra dato"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: view:account.crossovered.analytic:0
+#: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic
+#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
+msgid "Crossovered Analytic"
+msgstr "Krysset Analyse"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,name:0
+#: field:account.analytic.plan.line,plan_id:0
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
+msgid "Analytic Plan"
+msgstr "Analytisk Plan"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,journal_id:0
+#: view:account.crossovered.analytic:0
+#: field:account.crossovered.analytic,journal_ids:0
+msgid "Analytic Journal"
+msgstr "Analytisk journal"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
+msgid "Analytic Plan Line"
+msgstr "Analytisk plan linje"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
+#, python-format
+msgid "User Error"
+msgstr "Brukerfeil"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr "Analytisk Plan forekomst"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr "Ok"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr "Modell Plan"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr "Konto2 ID"
+
+#. module: account_analytic_plans
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Fakturanummer må være unik pr. firma!"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "Beløp"
+
+#. module: account_analytic_plans
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Konfigurasjon feil! Den valgte valutaen bør deles av standard kontoer også."
+
+#. module: account_analytic_plans
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Feil kredit eller debet beløp i regnskaps oppføringen !"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr "Konto6 ID"
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr "Multi Planer"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Kontoutskriftlinje"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action_installer
+msgid "Define your Analytic Plans"
+msgstr "Definer dine analytiske planer."
+
+#. module: account_analytic_plans
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "Tidsskriftet og perioden valgt å tilhøre samme selskap."
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"Datoen for din bilagsregistrering ikke er i den definerte perioden! Du bør "
+"endre datoen eller fjerne denne begrensningen fra tidsskriftet."
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Journalkoden må være unik pr firma!"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr "Analytisk konto Referanse."
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Salgsordrelinje"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
+#: view:analytic.plan.create.model:0
+#, python-format
+msgid "Distribution Model Saved"
+msgstr "Distribusjon Model Lagret"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr "Analytisk distribusjon modeller"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+msgid "Print"
+msgstr "Skriv ut"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: field:account.analytic.line,percentage:0
+msgid "Percentage"
+msgstr "Prosentdel"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#, python-format
+msgid "A model having this name and code already exists !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "No analytic plan defined !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,plan_ids:0
+#: field:account.journal,plan_id:0
+msgid "Analytic Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Perc(%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: 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 ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:341
+#: code:addons/account_analytic_plans/account_analytic_plans.py:485
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
+msgid "Dont show empty lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Save This Distribution as a Model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#, python-format
+msgid "Please put a name and a code before saving the model !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:341
+#: code:addons/account_analytic_plans/account_analytic_plans.py:485
+#, python-format
+msgid "No Analytic Journal !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.default,analytics_id:0
+#: view:account.analytic.plan.instance:0
+#: field:account.analytic.plan.instance,name:0
+#: field:account.bank.statement.line,analytics_id:0
+#: field:account.invoice.line,analytics_id:0
+#: field:account.move.line,analytics_id:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date2:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,help:account_analytic_plans.account_analytic_plan_form_action_installer
+msgid ""
+"To setup a multiple analytic plans environment, you must define the root "
+"analytic accounts for each plan set. Then, you must attach a plan set to "
+"your account journals."
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "Value Error"
+msgstr ""
diff --git a/addons/import_google/i18n/mn.po b/addons/import_google/i18n/mn.po
new file mode 100644
index 00000000000..9b0376c0d98
--- /dev/null
+++ b/addons/import_google/i18n/mn.po
@@ -0,0 +1,217 @@
+# Mongolian 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-08-31 07:21+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-01 04:55+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
+
+#. module: import_google
+#: help:synchronize.google.import,group_name:0
+msgid "Choose which group to import, By default it takes all."
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Google Calendar Events"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Events"
+msgstr ""
+
+#. 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 ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#, python-format
+msgid ""
+"Invalid login detail !\n"
+" Specify Username/Password."
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,supplier:0
+msgid "Supplier"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Options"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,group_name:0
+msgid "Group Name"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_crm_case_categ
+msgid "Category of Case"
+msgstr ""
+
+#. 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 ""
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "Import Google Data"
+msgstr ""
+
+#. module: import_google
+#: view:crm.meeting:0
+msgid "Meeting Type"
+msgstr ""
+
+#. 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 ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_login
+msgid "Google Contact"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import contacts from a google account"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Please specify correct user and password !"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,customer:0
+msgid "Customer"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_synchronize_google_import
+msgid "synchronize.google.import"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Contacts"
+msgstr ""
+
+#. 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 ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:50
+#, python-format
+msgid "Import google"
+msgstr ""
+
+#. 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 ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,create_partner:0
+msgid "Options"
+msgstr "Тохируулга"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "_Ok"
+msgstr ""
+
+#. 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 ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_import_message
+msgid "Import Message"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,calendar_name:0
+msgid "Calendar Name"
+msgstr ""
+
+#. module: import_google
+#: help:synchronize.google.import,supplier:0
+msgid "Check this box to set newly created partner as Supplier."
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Import only address"
+msgstr "Зөвхөн хаяг оруулах"
+
+#. module: import_google
+#: field:crm.case.categ,user_id:0
+msgid "User"
+msgstr ""
+
+#. 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 ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Create partner for each contact"
+msgstr ""
+
+#. module: import_google
+#: help:synchronize.google.import,customer:0
+msgid "Check this box to set newly created partner as Customer."
+msgstr ""
diff --git a/addons/point_of_sale/i18n/nb.po b/addons/point_of_sale/i18n/nb.po
new file mode 100644
index 00000000000..42e5832b237
--- /dev/null
+++ b/addons/point_of_sale/i18n/nb.po
@@ -0,0 +1,2720 @@
+# 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-08-31 07:48+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-01 04:55+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,product_nb:0
+msgid "Product Nb."
+msgstr "Produkt Nb"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+msgid "Sales by day"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:49
+#, python-format
+msgid ""
+"You must define which payment method must be available through the point of "
+"sale by reusing existing bank and cash through \"Accounting > Configuration "
+"> Financial Accounting > Journals\". Select a journal and check the field "
+"\"PoS Payment Method\" from the \"Point of Sale\" tab. You can also create "
+"new payment methods directly from menu \"PoS Backend > Configuration > "
+"Payment Methods\"."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 view:report.pos.order:0
+msgid "Today"
+msgstr "I dag"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.plain_water
+msgid "Plain Water"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Year from Creation date of cash register"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Post All Orders"
+msgstr "Poster Alle Ordre"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_2l_product_template
+msgid "Spa Reine 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_box_out
+msgid "Pos Box Out"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
+#: model:ir.ui.menu,name:point_of_sale.menu_report_cash_register_all
+msgid "Register Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Details of Sales"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 field:report.cash.register,day:0
+#: view:report.pos.order:0 field:report.pos.order,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: point_of_sale
+#: view:pos.make.payment:0
+msgid "Add payment :"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.out,name:0
+msgid "Description / Reason"
+msgstr "Beskrivelse / Årsak"
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,product_name:0
+#: field:report.sales.by.margin.pos.month,product_name:0
+msgid "Product Name"
+msgstr "Produktnavn"
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Month from Creation date of cash register"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0 report:pos.invoice:0
+#: field:pos.make.payment,amount:0 report:pos.user.product:0
+#: field:report.transaction.pos,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr "Konfigurasjonsfeil ! Valgt valuta må settes opp i kontoplan"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.pos_category_action
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_category view:pos.category:0
+msgid "PoS Categories"
+msgstr "PoS Kategorier"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_box_out
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
+msgid "Take Money Out"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "VAT"
+msgstr "MVA"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Origin"
+msgstr "Opphav"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Tax"
+msgstr "MVA"
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Starting Date"
+msgstr "Startdato"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:46
+#, python-format
+msgid ""
+"You do not have any open cash register. You must create a payment method or "
+"open a cash register."
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 field:report.pos.order,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total of the day"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,average_price:0
+msgid "Average Price"
+msgstr "Gjennomsnittspris"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Disc. (%)"
+msgstr "Rab. (%)"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
+msgid "Cash Register Management"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_45g_product_template
+msgid "Lays Naturel 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_2l_product_template
+msgid "Coca-Cola Regular 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
+msgid "Sales by month"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.soda_orange
+msgid "Orange"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+msgid "Sales by User"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Disc.(%)"
+msgstr "Rab.(%)"
+
+#. module: point_of_sale
+#: field:pos.box.entries,ref:0
+msgid "Ref"
+msgstr "Ref"
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,price_total:0
+msgid "Total Price"
+msgstr "Totalpris"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_brune_33cl_product_template
+msgid "Leffe Brune 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
+#: report:pos.sales.user:0
+msgid "Sales Report"
+msgstr "Salgsrapport"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.beverage
+msgid "Beverages"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.stella_50cl_product_template
+msgid "Stella Artois 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.details:0
+msgid "Dates"
+msgstr "Datoer"
+
+#. module: point_of_sale
+#: field:pos.category,parent_id:0
+msgid "Parent Category"
+msgstr "Overordnet kategori"
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.lines:0 report:pos.payment.report.user:0
+#: report:pos.user.product:0
+msgid "["
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,total:0
+#: field:report.sales.by.margin.pos.month,total:0
+msgid "Margin"
+msgstr "Margin"
+
+#. module: point_of_sale
+#: field:pos.discount,discount:0 field:pos.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Rabatt (%)"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_speciale_product_template
+msgid "Dr. Oetker Ristorante Speciale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "Total qty"
+msgstr "Total ant"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
+msgid "Fanta Orange 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
+msgid "Sales by User Monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Today's Closed Cashbox"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Day from Creation date of cash register"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
+msgid "Daily Operations"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:285
+#, python-format
+msgid "Configuration Error !"
+msgstr "Konfigurasjonsfeil!"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.sparkling_water
+msgid "Sparkling Water"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+msgid "Fill in this form if you put money in the cash register:"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Search Cash Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "August"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_lemon_33cl_product_template
+msgid "Pepsi Max Cool Lemon 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "June"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order line"
+msgstr "POS Ordre linje"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_50cl_product_template
+msgid "Fanta Orange 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.category,child_id:0
+msgid "Children Categories"
+msgstr "Underordnede Kategorier"
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_date:0
+msgid "Payment Date"
+msgstr "Betalingsdato"
+
+#. module: point_of_sale
+#: help:product.product,pos_categ_id:0
+msgid ""
+"If you want to sell this product through the point of sale, select the "
+"category it belongs to."
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Closing Date"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_1l_product_template
+msgid "Coca-Cola Light 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_50cl_product_template
+msgid "Chaudfontaine 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0 report:pos.lines:0 field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
+msgid "Quantity"
+msgstr "Antall"
+
+#. module: point_of_sale
+#: field:pos.order.line,name:0
+msgid "Line No"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Period"
+msgstr "Periode"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:49
+#, python-format
+msgid "No Cash Register Defined !"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Net Total:"
+msgstr "Netto total:"
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_name:0
+msgid "Payment Reference"
+msgstr "Betalingsreferanse"
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Mode of Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_confirm
+msgid "Post POS Journal Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:408
+#, python-format
+msgid "Customer Invoice"
+msgstr "Kundefaktura"
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,total_discount:0
+msgid "Total Discount"
+msgstr "Rabatt totalt"
+
+#. module: point_of_sale
+#: view:pos.details:0 view:pos.payment.report:0 view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+msgid "Print Report"
+msgstr "Skriv ut rapport"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_bolognese_product_template
+msgid "Dr. Oetker Ristorante Bolognese"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:105
+#, python-format
+msgid "Please check that income account is set to %s"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.pizza
+msgid "Pizza"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_return.py:85
+#: code:addons/point_of_sale/wizard/pos_return.py:240
+#, python-format
+msgid "Add Product"
+msgstr "Legg til produkt"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_am:0
+msgid "Invoice Amount"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.coke
+msgid "Coke"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_pos_confirm
+msgid "Create Sale Entries"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
+#: report:pos.details:0 view:pos.order:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:87
+msgid "Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created in current month"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Ending Balance"
+msgstr "Sluttbalanse"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_50cl_product_template
+msgid "Pepsi Max 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.san_pellegrino_1l_product_template
+msgid "San Pellegrino 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Post Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_1l_product_template
+msgid "Spa Reine 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Mode of Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:50
+#, python-format
+msgid "Cash registers are already closed."
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Feil: Ugyldig ean kode"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_open_statement
+#: view:pos.open.statement:0
+msgid "Open Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.details,date_end:0 field:pos.sale.user,date_end:0
+msgid "Date End"
+msgstr "Sluttdato"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created during current year"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale view:pos.order:0
+msgid "PoS Orders"
+msgstr "POS Ordre"
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Sales total(Revenue)"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total paid"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
+msgid "List of Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.maes_50cl_product_template
+msgid "Maes 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_transaction_pos
+msgid "transaction for the pos"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Not Invoiced"
+msgstr "Ikke fakturert"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re
+#: report:pos.user.product:0
+msgid "User's Product"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:641
+#, python-format
+msgid ""
+"You have to select a pricelist in the sale form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_2l_product_template
+msgid "Fanta Orange 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_33cl_product_template
+msgid "Spa Reine 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_discount
+msgid "Add a Global Discount"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_prosciutto_product_template
+msgid "Dr. Oetker Ristorante Prosciutto"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_light_paprika_170g_product_template
+#: model:product.template,name:point_of_sale.lays_paprika_170g_product_template
+msgid "Lays Light Paprika 170g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_lemon_50cl_product_template
+msgid "Coca-Cola Light Lemon 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.cash.register,balance_end_real:0
+msgid "Closing Balance"
+msgstr "Sluttsaldo"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
+#: model:ir.model,name:point_of_sale.model_pos_close_statement
+msgid "Close Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_naturel_45g_product_template
+msgid "Croky Naturel 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.product_product_putmoneyforchange1_product_template
+msgid "Cash Out"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Starting Balance"
+msgstr "Inngående saldo"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_category
+#: field:product.product,pos_categ_id:0
+msgid "PoS Category"
+msgstr "PoS Kategori"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chimay_bleu_75cl_product_template
+msgid "Chimay Bleu 75cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.payment.report.user:0
+msgid "Payment By User"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,nbr:0
+msgid "# of Lines"
+msgstr "# linjer"
+
+#. module: point_of_sale
+#: help:account.journal,check_dtls:0
+msgid ""
+"This field authorize Validation of Cashbox without controlling the closing "
+"balance."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_details
+msgid "Sale Details"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.pils
+msgid "Pils"
+msgstr ""
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "St.Name"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Sales total"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "Sum of subtotals"
+msgstr "Sum av subtotaler"
+
+#. module: point_of_sale
+#: field:pos.order,lines:0
+msgid "Order Lines"
+msgstr "Ordrelinjer"
+
+#. module: point_of_sale
+#: view:report.transaction.pos:0
+msgid "Total Transaction"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_petillante_50cl_product_template
+msgid "Chaudfontaine Petillante 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,create_date:0
+msgid "Creation Date"
+msgstr "Opprettet, dato:"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
+msgid "Today's Sales"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_300g_product_template
+msgid "Lays Naturel XXL 300g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS "
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:pos.user.product:0
+msgid "Total :"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 view:report.pos.order:0
+msgid "My Sales"
+msgstr "Mine salg"
+
+#. module: point_of_sale
+#: field:pos.order,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prisliste"
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total invoiced"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,product_qty:0
+msgid "# of Qty"
+msgstr "# av Ant"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
+msgid "Sales by margin monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 field:report.sales.by.margin.pos,date_order:0
+#: field:report.sales.by.margin.pos.month,date_order:0
+#: field:report.sales.by.user.pos,date_order:0
+#: field:report.sales.by.user.pos.month,date_order:0
+msgid "Order Date"
+msgstr "Ordredato"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.stella_33cl_product_template
+msgid "Stella Artois 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created during this year"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Draft Invoice"
+msgstr "Fakturakladd"
+
+#. module: point_of_sale
+#: 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 ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_2l_product_template
+msgid "Evian 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "September"
+msgstr "September"
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Opening Date"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Taxes :"
+msgstr "Mva"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_2l_product_template
+msgid "Coca-Cola Light 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_funghi_product_template
+msgid "Dr. Oetker Ristorante Funghi"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,disc:0
+msgid "Disc."
+msgstr "Rab."
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lindemans_kriek_37,5cl_product_template
+msgid "Lindemans Kriek 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_33cl_product_template
+msgid "Coca-Cola Zero 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "VAT :"
+msgstr "MVA:"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order lines"
+msgstr "POS Ordre linjer"
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Receipt :"
+msgstr "Kvittering"
+
+#. module: point_of_sale
+#: field:account.bank.statement.line,pos_statement_id:0
+#: field:pos.order,amount_return:0
+msgid "unknown"
+msgstr "ukjent"
+
+#. module: point_of_sale
+#: report:pos.details:0 field:report.transaction.pos,date_create:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
+msgid "Apply Discount"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0 report:pos.sales.user:0 report:pos.sales.user.today:0
+#: report:pos.user.product:0 view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
+#: field:report.transaction.pos,user_id:0
+#: model:res.groups,name:point_of_sale.group_pos_user
+msgid "User"
+msgstr "Bruker"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_33cl_product_template
+msgid "Coca-Cola Light 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.perrier_1l_product_template
+msgid "Perrier 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total discount"
+msgstr "Total rabatt"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_box_entries
+msgid "Pos Box Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.boon_framboise_37,5cl_product_template
+msgid "Boon Framboise 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "November"
+msgstr "November"
+
+#. module: point_of_sale
+#: field:pos.config.journal,code:0
+msgid "Code"
+msgstr "Engelsk"
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
+#: field:pos.config.journal,journal_id:0 field:pos.order,sale_journal:0
+#: view:report.cash.register:0 field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
+msgid "Journal"
+msgstr "Journal"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.timmermans_faro_37,5cl_product_template
+msgid "Timmermans Faro 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 view:pos.order:0 field:pos.order,state:0
+#: report:pos.sales.user:0 report:pos.sales.user.today:0
+#: field:report.cash.register,state:0 field:report.pos.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,no_trans:0
+msgid "Number of Transaction"
+msgstr "Antall transaksjoner"
+
+#. module: point_of_sale
+#: view:pos.box.entries:0 view:pos.box.out:0 view:pos.confirm:0
+#: view:pos.make.payment:0 view:pos.open.statement:0 view:pos.receipt:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
+msgid "Sales (summary)"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.timmermans_kriek_37,5cl_product_template
+msgid "Timmermans Kriek 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,check_dtls:0
+msgid "Control Balance Before Closing"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_order_line
+msgid "Lines of Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 view:report.transaction.pos:0
+msgid "Amount total"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
+msgid "Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Users"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.food
+msgid "Food"
+msgstr "Mat"
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: report:pos.details:0 report:pos.invoice:0 report:pos.lines:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:30
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:69
+msgid "Price"
+msgstr "Pris"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_stracciatella_2,5l_product_template
+msgid "ijsboerke Stracciatella 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,journal_user:0
+msgid "PoS Payment Method"
+msgstr ""
+
+#. module: point_of_sale
+#: help:product.product,expense_pdt:0
+msgid ""
+"This is a product you can use to take cash from a statement for the point of "
+"sale backend, exemple: money lost, transfer to bank, etc."
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.cash.register,date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_33cl_product_template
+msgid "Coca-Cola Regular 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:65
+#, python-format
+msgid "Unable to Delete !"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_oven_150g_product_template
+msgid "Lays Paprika Oven Baked 150g"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Start Period"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 field:pos.category,complete_name:0
+#: field:pos.category,name:0 report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+msgid "Name"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_gazeuse_33cl_product_template
+msgid "Spa Barisart 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:284
+#, python-format
+msgid ""
+"There is no receivable account defined to make payment for the partner: "
+"\"%s\" (id:%d)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid ""
+"Generate all sale journal entries for non invoiced orders linked to a closed "
+"cash register or statement."
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:293
+#: code:addons/point_of_sale/point_of_sale.py:472
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:100
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:105
+#: code:addons/point_of_sale/wizard/pos_box_out.py:86
+#: code:addons/point_of_sale/wizard/pos_box_out.py:88
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.lines:0 report:pos.payment.report.user:0
+#: report:pos.user.product:0
+msgid "]"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: point_of_sale
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_light_naturel_170g_product_template
+#: model:product.template,name:point_of_sale.lays_naturel_170g_product_template
+msgid "Lays Light Naturel 170g"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0 report:pos.lines:0
+#: report:pos.payment.report.user:0 report:pos.sales.user:0
+#: report:pos.sales.user.today:0 report:pos.user.product:0
+msgid "Print Date"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:282
+#, python-format
+msgid "There is no receivable account defined to make payment"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid "Do you want to open cash registers?"
+msgstr ""
+
+#. module: point_of_sale
+#: help:pos.category,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of product categories."
+msgstr ""
+
+#. module: point_of_sale
+#: field:product.product,expense_pdt:0
+msgid "PoS Cash Output"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.soda
+msgid "Soda"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 view:pos.order:0 view:report.cash.register:0
+#: view:report.pos.order:0
+msgid "Group By..."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "POS Orders"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
+msgid "All Closed CashBox"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:640
+#, python-format
+msgid "No Pricelist !"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Update"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Base"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.categ_others
+msgid "Others"
+msgstr ""
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Point-of-Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_50cl_product_template
+msgid "Evian 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Notes"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_lemon_2l_product_template
+msgid "Coca-Cola Light Lemon 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.invoice:0 field:pos.order,amount_tax:0
+msgid "Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
+msgid "Sale line"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_oven_150g_product_template
+msgid "Lays Naturel Oven Baked 150g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_decaf_33cl_product_template
+msgid "Coca-Cola Light Decaf 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.product_normal_action
+#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale_product
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_products
+msgid "Products"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_4formaggi_product_template
+msgid "Dr. Oetker Ristorante Quattro Formaggi"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_1l_product_template
+msgid "Coca-Cola Zero 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.sales.user:0 report:pos.sales.user.today:0
+#: field:report.pos.order,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_product_output
+#: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
+msgid "Products 'Put Money In'"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_bolognaise_250g_product_template
+msgid "Croky Bolognaise 250g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,user_id:0
+msgid "Connected Salesman"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_sale_all
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale_all
+msgid "All Sales Orders"
+msgstr ""
+
+#. module: point_of_sale
+#: help:product.product,income_pdt:0
+msgid ""
+"This is a product you can use to put cash into a statement for the point of "
+"sale backend."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print the Receipt of the Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.make.payment,journal:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_45g_product_template
+msgid "Lays Paprika 45g"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: report:pos.details:0 report:pos.payment.report.user:0
+#: report:pos.user.product:0 field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:32
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:59
+msgid "Qty"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 view:report.pos.order:0
+msgid "Month -1"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sale_user
+#: model:ir.model,name:point_of_sale.model_pos_sale_user
+#: view:pos.payment.report.user:0
+msgid "Sale by User"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_1l_product_template
+msgid "Evian 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_open_statement
+msgid "Open Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.water
+msgid "Water"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "state"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "July"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_poivre_sel_oven_150g_product_template
+msgid "Lays Sel et Poivre Oven Baked 150g"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Qty of product"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chimay_rouge_33cl_product_template
+msgid "Chimay Rouge 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.pos.order,delay_validation:0
+msgid "Delay Validation"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,nb_print:0
+msgid "Number of Print"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_make_payment
+msgid "Point of Sale Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_50cl_product_template
+msgid "Coca-Cola Light 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.jupiler_50cl_product_template
+msgid "Jupiler 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "End Period"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_lemon_33cl_product_template
+msgid "Coca-Cola Light Lemon 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,auto_cash:0
+msgid "Automatic Opening"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_ketchup_250g_product_template
+msgid "Lays Ketchup 250g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.perrier_50cl_product_template
+msgid "Perrier 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.pos.order,state:0
+msgid "Synchronized"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 field:report.cash.register,month:0
+#: view:report.pos.order:0 field:report.pos.order,month:0
+msgid "Month"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+msgid "Statement Name"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Year of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
+#: field:pos.box.entries,journal_id:0 field:pos.box.out,journal_id:0
+msgid "Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid "Yes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_receipt
+msgid "Point of sale receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
+msgid "Sales by User Daily margin"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid "Open Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,journal_id:0
+msgid "Sales Journal"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.cash.register,balance_start:0
+msgid "Opening Balance"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 selection:report.pos.order,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_vegetale_product_template
+msgid "Dr. Oetker Ristorante Vegetale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created by today"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_2l_product_template
+msgid "Coca-Cola Zero 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,amount_paid:0 selection:pos.order,state:0
+msgid "Paid"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
+msgid "All sales lines"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Discount"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created in last month"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.beers
+msgid "Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid ""
+"OpenERP will close all cash registers he can close automatically without "
+"validation. He will also open all cash registers for which you have to "
+"control the ending belance before closing manually."
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created by today"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.product_product_putmoneyforchange0_product_template
+msgid "Cash In"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: report:all.closed.cashbox.of.the.day:0 report:pos.invoice:0
+#: report:pos.lines:0 report:pos.payment.report.user:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:49
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:93
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:271
+msgid "Total:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
+msgid "Sales by margin"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_config_journal
+msgid "Journal Configuration"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_paprika_45g_product_template
+msgid "Croky Paprika 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Reprint"
+msgstr ""
+
+#. module: point_of_sale
+#: help:pos.order,user_id:0
+msgid ""
+"Person who uses the the cash register. It could be a reliever, a student or "
+"an interim employee."
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_id:0
+msgid "Nbr Invoice"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:231
+msgid "Receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid ""
+"The system will open all cash registers, so that you can start recording "
+"payments. We suggest you to control the opening balance of each register, "
+"using their CashBox tab."
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0 report:pos.lines:0 field:pos.order.line,price_unit:0
+#: report:pos.payment.report.user:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Done"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
+#: report:pos.invoice:0 view:pos.order:0 field:pos.order,invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.rochefort_8_33cl_product_template
+msgid "Rochefort \"8\" 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 selection:report.cash.register,state:0
+msgid "Open"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,name:0 field:pos.order.line,order_id:0
+msgid "Order Ref"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.timmermans_geuze_37,5cl_product_template
+msgid "Timmermans Geuze 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_pickles_250g_product_template
+msgid "Lays Pickels 250g"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,net_margin_per_qty:0
+#: field:report.sales.by.margin.pos.month,net_margin_per_qty:0
+msgid "Net margin per Qty"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
+msgid "Sales by user monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template
+msgid "Spa et Fruit Orange 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
+msgid "Sales by User Margin"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_payment.py:59
+#, python-format
+msgid "Paiement"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_33cl_product_template
+msgid "Pepsi Max 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_pos_order
+msgid "Point of Sale Orders Statistics"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: model:ir.model,name:point_of_sale.model_product_product
+#: report:pos.details:0 field:pos.order.line,product_id:0
+#: report:pos.payment.report.user:0 report:pos.user.product:0
+#: view:report.pos.order:0 field:report.pos.order,product_id:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:29
+msgid "Product"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_pollo_product_template
+msgid "Dr. Oetker Ristorante Pollo"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
+msgid "Pos Lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.grisette_cerise_25cl_product_template
+msgid "Grisette Cerise 25cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_33cl_product_template
+msgid "Chaudfontaine 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_margherita_product_template
+msgid "Dr. Oetker La Margherita"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_root
+msgid "PoS Backend"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 selection:pos.order,state:0
+msgid "Posted"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,date_order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user
+#: model:ir.model,name:point_of_sale.model_pos_payment_report_user
+msgid "Sales lines by Users"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_2l_product_template
+msgid "Pepsi 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Order"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:472
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.details:0
+msgid "POS Details"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.details,user_ids:0
+msgid "Salesmen"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_cash_register
+#: view:report.cash.register:0
+msgid "Point of Sale Cash Register Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: point_of_sale
+#: model:res.groups,name:point_of_sale.group_pos_manager
+msgid "Manager"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.details,date_start:0 field:pos.sale.user,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: field:pos.order,amount_total:0 report:pos.payment.report.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:33
+msgid "Total"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.sale.user:0
+msgid "Sale By User"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
+msgid "Open Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lindemans_pecheresse_37,5cl_product_template
+msgid "Lindemans Pecheresse 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_33cl_product_template
+msgid "Pepsi 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: model:ir.actions.report.xml,name:point_of_sale.account_statement
+msgid "Statement"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report
+#: model:ir.model,name:point_of_sale.model_pos_payment_report
+#: view:pos.payment.report:0
+msgid "Payment Report"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_25cl_product_template
+msgid "Fanta Orange 25cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Generate Journal Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0 report:pos.details_summary:0 report:pos.lines:0
+#: field:pos.order,company_id:0 field:pos.order.line,company_id:0
+#: report:pos.payment.report.user:0 report:pos.sales.user:0
+#: report:pos.sales.user.today:0 report:pos.user.product:0
+#: field:report.pos.order,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.entries,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.orangina_33cl_product_template
+msgid "Orangina 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_product_input
+#: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
+msgid "Products 'Take Money Out'"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chimay_bleu_33cl_product_template
+msgid "Chimay Bleu 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_account_journal_form
+#: model:ir.ui.menu,name:point_of_sale.menu_action_account_journal_form_open
+msgid "Payment Methods"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.chips
+msgid "Chips"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_spinaci_product_template
+msgid "Dr. Oetker Ristorante Spinaci"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:293
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:100
+#: code:addons/point_of_sale/wizard/pos_box_out.py:88
+#, python-format
+msgid "You have to open at least one cashbox"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
+msgid "Today's Payment By User"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_box_entries
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
+msgid "Put Money In"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:238
+#: code:addons/point_of_sale/point_of_sale.py:253
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "No. Of Articles"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_vanille_2,5l_product_template
+msgid "ijsboerke Vanille 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:pos.order,state:0 selection:report.pos.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.orangina_1,5l_product_template
+msgid "Orangina 1.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,picking_id:0
+msgid "Picking"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.ice_cream
+msgid "Ice Cream"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,shop_id:0 field:report.pos.order,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.belle_vue_kriek_25cl_product_template
+msgid "Belle-Vue Kriek 25cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_petillante_1,5l_product_template
+msgid "Chaudfontaine Petillante 1.5l"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS Report"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_1,5l_product_template
+msgid "Chaudfontaine 1.5l"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
+msgid "Close Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:65
+#, python-format
+msgid "In order to delete a sale, it must be new or cancelled."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_50cl_product_template
+msgid "Coca-Cola Regular 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Generate Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.entries,product_id:0 field:pos.box.out,product_id:0
+msgid "Operation"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,account_move:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Confirm"
+msgstr ""
+
+#. module: point_of_sale
+#: help:account.journal,auto_cash:0
+msgid ""
+"This field authorize the automatic creation of the cashbox, without control "
+"of the initial balance."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_50cl_product_template
+msgid "Coca-Cola Zero 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_tonno_product_template
+msgid "Dr. Oetker Ristorante Tonno"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 selection:pos.order,state:0
+#: selection:report.pos.order,state:0
+msgid "New"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:238
+#, python-format
+msgid "In order to set to draft a sale, it must be cancelled."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_zero_orange_33cl_product_template
+msgid "Fanta Zero Orange 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Day of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_rep
+msgid "Reporting"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.maes_33cl_product_template
+msgid "Maes 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+msgid "Put Money"
+msgstr ""
+
+#. module: point_of_sale
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
+msgid "Configuration"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.orval_33cl_product_template
+msgid "Orval 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_1l_product_template
+msgid "Coca-Cola Regular 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:253
+#, python-format
+msgid "Unable to cancel the picking."
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created during current month"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created last month"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
+msgid "Invoices"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "December"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_gazeuse_1,5l_product_template
+msgid "Spa Barisart 1.5l"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:329 view:pos.order:0
+#, python-format
+msgid "Return Products"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.jupiler_33cl_product_template
+msgid "Jupiler 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_chocolat_2,5l_product_template
+msgid "ijsboerke Chocolat 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Take Money"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_details
+msgid "Sales Details"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:50
+#, python-format
+msgid "Message"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.journal:0 model:ir.model,name:point_of_sale.model_pos_order
+#: model:ir.ui.menu,name:point_of_sale.menu_point_root_touchscreen
+#: view:product.product:0
+msgid "Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0 field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0 field:report.pos.order,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 view:pos.order:0 selection:pos.order,state:0
+#: view:report.pos.order:0 selection:report.pos.order,state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid "No"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_gazeuse_50cl_product_template
+msgid "Spa Barisart 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.special_beers
+msgid "Special Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,notice:0
+msgid "Discount Notice"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Re-Print"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Draft"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_zero_orange_1,5l_product_template
+msgid "Fanta Zero Orange 1.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:358
+#, python-format
+msgid "Please provide a partner for the sale."
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.fruity_beers
+msgid "Fruity Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_dame_blanche_2,5l_product_template
+msgid "ijsboerke Dame Blanche 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
+msgid "ijsboerke Moka 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,help:point_of_sale.action_account_journal_form
+msgid ""
+"Payment methods are defined by accounting journals having the field Payment "
+"Method checked."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
+msgid "Sales by user"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_hawaii_product_template
+msgid "Dr. Oetker Ristorante Hawaii"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print Receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "January"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Orders lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_petillante_33cl_product_template
+msgid "Chaudfontaine Petillante 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,help:point_of_sale.product_normal_action
+msgid ""
+"You must define a Product for everything you buy or sell. Products can be "
+"raw materials, stockable products, consumables or services. The Product form "
+"contains detailed information about your products related to procurement "
+"logistics, sales price, product category, suppliers and so on."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_2l_product_template
+msgid "Pepsi Max 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:358
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_300g_product_template
+msgid "Lays Paprika XXL 300g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid "Do you want to close your cash registers?"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Refund"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#, python-format
+msgid "Please create an invoice for this sale."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_mozzarella_product_template
+msgid "Dr. Oetker Ristorante Mozzarella"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:66
+#: model:ir.ui.menu,name:point_of_sale.menu_close_statement
+#: view:pos.close.statement:0
+#, python-format
+msgid "Close Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.payment.report.user:0
+msgid "Disc(%)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "General Information"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: view:pos.details:0 view:pos.discount:0 view:pos.payment.report:0
+#: view:pos.payment.report.user:0 view:pos.sale.user:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:13
+msgid "Close"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Order lines"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.journal:0
+msgid "Extended Configuration"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,price_subtotal:0
+msgid "Subtotal w/o Tax"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_50cl_product_template
+msgid "Spa Reine 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_blonde_33cl_product_template
+msgid "Leffe Blonde 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
+msgid "Pyament Report"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,jl_id:0
+msgid "Cash Journals"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.sales.user.today:0
+msgid "Today's Sales By User"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Customer Code"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_out.py:86
+#, python-format
+msgid "please check that account is set to %s"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.config.journal,name:0 report:pos.invoice:0 report:pos.lines:0
+msgid "Description"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "May"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Sales lines"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Yesterday"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,note:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_decaf_33cl_product_template
+msgid "Coca-Cola Zero Decaf 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Describe why you take money from the cash register:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
+#: model:ir.ui.menu,name:point_of_sale.menu_report_pos_order_all
+#: view:report.pos.order:0
+msgid "Point of Sale Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 field:pos.order,partner_id:0 view:report.pos.order:0
+msgid "Customer"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "February"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "    Today    "
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "April"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,statement_ids:0
+msgid "Payments"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month
+msgid "Sales by User Monthly margin"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_9_33cl_product_template
+msgid "Leffe Brune \"9\" 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: help:account.journal,journal_user:0
+msgid ""
+"Check this box if this journal define a payment method that can be used in "
+"point of sales."
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.category,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_return.py:316 view:pos.make.payment:0
+#, python-format
+msgid "Make Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:pos.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_sales_user_today
+msgid "Sales User Today"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Month of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: field:product.product,income_pdt:0
+msgid "PoS Cash Input"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 field:report.cash.register,year:0
+#: view:report.pos.order:0 field:report.pos.order,year:0
+msgid "Year"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:31
+msgid "Disc (%)"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:41
+msgid "Subtotal:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:45
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:268
+msgid "Tax:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:64
+msgid "Disc"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:71
+msgid "+/-"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:105
+msgid "Paid:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:113
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:288
+msgid "Change:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:124
+msgid "Back to Products"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:127
+msgid "Validate"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:140
+msgid "pending orders"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:145
+msgid ""
+"There are pending operations that could not be saved into the database, are "
+"you sure you want to exit?"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:236
+msgid "Print"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:238
+msgid "Next Order"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:248
+msgid "Phone:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:249
+msgid "User:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:250
+msgid "Shop:"
+msgstr ""
diff --git a/addons/sale_crm/i18n/zh_CN.po b/addons/sale_crm/i18n/zh_CN.po
index bbae3770541..6678287c01e 100644
--- a/addons/sale_crm/i18n/zh_CN.po
+++ b/addons/sale_crm/i18n/zh_CN.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: 2012-08-18 17:40+0000\n"
-"Last-Translator: Heling Yao <Unknown>\n"
+"PO-Revision-Date: 2012-08-31 14:59+0000\n"
+"Last-Translator: ccdos <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:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-01 04:55+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "分类"
 
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:112
 #, python-format
 msgid "Converted to Sales Quotation(%s)."
-msgstr ""
+msgstr "转换为销售报价单(%s)。"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -73,7 +73,7 @@ msgstr "在生成销售订单后检查是否关闭商机。"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "我的商机"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -104,13 +104,13 @@ msgstr "关闭商机"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "这阶段我的计划收入"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr ""
+msgstr "商机 '%s'  被转换为报价单"
 
 #. module: sale_crm
 #: view:sale.order:0
diff --git a/addons/sale_mrp/i18n/zh_CN.po b/addons/sale_mrp/i18n/zh_CN.po
index 86105255a19..bb04533ef97 100644
--- a/addons/sale_mrp/i18n/zh_CN.po
+++ b/addons/sale_mrp/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-06-28 05:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-31 14:59+0000\n"
+"Last-Translator: ccdos <Unknown>\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:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-01 04:55+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -40,12 +40,12 @@ msgstr "销售名称"
 #. module: sale_mrp
 #: sql_constraint:mrp.production:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "编号必须在公司内唯一！"
 
 #. module: sale_mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "订单数量不能是负数或者0！"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_name:0

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 210/288] [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 211/288] [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 212/288] [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 213/288] [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 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 214/288] [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 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 215/288] [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 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 216/288] [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 217/288] [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 218/288] [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 219/288] [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 220/288] 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 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 221/288] [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 222/288] [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 223/288] [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 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 224/288] [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 225/288] [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 226/288] [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 227/288] [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 228/288] [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 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 229/288] [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 230/288] [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 231/288] [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 232/288] [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 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 233/288] [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 234/288] [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 235/288] [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 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 236/288] [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 237/288] [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 238/288] [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 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 239/288] [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 240/288] [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 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 241/288] [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
zcmZWwWmHsA*S<4D3_TzXQj*djT?5kHjdVzdg!IrU(g+fglG4%)Eh1gg2qH*#4}8Aw
z&-YvR+;i4CYu&x~kNrINS^JzFtEsMlhfRqM005qnqOA76HS|9(6yx9ACuuqIZ^5uq
zQIG{5|ML`dmZkpN!F;2nCWko>B?st)mm0a+0Dulql9kr=`*;xawuRF`Z`-Z9vvT*N
z*O1WiRZ3<ig4Z#o8O#?0lchi_!JIxQ3l4s+EVQ^N*era`B2Pu)f<ngdeg5pg&i4(L
z5`z`N6T!m><AZ-YPwBvQ3%<$=D6LowxS$RAY_`3c+3|ZN=jW)|n(rY+h2wlpXYk(F
zsLo2RS|*eF{~0%@_3`mT?KmbI5rRz@I5krfLY>g;F7vuuAMHRcoaS()mr!tkVMLc>
zV&|atg{0}_nfda}gYz)u0ySXjKB-Q;6s%=GP}w-9uA_`F4F8a9kNpEc;~6Zhz)Rq*
zohz)^t90Ujc>C`=Ay?(@W}8H34uGo#{_+vY?mgKqJaQ(XOr~j!NSFV@`hJ@-jxBE{
z4rvV0nPuI>uH2;DvJvM{*fiKEk_y<0x^z*QOHYI#<;Zv?+mEvgvryK#WXhGeRs3c5
zuMnp876Skj92OJW53h@iLMPNT>P@yDF?{t(#1xSiL(pB(ZHZb+@s@KlRLNhy+z)KN
zV$LOdKElVE8?GBA&RyV*F@-Hpo{r8OrAa0IiCoMxet^r;r!;<63q6Ih^tmsMSl6jC
z5c2iER&4u#0?`3(r(9cOC)RXnTgo34r>f7Uv8%}Sq52<jb{y9C<sv)9+6)(4pQ3)D
z#bL0rpku614`tN36x}v6v1H&u0JdOKHavYwWhYjB&1_AZgoPRz7M-0x2@4-<g)8d<
z>Y`UvmbB)=tWks&O0hDKr)pWMgG|paJ|*rhWqdRg#0BPzt*awL;mR*<(d#)B%9eUA
z2WWga-_$k!9GH^9><mM~boCOIjCyBCs;WUIn-i0^UcY~?m$`2_9WH$Cav6@5bJ2Zy
zTAVosT<2Yz0SKhAbSZ@~p)5y5g^W=Kd7=vL(3305M33KowDT)(6oT$L6<*QNq83I3
zE6hz!C+ZQe3t+EK?Z4<5KW2=bec%}R^ai6ufYh$-r{vl|b1V341-Da1njc>4cl-_8
zwSCid*>{Lj(>tW)cH!%ovuS?w?_V~XIMQo(m*_6|T?%mSKVx9ly|66aCH9F?{@;|L
zY`hc%yt`jQD<m}&E!D7e<_!(~zo#Cd*14DKexVjqylwkT;b~%0e8X3PBO(jeJ6FH$
zD0179z|THAlGw<@B|y7G6gZ-C7`a=TM)-3girWRNKXNO-nm)AR9nEJ{u~QjfDn`U4
zrH&yh0DJWMD#+|#dUpSbx0pW?KB!~Z$%lA{wq+xAnREp}<@*#llVzMn=7Q*e>J6V4
z`WUwR96FiA&LMTZ6{*qW%M7O<=bmp)aR+`thYa+!)R@;D!A>5lcIU5E=Ezn*${#$}
z#n2WJW-o}N(UpYE=7i_1L>(^U|KL1C_HN*F9EjrKi1`-rcRv}}_py;XDsMTKpgPKK
zwlP~E#;7&ESeS<h?}d7kRb(N!{=B~;ojf4f8Qsd-v$FuR=17mSuTMhLlI+Gt2e((S
z18w>LC7H`Vh|cgalNvhxihBvxgg{sR7VdaY<{T8HvVHD|<`org;{y^gKG#n+)S-tC
z$qKSStKPD<MHx<aBp{kF=H_5^bkG+jZ|ZShq*~hxgwJ9F>@nZFg7|Nnn4D~N0L|@L
zMJiCg3?u8ROcg=^!wQ{|lo31{R%M~umf%{WnU1S}`yprY3#So#4iVaO6WsT#W*hBy
z&I6rLuv(a_de#xI&yO~}m#XJ38r?hboufNT8IAw!@)Z91W^9j=zL}#mwBBrw38k~B
z-*Fg}`BZBykBE`}(I$T-CRpTVGL@kQ0-{nu{i0j($hd~!t5<#GI8J8o6=A=zv;M-G
zuZWw+9bvq{!<gFNf0k{$0QVKKs5uCd62eP^8+=k$N7`f$f)^<Ar1FynV5_X+#Z;Sj
zumvrpWH>9spa85~)|ojOD~#$hO4$Mv&509`{)828)_X~T&JYHFRT#29?)JIzmRovu
z$>WAwRj~TY8nRvl7eEfYmAp=cq1rR80f_aAKZp>aAJK|$Jyg{@W|UaCV`=C5U?R41
zNNe8~K-KlAVcupGgp$ul#6-rgc9?W-92`9<>}8W0MoWlwEf5TAyQG657<yIJfASX9
z1_?rVtu2>)e&=%47kb&{c}s?6b{}jDb#$+-*Vh4l3rk&c7j|Dp;}1iC&n1EEgC!wz
za9Pb+(saTZd5c7344py5fyBE7cq#E8JG=K==x;JARsRb8Dsg)|8FhI>Wh#gda0g9`
z7?nzC5f6yGokReMr`DVWKKW{i^@5)hyt$9CW3ZO&$>aI4iynA2TjM0!|4g!ZvX*>G
z(~oOdTdI|G8^!>w_u`~a@gGeZH5WHfe;6}UGUy)yHg?v^f(MN;Ll+Aw%;Ytx5KU<4
zJ+tQ5ls0drxcqKY>jIW=eSVCGW=X38)BGp(@%fGPs8t)0H?L1-hS~`TSjw;gFx>Gx
zj8<1!YTATNw{$X~*UK`XOd8pR0m~|gGR(wMeLe(iPOVp7Q4g3%210`Guekdf@?J!n
z-_&hej*l5}{P=D7aa79&`<*@-%=;F@^saQ+%;3}6I@8KpL!qmr-|H(W$yL-_R+01<
z?}3R(vR8^n=3BId2{I%EvIzqv)4crMc&Kz++~}Yk%Fj_G%3??h({SOwUzpJOcSAd`
z*F`kMsMgM&+W%UUxQb<cp*e>UY4wI*KDqU67>U8F8e~gQ5r#$47E<9)p32KRb)H;y
z23XI)kW{_<zy^CplEi9|i3SZPuu~Y%Rj3iT@g#7B^D9p-s+WJ0ln`p_IG>w4)O*SF
zrrqqvh3F0`cBgt&tNOdv57a9Onydvy=#iwbP!GMLDzwxJc_Y2rxllSy8?AW(*?lpO
zn{kO2dV_9+=kKBw{_4qY(6>t2WzJezFk(d_dG`v`aeH#O>3`|~z|uo@Cg}6>^9@L~
zqb<gbAtv)YRmdt$!e`S76%23QfXJiDRaE6MK2xNCY@pgWRp7zjc7!ac*z84EgQ-Ne
zMpoi^$eG#MZ|6=zfyC<4?@XJ6zSN@hoDRl;v?sjZszU)ZIv)7xG$wa0s@;s+9QAv1
zW$pD_#(xs2<+vB;CPjtomsz{d$^E_fm#QjO0dq4)#crMnDMFC!JG?46r9%N(ym}D}
zk}9oQl9zm8qfjOY1xWTV<HW<r($+g6I3xl^K+}VGHWGp-cK@a2cV=|X3sM$Nh7?Zo
ztEn^ImNR=*fm<x1H--Srv>5`aC#5q$dp61VdCg<V_PV(&Q0hTX?}f%?SLn{sQOBA3
zYLgQgt+=1&=;-K)!;6i!cJ}VB>n`6qu2-cE)S_o2ov6e@xn#>y6N}Q+qWQ_4Eeg?A
znPgs3if0B9s-QRkSy=NFIBYwDy0)PnOp<Ee1(Rex?qdqMk<+}Al_kJ9T46K4tHe3D
zMkX2a->Q3F^?>GNEP_IJ<ISyrx=?a}6oZ8PJ}Q@6<eVyL+go*H_@4lsKqoUrM&m!-
zC@En&yt-Td`)0;Z{Ezs!o>4}^>e&9^YJ5n|#-WpUhHrYeQd+uv#_Jz%yw2mOI~iVn
zo!I$JDL2U4=tUT}k_w3`!a9_2UtYaHCTq}`yb2N<j9!b@Fx7RtgjcaJTwU>Wz1?0P
z3kf6~B<PsQ7<%>G>JOGXMJ%@uJu6ksB`5|GDgg5&(To9oey-;+=S7+ya&VC}bWz1Z
zfEg<A5X?h<yu3_}xs^0zoxUxSX<L3OzTLOtMS3*ab<msg=T&k2Jw=sn&yOAANKEOd
z!ijIhF9|KG28yc+oFg%l@VO;A_*&4Kx~L5vwukQjXeQqUkk@eN7jfsl#t-?kWf!>K
zUM~5d>NJWA56-4^ElDLo4zWY`Xi6?aVUMp~q5-(Fj!0wJ<Tjc4b@KKTi7oR;c0bnt
zBKw=~>RT3WZtk<GDIx+4$e~ZWqcC-a>(>!IJ&(NYswRDJvj%PDS?^IjJtI5GH!JUG
znca^};C>7omtm8LbP=9(Zb|!l^H-NE<EEn9jp*Wc_g?PqYm%mC15SAt+4CKL&XNWq
z<CmAv-;G1;dc=>*&(v<#8*BrwO<bA+YqEYB0WmSaCwIW&Wt26DF;2c9_#};c>{bqF
z@f7YKz+hk!Uc1@D8Nc~W6{|=S?-ax;q6H&Q?{=E!!YGI<v~c3IH!5vg;c}`@kKy63
ztmhCJ;j5`oeqC)O8}s2}I;kVz&5HMY5FwJRRO7gJ4Yh*vfNB^s{N8}OWXJc@OsuZ0
z&7UR|4-)##7X5Zb#3l=UyW#V@!y0`zsr<ckx93-=;RWrQk06RXre<SzLTY3-NMN2g
zH&7XeH<UqBx9TLR)dRsL9Oxry{xh@+0<fY*fn_jEu0mXno92Vjked%Y9C!eOjQbT9
z5zvOZ9QoUjFH!ZuXeIdW;N$ia@ADmA0cyT~c~P^MEnk$(H#p%g%*dc!G#Qh?+y6sV
z)^z>?7ZCl2KzX6HKrcLGDT}`G8ibDP>G&D-VAhiib+`6|4J*rEjm|H2ZFAoZj}{#6
zsM`C>w;9iH@Otw|cBD;ye{CZl5VOnAd}Y?2Gisyt!;k8RpO^(H$Pxm`(2)Wnh9q6V
zmYo~FII;mlP!D)Qy|qf(3Yg3zta4JQGC5GCgl!@VsL5lN1uYRV7)y?09OjP-3|Cz#
zJ3l6)oGu7sFyN`&c~_3raq~ETK`|cq9&ZPy>nmP_231hTJ2*x5$Iwu!I6Lai6*@V|
zDSx1i*Mcot4w7UtWLHpba_FSKO3plMkdu(QtM|wwv;H1O1VG}r9;x%WjsYGFqh!mW
zKoq1XAovRd9}d7~n1eIPL8rW*OhZ8MX1nUIg#`}LlC+ucO-pX%41fO=x~xdqpS+i4
z>r+}*U|kHlvrNukAdDDNd~obVPL-1~nkErSlx>UTV3DQ1j`Kv>w?Gr%_*TF40|RYy
z$)L81zWKguYcKdx0dzlLU3He>04xMZ3U=K`n^&!>B5AJn@weV{;)Wp#zy+T^qt$`!
zL!-i)BEW|WQiI?X(;nlNZGiA4TWD2OIYn<m0<j?o_*GtZfEFq&lD3Ub9)9K-u-+jo
zM-RxX%b|se+t=AUALS2A1pR1IeVFj>&6(M3<Evic*OV|l2#cV){R;H>A)&Hq2F36+
zlf}a+37;byv&Sm<Pf%0@pat_h&@}6PM}VwazR!u4Y&@gQeD(I)BY=_;veR)m`ckq>
zJLEe$A4UXa?V!ZaxUjjs8oD)FQ~An$&_PA;AZ6C#=y|I`ry;quCRMx=8~Hn@a|0(_
z1&q|GCVDW3OV0WZuK~^1LAnusT!q$Y{`dg47R8*-({S~meOWjJ*T5(I{Z~7vsl<1(
zk{DnhR2yIqr6?v}Kh~yWg+(4<L%pb~08j3#l_QOP)_jt0-AGE}D=&g?5#N`OG;32|
z@`Rfp97$9=GUIMNa##Nh49H<jw4d+ZYR3eqCn;`elk4<ShPR!57fjEe{vxgWG8tXz
zVE%4a{e}kD+pMU<F@YH)Tr2URpm%q|iqE4moUFaF<?2=DUn8eajlDmXU4c0xLmq=>
z02e-%-!?PSZ6Q79m%n_^RSQ%8ywok`?|JjK;1HmNG9aOn14aK(CLe=x+xI8~h+w*>
zVmE7Mdc>++G+ERUMy(Wl!N`kfsH_O|Ji92<EnwBU^n~r#=1@}RVAihCL*Sd2AvQ-(
zTBNmgL7#J{O2P!1;v-z}N-4AP_{@sF;S$fg5*FZ9Y4$~xn0qHqwhVqR7(8{1O_z?H
zYymrjJ&Qg<UnfUWhOe}b%Nr3=Lva-yk!>+c1Mj;Ez!2nB^s+Azr2bv2sZ{mVJiXAD
zrJ=ix#2AkrTJX-Y7*>bVF++{&Q%ME;m;1x99j78)5K<pM+TAVgKKvt)Gu~JJ0B6D&
zKGF=|)w{gT6}7pGwnC6DLp`>|n`xInarPnXs0cr7JsuAM?qtu#@1awq%7n!1hT1TX
zu4!z|dE94cb!gTrI?~m!-E6J--=yJ`=wc&TxC9_sURYr7f(CLjox04$BymRF1{hIS
zN^1ijT@}6i#vW@Lx0=;3zJ*RN{N{{!)Q+r$X@k~%OH#!Pzi#YKGxbqS^`{?p7`(#v
z+m3YBuogh_4ZH!8?w8DPM_K|5w``p^vqHdi3Es?s5*CDKFpHiLFZhakgn;Uq?Qxkh
zByMFzESudyKt4I0bp|c6M$3jtv_h68r{Ej&x0a|v%36{t@5A1icX+#PgMOygCFZ|=
zdPZ)gQ}UZZki4OFr149n9>*<UP0)t<T;~(V_r7Xldg+HuC2M6Enqu(^2a5&YP5dps
zd^h@Zaun<lSGklkC=ugPGcY$?Cm@r+NJKu2fXjyZllZg{Tukm+WVnT;MF;)PHw=V2
z{F21Ppif5>JS-)Te3jbfos)V21nmE;Q_>=?6k3*!K9c%*cfUHl^;R}i|8RigFc&Dn
z%>oS^ZbXnj9kr;9k1(@~og{~iz(#6&U0eDa;4Yf;5$b;`KD~bK_r|DI`l?F^&5!Hi
zw2?i590Plz7O`D}gpsO=h5aOj6$TEy0kSWFeA2>lEJkNIQ9U|N`8zSEeCp_*hz2S`
zs2Hhdq%7D72h{#s&RLwM-!%l3)l{$Dbyib3c5}(n;lAcqL=wb+m5y}u_V(tHl9Foq
zJ-vl#?qzu?ege`y+<mIKA8zfJeSsjlyH)>$#fYsc0L8Y#D&j3_#w9$$kFe<Z>?mXQ
zgc$GR{Kbh(-nQ`E{8$C3pO3>MW{+x1xxn)hWSV*@VyxdKd2~hanr0obJI(JKQFNGL
za!et&?n4+uA^oq~ag}>o{lx`+on9mlo#FRw??<%H`@5L^u97{RPeB|Ay0u2lix3>-
zmyh*!8rooBe|LA+AvierxckxPzJxZUwad3u!5$2@gWuuMMI=;UedxO&M3Z|Jp4Fq<
zj%dJT$F`mAN7E;+BGDBHA1LWQtUDn!(pvX32l3_AJD=9%|9Y5|rMCM*=hy`aWes&4
zC;gph1}_ZE@0?XB_}xDq&<sn13t&`$s?5AKgi;sTClO(+)gm#`fZV$9RsbEcLHhVn
zGSBm;r-j{ji-Cu!WcIHi?n75JsQvQFt6xk297szYwrQIFi|f|))F5#C=9=xjM$bT7
z$mx65POOIeTQV?t1cO%ry=NUH*@8s<Mjmi-G_=ghM(zsZ(~5+Z94uKTO6P6YW&mPQ
zn<F-(6%pSSm$G^KN$>(4p)W$qpF}~CSdQCSm#zB+r@<j$UJ?s=$(q_^RG*#-R8=lT
zChf(6*7f1#lV*JADg<3779I-^Bap>XZDsf%ZdXH>i(9eRMng2Y{`Ilqej@sz_L^{D
zivIof%(@g6A$>k(wA$EnK2mpS3nDVv`m^>LtDRGiIy5JO&BK7hIDn2>b#McK?_+Ws
z)|TC^PY>(Z*B)m*ZF#}>V-@tktZO2aU*aigxSQ3341X^AP<;5ic8gQAjR@Q$&lL7;
z^Su=n<NgA?7xfNLxc~O>_Mw4WE}Z@w4Zp#AFp`U#J4q~eY~9IsvJOSCJD%SeolkpU
zCa(PwPGWh)EsC23jX}pPFrWj62KLzWM<{LGS68#|w;#m&4R*iv|43|{RSw!K`#yZ5
zdQEL2gBZ*gjaef4ldUa!g~)sHn#Sm=y$@IJhhoLOJFil~&;Iwnr$m8dH9DO^_#}Vp
z_gWp#+GmK+7>UCw%vQe%h$<!BoyrL9(#b<4+0%uYzbAk1z|Vn7Z!-d^d$zM4O?C~P
zjX~oH8VB0ZC}jLFTURR1pSG|8k$4v`QXGDa2D5lqh4;2$D`$5+d8$^t4zEp$0$I3L
zQW`1AL*at1ZiN6gLfPx>FBas@3+BhpN$ljS;kreZVQHn*p1p`8_aT^yj*lG~>(E(G
z9ZB60y_Pe7o4_fKdf@w!kL-pQ2A&J4LKjk1YEnrW7~!Dt@p0dp&SBh;Q_M3mVhU0!
zA2o)9>ttiML;e7QZHx>O`VpW6?E|yTV&>L|_mjMVe^j1{AH3F3u*D_)A!X4O&}ex!
zAza4mGjdNQR}zOmCMNjXDDE?sRjdTRz+pHmkC_#f&iqrvgs8bi&%~?i^r^niQ#OoH
zk1hs}PnNVW&cxa0-6v*6Nna+HF@|42prONl;xqtx(3W5;-~E1qxs?Lb2Q?gA*ct25
z!M&CR_yvyt)1Hkgi=~e}@8sf3Tu8-8ar1lz@mf&tmX6CSrQ-O>j*f>^yd<%4xaQl@
zjPIU6epibdR^?cn9?7Z+zC8SDag7J-@bK)#pjMLvftldPm>x)`$c_cJjG+DAPk63|
z2pyYN>kk4kr}LcVt=7{t*-fj}mfmLb5C+QovHVP0-Y9vzi-1|#+bg)kQ<_lNrSA|A
z79Tn>I?ptTa}J4fzR=HB2lqdh0Vfw<I;i?Kg?c%2l*cpIpMyCAeVyMM{vdwB#0Zm&
zypH@ulD^;HgGbj^pg8@>Onpo`SW8K>QKpZJdMy7u9!!Py{VIQ9oTXT07p0Wtg}2ka
z%3)Bu`pn3d??b`#-!~c2X^%_Wdu1GBn;&a=z0o<d@g=!ecw9d25B>XzU>Sqtm{~pJ
z`F*HmK1Kg*K>4*-BU7urSP;fwsnfX(;cZeqp~J$JI(do*QC2KJ`cZlpF1N6LHs2lf
zfzj4q2-phRfD=|GeApX(o<dZuUnQNUd<~V;GgRB-S(x*ZoseS2TOx2xZx(YZbey8A
zzoU&JSYv5aUB?v>=)=5fvCI#S593)P+0V*Z&lzuFp<zkE^-=B4?sf@T4{MELC3?(P
zrK_f*WxNxBBsr`QlYW<5EVG*-5-dPsAigg^SkS`=@WaKh_9r~C@?vE!ri1Jar@ol9
zTD|ToOVmIEymlr&(TDb!tQo9y@D;Rc-?|V60y4X#VL8yEC;Fq;*8SrPPhw3%iqYgO
zCx@qP!>5%oQW^%Gtq(4}!I2K5AgGQr$zO^66aX|PC060fO-5T>6K+f={RRi^y;@<w
z3+LbC3X&$VHO1%=$fvjr)dlt4V&{Kzy_~p@Cr4uc6=#_Lakif9pitn-y$a>JKocT@
zuofTI&x|MxIeY5|VI&iXZmiStsMuk?c5cuz94BjQCM8ar@~I8{YRL%;!?AoFiad@}
zAfkN%k3(4YGN;)v(Jz;g+ujBV7jp8+Rh;k82)E#2=mh&n&bf&o#%R(%LIF4tZr8)X
zY)R9WWy3CpL*ZjTr3u1hgL<P`SYkWrV!C`ZuTH`j`xG}7BTw*<a-6I(SdEI1ktnQ{
z5f)>dS-L@;9zR&|4Ay(}y8&k$;}epEFM*9csU(K+(HE4T#3}4ZJ9*WY*%m}8Q+ISI
zToOlnWbVC4AQ7=jlPpdQsCKW>rrV1A44Jq*dJC^{!R5F(z=D?EcggOS$(onf%h07i
zCx3O)jF2btdhtEoW(|!%XB~ISDz4y@g^R;qdL`7oJ^m&waS}6c%n5`AH~AU`{p?rq
zueR$6p@+3z#38E0Ele$T=eZdIhK{WR#{HlxxsCrEhuSqw9Op}N(MBXSQm(L=&#^M!
zh!}0MSPF73zW^x{&%Ps(;USkM%RIoz)|13~#z=3qh%t3EO~e|cR-ouYhqjnRDE_e!
zmJx>ak$amlY)F*L^1w}v_q&=iA**WLEs^X_masuVy^H*CyUj|;c#<j&KG4+UgZvTx
z^<jFaas;wGY3N(=wco3(^yle(UEw>PlIO`&eg1)tiz-fM!M$bD=0t8U8Yk-?e1z$A
zmNXa<6h!furR1QlG*!C#RZo{q>~GB2_>`9<lH<%;9|#$V;}u3JUp9sfk-v1`(SDFX
zRgPaD5qR*jFcDw^BL3$)#T6BLz$R6fy1|PFGs;0s;}<IlUf5_Lap)9My>J7y(llAm
zGzh#FV_<W?ztT5_wXfd4s6P8?C)2lw#RSjt!3%EnUm91jUZBS_<u8MQRlYc=gC`p)
zDa>S!pN^pmzi)ZR`&S5GvUxj=rUK>u?-1AjpUeX+j&HxJaaGFU(H%x%DUpPGhfWk;
z9y2_u?9oYaI&In~Gcu(WRFx)vgMPa4zJFNslcns$vErD*CPwFsMAwg5fIAKZqggMK
zGhDj+W%*&ZmrdjFG9ODy1zzqa>$Ap|gY;vBpmb9d_4}P=DU^A*fb+ksBAi_B>a%m7
z5Asx_mR`yO$*Qp7kqAxMMUby7u^A^RH|V%BhawBH9<*WCM}i=kMVgNKX`AB6hSKV&
zXq1~Y@2{5kBG)bjZ-VKl4=JRX+Dm%qSPmj%%Xf|thLrD?rhg(NG|!*3mtJk}RUZD@
zviXPL3Lfe6)yiY(;=jI)*E8lSMOibn3i0RP&&xl>V^Y#`A_(t!@x()g{il|{Env_K
z#O2{@ZW?&(oyesA-G1{ZY&p?_bNzag8Rjflk{qHlcGXb${IwOf;^@QvR~A>cId(?D
zRT~am9t7K+MtJ3T@NBG}pOpv&0Ki=mC}5N8Zc^H-K8+f_vIER;!<QqR7L5E6PHEOf
z0z=nUl)}eJdFiqg)z@^OR~FGT0*u3QIM7d>`iXr<*1xPDYHR4Em6R{oI$0z;NKnsO
zl3@zP4e9ixSdz4A_mj?w*angU5iR4YblM?PkH259d8XVZc-8~8LrJvxx_V8|88-L2
z)gP&=NZ_fh=yF1X%dDg^5Nb~UMRTEe=VXU+P@*r06V{L0;2}Yj;rNzG)JhTlzJ;SW
zDA~s3=X4yVj77Nc{GN|ub(27eiX`mZm3=~xWshL$CfX20Tzo~)4{sQNp7cvb+Jx#E
zXkDQ^N1wI#?bv{TmRT8y^^bL-Rl)nr#Z`e#0RSM1`OjT|&%qmw$;G!09FhW4<--gg
zX#BeAITjq*(kY$NG0<LfV*kC7sO-1vGh1fNJ7jw;=B#qNIH8aRpk1A=%T&B@Y>>u1
zCJKd5yyBkNC)<^FLWT5^rY$q7SUwlSqgD!;E*N_}FK+z1l?))Mh21UCEZlz!<6W+}
zNi7K$*?<%_NGWX#(Ibw7vY%2zwN>2U>zB>dx>_BTN=r!$mK)`NGtcmySSto3Q|iAH
z!{)wG3Oc01H}PTCU_dEbh(tK*$Rn!ugDAc$V@=3$KHFtvK}?9J`^6J=Q5ru+0LEAu
z`S4)A10h|`YBkT!or7u{yO8}Oku2{G$Q~EFxcyKNR)&2lkIY7JGX2KzXAyG;b|d0N
zPcycQXl8XvsEauP<B9bBl<H&Y9h3ZW4Zc6R0uE;BXIiBIEX`$?zit$Pr~9cD1mZ*h
zpu}@cV4&+uvo~Emxx)c-UCH3tBwJ-*EuHFxM${6ZxBC>)O2ZzmL54-w#l!t-5pSW5
zi)4xg?xz<Cf_yoKh!iI=df2z2C_)h4Gg+MUj6!Sb9{L)nT|O7b#X{c<Lnbo`?o9qi
zZUE8x^7&nvHLbAyNkq2n{>C$+_Kps5{PZ5~;Pe`Yt)CtpLD@}%J-05?;p9%>(IfS3
z8njP4#G`pBg5mA(Ucpzx&|Jr{>HQ-ewbS<|Px=bf#0jA@&JCZA)Qw5xltDeC1~REf
z5Z6Iofs@ZBap+~AH-+CaReKFY7ANaMalL))GanS*X5EA-U;}hUoaeV+lWMYND)LLc
zt54p2H51ZZ1MI$M7qUCt#TgQw)4g|3(Z40V@=?Zf?d>%Q@LJ6XfI4p>CK$3WHo_;4
zbQu?{%9?McBk<)1!0rg^tm~5@raIa9%a_?%eBgDKJn^N-1cnv$-GQyL{PQIzvDt4$
zpimLN<8>%<-7i1tj;27P3EWDab<^3`aFOj1gZ&zr?CGaje0>-R$CnJ#z<#L%GJnF#
zfJMAwrsyI>Bq`(}zk4*_5?P*A8Y?tqrf%VYCGkuNZ^;Sm$z@D1O{`oIi5Mfzr%$L*
zQl&#JSeV}K{LsAk7RjFP;UoyY9xhEt@rWWhx1`UA8bp+q(k2r21TXQz3zz3Y<7jt&
z&#_}6%=@S}!h2@0r?ZMaDC0LI4xdzemBJm`BQKT+AcUc!O%jB0A=B&JCH{1}=h-5_
z>-%7fP}yI+&thClZVsUc>pNUKXs6Sgiv<lsjSoo}0KDFKr_&(g?%l;-{ZDqs=+kkh
zSur9HqHt*VPwb7b0UdBefnjXiYn>1W{ze5ns_Xs2QH*l-Q(PibOqn|eQ#o;rlPoBa
zQgdVpzRo@kJK}izY=HVo55^A^cw2a_g-UUCZnD<P6<uSv1H5j}%uKn2_VYgI|1Ls@
z8*(=Ohq+w0LYPkp?7)Q#*(?qU7tIwOud``?(mBUBQX&|K$(Q^d?UnfxKMmqDI;Yi3
zYfCAX2U9}npORdYe*#VVA69uk_zihl6xo~?hEdX0u|YKcQo-vtSZ^fSBG(0bu?veO
zKruJVo;;5ae+!N$!GOczGiubhRBm7upZ|cwHJu(B(~AR4u*2OF8=a~KV@cX-BSka1
z(DX!tSa!Cx%pxluRf`S|WuUs2FE~Q+?A6~IoV^K@KU{IGET}JAk${WGhOAF$f8rg8
zGK5<)Q8n8U)Q1qRktPO;&9%+$)I!oOH*^8b=#ou#2*p}ZXbm9|EC7b~3~TRBrXbx=
zmfc&WT6Tkb^rsx1;fp=c1S`=n@{Z4aZ_ce{Z3*tc;jb15TXY41M!}`f4mP^t`T6XO
zyj5;RsD7XQ5U$$bIs$l6{z>E9GzekhQZi7;Oy#hF1ww7?WV1Z#3jcFW=iamaJoIGk
zRfQCw&qZhj!6wiI!&vOrwM(MfQfJtmGb0GK=@`2O22iquhxD>87%>N!bbe1_HLmd^
z%Z|lCju+LfQ&F+Ta1{!hmDVt{;$J4=%Rd9FcA5$wiJ^u<?__Nt@@>|pMOpf!BDFwF
zGV1Tn;#nT%M@j%Nr$FQJTN@f_H@My1v&2fPMFe~+%GG|OshYhQdE$cM=>N)+lZtL7
zt1&tXw6R|HAqq3h9(zbr=cK0%4qbnJd(;)ZSw<}g9j(7Ce*7ypz<C(pKko?vJ7Pvf
zG@Bre-?t=n{28+0D=(@FTDxW+58Uv-!jNQO8%g=Iy)DMTch>0k=YBX~w1E{r;>82&
zJL~!u`al9}A}-cfADvj_In(Y_qWG$@Kd#X@Fsf%Tk`jqNiDQMmXyA8fzO#q6Zuas1
z#fH&I5;GjKj-KeuQ{*UOY7!mDWu!FQLs5>i1k2u<m1}>oi!`O3(J>BnD}Zq+YyB+^
zQSX1sK#SNY!?trg5J7VvOZ(e^RS><Th~ZaQN>AvQu*f=0CLFhv10Av%%DcHs0V*oG
z2=Ueugk})|Dc?b~4xO+Q^OyC~#NRI+OFU}(n%TB#X^0}vm#1-4nk9nF*dUA*c+T{H
zo6xDwmrhsK2afn;?}c_pFoW-PA3SVePx3flRPlz)L(Uhx#(Py5pYvSX<j}1oy=;ln
zq@{}(Dgh<z+zk_?uzVM$@d#+Fai8qz7F$n#yy7ClU@R_~{F&XO%<_K2y0!!SQm+jJ
z7Wl3<PF61Qky|hpMjW2)TxywhPO>BMR$lu!olQsC%7D$|rYubfO&HmEhS=DD#-k8o
zoPYO@0KB(G^Png<xXJ6?z9PdmOO<)^i%g<D`0dB<@$$Qv>?KXIizS*NAVn_mm7$}b
zf(aMPGMXuC&pdGOAjO=Fa0l-bw0%fO+><l}mSqmaAqToRzl5PwuW_y~ovfoOJtKbf
zo^l>$lmL9c3MI>XCX<`AxAlO&YqI7cu~_}FerKiK*Udor!1j+>{)1D;+q=NGu1@Y~
zu#uQ_NilEfzuKQKh;!Z<Xq%fCk!QCR3t+32*+bOI3gD*_68NK+*9voa+!7Ypsh_%u
z@_jPM74C4=jgiVB3U^+C0#%SYU>wB14RQSC%8N3e(0IEST^8V9Vf0U287s<u=U&c2
zsqjlI$adDq0})j0n?-97+juym+HO$7N7LeV_1AKnPS{G*Y^HY>N1P4^vU-*8BO0G*
zQK)swSe+dPIOdMtWS{3xa;dN^XzkkzYp0xPIEke<d-V4bk|BTG)Sivgu7rFJ96B?<
z96P(vS@j?Gk6U8J073(Y-aS>xRp0*6Ds#~BXXWzfMLG`WQ^-TNJyK&jYN)KlR~2nU
z`6u1P=1Zf%+Cu@fiA9muxWV`LZo_GNl=2QaCo?x?<6raCazhCVQA+nT6zVD0EN>X1
zFmzmz5ULrFs7BbVz24oC*mdi?d0?N3l+S4R*Q%<j{iCb9q4m6mwUk6CIDAHlN7#2f
z=+;X^v@)<R=h>Ck7r=5VhFr}Q8h`y`jhs?IgCWr>s341#d3AP^<SVl#?owaDAafZ+
zE@bWvx*vxVOI)lX{=xLjjdRYRwKZIayWmfo$!p_2`O#_Ffh(quVxcV*RN7{WmuNrt
zs~jI6!t(=A`KC7p`M15veRIY|Y1s!C{$8ly5R$!rXVFt|ZoUtyGCac5w0|&PotvIv
zmmW`;D&w_c*`?Brn>kxCziy=BuzdbrnX|FU{O4`$38FCxORrDBMX~7T3%Yo@gz{^~
zORf%Kk$lDjCYLy&jN{Pf?%-x({fE?5(3@@w!N)%*5(MwQ+zhPUE<fHLNVVT=`mPC4
zgXjo?t^Qym9sap5Rd9bs0VwL@n4MxRJUU5LyPALelBevBp&s@}Bq<LB>@f@UhgEe?
z@*A207@(7UZUGTG;Do?JzTW&4*IGfuX`ztU;M$DJmlj)0--@dG68?}})5Wb+Kw6zi
z2^ZSN`9b*Z<h4bAW~B9Zzh~i8IB0iR)ohy0WIG?je;G>nO(znVUPuLRFB0ra33Gsu
z<j)>HX2ev*#PBk+$1%96PkfVyAgRUu+*|C&^YjQmbRU-P7p>iy-OtRqh^U_Qe2aLW
zbC<#qAY_Rr+hPfEOHRfw3(SwWMw+NVrwUDugT2hYhL)n%?WqQ?;anb;F`}8Dvj)Gf
z9MQ8nXKS!NUo=k{>bsIMiy-Ho$T#Ok)bm@+YI|QRK046`Kh8h=O$_lEy6`p&kBMNF
z6r445!s9m>%pyXz)a=dHbIcot@TE{azqveE^8LpsoyOKf-bW*kr4xNmUFB=BTxB9~
z_tL5V*jH(ca!lN^5bAhn7~eRy_Uqsi_hFWuH<Qsfp6-|XeZc~zJ=E=X=Ac4w92V?(
z0$@Q<(?_&QbhPT6#dp<jBs~9iG~Nxh-F`@w81v28DUo-O$IGRfQ?9siPCZS#q{&Bn
z-dp5@>i0rc=4b+18p!7|(XYR7ftG0HD!wyEy$=iA%b(XCJM51u2LQA^j#X~b62;1x
z?+K4BJ>wCvB|Zh|6B6h=C2-j5=a%rC+i5tCi@YIK3%Zj{@nc-ga1%PQ6UC}_YdJ&d
zNoYiYD;}&@BDqV#fzAY6Z&vGAZhSy+)VbNbHIC{LlREq4^hN5;GP!lkw-`m+YR*L7
z677nrJ^z0p8f9$BI+>BmX+0Hor@Q~EzjSnE;*@8S`Ie6|h<Hi_bw2I;WO9{bgjDMB
z73%WUq|~$G?&PZ~#*wdmS$>q4Z$%NQ-uI&`4X=+(dW<F%VkWb5v%f|^XH+{_TSRDQ
zDb@?Au^DWLY~08^(ZcHr_opfL1^Z(vi?!Exh+i)zex-i+;nsaH$9~xQh1$?5yq>*8
z*EWHzvZ8`HRjDNHd3+%&0j;Dd{fC6XwEPg(1zZeZxx2t9H$UIJX>QE)a(KfnWT#})
z98n%4%({Y?^2lPmdTK^ZH^=Q`@mK&g--vi5<0Lw@<wnR^!D;?<y<B|T3$Ke^%Yo4~
zrUU%tzvSIEd&mvM8~Ga;T|Hcr`fWjlf8hRv#b1juZf1MjJ+Dw#)ywX)O<&C}0^F9a
zNJ?hfzRwwF8fDD>yMctA!Rbf7CrPou@sCpv4_DeX#?Jz|2}jM(4)4`)yx29~ojtDh
zg6R0dV^qk%qsC=1hCdnr8Amj_Rd-%*fh1N*#oYUsykICNr$+vWxnewF3s8;@=LS1Y
z>N896QK$RTN(kPbveZa;Zppdb+$I|DRa8{8RaE%%ebD`3N+PG_Bbw{~_<%aOO#O}0
zVh@n`ZzORsw}V-Fc88sJFRw=o9t|JF`k7t=^;6=Q*vAW65bTr)P}mn+B#NDkmNoX#
z&Gg|~|2bKdqo^blQ4r9FWlufXxaF%h4T)&IBOm=tqc{rk$Cqg+6}(A~{e&7BiZbtf
z?CII&e#qJTa(kYcVel`e!A+0qw2FF;%BHys1OziIj1v&is|;qW|9}ez`~$8IS0L-S
zc6q4&_Bf&a#kx}$%ZbhGRzLfi7bE4xSYsR7a7)^2tyIqb2DJgqE=-mLf_pbkGO1bQ
zxj&?ky59_b0py|UmQ}d;G*-;^)DN1W9@aD3FZJ@fcQ}R29@Cd@pV`$k&3R|o{y`!j
z50A61HF8qg3#$J_R<qakSg!G2r}5rXspHNYk&t820N#C8ugpUO+@XNWr>v|-DJ1hL
z{Q;-h6a(+&o2Oe8$XS^e0A2h-aQ{=dH)xmq+49%Iq<Q_PO&FL_oBnIX^<S5LmUi)^
zPAi30sfj<@epu-ad2F<L)MLH*WYYkG1Ai{}7aF2tE?G<L9&WfryZz@V*vHjqkDkvp
zN2vmsG45x!pF^S(dLaFJ_>&wGSzwt)*YEJ>UPm7xrf^v**j1w5kYi<%;ZC17(-nb=
z*O6m)*WM~-rOBH6N!QY$xH#LHxX=%dRTi8FTJ7V$VLJ$*XonT+aOeARZQ(NHLGvMu
zXJ7b{hT6C7;nkvC(K#vSRHz=^7+oRA0mf%o`P|6?&}Sb!jf;F$o+#-mN1H$6iJbeh
z?q_u*)o3c=j^Yd#Tf5G@qRp;fjt)SDu;oyoVU$-lRn9Himgt^r<&5m!=Cp-`96s^w
zpqrkuR73BvIrjPlu2JJ8F*2d}99zxH(_~DdJyfY&Jwx*JgRZbR#Yj)jH*vqKpjk+M
z+t#;-t3bb&-XDUjdQO~omj{q8X_A2YQ$rpA_}$RZ5WnK;EA3Pr`;D)my5jrwxE<dI
zLp#Bu$!}3>Y1;B^whbH&d13Q9s~OrF(lqP<EEE^s+}J2<f{hwXAHsJ3f4v_6)B3?=
dvhn*7%x2rlD9g@{`q#1oD9NeI*2q|d{U6{5u<if=

literal 0
HcmV?d00001


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 242/288] 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 243/288] [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 244/288] [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 245/288] [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 246/288] [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 247/288] [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 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 248/288] [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 249/288] [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 250/288] [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 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 251/288] [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 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 252/288] [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 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 253/288] [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 254/288] [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 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 255/288] [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 a613b710e92c09ed0da76fef145ef91a7a041d3d Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Tue, 4 Sep 2012 14:41:17 +0200
Subject: [PATCH 256/288] [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 257/288] [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 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 258/288] [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 259/288] [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 c0fbdc25566af3ee35fac1509748a9bb9715a682 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Tue, 4 Sep 2012 15:50:45 +0200
Subject: [PATCH 260/288] [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 261/288] [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 262/288] [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 263/288] [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 264/288] [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 265/288] [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 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 266/288] [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 267/288] [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 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 268/288] [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 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 269/288] 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 270/288] 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 271/288] 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 272/288] 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 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 273/288] 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 274/288] [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 275/288] 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 276/288] 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 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 277/288] 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 278/288] 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 279/288] 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 280/288] 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 281/288] [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 282/288] 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 283/288] [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 284/288] [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 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 285/288] [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 286/288] [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 287/288] [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 288/288] [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>