From b2c4dd6b8717aadc383e9727fefbf98af5643025 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 7 Sep 2010 13:21:01 +0530
Subject: [PATCH 001/244] [MOD/IMP]res_user : Usability Improvement

bzr revid: dbr@tinyerp.com-20100907075101-ki0rwisnslqjqd93
---
 bin/addons/base/base_update.xml | 14 ++++++++------
 bin/addons/base/res/res_user.py |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 7639418f825..02ea1c58e5c 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -114,16 +114,18 @@
                     <newline/>
                     <notebook colspan="4">
                         <page string="User">
-                            <field name="address_id" select="1"/>
-                            <field name="user_email" widget="email"/>
                             <field name="company_id" required="1"
                                 context="{'user_id': self, 'user_preference': 1}"
                                 on_change="on_change_company_id(company_id)"
                                 groups="base.group_multi_company"
-                                />
+                                />                        
+                            <field name="address_id" select="1"/>
+                            <field name="user_email" widget="email"/>
+                            <field name="context_lang"/>   
+                            <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>                                                    
                             <field name="action_id" required="True"/>
-                            <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
-                            <field name="context_lang"/>
+
+
                             <field name="context_tz"/>
                             <field name="view" readonly="0"/>
                             <field name="menu_tips" colspan="2"/>
@@ -141,7 +143,7 @@
                             <field colspan="4" nolabel="1" name="roles_id"/>
                         </page>
                         <page string="Companies">
-                            <field colspan="4" nolabel="1" name="company_ids" select="1"/>
+                            <field colspan="4" nolabel="1" name="company_ids" select="1" widget="selection"/>
                         </page>
                     </notebook>
                 </form>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index d8645a83cc0..db76c333730 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -240,10 +240,10 @@ class users(osv.osv):
                  " aren't configured, it won't be possible to email new "
                  "users."),
         'signature': fields.text('Signature', size=64),
-        'address_id': fields.many2one('res.partner.address', 'Address'),
+        'address_id': fields.many2one('res.partner.address', 'Company Address'),
         'active': fields.boolean('Active'),
         'action_id': fields.many2one('ir.actions.actions', 'Home Action'),
-        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),
+        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action',help="Always Display Tips"),
         'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
         'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
 

From 34577af85f3d9b2a4f578e66cf47d86e5de7a3aa Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Tue, 7 Sep 2010 10:49:02 +0200
Subject: [PATCH 002/244] [FIX] Fixed gettext translation (in particular, fixed
 translation in RML reports).

bzr revid: jth@openerp.com-20100907084902-0l323afsiju4y1i4
---
 bin/tools/translate.py | 62 ++++++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 18 deletions(-)

diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 18747a3c143..64f742924f3 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -29,6 +29,7 @@ import re
 import tarfile
 import tempfile
 from os.path import join
+import logging
 
 from datetime import datetime
 from lxml import etree
@@ -127,30 +128,55 @@ def translate(cr, name, source_type, lang, source=None):
     res = res_trans and res_trans[0] or False
     return res
 
+logger = logging.getLogger('translate')
+
 class GettextAlias(object):
+
+    def _get_cr(self, frame):
+        is_new_cr = False
+        cr = frame.f_locals.get('cr')
+        if not cr:
+            s = frame.f_locals.get('self', {})
+            cr = getattr(s, 'cr', False)
+            if not cr:
+                if frame.f_globals.get('pooler', False):
+                    # TODO: we should probably get rid of the 'is_new_cr' case: no cr in locals -> no translation for you
+                    dbs = frame.f_globals['pooler'].pool_dic.keys()
+                    if len(dbs) == 1:
+                        cr = pooler.get_db(dbs[0]).cursor()
+                        is_new_cr = True
+        return cr, is_new_cr
+    
+    def _get_lang(self, frame):
+        lang = frame.f_locals.get('context', {}).get('lang', False)
+        if not lang:
+            args = frame.f_locals.get('args', False)
+            if args:
+                lang = args[-1].get('lang', False)
+            if not lang:
+                s = frame.f_locals.get('self', {})
+                c = getattr(s, 'localcontext', {})
+                lang = c.get('lang', False)
+        return lang
+    
     def __call__(self, source):
+        is_new_cr = False
+        res = source
         try:
             frame = inspect.stack()[1][0]
+            cr, is_new_cr = self._get_cr(frame)
+            lang = self._get_lang(frame)
+            if lang and cr:
+                cr.execute('SELECT value FROM ir_translation WHERE lang=%s AND type IN (%s, %s) AND src=%s', (lang, 'code','sql_constraint', source))
+                res_trans = cr.fetchone()
+                res = res_trans and res_trans[0] or source
         except:
-            return source
+            logger.warn('translation went wrong for string %s', repr(source))
+        finally:
+            if is_new_cr:
+                cr.close()
+        return res
 
-        cr = frame.f_locals.get('cr')
-        try:
-            lang = (frame.f_locals.get('context') or {}).get('lang', False)
-            if not (cr and lang):
-                args = frame.f_locals.get('args',False)
-                if args:
-                    lang = args[-1].get('lang',False)
-                    if frame.f_globals.get('pooler',False):
-                        cr = pooler.get_db(frame.f_globals['pooler'].pool_dic.keys()[0]).cursor()
-            if not (lang and cr):
-                return source
-        except:
-            return source
-
-        cr.execute('select value from ir_translation where lang=%s and type IN (%s,%s) and src=%s', (lang, 'code','sql_constraint', source))
-        res_trans = cr.fetchone()
-        return res_trans and res_trans[0] or source
 _ = GettextAlias()
 
 

From 1e5bd3dc4c5dfde324ed559b01ffdc89d2367c63 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 8 Sep 2010 11:35:34 +0530
Subject: [PATCH 003/244] [IMP] res_user view improved

bzr revid: vir@tinyerp.com-20100908060534-pod7b4b10lxd193n
---
 bin/addons/base/base_update.xml | 2 +-
 bin/addons/base/res/res_user.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 02ea1c58e5c..8e12c123b42 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -143,7 +143,7 @@
                             <field colspan="4" nolabel="1" name="roles_id"/>
                         </page>
                         <page string="Companies">
-                            <field colspan="4" nolabel="1" name="company_ids" select="1" widget="selection"/>
+                            <field colspan="4" nolabel="1" name="company_ids" select="1"/>
                         </page>
                     </notebook>
                 </form>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index db76c333730..9203d76dacc 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -243,7 +243,7 @@ class users(osv.osv):
         'address_id': fields.many2one('res.partner.address', 'Company Address'),
         'active': fields.boolean('Active'),
         'action_id': fields.many2one('ir.actions.actions', 'Home Action'),
-        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action',help="Always Display Tips"),
+        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),
         'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
         'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
 
@@ -264,7 +264,7 @@ class users(osv.osv):
                                 selection=[('simple','Simplified'),('extended','Extended')],
                                 string='Interface', help="Choose between the simplified interface and the extended one"),
         'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240),
-        'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to display tips on each menu action"),
+        'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
 
     }
 

From f8590fbfd6d0492e871535198e908f6db7d155e2 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Sat, 11 Sep 2010 11:55:08 +0530
Subject: [PATCH 004/244] [IMP] Improved the viwe of User Preferences

bzr revid: vir@tinyerp.com-20100911062508-9ze77rhm45veup5o
---
 bin/addons/base/base_update.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 8e12c123b42..50f923d1b20 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -82,16 +82,15 @@
                                     context="{'user_id': self, 'user_preference': 1}" groups="base.group_multi_company"/>
                             <field name="view" readonly="0"/>
                             <label string="" colspan="2"/>
-                            <field name="menu_tips" colspan="2" readonly="0"/>
                             <newline/>
-                            <separator colspan="4" string="Preferences"/>
                         </page>
                          <page string="Preferences">
-                            <field name="password" password="True" readonly="0" colspan="4"/>
+                            <field name="password" password="True" readonly="0" />
+                            <field name="context_lang" completion="1" readonly="0"/>
                             <label string="" colspan="1"/>
                             <label colspan="3" string="You must logout and login again after changing your password."/>
-                            <field name="context_lang" completion="1" readonly="0"/>
                             <field name="context_tz" completion="1" readonly="0"/>
+                            <field name="menu_tips" colspan="2" readonly="0"/>
                             <separator string="Email &amp; Signature" colspan="4"/>
                             <group colspan="4"><field name="user_email" widget="email"/></group>
                             <field colspan="4" name="signature" readonly="0" nolabel="1"/>

From b9beb3076e7d838960abf20dcf904586a533e6c5 Mon Sep 17 00:00:00 2001
From: "RGA (OpenERP)" <rga@tinyerp.com>
Date: Mon, 20 Sep 2010 14:40:37 +0530
Subject: [PATCH 005/244] [IMP]when create new filter it should be modified if
 same name filter already exist otherwise create new one

bzr revid: rga@tinyerp.com-20100920091037-tyheqqfx72b3cbm2
---
 bin/addons/base/ir/ir_filters.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/bin/addons/base/ir/ir_filters.py b/bin/addons/base/ir/ir_filters.py
index 2821d0c94b7..272d1c718c1 100644
--- a/bin/addons/base/ir/ir_filters.py
+++ b/bin/addons/base/ir/ir_filters.py
@@ -36,6 +36,20 @@ class ir_filters(osv.osv):
         act_ids = self.search(cr,uid,[('model_id','=',model),('user_id','=',uid)])
         my_acts = self.read(cr, uid, act_ids, ['name', 'domain','context'])
         return my_acts
+    
+    def create_or_replace(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        is_filter_exist = False
+        for filter in self.get_filters(cr, uid, vals['model_id']):
+            if filter['name'].lower() == vals['name'].lower():
+                is_filter_exist = filter['id']
+                break
+        if is_filter_exist:
+             return super(ir_filters, self).write(cr, uid, is_filter_exist, vals, context)
+        else:
+             return super(ir_filters, self).create(cr, uid, vals, context)
+
 
     _columns = {
         'name': fields.char('Action Name', size=64, translate=True, required=True),

From 8af368159be801f5ee24d8be8fdcad7025688cae Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 21 Sep 2010 16:04:57 +0200
Subject: [PATCH 006/244] [IMP] addons.init: avoid spurious warnings during
 validation of -i / -u server parameters Includes revert of revision 2111.5.24
 rvo@tinyerp.co.in-20100503134414-ma87k4htpifi00tz

bzr revid: odo@openerp.com-20100921140457-cwhl843wz86nfmm8
---
 bin/addons/__init__.py | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index cc3bdc2ce7b..3e062563dd5 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -757,16 +757,19 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
 
     return has_updates
 
+def _check_module_names(cr, module_names):
+    mod_names = set(module_names)
+    if 'base' in mod_names:
+        # ignore dummy 'all' module
+        mod_names.remove('all')
+    cr.execute("SELECT count(id) AS count FROM ir_module_module WHERE name in %s", (tuple(mod_names),))
+    if cr.dictfetchone()['count'] != len(mod_names):
+        # find out what module name(s) are incorrect:
+        cr.execute("SELECT name FROM ir_module_module")
+        incorrect_names = mod_names.difference([x['name'] for x in cr.dictfetchall()])
+        logging.getLogger('init').warning('invalid module names, ignored: %s', ", ".join(incorrect_names))
+
 def load_modules(db, force_demo=False, status=None, update_module=False):
-
-    def check_module_name(cr, mods, state):
-        for mod in mods:
-            id = modobj.search(cr, 1, ['&', ('state', '=', state), ('name', '=', mod)])
-            if id:
-                getattr(modobj, states[state])(cr, 1, id)
-            elif mod != 'all':
-                logger.notifyChannel('init', netsvc.LOG_WARNING, 'module %s: invalid module name!' % (mod))
-
     if not status:
         status = {}
     cr = db.cursor()
@@ -795,16 +798,23 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
 
         if update_module:
             modobj = pool.get('ir.module.module')
-            states = {'installed': 'button_upgrade', 'uninstalled': 'button_install'}
             logger.notifyChannel('init', netsvc.LOG_INFO, 'updating modules list')
             if ('base' in tools.config['init']) or ('base' in tools.config['update']):
                 modobj.update_list(cr, 1)
 
+            _check_module_names(cr, itertools.chain(tools.config['init'].keys(), tools.config['update'].keys()))
+
             mods = [k for k in tools.config['init'] if tools.config['init'][k]]
-            check_module_name(cr, mods, 'uninstalled')
+            if mods:
+                ids = modobj.search(cr, 1, ['&', ('state', '=', 'uninstalled'), ('name', 'in', mods)])
+                if ids:
+                    modobj.button_install(cr, 1, ids)
 
             mods = [k for k in tools.config['update'] if tools.config['update'][k]]
-            check_module_name(cr, mods, 'installed')
+            if mods:
+                ids = modobj.search(cr, 1, ['&', ('state', '=', 'installed'), ('name', 'in', mods)])
+                if ids:
+                    modobj.button_upgrade(cr, 1, ids)
 
             cr.execute("update ir_module_module set state=%s where name=%s", ('installed', 'base'))
 

From 0b314fd3dd6da4ca55993293d350825d55bd9b86 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 21 Sep 2010 16:25:25 +0200
Subject: [PATCH 007/244] [IMP] addons.init: handle properly empty update/init
 module spec

bzr revid: odo@openerp.com-20100921142525-2vjy7njophpl77bf
---
 bin/addons/__init__.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 3e062563dd5..297cf73c6f4 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -762,12 +762,13 @@ def _check_module_names(cr, module_names):
     if 'base' in mod_names:
         # ignore dummy 'all' module
         mod_names.remove('all')
-    cr.execute("SELECT count(id) AS count FROM ir_module_module WHERE name in %s", (tuple(mod_names),))
-    if cr.dictfetchone()['count'] != len(mod_names):
-        # find out what module name(s) are incorrect:
-        cr.execute("SELECT name FROM ir_module_module")
-        incorrect_names = mod_names.difference([x['name'] for x in cr.dictfetchall()])
-        logging.getLogger('init').warning('invalid module names, ignored: %s', ", ".join(incorrect_names))
+    if mod_names:
+        cr.execute("SELECT count(id) AS count FROM ir_module_module WHERE name in %s", (tuple(mod_names),))
+        if cr.dictfetchone()['count'] != len(mod_names):
+            # find out what module name(s) are incorrect:
+            cr.execute("SELECT name FROM ir_module_module")
+            incorrect_names = mod_names.difference([x['name'] for x in cr.dictfetchall()])
+            logging.getLogger('init').warning('invalid module names, ignored: %s', ", ".join(incorrect_names))
 
 def load_modules(db, force_demo=False, status=None, update_module=False):
     if not status:

From bbc9eba7a0824dafb05832518a4fa3a9117b8b1f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 21 Sep 2010 17:34:23 +0200
Subject: [PATCH 008/244] [IMP] netsvc.Agent: Agent.runner thread should be
 marked daemon to be terminated at server exit (harmlessly) Also set a thread
 name for the runner thread.

bzr revid: odo@openerp.com-20100921153423-053knurknw34qj1r
---
 bin/netsvc.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index d29aebd92b5..ce9b35d2a5b 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -352,7 +352,12 @@ class Agent(object):
                 time.sleep(1)
             time.sleep(60)
 
-threading.Thread(target=Agent.runner).start()
+agent_runner = threading.Thread(target=Agent.runner, name="netsvc.Agent.runner")
+# the agent runner is a typical daemon thread, that will never quit and must be
+# terminated when the main process exits - with no consequence (the processing
+# threads it spawns are not marked daemon)
+agent_runner.daemon = True
+agent_runner.start()
 
 
 import traceback

From 1e9167f9a9cf88cef7bcc898c49ce267764d4d3b Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 22 Sep 2010 11:09:37 +0530
Subject: [PATCH 009/244] [IMP] hr_* : Usability improvements

bzr revid: vir@tinyerp.com-20100922053937-5gah2r12uvewy210
---
 addons/hr/hr_department_view.xml                   |  4 ++--
 addons/hr/hr_view.xml                              |  4 ++--
 addons/hr_expense/hr_expense.py                    |  2 +-
 addons/hr_expense/hr_expense_view.xml              |  4 ++--
 addons/hr_holidays/hr_holidays_view.xml            | 14 +++++++-------
 addons/hr_holidays/security/ir.model.access.csv    |  1 +
 addons/hr_recruitment/hr_recruitment.py            |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml      |  4 ++--
 addons/hr_timesheet/hr_timesheet_view.xml          | 11 ++++++-----
 .../hr_timesheet_sheet/hr_timesheet_sheet_view.xml |  4 ++--
 10 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index ccbd506b7e6..d4f13458f1c 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -14,9 +14,9 @@
             <field name="arch" type="xml">
                 <form string="department">
                     <group col="6" colspan="4">
-                        <field colspan="4" name="name" select="1"/>
+                        <field name="name" select="1"/>
                         <field name="parent_id"/>
-                        <field colspan="4" name="manager_id" select="1"/>
+                        <field name="manager_id" select="1"/>
                         <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <notebook colspan="4" >
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index e0efa92056b..83b5b266e5e 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -99,7 +99,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <filter icon="terp-personal-" domain="[('active','=',False)]" string="Unactive" groups="base.group_extended"/>
+                    <filter icon="terp-personal+" domain="[('active','=',True)]" string="Active" groups="base.group_extended"/>
                     <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="department_id" widget="selection">
@@ -114,7 +114,7 @@
                     <separator orientation="vertical" />
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                     <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                    <filter string="Company" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'company_id'}"/>
+                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
                     </group>
                 </search>
              </field>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 6c2f44dfb8c..4003cded168 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -81,7 +81,7 @@ class hr_expense_expense(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'state': fields.selection([
             ('draft', 'Draft'),
-            ('confirm', 'Waiting Approved'),
+            ('confirm', 'Waiting Approval'),
             ('accepted', 'Approved'),
             ('invoiced', 'Invoiced'),
             ('paid', 'Reimbursed'),
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 4fc5b0412f8..79c0d5513f0 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -77,7 +77,7 @@
                         <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Expense Sheet">
+                        <page string="Description">
                             <newline/>
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <form string="Expense Lines">
@@ -99,7 +99,7 @@
                                 <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
                                 <button name="cancel" states="cancel" string="Cancel" type="workflow" icon="gtk-cancel"/>
                                 <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert"/>                                                                
-                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-ok"/>
+                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
                                 <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-execute"/>
                                 <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager" />
                             </group>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index aaa0628bc11..b73604bba7c 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -12,12 +12,13 @@
                         <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"
                             default="context.get('report', False)"/> 
                         <separator orientation="vertical"/>                    
-                        <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','draft')]" string="To Confirm"/>
-                        <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','confirm')]" string="To Approve"/>
+                        <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
+                        <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
                         <separator orientation="vertical"/>
                        <filter string="This Month" icon="terp-go-month" name="This Month"
                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <field name="user_id"/>
+                        <separator orientation="vertical"/>
+                        <field name="employee_id"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-personal+" help="My Department Holidays"
                                 domain="[('department_id.manager_id','=',uid)]" />
@@ -228,14 +229,14 @@
                 <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1');gray:state in ('cancel')">
                     <field name="employee_id"/>
                     <field name="department_id" invisible="not context.get('set_visible',False)"/>
+                    <field name="holiday_status_id"/>
+                    <field name="name"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
                     <field name="date_from"/>
                     <field name="date_to"/>
-                    <field name="name"/>
-                    <field name="holiday_status_id"/>
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
-                    <field name="type"/>
+                    <!--field name="type"/-->
                     <field name="state"/>
                     <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
@@ -259,7 +260,6 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
             <field name="domain">[('type','=','remove')]</field>
-            <field name="context">{'search_default_user_id':uid}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help">Leaves requests can be recorded by employees and validated by their managers. Once a leave request is validated it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc) and manage allowances per type.</field>
         </record>
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index a7022f1c1ea..c9d1d8afc6d 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -11,3 +11,4 @@
 "access_hr_holidays_system","hr.holidays.system","model_hr_holidays","base.group_system",1,0,0,0
 "access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,0,0,0
 "access_hr_holydays_status_employee","hr.holidays.status.employee","model_hr_holidays_status","base.group_user",1,0,0,0
+"access_resource_calendar_leaves_employee","resource_calendar_leaves_employee","resource.model_resource_calendar_leaves","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index c98b6c485f6..b9241477409 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -437,7 +437,7 @@ class hr_applicant(crm.crm_case, osv.osv):
             emp_id = employee_obj.create(cr,uid,{'name':applicant.name,'job_id':applicant.job_id.id})
             job_data = job_obj.browse(cr,uid, applicant.job_id.id)
             expected_emp = job_data['expected_employees'] - 1
-            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
+            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp,'state': 'old'})
 
         return res
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 5ecb50a828c..57141b34212 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -78,7 +78,7 @@
                         <field name="partner_name"/>
                         <field name="job_id" on_change="onchange_job(job_id)"/>
                         <button string="Schedule a Phone Call" name="%(action_hr_recruitment_phonecall)d" icon="terp-call-start" type="action" groups="base.group_extended"/>
-                        <button name="action_makeMeeting" type="object" string="Schedule Meeting" icon="terp-hr"/>
+                        <button name="action_makeMeeting" type="object" string="Schedule Meeting" icon="gtk-index"/>
                     <newline/>
                     <field name="department_id" widget="selection"/>
                     <group colspan="2" col="4">
@@ -100,7 +100,7 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
                             <button string="Create Partner"
                                     name="%(action_hr_recruitment_partner_create)d"
-                                    icon="terp-personal" type="action" attrs="{'readonly':[('partner_id','!=',False)]}"/>
+                                    icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}"/>
                             <newline/>
                             <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3"/>
                             <field name="email_from" colspan="3"/>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index f8e8fd2ab7e..4165f71d73f 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -16,8 +16,8 @@
                     <field name="date" on_change="on_change_date(date)"/>
                     <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id"/>
                     <field name="name"/>
-                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" sum="Total time"/>
                     <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
+                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" sum="Total time"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
                     <field name="amount" sum="Total cost"/>
                     <field name="general_account_id"/>
@@ -77,10 +77,11 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Anlytic account" icon="terp-personal+" domain="[]" context="{'group_by':'account_id'}"/>
-                        <separator orientation="vertical"/>                        
-                        <filter string="Product" icon="terp-personal" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Date" icon="terp-personal+" domain="[]" context="{'group_by':'date'}"/>                        
+                        <separator orientation="vertical"/>
+                        <filter string="Anlytic account" icon="terp-folder-green" domain="[]" context="{'group_by':'account_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>                        
                     </group>                     
                 </search>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index d9b666cfbf1..657ec40288d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -148,10 +148,10 @@
                     </notebook>
                     <field name="state"/>
                     <group col="4" colspan="2">
-                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-check"/>
                         <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                         <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel"/>
-                        <button name="done" states="confirm" string="Approve" type="workflow" icon="gtk-jump-to"/>
+                        <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
                     </group>
                 </form>
             </field>

From 2d2e0b25a3b43e000c4a16589aec799b7d5db979 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 22 Sep 2010 11:22:05 +0530
Subject: [PATCH 010/244] [FIX]:The records that has groupby field value =
 False or '' should also be returned to the client to show as 'Undefined'

bzr revid: nch@tinyerp.com-20100922055205-k9cu34iuzfhlvbg1
---
 bin/osv/orm.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 25a987dac61..64b118f3e15 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2275,6 +2275,9 @@ class orm(orm_template):
             del r['id']
         if groupby and fget[groupby]['type'] == 'many2one':
             data_ids = self.search(cr, uid, [('id', 'in', alldata.keys())], order=groupby, context=context)
+            # the IDS of the records that has groupby field value = False or ''
+            # should be added too
+            data_ids += filter(lambda x:x not in data_ids, alldata.keys())
             data = self.read(cr, uid, data_ids, groupby and [groupby] or ['id'], context=context)
             # restore order of the search as read() uses the default _order (this is only for groups, so the size of data_read shoud be small):
             data.sort(lambda x,y: cmp(data_ids.index(x['id']), data_ids.index(y['id'])))

From 4fc298f756aa40cf83d3b1a8c47dd2dcb4de0d53 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 22 Sep 2010 11:46:55 +0530
Subject: [PATCH 011/244] [IMP] hr_holidays : Improvements in view

bzr revid: vir@tinyerp.com-20100922061655-m0dvhpzlhqdv39is
---
 addons/hr_holidays/hr_holidays_view.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index b73604bba7c..e6cb46ab03d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -25,6 +25,11 @@
                         </field>
                         <field name="holiday_status_id" widget="selection"/>
                     </group>
+                    <newline/>
+                    <group expand="0" string="Extended options...">
+                        <field name="date_from"/>
+                        <field name="date_to"/>
+                    </group>
                     <newline />
                     <group expand="0" string="Group By...">
                         <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
@@ -216,6 +221,11 @@
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="state"/>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                    <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
+                    <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
+                    <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                 </tree>
             </field>
         </record>
@@ -320,7 +330,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_holiday_simple"/>
-            <field name="context">{'search_default_user_id':uid,'allocation_type':'company', 'report':True}</field>
+            <field name="context">{'allocation_type':'company', 'report':True}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 

From a640ecc89e0bc7c27795c6beb21dec0603a3f1b6 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Wed, 22 Sep 2010 11:53:31 +0530
Subject: [PATCH 012/244] [IMP]hr_holidays : Usability improvement in grops

bzr revid: amp@tinyerp.com-20100922062331-gchm37fo6oq60wgz
---
 addons/hr_holidays/hr_holidays_view.xml       | 24 +++++++++----------
 .../hr_holidays/security/ir.model.access.csv  |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index e6cb46ab03d..12d347cd876 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -90,12 +90,12 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2">
-                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
-                                <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
-                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
-                                <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
-                                <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
+                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                                <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
+                                <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
+                                <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                             </group>
                         </page>
                     </notebook>
@@ -133,12 +133,12 @@
                         <newline/>
                         <field name="state" colspan="2"/>
                         <group colspan="2">
-                            <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                            <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
-                            <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
-                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
-                            <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
-                            <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+                            <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
+                            <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                            <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
+                            <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
+                            <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                         </group>
                     </page>
                 </notebook>
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index c9d1d8afc6d..0e7b122a943 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -11,4 +11,4 @@
 "access_hr_holidays_system","hr.holidays.system","model_hr_holidays","base.group_system",1,0,0,0
 "access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,0,0,0
 "access_hr_holydays_status_employee","hr.holidays.status.employee","model_hr_holidays_status","base.group_user",1,0,0,0
-"access_resource_calendar_leaves_employee","resource_calendar_leaves_employee","resource.model_resource_calendar_leaves","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

From 50e75a080e9ba5612f376b070ec2fa7776cfaead Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 22 Sep 2010 12:35:07 +0530
Subject: [PATCH 013/244] [IMP] hr_evaluation : Usability Improvements

bzr revid: vir@tinyerp.com-20100922070507-w2j7bjl80s4gz6fx
---
 addons/hr_evaluation/hr_evaluation.py       |  4 ++--
 addons/hr_evaluation/hr_evaluation_view.xml | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index a3db4b08f93..263b34322b9 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -161,13 +161,13 @@ class hr_evaluation(osv.osv):
             ('2','Meet expectations'),
             ('3','Exceeds expectations'),
             ('4','Significantly exceeds expectations'),
-        ], "Overall Rating", help="This is the overall rating on that summarize the evaluation"),
+        ], "Appreciation", help="This is the appreciation on that summarize the evaluation"),
         'survey_request_ids': fields.one2many('hr.evaluation.interview','evaluation_id','Appraisal Forms'),
         'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', required=True),
         'state': fields.selection([
             ('draft','Draft'),
             ('wait','Plan In Progress'),
-            ('progress','Waiting Validation'),
+            ('progress','Waiting Appreciation'),
             ('done','Done'),
             ('cancel','Cancelled'),
         ], 'State', required=True, readonly=True),
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index cafffe2646e..9ec02b4ad0b 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -231,14 +231,12 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                    <filter icon="terp-check" string="Current" domain="[('state','in',('wait', 'progress'))]"/>                                       
-                    <separator orientation="vertical"/> 
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-dialog-close" string="Waiting Final Validation" domain="[('state','=','progress')]"/>                                        
-                    <filter icon="terp-check" string="In progress" domain="[('state','=','wait')]"/>
+                    <filter icon="terp-check" string="Current" domain="[('state','=','wait'))]" help="Evaluations that are in waiting state"/>                                       
+                    <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Evaluations that are in progress state"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"
                         domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
+                    <separator orientation="vertical"/> 
                     <filter icon="terp-gnome-cpu-frequency-applet+" string="Overpassed Deadline"
                         help="Evaluations that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/>
@@ -321,7 +319,7 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-document-new" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
+                        <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
@@ -332,7 +330,7 @@
                     <group expand="0" string="Group By...">
                         <filter string="Interviewer" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Survey" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'survey_id'}"/>
+                        <filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>

From bbd126478ca0c1bcc01fe9ddc8adb884af5fb4f5 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 22 Sep 2010 16:32:14 +0530
Subject: [PATCH 014/244] [IMP] hr_recruitment : Improvement in Recruitment
 analysis report

bzr revid: vir@tinyerp.com-20100922110214-8krfx2lbhzh8ffl0
---
 .../report/hr_recruitment_report.py           |  4 +-
 .../report/hr_recruitment_report_view.xml     | 81 ++++++++++---------
 2 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 4e2b160f3ea..2a2ab8fce2b 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -69,10 +69,11 @@ class hr_recruitment_report(osv.osv):
         'date_closed': fields.date('Closed', readonly=True),
         'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
-        'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('object_id.model', '=', 'hr.applicant')]"),
+        'type_id': fields.many2one('hr.recruitment.degree', 'Degree'),
         'department_id':fields.many2one('hr.department','Department',readonly=True),
         'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
         'salary_prop' : fields.float("Salary Proposed"),
+        'salary_prop_avg' : fields.float("Avg Salary Proposed", group_operator="avg"),
         'salary_exp' : fields.float("Salary Expected"),
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact Name',readonly=True),
@@ -107,6 +108,7 @@ class hr_recruitment_report(osv.osv):
                      s.priority,
                      s.stage_id,
                      sum(salary_proposed) as salary_prop,
+                     (sum(salary_proposed)/count(*)) as salary_prop_avg,
                      sum(salary_expected) as salary_exp,
                      extract('epoch' from (s.date_open-s.create_date))/(3600*24) as  delay_open,
                      extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as  delay_close,
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index edb00d1f727..d527120c801 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -21,11 +21,12 @@
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="nbr" sum="# Cases"/>
-                <field name="salary_prop" sum="Salary Proposed" />
-                <field name="salary_exp" sum="Salary Expected"/>
-                <field name="delay_open" avg='Avg Opening Delay'/>
-                <field name="delay_close" avg='Avg Closing Delay'/>
                 <field name="available" sum="Available"/>
+                <field name="salary_exp" sum="Expected Salary"/>
+                <field name="salary_prop" sum="Proposed Salary" />
+                <field name="salary_prop_avg" sum="Avg Proposed Salary" />
+                <field name="delay_open" avg='Avg Delay to Open'/>
+                <field name="delay_close" avg='Avg Delay to Close'/>
             </tree>
         </field>
     </record>
@@ -49,18 +50,18 @@
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
             	<group>
-            	    <filter icon="terp-go-year" string="365 Days"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Recruitment performed in last 356 days"/>
-	                <filter icon="terp-go-month" string="30 Days"
+            	    <filter icon="terp-go-year" string="Year"
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+	                    help="Recruitment performed in current year"/>
+	                <filter icon="terp-go-month" string="Month"
 	                    name="month"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Recruitment performed in this month"/>
-		            <filter icon="terp-go-week"
-	                    string="    7 Days    "
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+	                    help="Recruitment performed in current month"/>
+		            <filter icon="terp-go-month"
+	                    string="    Month-1    "
 	                    separator="1"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Recruitment during last 7 days"/>
+	                    domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+	                    help="Recruitment during last month"/>
 	                <separator orientation="vertical"/>
 	                <filter string="New"
                     	icon="terp-document-new"
@@ -74,50 +75,52 @@
                    		icon="terp-gtk-media-pause"
                    		domain="[('state','=','pending')]"
                    		help = "Pending recruitment"/>
+                    <filter string="Hired"
+                   		icon="terp-camera_test"
+                   		domain="[('state','=','done')]"
+                   		help = "Hired employees"/>
   					<separator orientation="vertical"/>
   					<field name="job_id"/>
 					<field name="department_id" widget="selection"/>
-                    <field name="user_id">
-                        <filter icon="terp-hr"
+                    <field name="user_id" string="Responsible">
+                        <filter icon="terp-personal"
                             string="My Recruitment"
                             help="My Recruitment"
                             domain="[('user_id','=',uid)]"/>
                     </field>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By ...">
-                   <filter string="User" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="job_id" widget="selection"/>
+                    <field name="type_id" widget="selection"/>
+                    <field name="priority"/>
+                    <field name="stage_id" widget="selection"/>
+                    <field name="state"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="date"/>
+                    <field name="date_closed"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By ...">
+                   <filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                    <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
                    <separator orientation="vertical"/>
+                    <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                   <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                   <separator orientation="vertical"/>
+                   <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
+            	   <separator orientation="vertical"/>
                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                    <separator orientation="vertical"/>
-                   <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                   <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                   <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
-            	   <separator orientation="vertical"/>
             	   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
             	   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
             	   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
                 </group>
 
-                <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="state"/>
-                    <separator orientation="vertical"/>
-                    <field name="date"/>
-                    <separator orientation="vertical"/>
-                    <field name="stage_id" widget="selection"/>
-                    <field name="type_id" widget="selection"/>
-                    <newline/>
-                    <field name="priority"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_closed"/>
-                    <separator orientation="vertical"/>
-                  	<field name="job_id" widget="selection"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                </group>
+                
                 </search>
         </field>
     </record>
@@ -127,7 +130,7 @@
         <field name="res_model">hr.recruitment.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
 	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_manager"/>

From c7fedc09fdeac8142731e88e3f9ded518b441886 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 13:32:56 +0200
Subject: [PATCH 015/244] [IMP] openerp-server.py: cleanup + double CTRL-C can
 now be used to force immediate shutdown of server

bzr revid: odo@openerp.com-20100922113256-z3rmztczeivddk9q
---
 bin/openerp-server.py | 94 +++++++++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 39 deletions(-)

diff --git a/bin/openerp-server.py b/bin/openerp-server.py
index f03c64d3400..9061b0ae3c8 100755
--- a/bin/openerp-server.py
+++ b/bin/openerp-server.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -16,7 +16,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,16 +27,19 @@ OpenERP is an ERP+CRM program for small and medium businesses.
 The whole source code is distributed under the terms of the
 GNU Public Licence.
 
-(c) 2003-TODAY, Fabien Pinckaers - Tiny sprl
+(c) 2003-TODAY, Fabien Pinckaers - OpenERP s.a.
 """
 
 #----------------------------------------------------------
 # python imports
 #----------------------------------------------------------
-import sys
+import logging
 import os
-import signal
 import pwd
+import signal
+import sys
+import threading
+import traceback
 
 import release
 __author__ = release.author
@@ -52,23 +55,22 @@ if pwd.getpwuid(os.getuid())[0] == 'root' :
 # get logger
 #----------------------------------------------------------
 import netsvc
-logger = netsvc.Logger()
+logger = logging.getLogger('server')
 
 #-----------------------------------------------------------------------
 # import the tools module so that the commandline parameters are parsed
 #-----------------------------------------------------------------------
 import tools
-
-logger.notifyChannel("server", netsvc.LOG_INFO, "version - %s" % release.version )
+logger.info("OpenERP version - %s", release.version)
 for name, value in [('addons_path', tools.config['addons_path']),
                     ('database hostname', tools.config['db_host'] or 'localhost'),
                     ('database port', tools.config['db_port'] or '5432'),
                     ('database user', tools.config['db_user'])]:
-    logger.notifyChannel("server", netsvc.LOG_INFO, "%s - %s" % ( name, value ))
+    logger.info("%s - %s", name, value)
 
 # Don't allow if the connection to PostgreSQL done by postgres user
 if tools.config['db_user'] == 'postgres':
-    logger.notifyChannel("server", netsvc.LOG_ERROR, "%s" % ("Attempted to connect database with postgres user. This is a security flaws, aborting."))
+    logger.error("Connecting to the database as 'postgres' user is forbidden, as it present major security issues. Shutting down.")
     sys.exit(1)
 
 import time
@@ -76,7 +78,7 @@ import time
 #----------------------------------------------------------
 # init net service
 #----------------------------------------------------------
-logger.notifyChannel("objects", netsvc.LOG_INFO, 'initialising distributed objects services')
+logger.info('initialising distributed objects services')
 
 #---------------------------------------------------------------
 # connect to the database and initialize it with base if needed
@@ -117,8 +119,7 @@ if tools.config['db_name']:
     for dbname in tools.config['db_name'].split(','):
         db,pool = pooler.get_db_and_pool(dbname, update_module=tools.config['init'] or tools.config['update'], pooljobs=False)
         if tools.config["test_file"]:
-            logger.notifyChannel("init", netsvc.LOG_INFO, 
-                 'loading test file %s' % (tools.config["test_file"],))
+            logger.info('loading test file %s', tools.config["test_file"])
             cr = db.cursor()
             tools.convert_yaml_import(cr, 'base', file(tools.config["test_file"]), {}, 'test', True)
             cr.rollback()
@@ -134,16 +135,14 @@ if tools.config["translate_out"]:
         msg = "language %s" % (tools.config["language"],)
     else:
         msg = "new language"
-    logger.notifyChannel("init", netsvc.LOG_INFO, 
-                         'writing translation file for %s to %s' % (msg, 
-                                                                    tools.config["translate_out"]))
+    logger.info('writing translation file for %s to %s', msg, tools.config["translate_out"])
 
     fileformat = os.path.splitext(tools.config["translate_out"])[-1][1:].lower()
     buf = file(tools.config["translate_out"], "w")
     tools.trans_export(tools.config["language"], tools.config["translate_modules"], buf, fileformat)
     buf.close()
 
-    logger.notifyChannel("init", netsvc.LOG_INFO, 'translation file written successfully')
+    logger.info('translation file written successfully')
     sys.exit(0)
 
 if tools.config["translate_in"]:
@@ -169,27 +168,19 @@ SIGNALS = dict(
     [(getattr(signal, sign), sign) for sign in LST_SIGNALS]
 )
 
-def handler(signum, _):
+netsvc.quit_signals_received = 0
+
+def handler(signum, frame):
     """
     :param signum: the signal number
-    :param _: 
+    :param frame: the interrupted stack frame or None
     """
-    netsvc.Agent.quit()
-    netsvc.Server.quitAll()
-    if tools.config['pidfile']:
-        os.unlink(tools.config['pidfile'])
-    logger.notifyChannel('shutdown', netsvc.LOG_INFO, 
-                         "Shutdown Server! - %s" % ( SIGNALS[signum], ))
-    logger.shutdown()
-    sys.exit(0)
+    netsvc.quit_signals_received += 1
+    if netsvc.quit_signals_received > 1:
+        sys.stderr.write("Forced shutdown.\n")
+        os._exit(0)
 
-for signum in SIGNALS:
-    signal.signal(signum, handler)
-
-
-import threading
-import traceback
-def dumpstacks(signum, _):
+def dumpstacks(signum, frame):
     # code from http://stackoverflow.com/questions/132058/getting-stack-trace-from-a-running-python-application#answer-2569696
 
     id2name = dict([(th.ident, th.name) for th in threading.enumerate()])
@@ -201,24 +192,49 @@ def dumpstacks(signum, _):
             if line:
                 code.append("  %s" % (line.strip()))
 
-    logger.notifyChannel("dumpstacks", netsvc.LOG_INFO, "\n".join(code))
+    logging.getLogger('dumpstacks').info("\n".join(code))
+
+for signum in SIGNALS:
+    signal.signal(signum, handler)
 
 if os.name == 'posix':
     signal.signal(signal.SIGQUIT, dumpstacks)
 
+def quit():
+    netsvc.Agent.quit()
+    netsvc.Server.quitAll()
+    if tools.config['pidfile']:
+        os.unlink(tools.config['pidfile'])
+    logger = logging.getLogger('shutdown')
+    logger.info("Initiating OpenERP Server shutdown")
+    logger.info("Hit CTRL-C again or send a second signal to immediately terminate the server...")
+    logging.shutdown()
+
+    # manually join() all threads before calling sys.exit() to allow a second signal
+    # to trigger _force_quit() in case some non-daemon threads won't exit cleanly.
+    # threading.Thread.join() should not mask signals (at least in python 2.5)
+    for thread in threading.enumerate():
+        if thread != threading.currentThread() and not thread.daemon:
+            while thread.isAlive():
+                # need a busyloop here as thread.join() masks signals
+                # and would present the forced shutdown
+                thread.join(0.05)
+                time.sleep(0.05)
+    sys.exit(0)
+
 if tools.config['pidfile']:
     fd = open(tools.config['pidfile'], 'w')
     pidtext = "%d" % (os.getpid())
     fd.write(pidtext)
     fd.close()
 
-
 netsvc.Server.startAll()
 
-logger.notifyChannel("web-services", netsvc.LOG_INFO, 
-                     'the server is running, waiting for connections...')
+logger.info('OpenERP server is running, waiting for connections...')
 
-while True:
+while netsvc.quit_signals_received == 0:
     time.sleep(60)
 
+quit()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From c6d238654cd923856d516212690acf83865ed499 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 13:45:25 +0200
Subject: [PATCH 016/244] [IMP] netsvc.Agent: spawned task threads should not
 be marked as daemon

bzr revid: odo@openerp.com-20100922114525-sxl26m5ilum0uscj
---
 bin/netsvc.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index ce9b35d2a5b..ca81372a8fe 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -348,7 +348,10 @@ class Agent(object):
                 current_thread.dbname = dbname   # hack hack
                 cls._logger.notifyChannel('timers', LOG_DEBUG, "Run %s.%s(*%r, **%r)" % (function.im_class.__name__, function.func_name, args, kwargs))
                 delattr(current_thread, 'dbname')
-                threading.Thread(target=function, args=args, kwargs=kwargs).start()
+                task_thread = threading.Thread(target=function, name='netsvc.Agent.task', args=args, kwargs=kwargs)
+                # force non-daemon task threads (the runner thread must be daemon, and this property is inherited by default)
+                task_thread.daemon = False
+                task_thread.start()
                 time.sleep(1)
             time.sleep(60)
 

From 68d0f64128b3592bf1ed8e0665f12b00529f4f8c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 13:46:31 +0200
Subject: [PATCH 017/244] [IMP] netrpc/http servers: consistently name server
 threads

bzr revid: odo@openerp.com-20100922114631-umxz97owiuvlcf0r
---
 bin/service/http_server.py   | 2 +-
 bin/service/netrpc_server.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/service/http_server.py b/bin/service/http_server.py
index 7b62dda6c05..86e5943f170 100644
--- a/bin/service/http_server.py
+++ b/bin/service/http_server.py
@@ -137,7 +137,7 @@ class BaseHttpDaemon(threading.Thread, netsvc.Server):
     _RealProto = '??'
 
     def __init__(self, interface, port, handler):
-        threading.Thread.__init__(self)
+        threading.Thread.__init__(self, name='%sDaemon-%d'%(self._RealProto, port))
         netsvc.Server.__init__(self)
         self.__port = port
         self.__interface = interface
diff --git a/bin/service/netrpc_server.py b/bin/service/netrpc_server.py
index 80cb968c8e9..9d25c98083a 100644
--- a/bin/service/netrpc_server.py
+++ b/bin/service/netrpc_server.py
@@ -102,7 +102,7 @@ class TinySocketClientThread(threading.Thread, netsvc.OpenERPDispatcher):
 
 class TinySocketServerThread(threading.Thread,netsvc.Server):
     def __init__(self, interface, port, secure=False):
-        threading.Thread.__init__(self, name="Net-RPC socket")
+        threading.Thread.__init__(self, name="NetRPCDaemon-%d"%port)
         netsvc.Server.__init__(self)
         self.__port = port
         self.__interface = interface

From 6acee33b4ea931747895c373cd0b3c352d95f372 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 22 Sep 2010 11:23:49 +0200
Subject: [PATCH 018/244] [FIX] osv.fields: fromkeys second argument is only
 evaluated once

bzr revid: olt@tinyerp.com-20100922092349-ab36ynbdzqvexryb
---
 bin/osv/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 3ab140e4088..64432ba15d7 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -777,7 +777,7 @@ class related(function):
         if not ids: return {}
         relation = obj._name
         if self._type in ('one2many', 'many2many'):
-            res = {}.fromkeys(ids, [])
+            res = dict([(i, []) for i in ids])
         else:
             res = {}.fromkeys(ids, False)
 

From 703708c614004150a441a39313279e64eea9fef6 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 22 Sep 2010 17:53:15 +0530
Subject: [PATCH 019/244] [IMP] hr_expense : Improvement in Expenses analysis
 report

bzr revid: vir@tinyerp.com-20100922122315-wcuibr61gafanqw6
---
 addons/hr_expense/report/hr_expense_report.py |  8 +--
 .../report/hr_expense_report_view.xml         | 66 +++++++++----------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index a885dfc55a0..1de708d2beb 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -48,8 +48,8 @@ class hr_expense_report(osv.osv):
         'user_id':fields.many2one('res.users', 'Validation User', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
         'price_total':fields.float('Total Price', readonly=True),
-        'delay_valid':fields.float('Delay Valid', readonly=True),
-        'delay_confirm':fields.float('Delay Confirm', readonly=True),
+        'delay_valid':fields.float('Delay to Valid', readonly=True),
+        'delay_confirm':fields.float('Delay to Confirm', readonly=True),
         'analytic_account': fields.many2one('account.analytic.account','Analytic account',readonly=True),
         'price_average':fields.float('Average Price', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
@@ -71,7 +71,7 @@ class hr_expense_report(osv.osv):
             create or replace view hr_expense_report as (
                  select
                      min(l.id) as id,
-                     date_trunc('day',s.create_date) as date,
+                     date_trunc('day',s.date) as date,
                      s.employee_id,
                      s.journal_id,
                      s.currency_id,
@@ -100,7 +100,7 @@ class hr_expense_report(osv.osv):
                  left join hr_expense_expense s on (s.id=l.expense_id)
                  left join product_uom u on (u.id=l.uom_id)
                  group by
-                     date_trunc('day',s.create_date),
+                     date_trunc('day',s.date),
                      to_char(date_trunc('day',s.create_date), 'YYYY'),
                      to_char(date_trunc('day',s.create_date), 'MM'),
                      to_char(date_trunc('day',s.create_date), 'YYYY-MM-DD'),
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 0f3f74a1ce5..8458936cd74 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -22,9 +22,9 @@
                 <field name="product_id" invisible="1"/>
                 <field name="product_qty" invisible="1"/>
                 <field name="state" invisible="1"/>
-                <field name="invoiced" sum="Total Invoiced Lines"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="no_of_products" sum="# of Products"/>
+                <field name="invoiced" sum="Total Invoiced Lines"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay_confirm"/>
@@ -53,46 +53,29 @@
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
               <group>
-                <filter icon="terp-go-year" string="  365 Days  "
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during last 7 year"/>
-                  <filter icon="terp-go-month" string="   30 Days   "
+                <filter icon="terp-go-year" string="  Year  "
+                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                      help="Expenses during current year"/>
+                  <filter icon="terp-go-month" string="   Month   "
                       name="month"
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during last month"/>
-                <filter icon="terp-go-week" string="    7 Days    " separator="1"
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Expenses during last 7 days"/>
+                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                      help="Expenses during current month"/>
+                <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                      domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Expenses during last month"/>
                   <separator orientation="vertical"/>
-                    <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Expenses"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
                     help = "Confirm Expenses"/>
                     <filter string="Accepted" icon="terp-camera_test" domain="[('state','=','accepted')]"
                       help = "Accepted Expenses"/>
                     <separator orientation="vertical"/>
+                    <filter string="Invoiced" icon="terp-dolar" domain="[('state','=','invoiced')]"
+                      help = "Invoiced Expenses"/>
+                    <separator orientation="vertical"/>
                     <field name="employee_id"/>
                     <field name="department_id"/>
-        </group>
-        <newline/>
-                <group expand="0" string="Group By...">
-                    <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
-                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
-                </group>
-                <newline/>
-                <group expand="0" string="Extended filters..." groups="base.group_extended">
+            </group>
+            <newline/>
+            <group expand="0" string="Extended filters..." groups="base.group_extended">
                 <field name="product_id"/>
                 <separator orientation="vertical"/>
                 <field name="user_id"/>
@@ -102,7 +85,24 @@
                 <field name="date"/>
                 <field name="date_confirm"/>
                 <field name="date_valid"/>
-                </group>
+            </group>
+            <newline/>
+            <group expand="1" string="Group By...">
+                <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
+                <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
+                <separator orientation="vertical"/>
+                <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                <separator orientation="vertical"/>
+                <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}"/>
+                <separator orientation="vertical"/>
+                <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                <separator orientation="vertical"/>
+                <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Create Date"/>
+                <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Create Date"/>
+                <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Create Date"/>
+            </group>
             </search>
         </field>
     </record>

From ba4f8ad2233f5657461663e5d5a710a1f8a43f31 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 22 Sep 2010 14:31:35 +0200
Subject: [PATCH 020/244] [FIX] addons: tried to remove a non existing key in
 dict

bzr revid: olt@tinyerp.com-20100922123135-qmh4hpfgr9iexs03
---
 bin/addons/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 297cf73c6f4..0c591f9ca4f 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -761,7 +761,8 @@ def _check_module_names(cr, module_names):
     mod_names = set(module_names)
     if 'base' in mod_names:
         # ignore dummy 'all' module
-        mod_names.remove('all')
+        if 'all' in mod_names:
+            mod_names.remove('all')
     if mod_names:
         cr.execute("SELECT count(id) AS count FROM ir_module_module WHERE name in %s", (tuple(mod_names),))
         if cr.dictfetchone()['count'] != len(mod_names):

From 14e03b34b705b9f4b81c28ee33eb1f53f0968c64 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 22 Sep 2010 14:54:03 +0200
Subject: [PATCH 021/244] [IMP] ir.attachment: performance improvement:
 'res_name' -> 'store=True' to avoid unecessary db lookup

bzr revid: olt@tinyerp.com-20100922125403-sw7yfp9rsr7i2g93
---
 bin/addons/base/ir/ir_attachment.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/ir/ir_attachment.py b/bin/addons/base/ir/ir_attachment.py
index abba9222d25..173632c4411 100644
--- a/bin/addons/base/ir/ir_attachment.py
+++ b/bin/addons/base/ir/ir_attachment.py
@@ -105,8 +105,8 @@ class ir_attachment(osv.osv):
         'datas': fields.binary('Data'),
         'datas_fname': fields.char('Filename',size=256),
         'description': fields.text('Description'),
-        'res_name': fields.function(_name_get_resname, type='char', 
-                string='Resource Name', method=True),
+        'res_name': fields.function(_name_get_resname, type='char', size=128,
+                string='Resource Name', method=True, store=True),
         'res_model': fields.char('Resource Object',size=64, readonly=True,
                 help="The database object this attachment will be attached to"),
         'res_id': fields.integer('Resource ID', readonly=True,

From 984163134f6909bd8c6c986acb66b45e75ff198e Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Fri, 24 Sep 2010 18:26:04 +0530
Subject: [PATCH 022/244] [IMP]: Add internal header on printscreen report.

bzr revid: rch_open_erp-20100924125604-48m4q8yz7o9pm3jl
---
 .../report/custom_default_printscreen.xsl     | 22 ++++++++++++++
 bin/addons/base/report/custom_new.xsl         |  4 +--
 .../base/report/custom_rml_printscreen.xsl    | 29 +++++++++++++++++++
 bin/report/printscreen/ps_list.py             |  7 +++++
 4 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 bin/addons/base/report/custom_default_printscreen.xsl
 create mode 100644 bin/addons/base/report/custom_rml_printscreen.xsl

diff --git a/bin/addons/base/report/custom_default_printscreen.xsl b/bin/addons/base/report/custom_default_printscreen.xsl
new file mode 100644
index 00000000000..46bcb0b843a
--- /dev/null
+++ b/bin/addons/base/report/custom_default_printscreen.xsl
@@ -0,0 +1,22 @@
+<?xml version = '1.0' encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+	<xsl:template name="first_page_graphics_corporation">
+		<!--logo-->
+		<fill color="black"/>
+        <stroke color="black"/>
+        <setFont name="DejaVu Sans" size="8"/>
+        <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//header-date"/></drawString>
+        <setFont name="DejaVu Sans Bold" size="10"/>
+        <drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//company"/></drawString>
+        <setFont name="DejaVu Sans" size="8"/>
+        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
+        <stroke color="#000000"/>
+        <lines size="8">1.3cm 19.3cm 28.5cm 19.3cm</lines>
+	</xsl:template>
+
+   <xsl:template name="first_page_frames">
+			<frame id="col1" x1="2.0cm" y1="2.5cm" width="24.7cm" height="16cm"/>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/bin/addons/base/report/custom_new.xsl b/bin/addons/base/report/custom_new.xsl
index 6680314ca40..3a988a56373 100644
--- a/bin/addons/base/report/custom_new.xsl
+++ b/bin/addons/base/report/custom_new.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-	<xsl:import href="../../base/report/custom_default.xsl"/>
-	<xsl:import href="../../base/report/custom_rml.xsl"/>
+	<xsl:import href="../../base/report/custom_default_printscreen.xsl"/>
+	<xsl:import href="../../base/report/custom_rml_printscreen.xsl"/>
 	<xsl:template match="/">
 		<xsl:call-template name="rml">
 			<xsl:with-param name="pageSize" select="report/config/PageSize"/>
diff --git a/bin/addons/base/report/custom_rml_printscreen.xsl b/bin/addons/base/report/custom_rml_printscreen.xsl
new file mode 100644
index 00000000000..38e3a207b6f
--- /dev/null
+++ b/bin/addons/base/report/custom_rml_printscreen.xsl
@@ -0,0 +1,29 @@
+<?xml version = '1.0' encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+	<xsl:template name="first_page_graphics_report"/>
+
+	<xsl:template name="rml">
+		<document filename="example.pdf">
+			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Report" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
+				<pageTemplate id="first_page">
+					<pageGraphics>
+						<xsl:call-template name="first_page_graphics_corporation"/>
+					</pageGraphics>
+
+					<xsl:call-template name="first_page_frames"/>
+				</pageTemplate>
+			</template>
+
+			<stylesheet>
+			    <xsl:call-template name="stylesheet"/>
+		    </stylesheet>
+
+			<story>
+				<xsl:call-template name="story"/>
+			</story>
+
+		</document>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index a350f52aa8c..142cb41d447 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -30,12 +30,14 @@ import locale
 import time, os
 from operator import itemgetter
 from datetime import datetime
+from report import report_sxw
 
 class report_printscreen_list(report_int):
     def __init__(self, name):
         report_int.__init__(self, name)
         self.context = {}
         self.groupby = []
+        self.cr=''
 
     def _parse_node(self, root_node):
         result = []
@@ -60,6 +62,7 @@ class report_printscreen_list(report_int):
     def create(self, cr, uid, ids, datas, context=None):
         if not context:
             context={}
+        self.cr=cr
         self.context = context
         self.groupby = context.get('group_by',[])
         self.groupby_no_leaf = context.get('group_by_no_leaf',False)
@@ -129,6 +132,10 @@ class report_printscreen_list(report_int):
         _append_node('PageHeight', '%.2f' %(pageSize[1] * 2.8346,))
         _append_node('report-header', title)
 
+        _append_node('company', pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr,uid,uid).company_id.name)
+        rpt_obj = pooler.get_pool(self.cr.dbname).get('res.users')
+        rml_obj=report_sxw.rml_parse(self.cr, uid, rpt_obj._name,context)
+        _append_node('header-date', str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")))
         l = []
         t = 0
         rowcount = 0;

From 9c78dc1b91dee9e979b131f600c2b33840f98ee2 Mon Sep 17 00:00:00 2001
From: "RON (OpenERP)" <>
Date: Mon, 27 Sep 2010 12:42:29 +0530
Subject: [PATCH 023/244] [IMP]: Usability improvements on base for
 "Configuration" and "Customization" menus

bzr revid: rpa@tinyerp.com-20100927071229-0sy4e7s2j7cfv54a
---
 bin/addons/base/ir/ir.xml                     | 137 ++++++++++++------
 bin/addons/base/ir/ir_cron.py                 |   2 +-
 bin/addons/base/ir/ir_ui_view.py              |   4 +-
 bin/addons/base/ir/workflow/workflow_view.xml |  44 ++++--
 .../wizard/base_module_configuration_view.xml |   2 +-
 5 files changed, 130 insertions(+), 59 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index e76af79ea01..d6c092bd6f6 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -10,14 +10,22 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Connect Events to Actions">
+                	<group col="6" colspan="4">
                     <field name="name" required="1"/>
                     <field name="model_id" on_change="onchange_object_id(model_id)"/>
                     <field name="action_id" on_change="onchange_action_id(action_id)"/>
                     <field name="key2" required="1"/>
-                    <field name="object" readonly="1"/>
                     <field name="res_id"/>
-                    <field name="value_unpickle"/>
-                    <field name="meta_unpickle"/>
+                    <field name="object" readonly="1"/>
+					</group>
+                	<group col="2" colspan="2">
+                        <separator colspan="2" string="Value"/>
+                    	<field name="value_unpickle" nolabel="1"/>
+                    </group>
+                	<group col="2" colspan="2">
+                        <separator colspan="2" string="Metadata"/>
+	                    <field name="meta_unpickle" nolabel="1"/>
+                    </group>
                     <field name="user_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </form>
@@ -47,12 +55,17 @@
                     <field name="name"/>
                     <field name="model"/>
                     <field name="key2"/>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'key2'}"/>
+                    </group>
                 </search>
             </field>
         </record>
 
         <record id="act_values_form_action" model="ir.actions.act_window">
-            <field name="name">Client Actions</field>
+            <field name="name">Client Events</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.values</field>
             <field name="view_type">form</field>
@@ -76,7 +89,9 @@
 	        <field name="act_window_id" ref="act_values_form_action"/>
 	    </record>
 
-        <menuitem action="act_values_form_action" id="menu_values_form_action" parent="base.menu_custom_action"/>
+        <menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
+
+        <menuitem action="act_values_form_action" id="menu_values_form_action" parent="next_id_6"/>
 
 
         <!-- Values -->
@@ -254,7 +269,7 @@
         </record>
 
         <record id="ir_sequence_type" model="ir.actions.act_window">
-            <field name="name">Sequence Types</field>
+            <field name="name">Sequence Codes</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.sequence.type</field>
             <field name="view_type">form</field>
@@ -310,7 +325,8 @@
             <field name="view_id" ref="action_view_tree"/>
             <field name="search_view_id" ref="action_view_search"/>
         </record>
-        <menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
+
+
         <menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/>
 
         <!--Filters form view-->
@@ -857,21 +873,25 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Views">
-                    <group colspan="2" col="2">
-                        <separator string="General" colspan="2"/>
-                        <field name="name" select="1"/>
-                        <field name="type" select="1"/>
-                        <field name="model" select="1"/>
-                        <field name="priority"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Advanced" colspan="2"/>
-                        <field name="field_parent"/>
-                        <field name="inherit_id" select="1"/>
-                        <field name="xml_id" select="1"/>
-                    </group>
-                    <separator string="View architecture" colspan="4"/>
-                    <field colspan="4" nolabel="1" name="arch"/>
+		            <group colspan="4" col="6">
+		                <field name="name" select="1" colspan="6"/>
+		                <field name="type" select="1"/>
+		                <field name="model" select="1"/>
+		                <field name="priority"/>
+		            </group>
+                    <notebook colspan="4">
+                    	<page string="Architecture">
+	                    	<field colspan="4" nolabel="1" name="arch"/>
+	                	</page>
+                    	<page string="Extra Info">
+	                        <separator string="Advanced" colspan="4"/>
+	                        <newline/>
+	                        <field name="field_parent"/>
+	                        <field name="inherit_id" select="1"/>
+	                        <field name="xml_id" select="1"/>
+	                	</page>
+
+	                </notebook>
                 </form>
             </field>
         </record>
@@ -898,6 +918,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Views">
+                    <filter icon="terp-stock_zoom" string="Search"
+                        domain="[('type', '=', 'search')]" />
+                    <filter icon="gtk-indent" string="Tree"
+                        domain="[('type', '=', 'tree')]" />
+                    <filter icon="gtk-new" string="Form"
+                        domain="[('type', '=','form')]" />
+                    <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="type"/>
                     <field name="model"/>
@@ -905,7 +932,7 @@
                     <field name="xml_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Object" icon="terp-stage" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
                 </search>
@@ -1208,12 +1235,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Model Description">
+                    <filter icon="terp-camera_test" string="In Memory"
+                        domain="[('osv_memory', '=', True)]" />
+                    <separator orientation="vertical" />
+                    <filter icon="terp-stock_symbol-selection"
+                        string="Custom" domain="[('state', '=', 'manual')]" />
+                    <separator orientation="vertical" />
+                    <filter icon="terp-stock_align_left_24" string="Base"
+                        domain="[('state', '=', 'base')]" />
+                    <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="model"/>
-                    <field name="osv_memory"/>
-                    <field name="state"/>
-                    <field name="access_ids"/>
-                    <field name="info"/>
+                    <newline/>
                 </search>
             </field>
         </record>
@@ -1225,12 +1258,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fields">
-                    <group colspan="4" col="4">
-                        <field name="name" select="1"/>
-                        <field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
-                        <field name="field_description"/>
-                        <field name="state"/>
-                    </group>
+                	<group colspan="4" col="6">
+		                <field name="name" select="1" />
+		            	<field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
+		            	<field name="field_description"/>
+		            	<field name="state"/>
+           	   		</group>
                     <notebook colspan="4">
                         <page string="Properties">
                             <group colspan="2" col="2">
@@ -1280,12 +1313,29 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Fields">
+                	<filter icon="terp-camera_test"
+                        string="Required"
+                        domain="[('required', '=', True)]"/>
+                    <separator orientation="vertical"/>
+                	<filter icon="terp-stock_align_left_24"
+                        string="Readonly"
+                        domain="[('readonly', '=', True)]"/>
+                    <separator orientation="vertical"/>
+                	<filter icon="terp-translate"
+                        string="Translate"
+                        domain="[('translate', '=', True)]"/>
+                    <newline/>
                     <field name="name"/>
                     <field name="field_description"/>
                     <field name="model_id"/>
                     <field name="ttype"/>
                     <field name="required"/>
                     <field name="readonly"/>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
+                    </group>
+
                 </search>
             </field>
         </record>
@@ -1328,6 +1378,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Module Data">
+                	<filter icon="terp-stock_effects-object-colorize"
+                        string="Updatable"
+                        domain="[('noupdate', '=', False)]"/>
+                    <separator orientation="vertical"/>
                     <field name="module"/>
                     <field name="name"/>
                     <field name="model"/>
@@ -1335,8 +1389,8 @@
                     <field name="noupdate"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Module" icon="terp-stage" domain="[]" context="{'group_by':'module'}"/>
-                        <filter string="Object" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Module" icon="terp-folder-blue" domain="[]" context="{'group_by':'module'}"/>
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
                     </group>
                 </search>
             </field>
@@ -1568,7 +1622,8 @@
                         <separator string="Action to Trigger" colspan="4"/>
                         <field name="model" groups="base.group_extended"/>
                         <field name="function"/>
-                        <field colspan="4" name="args"/>
+                        <separator string="Arguments" colspan="4"/>
+                        <field colspan="4" name="args" nolabel="1"/>
                     </page>
                     </notebook>
                 </form>
@@ -1587,8 +1642,8 @@
                     <field name="active"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="User" icon="terp-personal-" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Next Call" icon="terp-go-month"
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Execution" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'nextcall'}" />
                     </group>
                 </search>
@@ -1888,7 +1943,7 @@
             <field name="search_view_id" ref="view_server_action_search"/>
             <field name="context">{'key':'server_action'}</field>
         </record>
-        <menuitem action="action_server_action" id="menu_server_action" parent="base.menu_custom_action"/>
+        <menuitem action="action_server_action" id="menu_server_action" parent="base.next_id_6"/>
 
         <record model="ir.actions.act_window" id="action_model_grid_security">
             <field name="name">Access Controls Grid</field>
@@ -1944,8 +1999,8 @@
                 <search string="Search Actions">
                 	<filter string="To Do" name="todo" icon="terp-camera_test" domain=" ['|',('state','=','open'),'&amp;',('state','=','skip'),('restart','=','onskip')]" help="Todo State Or (Skip State And Onskip Restart)"/>
                 	<separator orientation="vertical"/>
-                    <field name="state"/>
-                    <field name="restart"/>
+                	<field name="state"/>
+					<field name="restart"/>
                 </search>
             </field>
         </record>
diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py
index 33962c557c4..6b96333b5d5 100644
--- a/bin/addons/base/ir/ir_cron.py
+++ b/bin/addons/base/ir/ir_cron.py
@@ -52,7 +52,7 @@ class ir_cron(osv.osv, netsvc.Agent):
             ('hours', 'Hours'), ('work_days','Work Days'), ('days', 'Days'),('weeks', 'Weeks'), ('months', 'Months')], 'Interval Unit'),
         'numbercall': fields.integer('Number of Calls', help='Number of time the function is called,\na negative number indicates that the function will always be called'),
         'doall' : fields.boolean('Repeat Missed'),
-        'nextcall' : fields.datetime('Next Call Date', required=True),
+        'nextcall' : fields.datetime('Next Execution Date', required=True),
         'model': fields.char('Object', size=64),
         'function': fields.char('Function', size=64),
         'args': fields.text('Arguments'),
diff --git a/bin/addons/base/ir/ir_ui_view.py b/bin/addons/base/ir/ir_ui_view.py
index 62e4bd9dd6e..810bfcf108a 100644
--- a/bin/addons/base/ir/ir_ui_view.py
+++ b/bin/addons/base/ir/ir_ui_view.py
@@ -55,7 +55,7 @@ class view(osv.osv):
     _columns = {
         'name': fields.char('View Name',size=64,  required=True),
         'model': fields.char('Object', size=64, required=True),
-        'priority': fields.integer('Priority', required=True),
+        'priority': fields.integer('Sequence', required=True),
         'type': fields.selection((
             ('tree','Tree'),
             ('form','Form'),
@@ -212,7 +212,7 @@ class view_sc(osv.osv):
     _sql_constraints = [
         ('shortcut_unique', 'unique(res_id, resource, user_id)', 'Shortcut for this menu already exists!'),
     ]
-        
+
 view_sc()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 089d5ee777f..3fb98efb8f9 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -15,9 +15,11 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Workflow">
-          <field name="name"/>
-          <field name="osv"/>
-          <field name="on_create"/>
+        	<group col="6" colspan="4" >
+          		<field name="name"/>
+          		<field name="osv"/>
+          		<field name="on_create"/>
+          	</group>
           <separator colspan="4" string="Activities"/>
           <field colspan="4" name="activities" nolabel="1"/>
         </form>
@@ -92,10 +94,12 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Activity">
-          <field name="name"/>
-          <field name="wkf_id"/>
-          <group colspan="4" col="7">
-            <field name="kind" colspan="4"/>
+        	<group col="6" colspan="4">
+            	<field name="name"/>
+            	<field name="wkf_id"/>
+            	<field name="kind"/>
+            </group>
+          <group  colspan="2">
             <field name="flow_start"/>
             <field name="flow_stop"/>
           </group>
@@ -166,11 +170,20 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Activity">
+          <filter icon="terp-camera_test" string="Flow Start"
+            domain="[('flow_start', '=',True)]" />
+          <filter icon="terp-gtk-stop" string="Flow Stop"
+            domain="[('flow_stop', '=',True)]" />
+          <separator orientation="vertical"/>
           <field name="name"/>
           <field name="wkf_id"/>
           <field name="kind"/>
           <field name="action_id"/>
           <field name="action"/>
+          <newline/>
+	          <group expand="0" string="Group By...">
+        	      <filter string="Workflow" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'wkf_id'}"/>
+    	      </group>
         </search>
       </field>
     </record>
@@ -197,13 +210,15 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Transition">
-          <field name="act_from"/>
-          <field name="act_to"/>
-          <field colspan="4" name="condition"/>
-          <field name="signal"/>
-          <field name="role_id"/>
-          <field name="trigger_model"/>
-          <field name="trigger_expr_id"/>
+        	<group col="6" colspan ="4">
+            	<field name="act_from"/>
+            	<field name="act_to"/>
+            	<field name="signal"/>
+            	<field name="condition"/>
+            	<field name="trigger_model"/>
+          	    <field name="trigger_expr_id"/>
+            	<field name="role_id"/>
+            </group>
         </form>
       </field>
     </record>
@@ -229,6 +244,7 @@
         <search string="Transition">
           <field name="act_from"/>
           <field name="act_to"/>
+          <field name="signal"/>
           <field name="condition"/>
         </search>
       </field>
diff --git a/bin/addons/base/module/wizard/base_module_configuration_view.xml b/bin/addons/base/module/wizard/base_module_configuration_view.xml
index 559273be8a9..7f11eced7d4 100644
--- a/bin/addons/base/module/wizard/base_module_configuration_view.xml
+++ b/bin/addons/base/module/wizard/base_module_configuration_view.xml
@@ -27,7 +27,7 @@
         <menuitem name="Start Configuration"
             action="action_start_configurator"
             id="menu_view_base_module_configuration" parent="next_id_11"
-            type="server" icon="STOCK_EXECUTE" sequence="2" />
+            type="server" icon="STOCK_EXECUTE" sequence="100" />
 
         <record model="ir.values" id="action_todo_config">
             <field name="model_id" ref="model_ir_actions_todo" />

From 83a1255311f65e4596c20f25de8ec3d65464ebf9 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 15:27:48 +0530
Subject: [PATCH 024/244] [IMP]:improved internal header and print pagecount
 without black square on the right of the page number

bzr revid: apa@tinyerp.com-20100927095748-9927u4i2y1rmmo9f
---
 bin/addons/base/res/res_company.py    | 6 +++---
 bin/report/render/rml2pdf/trml2pdf.py | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index 1bc0f7372ee..2f0b567666e 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -212,8 +212,8 @@ class res_company(osv.osv):
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="490" y="725">[[ company.partner_id.name ]]</drawString>
         <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="1065" y="725"><pageNumber/>/  </drawRightString>
-        <drawString x="1065" y="725"><pageCount/></drawString>
+        <drawRightString x="1073" y="725"><pageNumber/>/  </drawRightString>
+        <drawString x="1073" y="725"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>25 720 1085 720</lines>
     </pageGraphics>
@@ -233,7 +233,7 @@ class res_company(osv.osv):
         <drawString x="9.8cm" y="28.3cm">[[ company.partner_id.name ]]</drawString>
         <setFont name="DejaVu Sans" size="8"/>
         <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> /  </drawRightString>
-        <drawString x="19.8cm" y="28.3cm"><pageCount/></drawString>
+        <drawString x="19.7cm" y="28.3cm"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
         </pageGraphics>
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index ca47423008b..be8cde09259 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -42,11 +42,12 @@ class PageCount(platypus.Flowable):
     def draw(self):
         self.canv.beginForm("pageCount")
         self.canv.setFont("Helvetica", utils.unit_get(str(8)))
-        self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
+        self.canv.drawString(0, 0, str(self.canv._pageCount))
         self.canv.endForm()
 
 class PageReset(platypus.Flowable):
     def draw(self):
+        self.canv._pageCount = self.canv.getPageNumber()
         self.canv._pageNumber = 0
 
 class _rml_styles(object,):
@@ -261,7 +262,7 @@ class _rml_canvas(object):
             if n.tag == 'pageNumber':
                 rc += str(self.canvas.getPageNumber())
             rc += utils._process_text(self, n.tail)
-        return rc
+        return rc.replace(' ','').replace('\n','')
 
     def _drawString(self, node):
         v = utils.attr_get(node, ['x','y'])

From bf0124f28c9ea9bbc8866b23f7feb89b7ebf4716 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 15:39:55 +0530
Subject: [PATCH 025/244] [IMP]:improved for internal header

bzr revid: apa@tinyerp.com-20100927100955-m0nh5r0sdp8r4yvt
---
 bin/report/render/rml2pdf/trml2pdf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index be8cde09259..30df7b6211e 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -262,7 +262,7 @@ class _rml_canvas(object):
             if n.tag == 'pageNumber':
                 rc += str(self.canvas.getPageNumber())
             rc += utils._process_text(self, n.tail)
-        return rc.replace(' ','').replace('\n','')
+        return rc.replace('\n','')
 
     def _drawString(self, node):
         v = utils.attr_get(node, ['x','y'])

From 6860beac3e044ce28e3f9a43e50561de7348b68d Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 16:32:15 +0530
Subject: [PATCH 026/244] [IMP]:improved header

bzr revid: apa@tinyerp.com-20100927110215-pua562rflkics8j2
---
 bin/addons/base/res/res_company.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index 2f0b567666e..6d78062a0e9 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -212,7 +212,7 @@ class res_company(osv.osv):
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="490" y="725">[[ company.partner_id.name ]]</drawString>
         <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="1073" y="725"><pageNumber/>/  </drawRightString>
+        <drawRightString x="1073" y="725"><pageNumber/>/</drawRightString>
         <drawString x="1073" y="725"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>25 720 1085 720</lines>
@@ -232,7 +232,7 @@ class res_company(osv.osv):
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="9.8cm" y="28.3cm">[[ company.partner_id.name ]]</drawString>
         <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> /  </drawRightString>
+        <drawRightString x="19.7cm" y="28.3cm"><pageNumber/>/</drawRightString>
         <drawString x="19.7cm" y="28.3cm"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>

From a4f08919b1bb435b3858d385c34facc181e14dc3 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 16:58:25 +0530
Subject: [PATCH 027/244] [IMP]:improved internal header for pagereset

bzr revid: apa@tinyerp.com-20100927112825-t8f7vkdut97fnfcv
---
 bin/report/render/rml2pdf/trml2pdf.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 30df7b6211e..c7ffc965649 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -42,12 +42,11 @@ class PageCount(platypus.Flowable):
     def draw(self):
         self.canv.beginForm("pageCount")
         self.canv.setFont("Helvetica", utils.unit_get(str(8)))
-        self.canv.drawString(0, 0, str(self.canv._pageCount))
+        self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
         self.canv.endForm()
 
 class PageReset(platypus.Flowable):
     def draw(self):
-        self.canv._pageCount = self.canv.getPageNumber()
         self.canv._pageNumber = 0
 
 class _rml_styles(object,):
@@ -811,7 +810,8 @@ class _rml_template(object):
                 fis.append(platypus.PageBreak())
             fis += r.render(node_story)
             # Reset Page Number with new story tag
-            fis.append(PageReset())
+            if self.localcontext.has_key('active_ids') and len(self.localcontext.get('active_ids')) > 1:
+                fis.append(PageReset())
             story_cnt += 1
         if self.localcontext:
             fis.append(PageCount())

From 6dcdbe95b06384ef2ab3c49980acb5bb1a1a060b Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 27 Sep 2010 17:20:13 +0530
Subject: [PATCH 028/244] [IMP]: Improvement in domain to launch config wizard
 by wizard

bzr revid: rpa@tinyerp.com-20100927115013-otj04tdu84e72tki
---
 bin/addons/base/module/wizard/base_module_configuration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/module/wizard/base_module_configuration.py b/bin/addons/base/module/wizard/base_module_configuration.py
index 909637c1d21..345ed9a9797 100644
--- a/bin/addons/base/module/wizard/base_module_configuration.py
+++ b/bin/addons/base/module/wizard/base_module_configuration.py
@@ -27,7 +27,7 @@ class base_module_configuration(osv.osv_memory):
     _name = "base.module.configuration"
 
     def start(self, cr, uid, ids, context=None):
-        todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, ['|', ('state', '=', 'open'), ('restart', '=', 'always')])
+        todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, ['|', ('state', '=', 'open'), '&', ('state', '=', 'skip'), ('restart', '=', 'onskip')])
         if not todo_ids:
             # When there is no wizard todo it will display message
             data_obj = self.pool.get('ir.model.data')

From 0e2eba601dfc16d4145eebb100e00d3a40ea4e3f Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 18:22:23 +0530
Subject: [PATCH 029/244] [IMP]:improved internal header for pagereset

bzr revid: apa@tinyerp.com-20100927125223-jkqs7z851d4jer1x
---
 bin/report/render/rml2pdf/trml2pdf.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index c7ffc965649..f0a945eb7f5 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -42,11 +42,15 @@ class PageCount(platypus.Flowable):
     def draw(self):
         self.canv.beginForm("pageCount")
         self.canv.setFont("Helvetica", utils.unit_get(str(8)))
-        self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
+        if '_pageCount' in dir(self.canv):
+            self.canv.drawString(0, 0, str(self.canv._pageCount))
+        else:
+            self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
         self.canv.endForm()
 
 class PageReset(platypus.Flowable):
     def draw(self):
+        self.canv._pageCount = self.canv.getPageNumber()
         self.canv._pageNumber = 0
 
 class _rml_styles(object,):
@@ -810,8 +814,7 @@ class _rml_template(object):
                 fis.append(platypus.PageBreak())
             fis += r.render(node_story)
             # Reset Page Number with new story tag
-            if self.localcontext.has_key('active_ids') and len(self.localcontext.get('active_ids')) > 1:
-                fis.append(PageReset())
+            fis.append(PageReset())
             story_cnt += 1
         if self.localcontext:
             fis.append(PageCount())

From 422b9f329252b69e26b9f18617346709bfed054f Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 18:47:41 +0530
Subject: [PATCH 030/244] [revert]:revert

bzr revid: apa@tinyerp.com-20100927131741-i62g05rrk8hv3wbq
---
 bin/report/render/rml2pdf/trml2pdf.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index f0a945eb7f5..848b0f29215 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -42,15 +42,11 @@ class PageCount(platypus.Flowable):
     def draw(self):
         self.canv.beginForm("pageCount")
         self.canv.setFont("Helvetica", utils.unit_get(str(8)))
-        if '_pageCount' in dir(self.canv):
-            self.canv.drawString(0, 0, str(self.canv._pageCount))
-        else:
-            self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
+        self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
         self.canv.endForm()
 
 class PageReset(platypus.Flowable):
     def draw(self):
-        self.canv._pageCount = self.canv.getPageNumber()
         self.canv._pageNumber = 0
 
 class _rml_styles(object,):

From 3eac92fc4a15892bced13c48bd16d31f8e479764 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 27 Sep 2010 16:13:44 +0200
Subject: [PATCH 031/244] [REM] web modules

bzr revid: xmo@openerp.com-20100927141344-hgzzsa4liemqnz8n
---
 bin/addons/base/__openerp__.py               |  1 -
 bin/addons/base/module/__init__.py           |  8 +--
 bin/addons/base/module/module.py             | 54 --------------------
 bin/addons/base/module/module_view.xml       |  8 ---
 bin/addons/base/module/module_web.py         | 46 -----------------
 bin/addons/base/module/module_web_view.xml   | 29 -----------
 bin/addons/base/security/ir.model.access.csv |  2 -
 7 files changed, 2 insertions(+), 146 deletions(-)
 delete mode 100644 bin/addons/base/module/module_web.py
 delete mode 100644 bin/addons/base/module/module_web_view.xml

diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py
index 47a36987b48..86a0229358a 100644
--- a/bin/addons/base/__openerp__.py
+++ b/bin/addons/base/__openerp__.py
@@ -44,7 +44,6 @@
         'ir/ir.xml',
         'ir/workflow/workflow_view.xml',
         'module/module_view.xml',
-        'module/module_web_view.xml',
         'module/module_data.xml',
         'module/module_report.xml',
         'module/wizard/base_module_import_view.xml',
diff --git a/bin/addons/base/module/__init__.py b/bin/addons/base/module/__init__.py
index 93f0f0a3d1c..1b7abf2e76e 100644
--- a/bin/addons/base/module/__init__.py
+++ b/bin/addons/base/module/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,14 +15,10 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import module_web
 import module
 import wizard
 import report
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index f4086f9edc3..7eeb3abf758 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -151,8 +151,6 @@ class module(osv.osv):
         'url': fields.char('URL', size=128, readonly=True),
         'dependencies_id': fields.one2many('ir.module.module.dependency',
             'module_id', 'Dependencies', readonly=True),
-        'web_dependencies_id': fields.one2many('ir.module.web.dependency',
-            'module_id', 'Web Dependencies', readonly=True),
         'state': fields.selection([
             ('uninstallable','Not Installable'),
             ('uninstalled','Not Installed'),
@@ -245,12 +243,6 @@ class module(osv.osv):
                     od = self.browse(cr, uid, ids2)[0]
                     mdemo = od.demo or mdemo
             
-            for web_mod in module.web_dependencies_id:
-                if web_mod.state == 'unknown':
-                    raise orm.except_orm(_('Error'), _("You try to install the module '%s' that depends on the module:'%s'.\nBut this module is not available in your system.") % (module.name, dep.name,))
-                ids2 = self.pool.get('ir.module.web').search(cr, uid, [('module','=',web_mod.name)])
-                self.pool.get('ir.module.web').button_install(cr, uid, ids2)
-                
             terp = self.get_module_info(module.name)
             try:
                 self._check_external_dependencies(terp)
@@ -373,7 +365,6 @@ class module(osv.osv):
                 id = self.create(cr, uid, dict(name=mod_name, state='uninstalled', **values))
                 res[1] += 1
             self._update_dependencies(cr, uid, id, terp.get('depends', []))
-            self._update_web_dependencies(cr, uid, id, terp.get('web_depends', []))
             self._update_category(cr, uid, id, terp.get('category', 'Uncategorized'))
 
         return res
@@ -417,18 +408,6 @@ class module(osv.osv):
         for d in depends:
             cr.execute('INSERT INTO ir_module_module_dependency (module_id, name) values (%s, %s)', (id, d))
 
-    def _update_web_dependencies(self, cr, uid, id, depends=[]):
-        web_module_pool = self.pool.get('ir.module.web')
-        res = False
-        
-        for d in depends:
-            ids = web_module_pool.search(cr, uid, [('module','=',d)])
-            if len(ids) > 0:
-                cr.execute("Select id from ir_module_web_dependency where module_id=%s and web_module_id=%s and name=%s", (id, ids[0], d))
-                res = cr.fetchone()
-                if not res:
-                    cr.execute('INSERT INTO ir_module_web_dependency (module_id, web_module_id, name) values (%s, %s, %s)', (id, ids[0], d))
-
     def _update_category(self, cr, uid, id, category='Uncategorized'):
         categs = category.split('/')
         p_id = None
@@ -493,39 +472,6 @@ class module(osv.osv):
 
 module()
 
-class web_module_dependency(osv.osv):
-    _name = "ir.module.web.dependency"
-    _description = "Web Module dependency"
-    
-    def _state(self, cr, uid, ids, name, args, context={}):
-        result = {}
-        mod_obj = self.pool.get('ir.module.web')
-        for md in self.browse(cr, uid, ids):
-            ids = mod_obj.search(cr, uid, [('module', '=', md.name)])
-            if ids:
-                result[md.id] = mod_obj.read(cr, uid, [ids[0]], ['state'])[0]['state']
-            else:
-                result[md.id] = 'unknown'
-        return result
-
-    
-    _columns = {
-        'name': fields.char('Name',  size=128, select=True),
-        'module_id': fields.many2one('ir.module.module', 'Module', select=True, ondelete='cascade'),
-        'web_module_id': fields.many2one('ir.module.web', 'Web Module', select=True, ondelete='cascade'),
-        'state': fields.function(_state, method=True, type='selection', selection=[
-            ('uninstallable','Uninstallable'),
-            ('uninstalled','Not Installed'),
-            ('installed','Installed'),
-            ('to upgrade','To be upgraded'),
-            ('to remove','To be removed'),
-            ('to install','To be installed'),
-            ('unknown', 'Unknown'),
-            ], string='State', readonly=True, select=True),
-    }
-
-web_module_dependency()
-
 class module_dependency(osv.osv):
     _name = "ir.module.module.dependency"
     _description = "Module dependency"
diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml
index bf5164d8276..7a303b9a9ae 100644
--- a/bin/addons/base/module/module_view.xml
+++ b/bin/addons/base/module/module_view.xml
@@ -129,14 +129,6 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="Web Dependencies">
-                            <field colspan="4" name="web_dependencies_id" nolabel="1">
-                                <tree string="Dependencies">
-                                    <field name="name"/>
-                                    <field name="state"/>
-                                </tree>
-                            </field>
-                        </page>
                         <page string="Features" attrs="{'invisible':[('state','!=','installed')]}">
                             <separator string="Created Menus" colspan="4"/>
                             <field colspan="4" name="menus_by_module" nolabel="1"/>
diff --git a/bin/addons/base/module/module_web.py b/bin/addons/base/module/module_web.py
deleted file mode 100644
index 8f65dc3960d..00000000000
--- a/bin/addons/base/module/module_web.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from osv import fields, osv, orm
-
-class module_web(osv.osv):
-    _name = "ir.module.web"
-    _description = "Web Module"
-    
-    _columns = {
-        'name': fields.char("Name", size=128, readonly=True, required=True),
-        'module': fields.char("Module", size=128, readonly=True, required=True),
-        'description': fields.text("Description", readonly=True, translate=True),
-        'author': fields.char("Author", size=128, readonly=True),
-        'website': fields.char("Website", size=256, readonly=True),
-        'state': fields.selection([
-            ('uninstallable','Uninstallable'),
-            ('uninstalled','Not Installed'),
-            ('installed','Installed')
-            ], string='State', readonly=True)
-    }
-    
-    _defaults = {
-        'state': lambda *a: 'uninstalled',
-    }
-    _order = 'name'
-
-    _sql_constraints = [
-        ('name_uniq', 'unique (name)', 'The name of the module must be unique !'),
-    ]
-    
-    def update_module_list(self, cr, uid, modules, context={}):
-        
-        for module in modules:
-            mod_name = module['name']
-            ids = self.search(cr, uid, [('name','=',mod_name)])
-            if ids:
-                self.write(cr, uid, ids, module)
-            else:
-                self.create(cr, uid, module)
-                
-    def button_install(self, cr, uid, ids, context={}):
-        return self.write(cr, uid, ids, {'state': 'installed'}, context)
-    
-    def button_uninstall(self, cr, uid, ids, context={}):
-        return self.write(cr, uid, ids, {'state': 'uninstalled'}, context)
-                
-module_web()
-
diff --git a/bin/addons/base/module/module_web_view.xml b/bin/addons/base/module/module_web_view.xml
deleted file mode 100644
index 32e927b70e7..00000000000
--- a/bin/addons/base/module/module_web_view.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="module_web_tree" model="ir.ui.view">
-            <field name="name">ir.module.web.tree</field>
-            <field name="model">ir.module.web</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree>
-                    <field name="name"/>
-                    <field name="module"/>
-                    <field name="description"/>
-                    <field name="author"/>
-                    <field name="state"/>
-                    <button name="button_install" string="Install" type="object" states="uninstalled" context="{'reload': 1}"/>
-                    <button name="button_uninstall" string="Uninstall" type="object" states="installed" context="{'reload': 1}"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="open_module_web_list" model="ir.actions.url">
-            <field name="name">web_module_list</field>
-            <field name="url">/openerp/modules</field>
-        </record>
-        <menuitem name="Web Modules" action="open_module_web_list" id="open_module_web_list_url" type="url" parent="base.menu_management"/>
-
-    </data>
-</openerp>
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 97b4c2895e0..9168d93078d 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -124,6 +124,4 @@
 "access_ir_filter all","ir_filters all","model_ir_filters",,1,0,0,0
 "access_ir_filter employee","ir_filters employee","model_ir_filters","group_user",1,1,1,1
 "access_ir_filters","ir_filters_all","model_ir_filters",,1,1,1,1
-"access_ir_module_web","ir.module.web","model_ir_module_web","group_system",1,1,1,1
-"access_ir_module_web_dependency","ir.module.web.dependency","model_ir_module_web_dependency","group_system",1,1,1,1
 "access_res_partner_address","res.partner.address","model_res_partner_address","group_system",1,1,1,1

From 573ea5722f467031b1b018a3aa7e107c206da1ef Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Mon, 27 Sep 2010 23:35:06 +0530
Subject: [PATCH 032/244] [FIX] wizard exception replaced by osv exception

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

bzr revid: jvo@tinyerp.com-20100927180506-w5oq9ia1pjgjdyqd
---
 bin/addons/base/module/wizard/base_module_upgrade.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/module/wizard/base_module_upgrade.py b/bin/addons/base/module/wizard/base_module_upgrade.py
index fe85cb0422c..500622489e7 100644
--- a/bin/addons/base/module/wizard/base_module_upgrade.py
+++ b/bin/addons/base/module/wizard/base_module_upgrade.py
@@ -95,7 +95,7 @@ class base_module_upgrade(osv.osv_memory):
                 if dep_mod.state in ('unknown','uninstalled'):
                     unmet_packages.append(dep_mod.name)
         if len(unmet_packages):
-            raise wizard.except_wizard('Unmet dependency !', 'Following modules are uninstalled or unknown. \n\n'+'\n'.join(unmet_packages))
+            raise osv.except_osv('Unmet dependency !', 'Following modules are uninstalled or unknown. \n\n'+'\n'.join(unmet_packages))
         mod_obj.download(cr, uid, ids, context=context)
         cr.commit()
         db, pool = pooler.restart_pool(cr.dbname, update_module=True)

From 9bfc761a80605d8f6d544ed134fc60319630ca64 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 28 Sep 2010 13:09:54 +0530
Subject: [PATCH 033/244] [IMP] add separator in user preference view

bzr revid: vir@tinyerp.com-20100928073954-e009nxnz7oncfee2
---
 bin/addons/base/base_update.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 66376ed2acc..361bbfa67a0 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -82,6 +82,7 @@
                                     context="{'user_id': self, 'user_preference': 1}" groups="base.group_multi_company"/>
                             <field name="view" readonly="0"/>
                             <label string="" colspan="2"/>
+                            <separator string="Default Filters" colspan="4"/>
                             <newline/>
                         </page>
                          <page string="Preferences">

From c153c2d46b8a75b823a63981b5963ef1fb5adb3c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 28 Sep 2010 09:52:57 +0200
Subject: [PATCH 034/244] [ADD] server-side web addons

bzr revid: xmo@openerp.com-20100928075257-06f2b3o6kvdb9f6y
---
 bin/addons/__init__.py           | 20 ++++++++---------
 bin/addons/base/base.sql         |  1 +
 bin/addons/base/module/module.py | 38 ++++++++++++++++++++++++++++++--
 bin/tools/misc.py                |  7 +++---
 4 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 0c591f9ca4f..08cc60c19bd 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -203,14 +203,14 @@ def get_module_filetree(module, dir='.'):
 
     return tree
 
-def get_module_as_zip_from_module_directory(module_directory, b64enc=True, src=True):
-    """Compress a module directory
+def zip_directory(directory, b64enc=True, src=True):
+    """Compress a directory
 
-    @param module_directory: The module directory
+    @param directory: The directory to compress
     @param base64enc: if True the function will encode the zip file with base64
     @param src: Integrate the source files
 
-    @return: a stream to store in a file-like object
+    @return: a string containing the zip file
     """
 
     RE_exclude = re.compile('(?:^\..+\.swp$)|(?:\.py[oc]$)|(?:\.bak$)|(?:\.~.~$)', re.I)
@@ -225,16 +225,16 @@ def get_module_as_zip_from_module_directory(module_directory, b64enc=True, src=T
 
     archname = StringIO()
     archive = PyZipFile(archname, "w", ZIP_DEFLATED)
-    archive.writepy(module_directory)
-    _zippy(archive, module_directory, src=src)
+    archive.writepy(directory)
+    _zippy(archive, directory, src=src)
     archive.close()
-    val = archname.getvalue()
+    archive_data = archname.getvalue()
     archname.close()
 
     if b64enc:
-        val = base64.encodestring(val)
+        return base64.encodestring(archive_data)
 
-    return val
+    return archive_data
 
 def get_module_as_zip(modulename, b64enc=True, src=True):
     """Generate a module as zip file with the source or not and can do a base64 encoding
@@ -256,7 +256,7 @@ def get_module_as_zip(modulename, b64enc=True, src=True):
         if b64enc:
             val = base64.encodestring(val)
     else:
-        val = get_module_as_zip_from_module_directory(ap, b64enc, src)
+        val = zip_directory(ap, b64enc, src)
 
     return val
 
diff --git a/bin/addons/base/base.sql b/bin/addons/base/base.sql
index 778a64b2420..84676a7f59b 100644
--- a/bin/addons/base/base.sql
+++ b/bin/addons/base/base.sql
@@ -302,6 +302,7 @@ CREATE TABLE ir_module_module (
     certificate character varying(64),
     description text,
     demo boolean default False,
+    web boolean DEFAULT FALSE,
     primary key(id)
 );
 ALTER TABLE ir_module_module add constraint name_uniq unique (name);
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 7eeb3abf758..55a5c867264 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -173,12 +173,14 @@ class module(osv.osv):
         'reports_by_module': fields.function(_get_views, method=True, string='Reports', type='text', multi="meta", store=True),
         'views_by_module': fields.function(_get_views, method=True, string='Views', type='text', multi="meta", store=True),
         'certificate' : fields.char('Quality Certificate', size=64, readonly=True),
+        'web': fields.boolean('Has a web component', readonly=True),
     }
 
     _defaults = {
         'state': lambda *a: 'uninstalled',
         'demo': lambda *a: False,
         'license': lambda *a: 'AGPL-3',
+        'web': False,
     }
     _order = 'name'
 
@@ -332,6 +334,7 @@ class module(osv.osv):
             'website': terp.get('website', ''),
             'license': terp.get('license', 'GPL-2'),
             'certificate': terp.get('certificate') or None,
+            'web': terp.get('web') or False,
         }
 
     # update the list of available packages
@@ -470,6 +473,39 @@ class module(osv.osv):
                     logger.critical('module %s: invalid quality certificate: %s', mod.name, mod.certificate)
                     raise osv.except_osv(_('Error'), _('Module %s: Invalid Quality Certificate') % (mod.name,))
 
+    def list_web(self, cr, uid, context=False):
+        """ list_web(cr, uid, context) -> [module_name]
+        Lists all the currently installed modules with a web component.
+
+        Returns a list of addon names.
+        """
+        return [
+            module['name']
+            for module in self.browse(cr, uid,
+                self.search(cr, uid,
+                    [('web', '=', True),
+                     ('state', 'in', ['installed','to upgrade','to remove'])],
+                    context=context),
+                context=context)]
+    def get_web(self, cr, uid, names, context=False):
+        """ get_web(cr, uid, [module_name], context) -> [{name, depends, content}]
+
+        Returns the web content of all the named addons.
+
+        The toplevel directory of the zipped content is called 'web',
+        its final naming has to be managed by the client
+        """
+        modules = self.browse(cr, uid,
+            self.search(cr, uid, [('name', 'in', names)], context=context),
+                              context=context)
+        return [
+            {'name': module.name,
+             'depends': [dep.name for dep in module.dependencies_id],
+             'content': addons.zip_directory(
+                 addons.get_module_resource(module.name, 'web'))}
+            for module in modules
+        ]
+
 module()
 
 class module_dependency(osv.osv):
@@ -501,5 +537,3 @@ class module_dependency(osv.osv):
             ], string='State', readonly=True, select=True),
     }
 module_dependency()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 5a3d21bef86..b3b3d7d9baa 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -110,11 +110,12 @@ def init_db(cr):
         id = cr.fetchone()[0]
         cr.execute('insert into ir_module_module \
                 (id, author, website, name, shortdesc, description, \
-                    category_id, state, certificate) \
-                values (%s, %s, %s, %s, %s, %s, %s, %s, %s)', (
+                    category_id, state, certificate, web) \
+                values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)', (
             id, info.get('author', ''),
             info.get('website', ''), i, info.get('name', False),
-            info.get('description', ''), p_id, state, info.get('certificate') or None))
+            info.get('description', ''), p_id, state, info.get('certificate') or None,
+            info.get('web') or False))
         cr.execute('insert into ir_model_data \
             (name,model,module, res_id, noupdate) values (%s,%s,%s,%s,%s)', (
                 'module_meta_information', 'ir.module.module', i, id, True))

From 5577f2bc4ac052738be132d9368a6c22a27baf5a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 28 Sep 2010 13:09:15 +0200
Subject: [PATCH 035/244] [FIX] web dependencies: only send dependencies to web
 modules

Issue: if we depend from a module which depends from a module with a web component, we're hosed. Normal?

bzr revid: xmo@openerp.com-20100928110915-0m22v3l4ittx51c1
---
 bin/addons/base/module/module.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 55a5c867264..954a1087962 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -500,7 +500,11 @@ class module(osv.osv):
                               context=context)
         return [
             {'name': module.name,
-             'depends': [dep.name for dep in module.dependencies_id],
+             'depends': [dep.name for dep in module.dependencies_id
+                         if self.search(cr, uid, [
+                             ('name', '=', dep.name),
+                             ('web', '=', True)
+                             ], context=context)],
              'content': addons.zip_directory(
                  addons.get_module_resource(module.name, 'web'))}
             for module in modules

From c5f030d5e0e6f82deecf6d294c27d9f9e2381c23 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 28 Sep 2010 14:34:52 +0200
Subject: [PATCH 036/244] [IMP] add logging when server sends data to client,
 also bail out early from sending addons if we know we'll have nothing to send
 (client requested an empty set of web addons)

bzr revid: xmo@openerp.com-20100928123452-vhpoo1izp29lppo3
---
 bin/addons/base/module/module.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 954a1087962..759d4a14f43 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -72,6 +72,7 @@ module_category()
 class module(osv.osv):
     _name = "ir.module.module"
     _description = "Module"
+    __logger = logging.getLogger('base.' + _name)
 
     def get_module_info(self, name):
         info = {}
@@ -498,6 +499,9 @@ class module(osv.osv):
         modules = self.browse(cr, uid,
             self.search(cr, uid, [('name', 'in', names)], context=context),
                               context=context)
+        if not modules: return []
+        self.__logger.info('Sending web content of modules %s '
+                           'to web client', names)
         return [
             {'name': module.name,
              'depends': [dep.name for dep in module.dependencies_id

From 6d2e4664e82e8511900242e1d8e610d5d14c42a0 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 28 Sep 2010 18:46:15 +0530
Subject: [PATCH 037/244] [IMP] lunch, survery : Improvements

bzr revid: vir@tinyerp.com-20100928131615-nxslnafaf0r4v7ut
---
 addons/lunch/lunch.py         | 4 ++--
 addons/survey/survey_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index ad2996315aa..5a777564408 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -99,7 +99,7 @@ class lunch_cashmove(osv.osv):
         'amount': fields.float('Amount', digits=(16, 2)),
         'box': fields.many2one('lunch.cashbox', 'Box Name', size=30, required=True),
         'active': fields.boolean('Active'),
-        'create_date': fields.datetime('Created date', readonly=True),
+        'create_date': fields.datetime('Creation Date', readonly=True),
     }
 
     _defaults = {
@@ -141,7 +141,7 @@ class lunch_order(osv.osv):
         'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ], \
             'State', readonly=True, select=True),
         'price': fields.function(_price_get, method=True, string="Price"),
-        'category': fields.many2one('lunch.category','Category',readonly=True),
+        'category': fields.many2one('lunch.category','Category'),
     }
 
     _defaults = {
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 2aa3eac089d..745cf98c484 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -265,7 +265,7 @@
                         <field name="title" select="1"/>
                         <field name="type" select="1" widget="selection"/>
                         <field name="responsible_id" select="1" default="1">
-                            <filter string="MY" icon="terp-partner" domain="[('responsible_id','=',uid)]"/>
+                            <filter string="MY" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
                         </field>
                    </group>
                    <newline/>

From 60f6882c37c9473de9e0bfc1588fa203e700b7e2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 28 Sep 2010 15:31:57 +0200
Subject: [PATCH 038/244] [FIX] web dependencies handling: walk the entire
 dependency tree, not just direct (server-side) dependencies of the current
 module, to discover and return the dependencies of the web addon to the web
 client

bzr revid: xmo@openerp.com-20100928133157-9n31dj4h1b96co5u
---
 bin/addons/base/module/module.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 759d4a14f43..ad10e4e8e5f 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -474,7 +474,7 @@ class module(osv.osv):
                     logger.critical('module %s: invalid quality certificate: %s', mod.name, mod.certificate)
                     raise osv.except_osv(_('Error'), _('Module %s: Invalid Quality Certificate') % (mod.name,))
 
-    def list_web(self, cr, uid, context=False):
+    def list_web(self, cr, uid, context=None):
         """ list_web(cr, uid, context) -> [module_name]
         Lists all the currently installed modules with a web component.
 
@@ -488,7 +488,17 @@ class module(osv.osv):
                      ('state', 'in', ['installed','to upgrade','to remove'])],
                     context=context),
                 context=context)]
-    def get_web(self, cr, uid, names, context=False):
+    def _web_dependencies(self, cr, uid, module, context=None):
+        for dependency in module.dependencies_id:
+            (parent,) = self.browse(cr, uid, self.search(cr, uid,
+                [('name', '=', dependency.name)], context=context),
+                                 context=context)
+            if parent.web:
+                yield parent.name
+            else:
+                self._web_dependencies(
+                    cr, uid, parent, context=context)
+    def get_web(self, cr, uid, names, context=None):
         """ get_web(cr, uid, [module_name], context) -> [{name, depends, content}]
 
         Returns the web content of all the named addons.
@@ -504,11 +514,8 @@ class module(osv.osv):
                            'to web client', names)
         return [
             {'name': module.name,
-             'depends': [dep.name for dep in module.dependencies_id
-                         if self.search(cr, uid, [
-                             ('name', '=', dep.name),
-                             ('web', '=', True)
-                             ], context=context)],
+             'depends': list(self._web_dependencies(
+                 cr, uid, module, context=context)),
              'content': addons.zip_directory(
                  addons.get_module_resource(module.name, 'web'))}
             for module in modules

From 17191285b3cc5b314b74f8f9477a3799146588df Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 28 Sep 2010 20:53:49 +0200
Subject: [PATCH 039/244] modifs

bzr revid: fp@tinyerp.com-20100928185349-4l60mx4oylaafjpy
---
 README | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/README b/README
index 80fb4701288..5725ce9f866 100644
--- a/README
+++ b/README
@@ -15,16 +15,3 @@ database, dynamic GUIs, customizable reports, NET-RPC and XML-RPC interfaces, ..
 For more information, please visit: 
 http://www.openerp.com
 
-About Tiny.be
-----------------
-
-Tiny.be is a company specialising in the development of high-level applications
-and websites. All the company products are free software, released under the 
-GNU GPL license. 
-
-Our main products include: OpenERP (ERP & CRM for SMB), Tiny eCommerce 
-(complete eCommerce system), OpenReport (automated generation of complex 
-documents), Tiny Raytracer, ...
-
-For more information, please visit:
-http://www.tiny.be

From 0c5c22241e7d70eec2accd9473d48c5a53ba4b84 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 29 Sep 2010 04:47:42 +0000
Subject: [PATCH 040/244] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20100929044742-hs94zc5tzloe42ql
---
 bin/addons/base/i18n/am.po    |  44 ++--
 bin/addons/base/i18n/ar.po    |  44 ++--
 bin/addons/base/i18n/bg.po    |  46 ++--
 bin/addons/base/i18n/bs.po    |  88 ++++----
 bin/addons/base/i18n/ca.po    |  46 ++--
 bin/addons/base/i18n/cs.po    |  44 ++--
 bin/addons/base/i18n/da.po    |  44 ++--
 bin/addons/base/i18n/de.po    |  48 ++--
 bin/addons/base/i18n/el.po    |  46 ++--
 bin/addons/base/i18n/en_GB.po |  50 +++--
 bin/addons/base/i18n/es.po    |  46 ++--
 bin/addons/base/i18n/es_EC.po |  83 ++++---
 bin/addons/base/i18n/et.po    | 169 ++++++++-------
 bin/addons/base/i18n/eu.po    |  44 ++--
 bin/addons/base/i18n/fa.po    |  46 ++--
 bin/addons/base/i18n/fi.po    |  45 ++--
 bin/addons/base/i18n/fr.po    |  64 +++---
 bin/addons/base/i18n/gl.po    |  53 +++--
 bin/addons/base/i18n/he.po    |  44 ++--
 bin/addons/base/i18n/hr.po    |  46 ++--
 bin/addons/base/i18n/hu.po    |  44 ++--
 bin/addons/base/i18n/id.po    |  44 ++--
 bin/addons/base/i18n/is.po    |  44 ++--
 bin/addons/base/i18n/it.po    | 397 +++++++++++++++++++---------------
 bin/addons/base/i18n/ja.po    |  46 ++--
 bin/addons/base/i18n/ko.po    |  44 ++--
 bin/addons/base/i18n/lt.po    |  58 +++--
 bin/addons/base/i18n/lv.po    |  44 ++--
 bin/addons/base/i18n/mn.po    | 283 +++++++++++++-----------
 bin/addons/base/i18n/nb.po    |  44 ++--
 bin/addons/base/i18n/nl.po    |  48 ++--
 bin/addons/base/i18n/pl.po    |  64 +++---
 bin/addons/base/i18n/pt.po    |  46 ++--
 bin/addons/base/i18n/pt_BR.po |  50 +++--
 bin/addons/base/i18n/ro.po    |  44 ++--
 bin/addons/base/i18n/ru.po    |  44 ++--
 bin/addons/base/i18n/sk.po    |  44 ++--
 bin/addons/base/i18n/sl.po    |  44 ++--
 bin/addons/base/i18n/sq.po    |  44 ++--
 bin/addons/base/i18n/sr.po    |  44 ++--
 bin/addons/base/i18n/sv.po    |  50 +++--
 bin/addons/base/i18n/th.po    |  44 ++--
 bin/addons/base/i18n/tlh.po   |  44 ++--
 bin/addons/base/i18n/tr.po    |  46 ++--
 bin/addons/base/i18n/uk.po    |  46 ++--
 bin/addons/base/i18n/vi.po    |  44 ++--
 bin/addons/base/i18n/zh_CN.po |  48 ++--
 bin/addons/base/i18n/zh_TW.po |  44 ++--
 debian/po/bg.po               |   2 +-
 debian/po/ca.po               |   2 +-
 debian/po/cs.po               |   2 +-
 debian/po/de.po               |   2 +-
 debian/po/el.po               |   2 +-
 debian/po/en_GB.po            |   2 +-
 debian/po/es.po               |   2 +-
 debian/po/es_EC.po            |   2 +-
 debian/po/fa.po               |   2 +-
 debian/po/fi.po               |   2 +-
 debian/po/fr.po               |   2 +-
 debian/po/gl.po               |   2 +-
 debian/po/hr.po               |   2 +-
 debian/po/it.po               |   2 +-
 debian/po/ja.po               |   2 +-
 debian/po/ko.po               |  12 +-
 debian/po/mn.po               |  41 ++++
 debian/po/nb.po               |   2 +-
 debian/po/nl.po               |   2 +-
 debian/po/pl.po               |   2 +-
 debian/po/pt.po               |   2 +-
 debian/po/ro.po               |   4 +-
 debian/po/ru.po               |   2 +-
 debian/po/sk.po               |   2 +-
 debian/po/sr.po               |   2 +-
 debian/po/sv.po               |   2 +-
 debian/po/tr.po               |   2 +-
 debian/po/uk.po               |   2 +-
 debian/po/zh_CN.po            |   2 +-
 debian/po/zh_TW.po            |   2 +-
 78 files changed, 1829 insertions(+), 1308 deletions(-)
 create mode 100644 debian/po/mn.po

diff --git a/bin/addons/base/i18n/am.po b/bin/addons/base/i18n/am.po
index 673da21f0e0..718ec294ec0 100644
--- a/bin/addons/base/i18n/am.po
+++ b/bin/addons/base/i18n/am.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: 2010-07-13 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7939,73 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8015,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ar.po b/bin/addons/base/i18n/ar.po
index f69ef3734bd..de0a35e7dfe 100644
--- a/bin/addons/base/i18n/ar.po
+++ b/bin/addons/base/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7938,73 +7938,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8014,13 +8015,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index 7f08e4a455d..325288006a4 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 22:19+0000\n"
+"PO-Revision-Date: 2010-09-09 18:37+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@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: 2010-09-09 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8104,73 +8104,74 @@ msgstr "руски / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "Не може да има двама потребитела с един и същ \"логин\"!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8180,13 +8181,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/bs.po b/bin/addons/base/i18n/bs.po
index be26a65700a..af99a2b5185 100644
--- a/bin/addons/base/i18n/bs.po
+++ b/bin/addons/base/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-08-03 04:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-09-12 21:46+0000\n"
+"Last-Translator: Bojan Markovic <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: 2010-08-04 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -413,7 +413,7 @@ msgstr "Naziv zemlje"
 #. module: base
 #: model:res.country,name:base.coreturn
 msgid "Colombia"
-msgstr ""
+msgstr "Kolumbija"
 
 #. module: base
 #: view:ir.module.module:0
@@ -620,7 +620,7 @@ msgstr "Oman"
 #: model:ir.actions.act_window,name:base.action_payterm_form
 #: model:ir.model,name:base.model_res_payterm
 msgid "Payment term"
-msgstr ""
+msgstr "Uvjeti plaćanja"
 
 #. module: base
 #: model:res.country,name:base.nu
@@ -635,23 +635,23 @@ msgstr "Radni dani"
 #. module: base
 #: help:ir.values,action_id:0
 msgid "This field is not used, it only helps you to select the right action."
-msgstr ""
+msgstr "Polje se ne koristi, služi za pomoć pri odabiru ispravne radnje."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
 #: view:wizard.ir.model.menu.create:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Kreiraj izbornik"
 
 #. module: base
 #: model:res.country,name:base.in
 msgid "India"
-msgstr ""
+msgstr "Indija"
 
 #. module: base
 #: model:ir.model,name:base.model_maintenance_contract_module
 msgid "maintenance contract modules"
-msgstr ""
+msgstr "moduli s ugovorom o održavanju"
 
 #. module: base
 #: view:ir.values:0
@@ -661,28 +661,28 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ad
 msgid "Andorra, Principality of"
-msgstr ""
+msgstr "Andora"
 
 #. module: base
 #: field:ir.module.category,child_ids:0
 #: field:res.partner.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Podkategorije"
 
 #. module: base
 #: selection:wizard.module.lang.export,format:0
 msgid "TGZ Archive"
-msgstr ""
+msgstr "TGZ arhiva"
 
 #. module: base
 #: field:res.partner.som,factor:0
 msgid "Factor"
-msgstr ""
+msgstr "Faktor"
 
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
-msgstr ""
+msgstr "%B - Puni naziv za mjesec."
 
 #. module: base
 #: field:ir.actions.report.xml,report_type:0
@@ -692,7 +692,7 @@ msgstr ""
 #: field:ir.values,key:0
 #: view:res.partner:0
 msgid "Type"
-msgstr ""
+msgstr "Vrsta"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -702,12 +702,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.gu
 msgid "Guam (USA)"
-msgstr ""
+msgstr "Guam (USA)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_grid
 msgid "Objects Security Grid"
-msgstr ""
+msgstr "Mreža sigurnosnih postavki objekata"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -723,7 +723,7 @@ msgstr ""
 #: selection:ir.actions.server,state:0
 #: selection:workflow.activity,kind:0
 msgid "Dummy"
-msgstr ""
+msgstr "Prazno"
 
 #. module: base
 #: constraint:ir.ui.view:0
@@ -733,29 +733,29 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
 #. module: base
 #: model:res.country,name:base.ky
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Kajmanska ostrva"
 
 #. module: base
 #: model:res.country,name:base.ir
 msgid "Iran"
-msgstr ""
+msgstr "Iran"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_request-act
 #: model:ir.ui.menu,name:base.menu_res_request_act
 msgid "My Requests"
-msgstr ""
+msgstr "Moji zahtjevi"
 
 #. module: base
 #: field:ir.sequence,name:0
 #: field:ir.sequence.type,name:0
 msgid "Sequence Name"
-msgstr ""
+msgstr "Naziv sekvence"
 
 #. module: base
 #: model:res.country,name:base.td
 msgid "Chad"
-msgstr ""
+msgstr "Čad"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -7961,73 +7961,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8037,13 +8038,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po
index 3ef8efd72dc..68f51968a1a 100644
--- a/bin/addons/base/i18n/ca.po
+++ b/bin/addons/base/i18n/ca.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:58+0000\n"
+"PO-Revision-Date: 2010-09-09 18:36+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.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: 2010-09-09 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8098,73 +8098,74 @@ msgstr "Rus / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "No podeu tenir dos usuaris amb el mateix identificador d'usuari!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8174,13 +8175,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/cs.po b/bin/addons/base/i18n/cs.po
index 1132bdeb2e2..aa4ad43cbc3 100644
--- a/bin/addons/base/i18n/cs.po
+++ b/bin/addons/base/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7941,73 +7941,74 @@ msgstr "Rusko / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8017,13 +8018,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/da.po b/bin/addons/base/i18n/da.po
index 4069cf08816..614b8a8f285 100644
--- a/bin/addons/base/i18n/da.po
+++ b/bin/addons/base/i18n/da.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: 2010-07-13 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7939,73 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8015,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po
index 44005e08899..968b8392abe 100644
--- a/bin/addons/base/i18n/de.po
+++ b/bin/addons/base/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-08-25 05:51+0000\n"
-"Last-Translator: Ferdinand-chricar <Unknown>\n"
+"PO-Revision-Date: 2010-09-09 17:58+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.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: 2010-08-26 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8105,73 +8105,74 @@ msgstr "Russian / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "2 Benuzter können nicht den gleichen Login Code haben!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8181,13 +8182,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/el.po b/bin/addons/base/i18n/el.po
index b27a5d71152..5e1718b2d48 100644
--- a/bin/addons/base/i18n/el.po
+++ b/bin/addons/base/i18n/el.po
@@ -6,13 +6,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:42+0000\n"
+"PO-Revision-Date: 2010-09-09 18:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -8106,73 +8106,74 @@ msgstr "Ρώσσικα / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "Δεν μπορεί να υπάρχουν δύο χρήστες με το ίδιο όνομα!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8182,13 +8183,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/en_GB.po b/bin/addons/base/i18n/en_GB.po
index 3c516ddf1c7..0e2166dc01f 100644
--- a/bin/addons/base/i18n/en_GB.po
+++ b/bin/addons/base/i18n/en_GB.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 22:13+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-11 15:00+0000\n"
+"Last-Translator: Martin Hood <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -2646,7 +2646,7 @@ msgstr "You can not remove the field '%s' !"
 #: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
-msgstr "Zip"
+msgstr "Postcode"
 
 #. module: base
 #: field:ir.module.module,author:0
@@ -8080,73 +8080,74 @@ msgstr "Russian / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8156,13 +8157,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po
index b1c8dadcb33..be23757ec05 100644
--- a/bin/addons/base/i18n/es.po
+++ b/bin/addons/base/i18n/es.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:29+0000\n"
+"PO-Revision-Date: 2010-09-09 18:09+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.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: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8104,73 +8104,74 @@ msgstr "Ruso / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8180,13 +8181,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/es_EC.po b/bin/addons/base/i18n/es_EC.po
index 61123e004e8..88d23a33bfa 100644
--- a/bin/addons/base/i18n/es_EC.po
+++ b/bin/addons/base/i18n/es_EC.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2009-12-27 01:49+0000\n"
+"PO-Revision-Date: 2010-09-18 22:18+0000\n"
 "Last-Translator: Cristian Salamea (GnuThink) <ovnicraft@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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8101,94 +8101,109 @@ msgstr "Ruso / русский язык"
 #. module: base
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
-msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
- 
+msgstr "¡No puede tener dos usuarios con el mismo identificador!"
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
-msgstr ""
- 
+msgstr "Tamaño del campo nunca puede ser menor que 1 !"
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
-msgstr ""
- 
+msgstr "Acceso directo a este menú ya existe !"
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+"No puede tener varios registros con el mismo id para el mismo módulo !"
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
-msgstr ""
- 
+msgstr "Tu contrato de mantenimiento esta ya suscrito en el sistema !"
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
-msgstr ""
- 
+msgstr "El nombre del módulo debe ser único !"
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
-msgstr ""
- 
+msgstr "El ID del certificado del módulo debe ser único !"
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
-msgstr ""
- 
+msgstr "El codigo del Título del Partner debe ser único"
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
-msgstr ""
- 
+msgstr "El nombre del Partner debe ser único"
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
- 
+msgstr "El nombre del país debe ser único"
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
- 
+msgstr "El codigo del pais debe ser unico"
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
-msgstr ""
- 
+msgstr "El nombre del lenguaje debe ser unico"
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
-msgstr ""
- 
+msgstr "El codigo del lenguaje debe ser unico"
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
-msgstr ""
- 
+msgstr "El nombre del grupo debe ser unico"
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "Error de restriccion"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
+"La operacion no puede ser completada, probablemente sucedio lo siguiente:\n"
+"- borrado: esta tratando de borrar un registro que hacer referencia a otro\n"
+"- creacion/actualizacion: un campo requerido no fue llenado correctamente"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
+"\n"
+"\n"
+"[objeto con referencia: %s - %s]"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Integrity Error"
-msgstr ""
+msgstr "Error de Integridad"
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index 83d224a2e1c..0814b45f278 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-19 08:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-09-21 14:25+0000\n"
+"Last-Translator: Tanel Kurvits <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: 2010-07-13 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -180,7 +180,7 @@ msgstr "Otsi partnerit"
 #: code:addons/base/module/wizard/wizard_export_lang.py:0
 #, python-format
 msgid "new"
-msgstr ""
+msgstr "uus"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -215,6 +215,8 @@ msgid ""
 "Save this document to a %s file and edit it with a specific software or a "
 "text editor. The file encoding is UTF-8."
 msgstr ""
+"Salvest see dokument %s faili ja muuda seda spetsiaaltarkvaraga või "
+"tekstiredaktoriga. Faili kodeering on UTF-8."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -225,13 +227,13 @@ msgstr "STOCK_DELETE"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Password mismatch !"
-msgstr ""
+msgstr "Salasõna ei klapi !"
 
 #. module: base
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "This url '%s' must provide an html file with links to zip modules"
-msgstr ""
+msgstr "See url '%s' peab andma html faili, mis viitab zip moodulitele"
 
 #. module: base
 #: selection:res.request,state:0
@@ -359,6 +361,8 @@ msgid ""
 "You can not remove the admin user as it is used internally for resources "
 "created by OpenERP (updates, module installation, ...)"
 msgstr ""
+"Sa ei saa eemaldada kasutajat 'admin' sest seda kasutatakse siseselt Open "
+"ERP poolt loodud vahendite jaoks (uuendused, moodulite paigaldamine, ...)"
 
 #. module: base
 #: model:res.country,name:base.gf
@@ -381,6 +385,8 @@ msgid ""
 "If you check this, then the second time the user prints with same attachment "
 "name, it returns the previous report."
 msgstr ""
+"Selle kasti märgistamisel pöördutakse eelmise aruande juurde, kui kasutaja "
+"prindib olemasoleva manuse nimega"
 
 #. module: base
 #: help:res.lang,iso_code:0
@@ -464,7 +470,7 @@ msgstr "Laiendatud"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
-msgstr ""
+msgstr "Kohandatud väljadel peab olema nimi mis algab 'x_'-ga !"
 
 #. module: base
 #: help:ir.actions.server,action_id:0
@@ -495,7 +501,7 @@ msgstr "Jordaania"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not remove the model '%s' !"
-msgstr ""
+msgstr "Sa ei saa eemaldada mudelit '%s'!"
 
 #. module: base
 #: model:res.country,name:base.er
@@ -847,13 +853,13 @@ msgstr "RML"
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Search"
-msgstr ""
+msgstr "Otsi"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Pie charts need exactly two fields"
-msgstr ""
+msgstr "Sektordiagrammid vajavad täpselt kahte välja"
 
 #. module: base
 #: help:wizard.module.lang.export,lang:0
@@ -997,7 +1003,7 @@ msgstr "STOCK_COPY"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Model %s Does not Exist !"
-msgstr ""
+msgstr "Mudelit %s ei eksisteeri !"
 
 #. module: base
 #: code:addons/base/module/module.py:0
@@ -1006,6 +1012,8 @@ msgid ""
 "You try to install the module '%s' that depends on the module:'%s'.\n"
 "But this module is not available in your system."
 msgstr ""
+"Sa proovid installeerida moodulit '%s' mis sõltub moodulist:'%s'.\n"
+"Aga seda moodulit pole sinu süsteemis saadaval."
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_link
@@ -1063,7 +1071,7 @@ msgstr "Päev: %(day)s"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not read this document! (%s)"
-msgstr ""
+msgstr "Sa ei saa lugeda seda dokumenti! (%s)"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1125,7 +1133,7 @@ msgstr "Kohandatud aruanne"
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (koopia)"
 
 #. module: base
 #: view:ir.sequence:0
@@ -1140,7 +1148,7 @@ msgstr "7. %H:%M:%S ==> 18:25:20"
 #. module: base
 #: help:res.users,company_id:0
 msgid "The company this user is currently working on."
-msgstr ""
+msgstr "Firma kus see kasutaja hetkel töötab."
 
 #. module: base
 #: help:ir.actions.server,message:0
@@ -1188,7 +1196,7 @@ msgstr "Valem"
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid "Can not remove root user!"
-msgstr ""
+msgstr "Ei saa eemaldada root kasutajat!"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1290,7 +1298,7 @@ msgstr "STOCK_PROPERTIES"
 #. module: base
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "Otsi kontakti"
 
 #. module: base
 #: view:ir.module.module:0
@@ -1355,7 +1363,7 @@ msgstr "Grupid"
 #. module: base
 #: constraint:res.users:0
 msgid "This user can not connect using this company !"
-msgstr ""
+msgstr "See kasutaja ei saa ühendada kasutades seda firmat !"
 
 #. module: base
 #: model:res.country,name:base.bz
@@ -1453,7 +1461,7 @@ msgstr ""
 #. module: base
 #: help:ir.rule.group,global:0
 msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
+msgstr "Tee see reegel globaalseks, Teisel juhul peab ta panema gruppi"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
@@ -1471,7 +1479,7 @@ msgstr "Hetke määr"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Greek / Ελληνικά"
-msgstr ""
+msgstr "Greeka / Ελληνικά"
 
 #. module: base
 #: view:ir.values:0
@@ -1506,7 +1514,7 @@ msgstr "Kinnitus"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Enter at least one field !"
-msgstr ""
+msgstr "Sisesta vähemalt üks väli!"
 
 #. module: base
 #: field:ir.ui.view_sc,name:0
@@ -1557,7 +1565,7 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not write in this document! (%s)"
-msgstr ""
+msgstr "Sa ei saa kirjutada sellesse dokumenti! (%s)"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -1717,7 +1725,7 @@ msgstr "Kehtiv"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not delete this document! (%s)"
-msgstr ""
+msgstr "Sa ei saa kustutada seda dokumenti! (%s)"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -1728,7 +1736,7 @@ msgstr "XSL"
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
-msgstr ""
+msgstr "Ei saa uuendata moodulit '%s'. See pole paigaldatud"
 
 #. module: base
 #: model:res.country,name:base.cu
@@ -1972,7 +1980,7 @@ msgstr "Moodul"
 #: model:ir.actions.act_window,name:base.action_res_bank_form
 #: model:ir.ui.menu,name:base.menu_action_res_bank_form
 msgid "Bank List"
-msgstr ""
+msgstr "Bankade nimekiri"
 
 #. module: base
 #: field:ir.attachment,description:0
@@ -2047,7 +2055,7 @@ msgstr ""
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Please specify an action to launch !"
-msgstr ""
+msgstr "Palun määra toiming, mida alustada!"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2113,7 +2121,7 @@ msgstr "terp-konto"
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "Recursion error in modules dependencies !"
-msgstr ""
+msgstr "Rekursiooni viga moodulite sõltuvustes !"
 
 #. module: base
 #: view:ir.model:0
@@ -2377,12 +2385,14 @@ msgid ""
 "spreadsheet software. The file encoding is UTF-8. You have to translate the "
 "latest column before reimporting it."
 msgstr ""
+"Salvetsa see dokument .CSV faili ja ava oma lemmik tabelarvutusprogrammiga. "
+"Faili kodeering on UTF-8. Sa pead tõlkima viimase veeru enne taasimportimist."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "Kliendid"
 
 #. module: base
 #: model:res.country,name:base.au
@@ -2556,6 +2566,8 @@ msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
 "But this module is not available in your system."
 msgstr ""
+"Sa püüad uuendada moodulit, mis sõltub moodulist: %s.\n"
+"Aga seda moodulit pole sinu süsteemis saadaval."
 
 #. module: base
 #: view:res.partner.address:0
@@ -2571,7 +2583,7 @@ msgstr "Litsents"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Invalid operation"
-msgstr ""
+msgstr "Sobimatu tegevus"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2615,7 +2627,7 @@ msgstr "Mooduli import"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not remove the field '%s' !"
-msgstr ""
+msgstr "Sa ei saa eemaldada välja '%s'!"
 
 #. module: base
 #: field:res.bank,zip:0
@@ -2647,7 +2659,7 @@ msgstr "%c - Sobiv kuupäeva ja aja esitlus."
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Finland / Suomi"
-msgstr ""
+msgstr "Soome / Suomi"
 
 #. module: base
 #: model:res.country,name:base.bo
@@ -2694,6 +2706,7 @@ msgstr "Reeglid"
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
+"Proovid eemaldada moodulit, mis on juba paigaldatud või alles paigaldamisel"
 
 #. module: base
 #: help:ir.values,key2:0
@@ -2855,7 +2868,7 @@ msgstr "Turvalisus"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Using a relation field which uses an unknown object"
-msgstr ""
+msgstr "Kasutan seose välja, mis omakorda kasutab tundmatut objekti"
 
 #. module: base
 #: model:res.country,name:base.za
@@ -3165,7 +3178,7 @@ msgstr "Näidisandmed"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "English (UK)"
-msgstr ""
+msgstr "Inglise (Suurbritannia)"
 
 #. module: base
 #: model:res.country,name:base.aq
@@ -3190,7 +3203,7 @@ msgstr "Veeb"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "English (CA)"
-msgstr ""
+msgstr "Inglise (CA)"
 
 #. module: base
 #: field:res.partner.event,planned_revenue:0
@@ -3315,7 +3328,7 @@ msgstr "Panga tüüp"
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid "The name of the group can not start with \"-\""
-msgstr ""
+msgstr "Grupi nimi ei tohi alata \"-\" märgiga"
 
 #. module: base
 #: wizard_view:module.upgrade,end:0
@@ -3380,7 +3393,7 @@ msgstr "Kuhja"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Tree can only be used in tabular reports"
-msgstr ""
+msgstr "Puud saab kasutada ainult tabulaarsetes aruannetes"
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -3908,7 +3921,7 @@ msgstr "Mosambiik"
 #: model:ir.actions.act_window,name:base.grant_menu_access
 #: model:ir.ui.menu,name:base.menu_grant_menu_access
 msgid "Manage Menus"
-msgstr ""
+msgstr "Halda menüüsid"
 
 #. module: base
 #: field:ir.actions.server,message:0
@@ -4012,7 +4025,7 @@ msgstr "Mongoolia"
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Tõrge"
 
 #. module: base
 #: view:res.partner.som:0
@@ -4062,7 +4075,7 @@ msgstr "Failivorming"
 #. module: base
 #: field:res.lang,iso_code:0
 msgid "ISO code"
-msgstr ""
+msgstr "ISO kood"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config_view
@@ -4318,7 +4331,7 @@ msgstr "Objekti väli"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "French (CH) / Français (CH)"
-msgstr ""
+msgstr "Prantsuse (CH) / Français (CH)"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4392,7 +4405,7 @@ msgstr "Tühista eemaldus"
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Communication"
-msgstr ""
+msgstr "Suhtlemine"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_server_object_lines
@@ -4403,7 +4416,7 @@ msgstr "ir.server.object.lines"
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "Module %s: Invalid Quality Certificate"
-msgstr ""
+msgstr "Moodul %s: Vigane kvaliteedisertifikaat"
 
 #. module: base
 #: model:res.country,name:base.kw
@@ -4439,7 +4452,7 @@ msgstr "res.partner.event"
 #. module: base
 #: field:res.company,user_ids:0
 msgid "Accepted Users"
-msgstr ""
+msgstr "Aksepteeritud kasutajad"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4600,6 +4613,8 @@ msgid ""
 "Can not create the module file:\n"
 " %s"
 msgstr ""
+"Ei saa luua mooduli faili:\n"
+" %s"
 
 #. module: base
 #: model:ir.actions.wizard,name:base.wizard_update
@@ -4615,7 +4630,7 @@ msgstr "Jätka"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Thai / ภาษาไทย"
-msgstr ""
+msgstr "Tai / ภาษาไทย"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_property_form
@@ -4712,7 +4727,7 @@ msgstr "Objektid"
 #. module: base
 #: field:ir.model.fields,selectable:0
 msgid "Selectable"
-msgstr ""
+msgstr "Valitav"
 
 #. module: base
 #: view:res.request.link:0
@@ -4774,7 +4789,7 @@ msgstr "Saalomoni Saared"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "Ligipääsuviga"
 
 #. module: base
 #: view:res.lang:0
@@ -4903,12 +4918,12 @@ msgstr "STOCK_GO_BACK"
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "General Settings"
-msgstr ""
+msgstr "Üldised seadistused"
 
 #. module: base
 #: model:ir.ui.menu,name:base.custom_shortcuts
 msgid "Custom Shortcuts"
-msgstr ""
+msgstr "Kohandatud kiirklahvid"
 
 #. module: base
 #: model:res.country,name:base.dz
@@ -4954,7 +4969,7 @@ msgstr "Python kood"
 #: code:addons/base/module/wizard/wizard_module_import.py:0
 #, python-format
 msgid "Can not create the module file: %s !"
-msgstr ""
+msgstr "Ei saa luua mooduli faili: %s !"
 
 #. module: base
 #: model:ir.module.module,description:base.module_meta_information
@@ -4980,7 +4995,7 @@ msgstr "Tühista"
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Please specify server option --smtp-from !"
-msgstr ""
+msgstr "Palun määra serveril valik --smtp-from!"
 
 #. module: base
 #: selection:wizard.module.lang.export,format:0
@@ -5378,7 +5393,7 @@ msgstr "Aktiivsed partneri sündmused"
 #: model:ir.ui.menu,name:base.menu_partner_function_form
 #: view:res.partner.function:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "Kontaktifunktsioonid"
 
 #. module: base
 #: view:multi_company.default:0
@@ -5421,7 +5436,7 @@ msgstr "Valik"
 #. module: base
 #: field:ir.actions.act_window,search_view:0
 msgid "Search View"
-msgstr ""
+msgstr "Otsinguvaade"
 
 #. module: base
 #: field:ir.rule,domain_force:0
@@ -5531,7 +5546,7 @@ msgstr "Python toiming"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "English (US)"
-msgstr ""
+msgstr "Inglise (USA)"
 
 #. module: base
 #: field:res.partner.event,probability:0
@@ -5574,7 +5589,7 @@ msgstr "Tegevus"
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Postal Address"
-msgstr ""
+msgstr "Postiaadress"
 
 #. module: base
 #: field:res.company,parent_id:0
@@ -5719,7 +5734,7 @@ msgstr ""
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
 msgid "This error occurs on database %s"
-msgstr ""
+msgstr "See viga juhtus andmebaasis %s"
 
 #. module: base
 #: wizard_button:base.module.import,init,import:0
@@ -5773,13 +5788,13 @@ msgstr "Kaskaad"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Field %d should be a figure"
-msgstr ""
+msgstr "Väli %d peaks olema number"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_inventory_form
 #: model:ir.ui.menu,name:base.menu_action_inventory_form
 msgid "Default Company per Object"
-msgstr ""
+msgstr "Vaikimisi firma objektikohta"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -8044,73 +8059,74 @@ msgstr "Vene keel / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8120,13 +8136,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/eu.po b/bin/addons/base/i18n/eu.po
index 0598e9173ce..a5bf4a24011 100644
--- a/bin/addons/base/i18n/eu.po
+++ b/bin/addons/base/i18n/eu.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: 2010-07-13 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7939,73 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8015,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/fa.po b/bin/addons/base/i18n/fa.po
index fdb2fe97e75..0aa5c25bfbb 100644
--- a/bin/addons/base/i18n/fa.po
+++ b/bin/addons/base/i18n/fa.po
@@ -3,13 +3,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:58+0000\n"
+"PO-Revision-Date: 2010-09-09 18:36+0000\n"
 "Last-Translator: Sadegh Ismael Nattaj <nat@sethack.com>\n"
 "Language-Team: OpenERP Iran <info@openerp-iran.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
@@ -8084,73 +8084,74 @@ msgstr "روسی / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "نمی‌توانید دو کاربر با یک لاگین داشته باشید!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8160,13 +8161,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index a2b99740d52..4e1a3189281 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8082,78 +8082,78 @@ msgstr "Sri Lanka"
 msgid "Russian / русский язык"
 msgstr "Venäjä / русский язык"
 
- 
 #. module: base
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8163,13 +8163,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 9fbec3d4981..49ba7240160 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-03 07:19+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-09-16 19:03+0000\n"
+"Last-Translator: Olivier Dony (OpenERP) <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: 2010-09-04 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -34,7 +34,7 @@ msgstr "%j - Jour de l'année comme un nombre décimal [001,366]."
 #. module: base
 #: field:ir.values,meta_unpickle:0
 msgid "Metadata"
-msgstr "Métadonnées"
+msgstr "Méta-données"
 
 #. module: base
 #: field:ir.ui.view,arch:0
@@ -58,7 +58,7 @@ msgstr "Code (ex:fr__FR)"
 #: field:workflow.activity,wkf_id:0
 #: field:workflow.instance,wkf_id:0
 msgid "Workflow"
-msgstr "Processus"
+msgstr "Flux métier"
 
 #. module: base
 #: view:wizard.module.lang.export:0
@@ -74,7 +74,7 @@ msgstr "Hongrois / Magyar"
 #. module: base
 #: field:ir.actions.server,wkf_model_id:0
 msgid "Workflow On"
-msgstr "Diagramme de flux actif"
+msgstr "Flux métier sur objet"
 
 #. module: base
 #: view:ir.module.module:0
@@ -107,13 +107,11 @@ msgid ""
 "understand. You will be able to switch to the extended view later.\n"
 "            "
 msgstr ""
-"Choisir entre \"Interface Simplifée\" et \"Interface Étendue\".\n"
+"Choisissez entre \"Interface Simplifée\" et \"Interface Étendue\".\n"
 "Si vous testez ou utilisez OpenERP pour la première fois, nous vous "
-"suggerons d'utiliser\n"
-"l'interface simplifiée, qui a moins d'option et de champ mais qui sera plus "
-"facile a \n"
-"comprendre. Vous pourrez basculer ultérieurement dans la vue étendu plus "
-"tard.\n"
+"suggérons d'utiliser l'interface simplifiée, qui a moins d'options et de "
+"champs mais sera plus facile à comprendre. Vous pourrez basculer "
+"ultérieurement dans la vue étendue.\n"
 "            "
 
 #. module: base
@@ -8117,73 +8115,74 @@ msgstr "Russie / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "Vous ne pouvez pas avoir deux utilsiateurs avec le même login !"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8193,13 +8192,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/gl.po b/bin/addons/base/i18n/gl.po
index 5c077ce5b88..5d303846db7 100644
--- a/bin/addons/base/i18n/gl.po
+++ b/bin/addons/base/i18n/gl.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: 2010-07-13 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7807,12 +7807,6 @@ msgstr ""
 msgid "Seychelles"
 msgstr ""
 
-#. module: base
-#: code:addons/base/res/res_user.py:0
-#, python-format
-msgid "You can not have two users with the same login !"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.sl
 msgid "Sierra Leone"
@@ -7945,68 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
+#. module: base
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
+msgstr ""
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8016,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po
index 2426ccb5e54..40e0f35f606 100644
--- a/bin/addons/base/i18n/he.po
+++ b/bin/addons/base/i18n/he.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: 2010-07-13 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8021,73 +8021,74 @@ msgstr "רוסית / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8097,13 +8098,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 651775fa941..679d8a9bf38 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 22:15+0000\n"
+"PO-Revision-Date: 2010-09-09 07:03+0000\n"
 "Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -7984,73 +7984,74 @@ msgstr "Ruski / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8060,13 +8061,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/hu.po b/bin/addons/base/i18n/hu.po
index 7698a7a7050..4a1e1c08a53 100644
--- a/bin/addons/base/i18n/hu.po
+++ b/bin/addons/base/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7938,73 +7938,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8014,13 +8015,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/id.po b/bin/addons/base/i18n/id.po
index d7ff94230a0..27beb420c03 100644
--- a/bin/addons/base/i18n/id.po
+++ b/bin/addons/base/i18n/id.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: 2010-08-29 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7950,73 +7950,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8026,13 +8027,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/is.po b/bin/addons/base/i18n/is.po
index d816f03a2ad..c1ee9927d16 100644
--- a/bin/addons/base/i18n/is.po
+++ b/bin/addons/base/i18n/is.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: 2010-07-13 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7939,73 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8015,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index f824cbc7431..75981ae4507 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:23+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-19 17:45+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -78,7 +78,7 @@ msgstr "Flusso di lavoro per"
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
-msgstr ""
+msgstr "Viste Create"
 
 #. module: base
 #: view:workflow.activity:0
@@ -496,7 +496,7 @@ msgstr "Descrizione Modello"
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
 msgid "Trigger Expression"
-msgstr ""
+msgstr "Espressione attivatrice"
 
 #. module: base
 #: model:res.country,name:base.jo
@@ -1119,6 +1119,9 @@ msgid ""
 "consider the present one as void. Do not hesitate to contact our accounting "
 "department at (+32).81.81.37.00."
 msgstr ""
+"Se il vostro pagamento è stato effettuato prima del ricevimento di questa "
+"mail, prego considerate nullo questo avvertimento. Non esitate a contattare "
+"la nostra amministrazione al (+32).81.81.37.00."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2342,7 +2345,7 @@ msgstr "Liechtenstein"
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_ltd
 msgid "Ltd"
-msgstr "Srl"
+msgstr "Ltd"
 
 #. module: base
 #: field:res.partner,ean13:0
@@ -2610,7 +2613,7 @@ msgstr "STOCK_SAVE_AS"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "SQL Constraint"
-msgstr ""
+msgstr "Vincoli SQL"
 
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
@@ -3284,6 +3287,9 @@ msgid ""
 "\"%s\" contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
+"\"%s\" contiene troppi punti. Gli IDS XML non devono contenere punti! Questi "
+"sono usati per riferisti ad altri modelli di dato, come in: "
+"module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -3471,7 +3477,7 @@ msgstr "Indirizzi Partner"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Indonesian / Bahasa Indonesia"
-msgstr ""
+msgstr "Indonesiano / Bahasa Indonesiano"
 
 #. module: base
 #: model:res.country,name:base.cv
@@ -3858,7 +3864,7 @@ msgstr "Contratto di manutenzione"
 #. module: base
 #: help:ir.actions.server,trigger_obj_id:0
 msgid "Select the object from the model on which the workflow will executed."
-msgstr ""
+msgstr "Seleziona l'oggetto dal modello su cui il workflow verrà eseguito."
 
 #. module: base
 #: field:ir.model,state:0
@@ -3958,7 +3964,7 @@ msgstr "Messaggio"
 #. module: base
 #: field:ir.actions.act_window.view,multi:0
 msgid "On Multiple Doc."
-msgstr ""
+msgstr "Su multipli doc."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config_contact
@@ -4163,7 +4169,7 @@ msgstr "a4"
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
 msgid "Search View Ref."
-msgstr ""
+msgstr "Rif. Vista Ricerca"
 
 #. module: base
 #: view:ir.rule.group:0
@@ -4433,7 +4439,7 @@ msgstr "Annulla Disinstallazione"
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Communication"
-msgstr ""
+msgstr "Comunicazione"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_server_object_lines
@@ -4444,7 +4450,7 @@ msgstr "ir.server.object.lines"
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "Module %s: Invalid Quality Certificate"
-msgstr ""
+msgstr "Modulo %s: Certificato di qualità non valido"
 
 #. module: base
 #: model:res.country,name:base.kw
@@ -4463,6 +4469,9 @@ msgid ""
 "Keep empty to not save the printed reports. You can use a python expression "
 "with the object and time variables."
 msgstr ""
+"Questo è il nome file dell'allegato usato per immagazzinare il risultato "
+"della stampa. Lasciare vuoto per non salvare il report stampato. Puoi usare "
+"una espressione di python con l'oggetto e le variabili temporali."
 
 #. module: base
 #: model:res.country,name:base.ng
@@ -4477,7 +4486,7 @@ msgstr "res.partner.event"
 #. module: base
 #: field:res.company,user_ids:0
 msgid "Accepted Users"
-msgstr ""
+msgstr "Utenti accettati"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4487,7 +4496,7 @@ msgstr "STOCK_UNDERLINE"
 #. module: base
 #: view:ir.values:0
 msgid "Values for Event Type"
-msgstr ""
+msgstr "Valori per i Tipi di Evento"
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
@@ -4508,6 +4517,8 @@ msgstr "Hong Kong"
 #: help:ir.actions.server,name:0
 msgid "Easy to Refer action by name e.g. One Sales Order -> Many Invoices"
 msgstr ""
+"E' facile riferisti all'azione per nome es. Un ordine di vendita -> molte "
+"fatture"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_10
@@ -4522,12 +4533,12 @@ msgstr "STOCK_BOLD"
 #. module: base
 #: model:res.country,name:base.ph
 msgid "Philippines"
-msgstr ""
+msgstr "Filippine"
 
 #. module: base
 #: model:res.country,name:base.ma
 msgid "Morocco"
-msgstr ""
+msgstr "Marocco"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4579,12 +4590,12 @@ msgstr "Rapporto di Introspezione su Oggetti"
 #. module: base
 #: model:res.country,name:base.pf
 msgid "Polynesia (French)"
-msgstr ""
+msgstr "Polinesia (Francese)"
 
 #. module: base
 #: model:res.country,name:base.dm
 msgid "Dominica"
-msgstr ""
+msgstr "Repubblica Dominicana"
 
 #. module: base
 #: model:ir.model,name:base.model_res_currency_rate
@@ -4594,7 +4605,7 @@ msgstr "Valore Valuta"
 #. module: base
 #: model:res.country,name:base.np
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 #. module: base
 #: field:res.partner.event,event_ical_id:0
@@ -4638,6 +4649,8 @@ msgid ""
 "Can not create the module file:\n"
 " %s"
 msgstr ""
+"Impossibile creare il file di modulo:\n"
+" %s"
 
 #. module: base
 #: model:ir.actions.wizard,name:base.wizard_update
@@ -4653,13 +4666,13 @@ msgstr "Continua"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Thai / ภาษาไทย"
-msgstr ""
+msgstr "Thailandia"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_property_form
 #: model:ir.ui.menu,name:base.menu_ir_property_form
 msgid "Default Properties"
-msgstr ""
+msgstr "Proprietà predefinite"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -4669,7 +4682,7 @@ msgstr "Slovenian / slovenščina"
 #. module: base
 #: field:ir.actions.report.xml,attachment_use:0
 msgid "Reload from Attachment"
-msgstr ""
+msgstr "Ricarica dall'allegato"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -4750,7 +4763,7 @@ msgstr "Oggetti"
 #. module: base
 #: field:ir.model.fields,selectable:0
 msgid "Selectable"
-msgstr ""
+msgstr "Selezionabile"
 
 #. module: base
 #: view:res.request.link:0
@@ -4781,7 +4794,7 @@ msgstr "terp-stock"
 #. module: base
 #: model:res.country,name:base.ae
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Emirati Arabi Uniti"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4801,7 +4814,7 @@ msgstr "Globale"
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
-msgstr ""
+msgstr "Repubblica Ceca"
 
 #. module: base
 #: model:res.country,name:base.sb
@@ -4812,7 +4825,7 @@ msgstr "Isole Salomone"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "Errore in Accesso"
 
 #. module: base
 #: view:res.lang:0
@@ -4833,12 +4846,12 @@ msgstr "Riempimento Numero"
 #. module: base
 #: model:res.country,name:base.ua
 msgid "Ukraine"
-msgstr ""
+msgstr "Ucraina"
 
 #. module: base
 #: model:res.country,name:base.to
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_category
@@ -4849,7 +4862,7 @@ msgstr "Categoria Modulo"
 #. module: base
 #: model:res.country,name:base.us
 msgid "United States"
-msgstr ""
+msgstr "Stati Uniti d'America"
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -4859,7 +4872,7 @@ msgstr "Guida di Riferimento"
 #. module: base
 #: model:res.country,name:base.ml
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4940,22 +4953,22 @@ msgstr "STOCK_GO_BACK"
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "General Settings"
-msgstr ""
+msgstr "Impostazioni generali"
 
 #. module: base
 #: model:ir.ui.menu,name:base.custom_shortcuts
 msgid "Custom Shortcuts"
-msgstr ""
+msgstr "Scorciatoie personalizzate"
 
 #. module: base
 #: model:res.country,name:base.dz
 msgid "Algeria"
-msgstr ""
+msgstr "Algeria"
 
 #. module: base
 #: model:res.country,name:base.be
 msgid "Belgium"
-msgstr ""
+msgstr "Belgio"
 
 #. module: base
 #: field:ir.translation,lang:0
@@ -4970,7 +4983,7 @@ msgstr "Lingua"
 #. module: base
 #: model:res.country,name:base.gm
 msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_company_form
@@ -4991,7 +5004,7 @@ msgstr "Codice Python"
 #: code:addons/base/module/wizard/wizard_module_import.py:0
 #, python-format
 msgid "Can not create the module file: %s !"
-msgstr ""
+msgstr "Impossibile creare il file del modulo: %s !"
 
 #. module: base
 #: model:ir.module.module,description:base.module_meta_information
@@ -5017,7 +5030,7 @@ msgstr "Annulla"
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Please specify server option --smtp-from !"
-msgstr ""
+msgstr "Per favore specificare l'opzione server --smtp-from !"
 
 #. module: base
 #: selection:wizard.module.lang.export,format:0
@@ -5063,7 +5076,7 @@ msgstr "Versione Pubblicata"
 #. module: base
 #: model:res.country,name:base.is
 msgid "Iceland"
-msgstr ""
+msgstr "Islanda"
 
 #. module: base
 #: view:res.users:0
@@ -5074,7 +5087,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
-msgstr ""
+msgstr "Germania"
 
 #. module: base
 #: view:ir.sequence:0
@@ -5117,7 +5130,7 @@ msgstr "Ricorda di uscire e rientrare se hai cambiato la password"
 #. module: base
 #: model:res.country,name:base.gy
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -5142,18 +5155,20 @@ msgstr "Creato Id"
 #. module: base
 #: model:res.country,name:base.hn
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #. module: base
 #: model:res.country,name:base.eg
 msgid "Egypt"
-msgstr ""
+msgstr "Egitto"
 
 #. module: base
 #: help:ir.actions.server,model_id:0
 msgid ""
 "Select the object on which the action will work (read, write, create)."
 msgstr ""
+"Seleziona l'oggetto sul quale l'azione dovrà lavorare (lettura, scrittura, "
+"creazione)."
 
 #. module: base
 #: view:ir.model:0
@@ -5192,7 +5207,7 @@ msgstr "Da installare"
 #: model:ir.module.module,shortdesc:base.module_meta_information
 #: field:res.currency,base:0
 msgid "Base"
-msgstr ""
+msgstr "Base"
 
 #. module: base
 #: model:res.country,name:base.lr
@@ -5231,7 +5246,7 @@ msgstr "Imposta"
 #. module: base
 #: model:res.country,name:base.mc
 msgid "Monaco"
-msgstr ""
+msgstr "Principato di Monaco"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -5263,12 +5278,12 @@ msgstr "Crea"
 #. module: base
 #: field:ir.exports,export_fields:0
 msgid "Export ID"
-msgstr ""
+msgstr "ID esportazione"
 
 #. module: base
 #: model:res.country,name:base.fr
 msgid "France"
-msgstr ""
+msgstr "Francia"
 
 #. module: base
 #: field:workflow.activity,flow_stop:0
@@ -5278,18 +5293,18 @@ msgstr "Arresta Flusso"
 #. module: base
 #: model:res.country,name:base.ar
 msgid "Argentina"
-msgstr ""
+msgstr "Argentina"
 
 #. module: base
 #: model:res.country,name:base.af
 msgid "Afghanistan, Islamic State of"
-msgstr ""
+msgstr "Stato islamico dell'Afghanistan"
 
 #. module: base
 #: code:addons/base/module/wizard/wizard_module_import.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Errore !"
 
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field_contry
@@ -5326,7 +5341,7 @@ msgstr "Separatore delle migliaia"
 #. module: base
 #: field:res.request,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Data di Creazione"
 
 #. module: base
 #: selection:ir.report.custom,type:0
@@ -5339,6 +5354,8 @@ msgid ""
 "Select the action that will be executed. Loop action will not be avaliable "
 "inside loop."
 msgstr ""
+"Scegli l'azione che verrà eseguita. Azioni ricorsive non saranno disponibili "
+"dentro il ciclo."
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -5378,7 +5395,7 @@ msgstr "Azienda"
 #. module: base
 #: model:res.country,name:base.pa
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 #. module: base
 #: selection:ir.report.custom,state:0
@@ -5411,12 +5428,12 @@ msgstr "Eventi Partner Attivi"
 #: model:ir.ui.menu,name:base.menu_partner_function_form
 #: view:res.partner.function:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "Funzioni Contatto"
 
 #. module: base
 #: view:multi_company.default:0
 msgid "Multi Company"
-msgstr ""
+msgstr "Multi Azienda"
 
 #. module: base
 #: view:ir.sequence:0
@@ -5426,7 +5443,7 @@ msgstr "Giorno dell'anno: %(doy)s"
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
-msgstr ""
+msgstr "Zona neutrale"
 
 #. module: base
 #: view:ir.model:0
@@ -5454,7 +5471,7 @@ msgstr "Selezione"
 #. module: base
 #: field:ir.actions.act_window,search_view:0
 msgid "Search View"
-msgstr ""
+msgstr "Vista di Ricerca"
 
 #. module: base
 #: field:ir.rule,domain_force:0
@@ -5465,6 +5482,7 @@ msgstr "Forza Dominio"
 #: help:ir.sequence,weight:0
 msgid "If two sequences match, the highest weight will be used."
 msgstr ""
+"se due sequenze soddisfano, quella col peso maggiore sarà utilizzata."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_attachment
@@ -5519,12 +5537,12 @@ msgstr "Città"
 #. module: base
 #: model:res.country,name:base.qa
 msgid "Qatar"
-msgstr ""
+msgstr "Qatar"
 
 #. module: base
 #: model:res.country,name:base.it
 msgid "Italy"
-msgstr ""
+msgstr "Italia"
 
 #. module: base
 #: selection:ir.rule,operator:0
@@ -5554,7 +5572,7 @@ msgstr "GPL-3 o versione successiva"
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "HTML from HTML(Mako)"
-msgstr ""
+msgstr "HTML da HTML (MAKO)"
 
 #. module: base
 #: field:workflow.activity,action:0
@@ -5564,7 +5582,7 @@ msgstr "Puthon Attivo"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "English (US)"
-msgstr ""
+msgstr "Inglese Americano (U.S.A.)"
 
 #. module: base
 #: field:res.partner.event,probability:0
@@ -5607,7 +5625,7 @@ msgstr "Attività"
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Postal Address"
-msgstr ""
+msgstr "Indirizzo postale"
 
 #. module: base
 #: field:res.company,parent_id:0
@@ -5622,7 +5640,7 @@ msgstr "Valore"
 #. module: base
 #: model:res.country,name:base.cg
 msgid "Congo"
-msgstr ""
+msgstr "Congo"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_exports_line
@@ -5675,6 +5693,8 @@ msgid ""
 "Object in which you want to create / write the object. If it is empty then "
 "refer to the Object field."
 msgstr ""
+"Oggetto nel quale vuoi creare/scrivere l'oggetto. Se vuoto allora si "
+"riferisce al campo oggetto."
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -5685,7 +5705,7 @@ msgstr "Non installato"
 #. module: base
 #: field:workflow.activity,out_transitions:0
 msgid "Outgoing Transitions"
-msgstr ""
+msgstr "Transizioni in Uscita"
 
 #. module: base
 #: field:ir.ui.menu,icon:0
@@ -5713,7 +5733,7 @@ msgstr "Richieste"
 #. module: base
 #: model:res.country,name:base.ye
 msgid "Yemen"
-msgstr ""
+msgstr "Yemen"
 
 #. module: base
 #: selection:workflow.activity,split_mode:0
@@ -5723,17 +5743,17 @@ msgstr "Or"
 #. module: base
 #: model:res.country,name:base.pk
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistan"
 
 #. module: base
 #: model:res.country,name:base.al
 msgid "Albania"
-msgstr ""
+msgstr "Albania"
 
 #. module: base
 #: model:res.country,name:base.ws
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #. module: base
 #: field:ir.ui.menu,child_id:0
@@ -5744,13 +5764,13 @@ msgstr "ID dipendenti"
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Problem in configuration `Record Id` in Server Action!"
-msgstr ""
+msgstr "Problema nella configurazione 'Record Id' nell'azione del Server!"
 
 #. module: base
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
 msgid "This error occurs on database %s"
-msgstr ""
+msgstr "Questo errore è avvenuto sul database %s"
 
 #. module: base
 #: wizard_button:base.module.import,init,import:0
@@ -5767,7 +5787,7 @@ msgstr "STOCK_DISCONNECT"
 #. module: base
 #: model:res.country,name:base.la
 msgid "Laos"
-msgstr ""
+msgstr "Laos"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -5783,7 +5803,7 @@ msgstr "Risincronizza i termini"
 #. module: base
 #: model:res.country,name:base.tg
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #. module: base
 #: selection:workflow.activity,kind:0
@@ -5804,13 +5824,13 @@ msgstr "A Cascata"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Field %d should be a figure"
-msgstr ""
+msgstr "Il campo %d dovrebbe essere una figura"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_inventory_form
 #: model:ir.ui.menu,name:base.menu_action_inventory_form
 msgid "Default Company per Object"
-msgstr ""
+msgstr "Azienda Predefinita per Oggetto"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -5825,7 +5845,7 @@ msgstr "Commento"
 #. module: base
 #: model:res.country,name:base.ro
 msgid "Romania"
-msgstr ""
+msgstr "Romania"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -5879,7 +5899,7 @@ msgstr "Inizia Installazione"
 #. module: base
 #: help:res.lang,code:0
 msgid "This field is used to set/get locales for user"
-msgstr ""
+msgstr "Questo campo è usato per impostare/leggere fuso locale per utente"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_2
@@ -5923,7 +5943,7 @@ msgstr "Utente"
 #. module: base
 #: model:res.country,name:base.pr
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Porto Rico"
 
 #. module: base
 #: code:addons/base/res/res_currency.py:0
@@ -5933,6 +5953,9 @@ msgid ""
 "' \\n                    'for the currency: %s \n"
 "' \\n                    'at the date: %s"
 msgstr ""
+"Nessun tasso trovato \n"
+"'\\n' per valuta: %s \n"
+"'\\n' alla data: %s"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -5948,7 +5971,7 @@ msgstr "Filtro"
 #. module: base
 #: model:res.country,name:base.ch
 msgid "Switzerland"
-msgstr ""
+msgstr "Svizzera"
 
 #. module: base
 #: model:res.country,name:base.gd
@@ -5984,7 +6007,7 @@ msgstr "Aggiornamento di Sistema Completato"
 #. module: base
 #: model:res.country,name:base.so
 msgid "Somalia"
-msgstr ""
+msgstr "Somalia"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_simple_view_form
@@ -6038,7 +6061,7 @@ msgstr "Nome Report"
 #. module: base
 #: field:ir.module.module,shortdesc:0
 msgid "Short Description"
-msgstr ""
+msgstr "Descrizione breve"
 
 #. module: base
 #: field:res.partner.event,partner_type:0
@@ -6058,7 +6081,7 @@ msgstr "Formato Orario 00->24: %(h24)s"
 #. module: base
 #: help:multi_company.default,field_id:0
 msgid "Select field property"
-msgstr ""
+msgstr "Seleziona la propietà del campo"
 
 #. module: base
 #: field:res.request.history,date_sent:0
@@ -6087,12 +6110,12 @@ msgstr "Sequenza"
 #. module: base
 #: model:res.country,name:base.tn
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunisia"
 
 #. module: base
 #: field:ir.actions.wizard,name:0
 msgid "Wizard Info"
-msgstr ""
+msgstr "Informazioni procedura guidata"
 
 #. module: base
 #: help:ir.cron,numbercall:0
@@ -6128,7 +6151,7 @@ msgstr "Propensioni"
 #: model:ir.actions.act_window,name:base.action_country_state
 #: model:ir.ui.menu,name:base.menu_country_state_partner
 msgid "Fed. States"
-msgstr ""
+msgstr "Stati Federali"
 
 #. module: base
 #: view:ir.model:0
@@ -6149,7 +6172,7 @@ msgstr "Superiore"
 #. module: base
 #: view:multi_company.default:0
 msgid "Returning"
-msgstr ""
+msgstr "Sto ritornando"
 
 #. module: base
 #: field:ir.actions.act_window,res_model:0
@@ -6230,7 +6253,7 @@ msgstr "Tabulare"
 #. module: base
 #: field:ir.actions.todo,start_on:0
 msgid "Start On"
-msgstr ""
+msgstr "Inizio a"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_5
@@ -6304,7 +6327,7 @@ msgstr "Tutti i Termini"
 #. module: base
 #: model:res.country,name:base.no
 msgid "Norway"
-msgstr ""
+msgstr "Norvegia"
 
 #. module: base
 #: view:res.lang:0
@@ -6353,6 +6376,8 @@ msgid ""
 "If set to true, the wizard will not be displayed on the right toolbar of a "
 "form view."
 msgstr ""
+"Se impostato a vero, la procedura guidata non verrà visualizzata nella barra "
+"degli strumenti a destra nella vista: modulo."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -6421,18 +6446,18 @@ msgstr "SMS"
 #. module: base
 #: model:res.country,name:base.cr
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 #. module: base
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
 msgid "Your can't submit bug reports due to uncovered modules: %s"
-msgstr ""
+msgstr "Non puoi sottoporre report di errori dovuto a moduli non coperti: %s"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_other_form
 msgid "Other Partners"
-msgstr ""
+msgstr "Altri Partner"
 
 #. module: base
 #: view:ir.model:0
@@ -6460,7 +6485,7 @@ msgstr "Deseleziona il campo attivo per nascondere il contatto."
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
-msgstr ""
+msgstr "Danimarca"
 
 #. module: base
 #: field:res.country,code:0
@@ -6485,12 +6510,12 @@ msgstr "Signora"
 #. module: base
 #: model:res.country,name:base.ee
 msgid "Estonia"
-msgstr ""
+msgstr "Estonia"
 
 #. module: base
 #: model:res.country,name:base.nl
 msgid "Netherlands"
-msgstr ""
+msgstr "Olanda"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_4
@@ -6520,7 +6545,7 @@ msgstr "STOCK_ZOOM_FIT"
 #. module: base
 #: model:res.country,name:base.cd
 msgid "Congo, The Democratic Republic of the"
-msgstr ""
+msgstr "Repubblica Democratica del Congo"
 
 #. module: base
 #: view:res.request:0
@@ -6532,12 +6557,12 @@ msgstr "Richiesta"
 #. module: base
 #: model:res.country,name:base.jp
 msgid "Japan"
-msgstr ""
+msgstr "Giappone"
 
 #. module: base
 #: field:ir.cron,numbercall:0
 msgid "Number of Calls"
-msgstr ""
+msgstr "Numero di chiamate"
 
 #. module: base
 #: wizard_view:module.lang.install,start:0
@@ -6577,7 +6602,7 @@ msgstr "Aggiungi Intestazione RML"
 #. module: base
 #: model:res.country,name:base.gr
 msgid "Greece"
-msgstr ""
+msgstr "Grecia"
 
 #. module: base
 #: field:res.request,trigger_date:0
@@ -6597,7 +6622,7 @@ msgstr "STOCK_GO_FORWARD"
 #. module: base
 #: help:ir.actions.server,code:0
 msgid "Python code to be executed"
-msgstr ""
+msgstr "Codice python da eseguire"
 
 #. module: base
 #: selection:ir.module.module.dependency,state:0
@@ -6607,7 +6632,7 @@ msgstr "Disinstallabile"
 #. module: base
 #: view:res.partner.category:0
 msgid "Partner Category"
-msgstr ""
+msgstr "Categoria Partner"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -6740,12 +6765,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.nc
 msgid "New Caledonia (French)"
-msgstr ""
+msgstr "Nuova Caledonia (Francese)"
 
 #. module: base
 #: field:res.partner.function,name:0
 msgid "Function Name"
-msgstr ""
+msgstr "Nome funzione"
 
 #. module: base
 #: view:maintenance.contract.wizard:0
@@ -6755,7 +6780,7 @@ msgstr "_Annulla"
 #. module: base
 #: model:res.country,name:base.cy
 msgid "Cyprus"
-msgstr ""
+msgstr "Cipro"
 
 #. module: base
 #: field:ir.actions.server,subject:0
@@ -6794,18 +6819,18 @@ msgstr "Transizioni in Ingresso"
 #. module: base
 #: model:res.country,name:base.cn
 msgid "China"
-msgstr ""
+msgstr "Cina"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Password empty !"
-msgstr ""
+msgstr "Manca la Password !"
 
 #. module: base
 #: model:res.country,name:base.eh
 msgid "Western Sahara"
-msgstr ""
+msgstr "Sahara Occidentale"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow
@@ -6815,7 +6840,7 @@ msgstr "Workflow"
 #. module: base
 #: model:res.country,name:base.id
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonesia"
 
 #. module: base
 #: selection:ir.actions.todo,start_on:0
@@ -6830,12 +6855,12 @@ msgstr "Scrivi Oggetto"
 #. module: base
 #: model:res.country,name:base.bg
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgaria"
 
 #. module: base
 #: model:res.country,name:base.ao
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -6913,7 +6938,7 @@ msgstr "child_of"
 #: view:res.users:0
 #: field:res.users,company_ids:0
 msgid "Accepted Companies"
-msgstr ""
+msgstr "Aziende accettate"
 
 #. module: base
 #: field:ir.report.custom.fields,operation:0
@@ -6935,7 +6960,7 @@ msgstr "Kiribati"
 #. module: base
 #: model:res.country,name:base.iq
 msgid "Iraq"
-msgstr ""
+msgstr "Iraq"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -7024,7 +7049,7 @@ msgstr "Condizione"
 #. module: base
 #: model:res.country,name:base.zr
 msgid "Zaire"
-msgstr ""
+msgstr "Zaire"
 
 #. module: base
 #: field:ir.attachment,res_id:0
@@ -7089,7 +7114,7 @@ msgstr "Termini non tradotti"
 #. module: base
 #: wizard_view:module.lang.import,init:0
 msgid "Import New Language"
-msgstr ""
+msgstr "Importa nuova lingua"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_activity_form
@@ -7117,7 +7142,7 @@ msgstr "="
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Second field should be figures"
-msgstr ""
+msgstr "Il secondo campo dovrebbe contenere figure"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_grid_security
@@ -7141,7 +7166,7 @@ msgstr "Alta"
 #. module: base
 #: field:ir.exports.line,export_id:0
 msgid "Export"
-msgstr ""
+msgstr "Esporta"
 
 #. module: base
 #: help:res.bank,bic:0
@@ -7151,7 +7176,7 @@ msgstr "Codice Identificazione Banca"
 #. module: base
 #: model:res.country,name:base.tm
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenistan"
 
 #. module: base
 #: model:res.country,name:base.pm
@@ -7196,12 +7221,12 @@ msgstr "STOCK_CONVERT"
 #. module: base
 #: model:res.country,name:base.tz
 msgid "Tanzania"
-msgstr ""
+msgstr "Tanzania"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Danish / Dansk"
-msgstr ""
+msgstr "Danese / Danimarca"
 
 #. module: base
 #: model:res.country,name:base.cx
@@ -7273,6 +7298,8 @@ msgid ""
 "Save this document to a .tgz file. This archive containt UTF-8 %s files and "
 "may be uploaded to launchpad."
 msgstr ""
+"Salva questo documento come file .tgz. Questo archivio contiene %s file UTF-"
+"8 e può essere inviato a Launchpad."
 
 #. module: base
 #: wizard_button:module.upgrade,end,config:0
@@ -7288,7 +7315,7 @@ msgstr "Catalan / Català"
 #. module: base
 #: model:res.country,name:base.do
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Repubblica Dominicana"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7298,13 +7325,13 @@ msgstr "STOCK_COLOR_PICKER"
 #. module: base
 #: model:res.country,name:base.sa
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Arabia Saudita"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Bar charts need at least two fields"
-msgstr ""
+msgstr "I Grafici a Barre necessitano di almeno due campi"
 
 #. module: base
 #: help:res.partner,supplier:0
@@ -7329,7 +7356,7 @@ msgstr "Istanza Destinazione"
 #. module: base
 #: field:ir.actions.wizard,multi:0
 msgid "Action on Multiple Doc."
-msgstr ""
+msgstr "Azione su doc. multipli"
 
 #. module: base
 #: view:wizard.module.lang.export:0
@@ -7349,12 +7376,12 @@ msgstr "Percorso XML"
 #. module: base
 #: model:res.country,name:base.gn
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 #. module: base
 #: model:res.country,name:base.lu
 msgid "Luxembourg"
-msgstr ""
+msgstr "Lussemburgo"
 
 #. module: base
 #: model:ir.actions.todo,note:base.config_wizard_step_user
@@ -7377,7 +7404,7 @@ msgstr "Bassa"
 #. module: base
 #: view:ir.values:0
 msgid "tree_but_action, client_print_multi"
-msgstr ""
+msgstr "tree_but_action, client_print_multi"
 
 #. module: base
 #: model:res.country,name:base.sv
@@ -7398,7 +7425,7 @@ msgstr "Menu Accesso"
 #. module: base
 #: model:res.country,name:base.th
 msgid "Thailand"
-msgstr ""
+msgstr "Thailandia"
 
 #. module: base
 #: selection:ir.report.custom.fields,fc0_op:0
@@ -7416,7 +7443,7 @@ msgstr "Permesso di cancellazione"
 #. module: base
 #: model:ir.model,name:base.model_multi_company_default
 msgid "multi_company.default"
-msgstr ""
+msgstr "multi_company.default"
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
@@ -7445,7 +7472,7 @@ msgstr "<"
 #. module: base
 #: model:res.country,name:base.uz
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistan"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window
@@ -7456,12 +7483,12 @@ msgstr "ir.actions.act_window"
 #. module: base
 #: model:res.country,name:base.vi
 msgid "Virgin Islands (USA)"
-msgstr ""
+msgstr "Isole Vergini (Stati Uniti d'America)"
 
 #. module: base
 #: model:res.country,name:base.tw
 msgid "Taiwan"
-msgstr ""
+msgstr "Taiwan"
 
 #. module: base
 #: view:ir.rule:0
@@ -7570,7 +7597,7 @@ msgstr "Accesso"
 #. module: base
 #: model:res.country,name:base.sk
 msgid "Slovak Republic"
-msgstr ""
+msgstr "Repubblica Slovacca"
 
 #. module: base
 #: model:res.country,name:base.aw
@@ -7612,7 +7639,7 @@ msgstr "Aggiungere il contratto di manutenzione"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Vietnam / Cộng hòa xã hội chủ nghĩa Việt Nam"
-msgstr ""
+msgstr "Vietnam / Cộng hòa xã hội chủ nghĩa Việt Nam"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
@@ -7628,7 +7655,7 @@ msgstr "Flusso di lavoro da eseguire su questo modello."
 #. module: base
 #: model:res.country,name:base.jm
 msgid "Jamaica"
-msgstr ""
+msgstr "Giamaica"
 
 #. module: base
 #: model:res.country,name:base.az
@@ -7654,7 +7681,7 @@ msgstr "Gibilterra"
 #. module: base
 #: model:res.country,name:base.vg
 msgid "Virgin Islands (British)"
-msgstr ""
+msgstr "Isole Vergini (Gran Bretagna)"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7674,7 +7701,7 @@ msgstr "Wallis e Fortuna"
 #. module: base
 #: model:res.country,name:base.rw
 msgid "Rwanda"
-msgstr ""
+msgstr "Ruanda"
 
 #. module: base
 #: constraint:res.partner:0
@@ -7703,6 +7730,9 @@ msgid ""
 "invoice, then `object.invoice_address_id.mobile` is the field which gives "
 "the correct mobile number"
 msgstr ""
+"Fornisce campi che possono essere usati per reperire il numero di celluare, "
+"ad esempio: seleziona la fattura, poi 'object.invoice_address_id.mobile' è "
+"il campo che da il corretto numero di cellulare"
 
 #. module: base
 #: field:ir.model.data,noupdate:0
@@ -7712,12 +7742,12 @@ msgstr "Non Aggiornabile"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Klingon"
-msgstr ""
+msgstr "Klingon"
 
 #. module: base
 #: model:res.country,name:base.sg
 msgid "Singapore"
-msgstr ""
+msgstr "Singapore"
 
 #. module: base
 #: selection:ir.actions.act_window,target:0
@@ -7854,7 +7884,7 @@ msgstr "Procedure di Configurazione"
 #. module: base
 #: field:res.lang,code:0
 msgid "Locale Code"
-msgstr ""
+msgstr "Codice Locale"
 
 #. module: base
 #: field:workflow.activity,split_mode:0
@@ -7874,7 +7904,7 @@ msgstr "Interfaccia Semplice"
 #. module: base
 #: model:res.country,name:base.cl
 msgid "Chile"
-msgstr ""
+msgstr "Cile"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7912,7 +7942,7 @@ msgstr "Salva come Prefisso Allegato"
 #. module: base
 #: model:res.country,name:base.hr
 msgid "Croatia"
-msgstr ""
+msgstr "Croazia"
 
 #. module: base
 #: field:ir.actions.server,mobile:0
@@ -7947,7 +7977,7 @@ msgstr "Seychelles"
 #. module: base
 #: model:res.country,name:base.sl
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
 
 #. module: base
 #: view:res.company:0
@@ -8013,12 +8043,12 @@ msgstr "Istanze Workflow"
 #: code:addons/base/res/partner/partner.py:0
 #, python-format
 msgid "Partners: "
-msgstr ""
+msgstr "Partners: "
 
 #. module: base
 #: model:res.country,name:base.kp
 msgid "North Korea"
-msgstr ""
+msgstr "Corea del Nord"
 
 #. module: base
 #: view:ir.report.custom:0
@@ -8048,7 +8078,7 @@ msgstr "Polish / Język polski"
 #. module: base
 #: field:ir.exports,name:0
 msgid "Export Name"
-msgstr ""
+msgstr "Nome esportato"
 
 #. module: base
 #: help:res.partner.address,type:0
@@ -8067,7 +8097,7 @@ msgstr "Scegli una lingua da installare"
 #. module: base
 #: model:res.country,name:base.lk
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -8077,97 +8107,114 @@ msgstr "Russian / русский язык"
 #. module: base
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
-msgstr ""
- 
+msgstr "Non puoi avere due utenti con lo stesso nome di accesso!"
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
-msgstr ""
- 
+msgstr "La dimensione del campo non può mai essere minore a 1 !"
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
-msgstr ""
- 
+msgstr "Il collegamento per questo menù esiste già!"
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+"Non puoi avere record multipli con lo stesso ID per lo stesso modulo!"
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
-msgstr ""
- 
+msgstr "Il tuo contratto di manutenzione è già sottoscritto nel sistema!"
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
-msgstr ""
- 
+msgstr "Il nome del modulo deve essere unico!"
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
-msgstr ""
- 
+msgstr "L'ID del certificato del modulo deve essere unico!"
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
-msgstr ""
- 
+msgstr "Il codice della funzione Partner deve essere unica!"
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
-msgstr ""
- 
+msgstr "Il nome del Partner deve esser unico!"
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
- 
+msgstr "Il nome della nazione deve essere unico!"
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
- 
+msgstr "Il codice della Nazione deve essere unico!"
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
-msgstr ""
- 
+msgstr "Il nome della lingua deve essere unico!"
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
-msgstr ""
- 
+msgstr "Il codice della lingua deve essere unico!"
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
-msgstr ""
- 
+msgstr "Il nome del gruppo deve essere unico!"
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "Errore nei Vincoli"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
+"L'operazione non può essere completata, probabilmente in seguito a:\n"
+"- cancellazione: stai cercando di cancellare un record mentra altri record "
+"sono referenziati a esso\n"
+"- creazione/aggiornamento: un campo obbligatorio deve essere correttamente "
+"impostato"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
+"\n"
+"\n"
+"[oggetto con referenza: %s - %s]"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Integrity Error"
-msgstr ""
+msgstr "Errore di integrità"
 
 #~ msgid "Attached ID"
 #~ msgstr "ID Allegato"
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index d63110985cb..9854b3d9c55 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:43+0000\n"
+"PO-Revision-Date: 2010-09-09 06:58+0000\n"
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7941,73 +7941,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8017,13 +8018,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ko.po b/bin/addons/base/i18n/ko.po
index 005f565f675..e8d4f6df07e 100644
--- a/bin/addons/base/i18n/ko.po
+++ b/bin/addons/base/i18n/ko.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: 2010-07-13 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7980,73 +7980,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8056,13 +8057,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/lt.po b/bin/addons/base/i18n/lt.po
index b1587b12873..5cb44432d4e 100644
--- a/bin/addons/base/i18n/lt.po
+++ b/bin/addons/base/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7938,75 +7938,101 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Constraint Error"
 msgstr ""
+
+#. module: base
+#: code:addons/osv/osv.py:0
+#, python-format
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
+msgstr ""
+
+#. module: base
+#: code:addons/osv/osv.py:0
+#, python-format
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
+msgstr ""
+
+#. module: base
+#: code:addons/osv/osv.py:0
+#, python-format
+msgid "Integrity Error"
+msgstr ""
diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po
index e27d60fa081..b731641cfa7 100644
--- a/bin/addons/base/i18n/lv.po
+++ b/bin/addons/base/i18n/lv.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: 2010-07-13 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8075,73 +8075,74 @@ msgstr "Krievu / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8151,13 +8152,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po
index ec489b19ee6..521063fcfbe 100644
--- a/bin/addons/base/i18n/mn.po
+++ b/bin/addons/base/i18n/mn.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:12+0000\n"
+"PO-Revision-Date: 2010-09-13 08:00+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\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: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
 msgid "Saint Helena"
-msgstr ""
+msgstr "Сэйнт Хелена"
 
 #. module: base
 #: wizard_view:res.partner.sms_send,init:0
@@ -369,7 +369,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.gf
 msgid "French Guyana"
-msgstr ""
+msgstr "Франц Гуана"
 
 #. module: base
 #: field:ir.ui.view.custom,ref_id:0
@@ -534,7 +534,7 @@ msgstr "Нэмэлт Тайлан"
 #. module: base
 #: selection:ir.report.custom,type:0
 msgid "Bar Chart"
-msgstr ""
+msgstr "Баганан диаграм"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -559,7 +559,7 @@ msgstr "Визард харагдац"
 #. module: base
 #: model:res.country,name:base.kh
 msgid "Cambodia, Kingdom of"
-msgstr ""
+msgstr "Камбож, Хаант улс"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -577,7 +577,7 @@ msgstr "STOCK_DIALOG_QUESTION"
 #. module: base
 #: model:res.country,name:base.pg
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Папуа Шинэ Гвиней"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
@@ -624,7 +624,7 @@ msgstr "Төлбөрийн нөхцөл"
 #. module: base
 #: model:res.country,name:base.nu
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -701,7 +701,7 @@ msgstr "STOCK_FILE"
 #. module: base
 #: model:res.country,name:base.gu
 msgid "Guam (USA)"
-msgstr ""
+msgstr "Гуам (USA)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_grid
@@ -774,7 +774,7 @@ msgstr "Негр"
 #. module: base
 #: model:res.country,name:base.ba
 msgid "Bosnia-Herzegovina"
-msgstr ""
+msgstr "Босни-Герцоговин"
 
 #. module: base
 #: field:ir.report.custom.fields,alignment:0
@@ -973,7 +973,7 @@ msgstr "Тайлангууд"
 #. module: base
 #: field:workflow,on_create:0
 msgid "On Create"
-msgstr ""
+msgstr "Үүсгэх үед"
 
 #. module: base
 #: wizard_view:base.module.import,init:0
@@ -1295,7 +1295,7 @@ msgstr "Испани"
 #. module: base
 #: field:res.company,logo:0
 msgid "Logo"
-msgstr "Эмблем"
+msgstr "Лого"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1415,6 +1415,9 @@ msgid ""
 "order in Object, and you can have loop on the sales order line. Expression = "
 "`object.order_line`."
 msgstr ""
+"Жагсаалт гаргах талбар эсвэл илэрхийлэл бичнэ. Жнь. Object дээр борлуулалтын "
+"захиалгыг сонговол борлуулалтын захиалгын мөрүүдээр гүйх боломжтой болно. "
+"Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -1811,7 +1814,7 @@ msgstr "Австри"
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Calendar"
-msgstr "Хуанли"
+msgstr "Календар"
 
 #. module: base
 #: field:workflow.activity,signal_send:0
@@ -2164,7 +2167,7 @@ msgstr "Оросын холбооны улс"
 #. module: base
 #: field:res.company,name:0
 msgid "Company Name"
-msgstr "Компаны нэр"
+msgstr "Компанийн нэр"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_roles_form
@@ -2214,6 +2217,10 @@ msgid ""
 "- The second parenthesis must match the whole version number.\n"
 "- The last parenthesis must match the extension of the module."
 msgstr ""
+"Кодын сайт дээр модуль хайх регуляр илэрхийлэл:\n"
+"- Эхний хаалт нь модулийг заана.\n"
+"- Хоёр дахь хаалт нь хувилбарын дугаарыг заана.\n"
+"- Сүүлийн хаалт нь модулийн өргөтгөлийг заана."
 
 #. module: base
 #: view:res.lang:0
@@ -2229,7 +2236,7 @@ msgstr "Тажикстан"
 #: model:ir.actions.act_window,name:base.act_values_form_action
 #: model:ir.ui.menu,name:base.menu_values_form_action
 msgid "Connect Actions To Client Events"
-msgstr ""
+msgstr "Үйлдлүүдийг клиент үзэгдлүүдтэй холбох"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -2341,7 +2348,7 @@ msgstr "Португаль"
 #. module: base
 #: selection:maintenance.contract,state:0
 msgid "Unvalid"
-msgstr ""
+msgstr "Буруу"
 
 #. module: base
 #: field:ir.module.module,certificate:0
@@ -2447,7 +2454,7 @@ msgstr "Нөхцөл"
 #: selection:ir.values,key:0
 #: selection:res.partner.address,type:0
 msgid "Default"
-msgstr ""
+msgstr "Өгөгдмөл"
 
 #. module: base
 #: field:ir.model.fields,required:0
@@ -2494,7 +2501,7 @@ msgstr "Хэлний нэр"
 #. module: base
 #: model:res.country,name:base.va
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Холи Сий (Ватикан хот улс)"
 
 #. module: base
 #: help:ir.actions.server,condition:0
@@ -2556,7 +2563,7 @@ msgstr "Банкны данс"
 #. module: base
 #: view:ir.sequence.type:0
 msgid "Sequence Type"
-msgstr ""
+msgstr "Дугаарлалтын төрөл"
 
 #. module: base
 #: code:addons/base/module/module.py:0
@@ -2691,7 +2698,7 @@ msgstr "wizard.module.update_translations"
 #: view:wizard.ir.model.menu.create:0
 #: field:wizard.ir.model.menu.create,view_ids:0
 msgid "Views"
-msgstr ""
+msgstr "Дэлгэцүүд"
 
 #. module: base
 #: view:res.groups:0
@@ -2732,7 +2739,7 @@ msgstr "Ажлын урсгалууд"
 #: model:ir.actions.act_window,name:base.action_config_wizard_form
 #: model:ir.ui.menu,name:base.menu_config_module
 msgid "Configuration Wizard"
-msgstr ""
+msgstr "Тохиргооны визард"
 
 #. module: base
 #: model:ir.model,name:base.model_res_roles
@@ -2803,7 +2810,7 @@ msgstr "NULL болгох"
 #: field:res.partner.event,som:0
 #: field:res.partner.som,name:0
 msgid "State of Mind"
-msgstr ""
+msgstr "Нөхцөл байдал"
 
 #. module: base
 #: model:res.country,name:base.bj
@@ -2813,7 +2820,7 @@ msgstr "Бенин"
 #. module: base
 #: view:ir.rule.group:0
 msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
+msgstr "Бүх шалгалтыг давбал дүрэм хангагдана"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2843,7 +2850,7 @@ msgstr "RML толгой"
 #. module: base
 #: wizard_field:res.partner.sms_send,init,app_id:0
 msgid "API ID"
-msgstr ""
+msgstr "API ID"
 
 #. module: base
 #: model:res.country,name:base.mu
@@ -2912,7 +2919,7 @@ msgstr "Дараагийн дугаар"
 #: view:res.currency:0
 #: field:res.currency,rate_ids:0
 msgid "Rates"
-msgstr "Харьцаанууд"
+msgstr "Ханшууд"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -2982,13 +2989,13 @@ msgstr "Өгөгдөл"
 #. module: base
 #: view:res.users:0
 msgid "Groups are used to defined access rights on each screen and menu."
-msgstr ""
+msgstr "Групп нь дэлгэц, цэснүүдэд хандах эрхийг тохируулахад хэрэглэгдэнэ."
 
 #. module: base
 #: field:ir.ui.menu,parent_id:0
 #: field:wizard.ir.model.menu.create,menu_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Толгой цэс"
 
 #. module: base
 #: help:ir.actions.act_window.view,multi:0
@@ -2998,6 +3005,7 @@ msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
 "form view."
 msgstr ""
+"Хэрэв чагт тавибал уг үйлдэл дэлгэцийн баруун талын самбар дээр харагдахгүй."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom_multicompany
@@ -3012,7 +3020,7 @@ msgstr ""
 #. module: base
 #: field:res.lang,decimal_point:0
 msgid "Decimal Separator"
-msgstr ""
+msgstr "Орон тусгаарлагч"
 
 #. module: base
 #: view:res.partner:0
@@ -3114,7 +3122,7 @@ msgstr "Шинэчлэлийг болих"
 #. module: base
 #: model:res.country,name:base.ci
 msgid "Ivory Coast (Cote D'Ivoire)"
-msgstr ""
+msgstr "Иворын эрэг"
 
 #. module: base
 #: model:res.country,name:base.kz
@@ -3152,12 +3160,12 @@ msgstr "Нэр"
 #. module: base
 #: model:res.country,name:base.ms
 msgid "Montserrat"
-msgstr ""
+msgstr "Монтсеррат"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
 msgid "Application Terms"
-msgstr ""
+msgstr "Програмын нэр томъёонууд"
 
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
@@ -3197,7 +3205,7 @@ msgstr "Вэб"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "English (CA)"
-msgstr ""
+msgstr "English (CA)"
 
 #. module: base
 #: field:res.partner.event,planned_revenue:0
@@ -3236,7 +3244,7 @@ msgstr "Мужийн код гурван тэмдэгтээр.\n"
 #. module: base
 #: model:res.country,name:base.sj
 msgid "Svalbard and Jan Mayen Islands"
-msgstr ""
+msgstr "Свалбард, Ян Маэны арлууд"
 
 #. module: base
 #: view:ir.rule:0
@@ -3276,7 +3284,7 @@ msgstr "хаагдсан"
 #. module: base
 #: selection:wizard.module.lang.export,state:0
 msgid "get"
-msgstr ""
+msgstr "авах"
 
 #. module: base
 #: help:ir.model.fields,on_delete:0
@@ -3286,7 +3294,7 @@ msgstr "many2one талбарын on delete шинж"
 #. module: base
 #: field:ir.actions.server,write_id:0
 msgid "Write Id"
-msgstr ""
+msgstr "Бичих Id"
 
 #. module: base
 #: field:ir.actions.act_window,domain:0
@@ -3307,7 +3315,7 @@ msgstr "SMS тохиргоо"
 #: model:ir.actions.act_window,name:base.ir_access_act
 #: model:ir.ui.menu,name:base.menu_ir_access_act
 msgid "Access Controls List"
-msgstr ""
+msgstr "Хандах эрхийн жагсаалт"
 
 #. module: base
 #: model:res.country,name:base.um
@@ -3341,7 +3349,7 @@ msgstr "Товчлол"
 #. module: base
 #: field:ir.model.data,date_init:0
 msgid "Init Date"
-msgstr ""
+msgstr "Эхлэл огноо"
 
 #. module: base
 #: field:workflow.activity,flow_start:0
@@ -3363,7 +3371,7 @@ msgstr "Данс эзэмшигч"
 #: model:ir.actions.act_window,name:base.act_values_form
 #: model:ir.ui.menu,name:base.menu_values_form
 msgid "Client Actions Connections"
-msgstr ""
+msgstr "Клиент үйлдлүүдийн холбоо"
 
 #. module: base
 #: field:ir.ui.view_sc,resource:0
@@ -3378,18 +3386,18 @@ msgstr "Цаг"
 #. module: base
 #: model:res.country,name:base.gp
 msgid "Guadeloupe (French)"
-msgstr ""
+msgstr "Гуаделоп (Франц)"
 
 #. module: base
 #: field:ir.report.custom.fields,cumulate:0
 msgid "Accumulate"
-msgstr ""
+msgstr "Хураах"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Tree can only be used in tabular reports"
-msgstr ""
+msgstr "Модыг зөвхөн хүснэгтэн тайланд хэрэглэнэ"
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -3429,7 +3437,7 @@ msgstr "res.request.history"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Client Action Configuration"
-msgstr ""
+msgstr "Клиент үйлдлийн тохиргоо"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_address_form
@@ -3437,17 +3445,17 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_partner_address_form
 #: view:res.partner.address:0
 msgid "Partner Addresses"
-msgstr ""
+msgstr "Харилцагчийн хаягууд"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Indonesian / Bahasa Indonesia"
-msgstr ""
+msgstr "Индонези / Бахаса Индонези"
 
 #. module: base
 #: model:res.country,name:base.cv
 msgid "Cape Verde"
-msgstr ""
+msgstr "Кэйп Вэрде"
 
 #. module: base
 #: code:addons/base/module/module.py:0
@@ -3456,6 +3464,9 @@ msgid ""
 "Some installed modules depend on the module you plan to Uninstall :\n"
 " %s"
 msgstr ""
+"Зарим суулгагдсан модулиуд таны хасах гэж байгаа модулиас хамааралтай "
+"байна:\n"
+" %s"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_res_partner_event
@@ -3468,7 +3479,7 @@ msgstr "Үйл явдал"
 #: model:ir.actions.act_window,name:base.action_res_roles
 #: model:ir.ui.menu,name:base.menu_action_res_roles
 msgid "Roles Structure"
-msgstr ""
+msgstr "Дүрүүдийн бүтэц"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_url
@@ -3555,7 +3566,7 @@ msgstr "Гох ассан"
 #. module: base
 #: model:res.country,name:base.fj
 msgid "Fiji"
-msgstr ""
+msgstr "Фиджи"
 
 #. module: base
 #: field:ir.model.fields,size:0
@@ -3627,7 +3638,7 @@ msgstr "Таны систем шинэчлэгдэнэ"
 #. module: base
 #: view:ir.module.module:0
 msgid "Defined Reports"
-msgstr ""
+msgstr "Тогтсон тайлангууд"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -3709,7 +3720,7 @@ msgstr "Биелэх үйлдлийн төрөл"
 #. module: base
 #: field:ir.server.object.lines,server_id:0
 msgid "Object Mapping"
-msgstr ""
+msgstr "Объект буулгалт"
 
 #. module: base
 #: help:res.currency,rate:0
@@ -3730,7 +3741,7 @@ msgstr "Үүсгэх / Бичих"
 #. module: base
 #: help:res.partner.category,active:0
 msgid "The active field allows you to hide the category without removing it."
-msgstr ""
+msgstr "Идэвхитэй талбар нь ангиллыг хасалгүйгээр нуух боломж олгоно."
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -3747,7 +3758,7 @@ msgstr "Ботсван"
 #: model:ir.ui.menu,name:base.menu_partner_title_partner
 #: view:res.partner.title:0
 msgid "Partner Titles"
-msgstr ""
+msgstr "Харилцагчийн гарчиг"
 
 #. module: base
 #: selection:ir.actions.todo,type:0
@@ -3757,7 +3768,7 @@ msgstr "Үйлчилгээ"
 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
 msgid "Add an auto-refresh on the view"
-msgstr ""
+msgstr "Дэлгэцэнд автомат шинэчлэл нэмэх"
 
 #. module: base
 #: wizard_view:module.upgrade,next:0
@@ -3774,12 +3785,12 @@ msgstr "Ажлын элементүүд"
 #. module: base
 #: field:wizard.module.lang.export,advice:0
 msgid "Advice"
-msgstr ""
+msgstr "Заавар"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Lithuanian / Lietuvių kalba"
-msgstr ""
+msgstr "Литва / Lietuvių kalba"
 
 #. module: base
 #: help:ir.actions.server,record_id:0
@@ -3787,6 +3798,8 @@ msgid ""
 "Provide the field name where the record id is stored after the create "
 "operations. If it is empty, you can not track the new record."
 msgstr ""
+"Үүсгэх үйлдлийн дараа бичлэг үүссэн талбарын нэрийг заана. Хэрэв хоосон "
+"орхивол шинэ бичлэгийг олж чадахгүй."
 
 #. module: base
 #: field:ir.ui.view,inherit_id:0
@@ -3850,17 +3863,17 @@ msgstr "Аймаг/Муж"
 #. module: base
 #: model:res.country,name:base.io
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Британий энэтхэгийн далайн нутаг"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Field Mapping"
-msgstr ""
+msgstr "Талбарын буулгалт"
 
 #. module: base
 #: field:maintenance.contract,date_start:0
 msgid "Starting Date"
-msgstr "Эхлэл огноо"
+msgstr "Эхлэл Огноо"
 
 #. module: base
 #: view:ir.model:0
@@ -3876,7 +3889,7 @@ msgstr "Мужийн код"
 #. module: base
 #: field:ir.model.fields,on_delete:0
 msgid "On delete"
-msgstr ""
+msgstr "Устгахад"
 
 #. module: base
 #: selection:res.lang,direction:0
@@ -3912,7 +3925,7 @@ msgstr "Мозамбик"
 #: model:ir.actions.act_window,name:base.grant_menu_access
 #: model:ir.ui.menu,name:base.menu_grant_menu_access
 msgid "Manage Menus"
-msgstr ""
+msgstr "Цэсүүдийг удирдах"
 
 #. module: base
 #: field:ir.actions.server,message:0
@@ -3923,7 +3936,7 @@ msgstr "Мессеж"
 #. module: base
 #: field:ir.actions.act_window.view,multi:0
 msgid "On Multiple Doc."
-msgstr ""
+msgstr "Олон баримтад."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config_contact
@@ -3961,7 +3974,7 @@ msgstr "module,type,name,res_id,src,value"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_management
 msgid "Modules Management"
-msgstr ""
+msgstr "Модулийн удирдлага"
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -4021,7 +4034,7 @@ msgstr "Алдаа"
 #. module: base
 #: view:res.partner.som:0
 msgid "Partner State of Mind"
-msgstr ""
+msgstr "Харилцагчийн нөхцөл байдал"
 
 #. module: base
 #: selection:ir.ui.view,type:0
@@ -4051,7 +4064,7 @@ msgstr "Бутан"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_11
 msgid "Textile Suppliers"
-msgstr ""
+msgstr "Нэхмэл нийлүүлэгчид"
 
 #. module: base
 #: selection:ir.actions.url,target:0
@@ -4081,7 +4094,7 @@ msgstr "STOCK_INDENT"
 #. module: base
 #: view:workflow.workitem:0
 msgid "Workflow Workitems"
-msgstr ""
+msgstr "Ажлын урсгалын элементүүд"
 
 #. module: base
 #: model:res.country,name:base.vc
@@ -4128,7 +4141,7 @@ msgstr "a4"
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
 msgid "Search View Ref."
-msgstr ""
+msgstr "Хайлтын дэлгэц."
 
 #. module: base
 #: view:ir.rule.group:0
@@ -4220,7 +4233,7 @@ msgstr "Камерун"
 #. module: base
 #: model:res.country,name:base.bf
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Буркина Фасо"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4235,7 +4248,7 @@ msgstr "Алгассан"
 #. module: base
 #: selection:ir.model.fields,state:0
 msgid "Custom Field"
-msgstr ""
+msgstr "Зохиомол талбар"
 
 #. module: base
 #: model:res.country,name:base.cc
@@ -4262,7 +4275,7 @@ msgstr "11. %U эсвэл %W ==> 48 (49-р долоо хоног)"
 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank_type_field
 msgid "Bank type fields"
-msgstr ""
+msgstr "Банкны төрөл талбарууд"
 
 #. module: base
 #: wizard_view:module.lang.import,init:0
@@ -4272,7 +4285,7 @@ msgstr "type,name,res_id,src,value"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Dutch / Nederlands"
-msgstr ""
+msgstr "Нидерланд"
 
 #. module: base
 #: wizard_view:server.action.create,step_1:0
@@ -4305,7 +4318,7 @@ msgstr "Макау"
 #. module: base
 #: model:ir.actions.report.xml,name:base.res_partner_address_report
 msgid "Labels"
-msgstr ""
+msgstr "Шошго"
 
 #. module: base
 #: wizard_field:res.partner.spam_send,init,from:0
@@ -4330,7 +4343,7 @@ msgstr "STOCK_NEW"
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "None"
-msgstr ""
+msgstr "Хоосон"
 
 #. module: base
 #: view:ir.report.custom.fields:0
@@ -4345,12 +4358,12 @@ msgstr "Ерөнхий"
 #. module: base
 #: field:workflow.transition,act_to:0
 msgid "Destination Activity"
-msgstr ""
+msgstr "Зорилтот үйлдэл"
 
 #. module: base
 #: view:ir.values:0
 msgid "Connect Events to Actions"
-msgstr ""
+msgstr "Үзэгдлүүдийг үйлдлүүдэд холбох"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4450,12 +4463,12 @@ msgstr "STOCK_UNDERLINE"
 #. module: base
 #: view:ir.values:0
 msgid "Values for Event Type"
-msgstr ""
+msgstr "Үзэгдлийн төрлийн утгууд"
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Always Searchable"
-msgstr ""
+msgstr "Үргэлж хайгдахуйц"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4475,7 +4488,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_10
 msgid "Scheduler"
-msgstr ""
+msgstr "Төлөвлөгч"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4508,6 +4521,8 @@ msgid ""
 "The selected language has been successfully installed. You must change the "
 "preferences of the user and open a new menu to view changes."
 msgstr ""
+"Сонгосон хэл амжилттай суулгагдлаа. Та өөрийн тохиргоо руу ороод хэлээ солих "
+"хэрэгтэй, дараа нь шинэ цэс нээхэд өөрчлөлт харагдана."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_sequence
@@ -4559,7 +4574,7 @@ msgstr "Непал"
 #. module: base
 #: field:res.partner.event,event_ical_id:0
 msgid "iCal id"
-msgstr ""
+msgstr "iCal id"
 
 #. module: base
 #: wizard_view:res.partner.sms_send,init:0
@@ -4574,12 +4589,12 @@ msgstr "%Y - Жилийн зуун орсон тоон дугаар."
 #. module: base
 #: selection:ir.report.custom,type:0
 msgid "Pie Chart"
-msgstr ""
+msgstr "Дугуй диаграм"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Seconde: %(sec)s"
-msgstr ""
+msgstr "Секунд: %(сек)"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -4621,12 +4636,12 @@ msgstr "Тай / ภาษาไทย"
 #: model:ir.actions.act_window,name:base.ir_property_form
 #: model:ir.ui.menu,name:base.menu_ir_property_form
 msgid "Default Properties"
-msgstr ""
+msgstr "Үндсэн шинжүүд"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Slovenian / slovenščina"
-msgstr ""
+msgstr "Словян / slovenščina"
 
 #. module: base
 #: field:ir.actions.report.xml,attachment_use:0
@@ -4774,7 +4789,7 @@ msgstr "Соломоны арлууд"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "ХандалтынАлдаа"
 
 #. module: base
 #: view:res.lang:0
@@ -4816,7 +4831,7 @@ msgstr "Америкын нэгдсэн улс"
 #. module: base
 #: rml:ir.module.reference:0
 msgid "Reference Guide"
-msgstr ""
+msgstr "Ишлэл гарын авлага"
 
 #. module: base
 #: model:res.country,name:base.ml
@@ -4831,7 +4846,7 @@ msgstr "STOCK_UNINDENT"
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
-msgstr ""
+msgstr "Интервал тоо"
 
 #. module: base
 #: selection:maintenance.contract,kind:0
@@ -4892,6 +4907,8 @@ msgid ""
 "This function will check for new modules in the 'addons' path and on module "
 "repositories:"
 msgstr ""
+"Энэ функц нь модулын сайт болон 'addons' хавтас дотор шинэ модуль нэмэгдсэн "
+"эсэхийг шалгана:"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4906,7 +4923,7 @@ msgstr "Ерөнхий тохируулга"
 #. module: base
 #: model:ir.ui.menu,name:base.custom_shortcuts
 msgid "Custom Shortcuts"
-msgstr ""
+msgstr "Зохиомол товчлол"
 
 #. module: base
 #: model:res.country,name:base.dz
@@ -4999,7 +5016,7 @@ msgstr "Харилцагид, ангиллаар"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_9
 msgid "Components Supplier"
-msgstr ""
+msgstr "Эд анги нийлүүлэгч"
 
 #. module: base
 #: field:ir.actions.act_window,default_user_ids:0
@@ -5029,7 +5046,7 @@ msgstr "Исланд"
 #. module: base
 #: view:res.users:0
 msgid "Roles are used to defined available actions, provided by workflows."
-msgstr ""
+msgstr "Дүр нь ажлын урсгалын үйлдлүүдтэй холбож хэрэглэгдэнэ."
 
 #. module: base
 #: model:res.country,name:base.de
@@ -5039,7 +5056,7 @@ msgstr "Герман"
 #. module: base
 #: view:ir.sequence:0
 msgid "Week of the year: %(woy)s"
-msgstr ""
+msgstr "Жилийн долоо хоног: %(ждх)"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_14
@@ -5072,7 +5089,7 @@ msgstr "Таны үйлчилгээний гэрээнүүд"
 msgid ""
 "Please note that you will have to logout and relog if you change your "
 "password."
-msgstr ""
+msgstr "Хэрэв нууц үгээ солисон бол системээс гараад орох хэрэгтэй."
 
 #. module: base
 #: model:res.country,name:base.gy
@@ -5092,12 +5109,12 @@ msgstr "GPL-2"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Portugese (BR) / português (BR)"
-msgstr ""
+msgstr "Португал / português (BR)"
 
 #. module: base
 #: field:ir.actions.server,record_id:0
 msgid "Create Id"
-msgstr ""
+msgstr "Үүсгэх Id"
 
 #. module: base
 #: model:res.country,name:base.hn
@@ -5140,7 +5157,7 @@ msgstr "Үйл явдлын төрөл"
 #: model:ir.actions.act_window,name:base.ir_sequence_type
 #: model:ir.ui.menu,name:base.menu_ir_sequence_type
 msgid "Sequence Types"
-msgstr ""
+msgstr "Дугаарлалтын төрлүүд"
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -5243,7 +5260,7 @@ msgstr "Аргентин"
 #. module: base
 #: model:res.country,name:base.af
 msgid "Afghanistan, Islamic State of"
-msgstr ""
+msgstr "Афганистан, Исламын муж"
 
 #. module: base
 #: code:addons/base/module/wizard/wizard_module_import.py:0
@@ -5259,7 +5276,7 @@ msgstr "country_id"
 #. module: base
 #: field:ir.cron,interval_type:0
 msgid "Interval Unit"
-msgstr ""
+msgstr "Интервал нэгж"
 
 #. module: base
 #: field:maintenance.contract,kind:0
@@ -5291,14 +5308,14 @@ msgstr "Үүссэн огноо"
 #. module: base
 #: selection:ir.report.custom,type:0
 msgid "Line Plot"
-msgstr ""
+msgstr "Мөрийн утга"
 
 #. module: base
 #: help:ir.actions.server,loop_action:0
 msgid ""
 "Select the action that will be executed. Loop action will not be avaliable "
 "inside loop."
-msgstr ""
+msgstr "Гүйцэтгэх үйлдлийг сонгоно. Давталт доторхи давтах үйлдэл боломжгүй."
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -5358,20 +5375,20 @@ msgstr "Алхамыг алгасах"
 #. module: base
 #: model:res.country,name:base.pn
 msgid "Pitcairn Island"
-msgstr ""
+msgstr "Питкэйрн арал"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_partner_event_type-act
 #: model:ir.ui.menu,name:base.menu_res_partner_event_type-act
 msgid "Active Partner Events"
-msgstr ""
+msgstr "Харилцагчийн үйл явдлууд"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_function_form
 #: model:ir.ui.menu,name:base.menu_partner_function_form
 #: view:res.partner.function:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "Харьцах хүний үүрэг"
 
 #. module: base
 #: view:multi_company.default:0
@@ -5386,7 +5403,7 @@ msgstr "Жилийн өдөр: %(doy)s"
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
-msgstr ""
+msgstr "Дундын бүс"
 
 #. module: base
 #: view:ir.model:0
@@ -5424,7 +5441,7 @@ msgstr ""
 #. module: base
 #: help:ir.sequence,weight:0
 msgid "If two sequences match, the highest weight will be used."
-msgstr ""
+msgstr "Хэрэв хоёр эрэмбэ давхацвал өндөх жинтэйг нь ашиглана."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_attachment
@@ -5499,12 +5516,12 @@ msgstr "<="
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Estonian / Eesti keel"
-msgstr ""
+msgstr "Эстони / Eesti keel"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Portugese / português"
-msgstr ""
+msgstr "Португали / português"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -5550,7 +5567,7 @@ msgstr "Суусан хувилбар"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_workflow_root
 msgid "Workflow Definitions"
-msgstr ""
+msgstr "Ажлын ургсалын тодорхойлолтууд"
 
 #. module: base
 #: model:res.country,name:base.mr
@@ -5561,7 +5578,7 @@ msgstr "Мавритани"
 #: view:workflow.activity:0
 #: field:workflow.workitem,act_id:0
 msgid "Activity"
-msgstr ""
+msgstr "Ажилбар"
 
 #. module: base
 #: view:res.partner:0
@@ -5603,7 +5620,7 @@ msgstr "Муж"
 #: model:ir.actions.act_window,name:base.ir_property_form_all
 #: model:ir.ui.menu,name:base.menu_ir_property_form_all
 msgid "All Properties"
-msgstr ""
+msgstr "Бүх шинжүүд"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_window
@@ -6078,7 +6095,7 @@ msgstr "Огноо форматлах тэмдэглэгээнүүд"
 #. module: base
 #: selection:ir.report.custom,frequency:0
 msgid "Monthly"
-msgstr "Сар тутмын"
+msgstr "Сарын"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_partner_som-act
@@ -6619,7 +6636,7 @@ msgstr "сонгох"
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Graph"
-msgstr "График"
+msgstr "Граф"
 
 #. module: base
 #: field:res.partner,child_ids:0
@@ -6707,7 +6724,7 @@ msgstr "Функцийн нэр"
 #. module: base
 #: view:maintenance.contract.wizard:0
 msgid "_Cancel"
-msgstr "_Цуцлах"
+msgstr "_Болих"
 
 #. module: base
 #: model:res.country,name:base.cy
@@ -7790,7 +7807,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.configuration.wizard,progress:0
 msgid "Configuration Progress"
-msgstr "Тохируулгын явц"
+msgstr "Тохиргооны явц"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_11
@@ -8020,73 +8037,74 @@ msgstr "Орос / орос хэл"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "Ижил нэвтрэх кодтой хоёр хэрэглэгч байж болохгүй!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8096,13 +8114,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
@@ -8110,3 +8135,7 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#, python-format
+#~ msgid "You can not have two users with the same login !"
+#~ msgstr "Ижил нэвтрэх кодтой хоёр хэрэглэгч байж болохгүй!"
diff --git a/bin/addons/base/i18n/nb.po b/bin/addons/base/i18n/nb.po
index 1e9993b4d68..eef57ddd6b6 100644
--- a/bin/addons/base/i18n/nb.po
+++ b/bin/addons/base/i18n/nb.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: 2010-07-13 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7939,73 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8015,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index ae3d9c50f19..0e1b62fa594 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 22:14+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-09 18:36+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.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: 2010-09-09 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8105,73 +8105,74 @@ msgstr "Russisch / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "U kunt niet twee gebruikers hebben met dezelfde gebruikersnaam !"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8181,13 +8182,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index 3945b229279..e9604cd0de8 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:50+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-26 10:02+0000\n"
+"Last-Translator: Michał Węgrzynek <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: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -68,7 +68,7 @@ msgstr "Aby zobaczyć oficjalne tłumaczenia, zobacz ten link: "
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Hungarian / Magyar"
-msgstr ""
+msgstr "Węgierski"
 
 #. module: base
 #: field:ir.actions.server,wkf_model_id:0
@@ -149,7 +149,7 @@ msgstr ""
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CANCEL"
-msgstr ""
+msgstr "Anuluj"
 
 #. module: base
 #: field:ir.report.custom,sortby:0
@@ -316,7 +316,7 @@ msgstr "Moduły niezainstalowanie"
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "txt"
-msgstr ""
+msgstr "txt"
 
 #. module: base
 #: wizard_view:server.action.create,init:0
@@ -332,7 +332,7 @@ msgstr "Konfiguruj"
 #. module: base
 #: model:res.country,name:base.tv
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #. module: base
 #: selection:ir.model,state:0
@@ -349,7 +349,7 @@ msgstr "Format daty"
 #: field:res.bank,email:0
 #: field:res.partner.address,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: base
 #: model:res.country,name:base.an
@@ -438,7 +438,7 @@ msgstr ""
 #: selection:workflow.activity,join_mode:0
 #: selection:workflow.activity,split_mode:0
 msgid "Xor"
-msgstr ""
+msgstr "XOR"
 
 #. module: base
 #: view:res.partner:0
@@ -2256,7 +2256,7 @@ msgstr "GPL-2 lub wersja późniejsza"
 #. module: base
 #: selection:res.partner.event,type:0
 msgid "Prospect Contact"
-msgstr ""
+msgstr "Potencjalny Kontakt"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_wizard
@@ -8054,7 +8054,7 @@ msgstr "Kod BIC/Swift"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Prospect"
-msgstr ""
+msgstr "Potencjalny Klient"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -8094,73 +8094,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "Nie może być dwóch użytkowników o tym samym loginie !"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8170,13 +8171,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po
index e09e05ac826..f2d03d46696 100644
--- a/bin/addons/base/i18n/pt.po
+++ b/bin/addons/base/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 22:19+0000\n"
+"PO-Revision-Date: 2010-09-09 18:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8088,73 +8088,74 @@ msgstr "Russo / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "Não pode ter dois utilizadores com o mesmo código de acesso!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8164,13 +8165,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index 7f0a6842f49..9bae937bb20 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:39+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-09 18:12+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8090,74 +8090,75 @@ msgstr "Russo / русский язык"
 #. module: base
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
-msgstr ""
- 
+msgstr "Não é permitido criar dois usuários com o mesmo login!"
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr "Não é permitido criar dois usuários com o mesmo login!"
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8167,13 +8168,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po
index ab158bb0387..39f4f21635c 100644
--- a/bin/addons/base/i18n/ro.po
+++ b/bin/addons/base/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7960,73 +7960,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8036,13 +8037,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index 0593b6c28be..145d2f828f8 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-03 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8073,73 +8073,74 @@ msgstr "Русский / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8149,13 +8150,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sk.po b/bin/addons/base/i18n/sk.po
index 525b88f0fc3..5654b60553b 100644
--- a/bin/addons/base/i18n/sk.po
+++ b/bin/addons/base/i18n/sk.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: 2010-07-13 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7987,73 +7987,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8063,13 +8064,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sl.po b/bin/addons/base/i18n/sl.po
index 8b7a6c11755..fe867b0ae1f 100644
--- a/bin/addons/base/i18n/sl.po
+++ b/bin/addons/base/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7979,73 +7979,74 @@ msgstr "rusko"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8055,13 +8056,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sq.po b/bin/addons/base/i18n/sq.po
index 85359ae27d0..98911a06d0b 100644
--- a/bin/addons/base/i18n/sq.po
+++ b/bin/addons/base/i18n/sq.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7944,73 +7944,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8020,13 +8021,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sr.po b/bin/addons/base/i18n/sr.po
index 331813e39f3..3d0dc60859e 100644
--- a/bin/addons/base/i18n/sr.po
+++ b/bin/addons/base/i18n/sr.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: 2010-07-13 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8070,73 +8070,74 @@ msgstr "Ruski / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8146,13 +8147,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 60616745c10..ed47e2be7c6 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:06+0000\n"
-"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
+"PO-Revision-Date: 2010-09-27 12:19+0000\n"
+"Last-Translator: Daniel Stenlöv (XCLUDE) <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: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -530,7 +530,7 @@ msgstr "Skräddarsydd rapport"
 #. module: base
 #: selection:ir.report.custom,type:0
 msgid "Bar Chart"
-msgstr ""
+msgstr "Stapeldiagram"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7960,73 +7960,74 @@ msgstr "Russian / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8036,13 +8037,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/th.po b/bin/addons/base/i18n/th.po
index 3d89bb7c03c..a8c0a3ca261 100644
--- a/bin/addons/base/i18n/th.po
+++ b/bin/addons/base/i18n/th.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: 2010-07-13 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7939,73 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8015,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/tlh.po b/bin/addons/base/i18n/tlh.po
index b5c2beaf76d..816c8a463c0 100644
--- a/bin/addons/base/i18n/tlh.po
+++ b/bin/addons/base/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7938,73 +7938,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8014,13 +8015,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index 097bdfd0cb6..8feffb44a99 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:42+0000\n"
+"PO-Revision-Date: 2010-09-09 18:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8077,73 +8077,74 @@ msgstr "Rusça / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8153,13 +8154,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index cc74cdef068..08556556f93 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 22:18+0000\n"
+"PO-Revision-Date: 2010-09-09 06:59+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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: 2010-09-09 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8022,73 +8022,74 @@ msgstr "Російська / Russian"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8098,13 +8099,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/vi.po b/bin/addons/base/i18n/vi.po
index 53c56cbc52f..43e1bc0ac30 100644
--- a/bin/addons/base/i18n/vi.po
+++ b/bin/addons/base/i18n/vi.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: 2010-07-13 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7939,73 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8015,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index bf78a77838f..8c2d99e0864 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:31+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-09 18:09+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.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: 2010-09-09 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7967,73 +7967,74 @@ msgstr "俄语 / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "用户名必须唯一！"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8043,13 +8044,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_TW.po b/bin/addons/base/i18n/zh_TW.po
index 40ec7115a88..69dd7e92bcc 100644
--- a/bin/addons/base/i18n/zh_TW.po
+++ b/bin/addons/base/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7953,73 +7953,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8029,13 +8030,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/debian/po/bg.po b/debian/po/bg.po
index d8f13067dda..64571e2e63f 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 77177aaa666..b549feb2080 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 1f7fc1c4c58..4db913ca2d2 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/de.po b/debian/po/de.po
index 08fb34dfca1..43f5b2f2589 100644
--- a/debian/po/de.po
+++ b/debian/po/de.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/el.po b/debian/po/el.po
index ab9a69979ea..2d7be856aea 100644
--- a/debian/po/el.po
+++ b/debian/po/el.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/en_GB.po b/debian/po/en_GB.po
index d3ca66429cd..a1f484305ba 100644
--- a/debian/po/en_GB.po
+++ b/debian/po/en_GB.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/es.po b/debian/po/es.po
index 7ad0e2b4434..46d906b1248 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/es_EC.po b/debian/po/es_EC.po
index 6d951e15c24..03035c61d26 100644
--- a/debian/po/es_EC.po
+++ b/debian/po/es_EC.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/fa.po b/debian/po/fa.po
index 436ac5811d6..331aa5d0d9d 100644
--- a/debian/po/fa.po
+++ b/debian/po/fa.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 72784367e2e..7dc02829e54 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 7bd2d8f0ed5..414a4999f6b 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 6be40ac91f6..2fa653b1970 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/hr.po b/debian/po/hr.po
index 00706c0c5b6..af9c295a595 100644
--- a/debian/po/hr.po
+++ b/debian/po/hr.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/it.po b/debian/po/it.po
index f2ed8ac826c..45bd312e0c1 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/ja.po b/debian/po/ja.po
index b197d925b88..20e0bc105be 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/ko.po b/debian/po/ko.po
index 268d893c01c..5218c4ce019 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-02-16 05:47+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-09-15 02:58+0000\n"
+"Last-Translator: barge <Unknown>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
 #. Description
 #: ../openerp-server.templates:1001
 msgid "Dedicated system account for the Open ERP server:"
-msgstr ""
+msgstr "Open ERP 서버를 위한 전용 시스템 계정:"
 
 #. Type: string
 #. Description
@@ -30,10 +30,10 @@ msgid ""
 "The Open ERP server must use a dedicated account for its operation so that "
 "the system's security is not compromised by running it with superuser "
 "privileges."
-msgstr ""
+msgstr "Open ERP 서버를 운영하실때는 슈퍼유저가 아닌 전용 계정을 이용하셔야 보안을 확보할수 있습니다"
 
 #. Type: string
 #. Description
 #: ../openerp-server.templates:1001
 msgid "Please choose that account's username."
-msgstr ""
+msgstr "사용자 이름을 선택하세요"
diff --git a/debian/po/mn.po b/debian/po/mn.po
new file mode 100644
index 00000000000..6d686d6e110
--- /dev/null
+++ b/debian/po/mn.po
@@ -0,0 +1,41 @@
+# Mongolian translation for openobject-server
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-server package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2010-09-10 03:13+0000\n"
+"Last-Translator: ub121 <ubs121@gmail.com>\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: 2010-09-29 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Dedicated system account for the Open ERP server:"
+msgstr "Open ERP серверт зориулсан системийн тусгай эрх:"
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid ""
+"The Open ERP server must use a dedicated account for its operation so that "
+"the system's security is not compromised by running it with superuser "
+"privileges."
+msgstr ""
+"Open ERP сервер тусгай хандах эрх хэрэглэх ёстой, ингэснээр супер "
+"хэрэглэгчийн эрх ашиглаж системийн хамгаалалтыг муутгахгүй болно."
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr "Нэвтрэх эрхийг сонгоно уу."
diff --git a/debian/po/nb.po b/debian/po/nb.po
index e47c06330de..818da6d0626 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 74e4e74742a..e1e37a63720 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 46a8c98366d..826e50fd881 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 43f085929f4..079780d23df 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/ro.po b/debian/po/ro.po
index 11c923af7a4..bace70806da 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-12-21 06:11+0000\n"
+"PO-Revision-Date: 2010-09-27 23:36+0000\n"
 "Last-Translator: Valentin Caragea <carageav@gmail.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 622e2dba6a9..0eebf4f7086 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 3b89810b2e4..25895cff9b8 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/sr.po b/debian/po/sr.po
index f9d964e00f5..7e895bfbfe4 100644
--- a/debian/po/sr.po
+++ b/debian/po/sr.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: 2010-07-22 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 384489afe97..e4138456cb4 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: Swedish\n"
 
diff --git a/debian/po/tr.po b/debian/po/tr.po
index c7bda785999..9379a4f8ef9 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/uk.po b/debian/po/uk.po
index 31375230c11..39ac200e9c5 100644
--- a/debian/po/uk.po
+++ b/debian/po/uk.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 7a64f4cac15..243dc2a4a40 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index 3e847c82ecf..0b9df2604e3 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -12,7 +12,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: TAIWAN\n"
 "X-Poedit-Language: Chinese\n"

From 031db2274363c41c8b7773f0d686a1b00d8a9d2c Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 29 Sep 2010 10:36:57 +0530
Subject: [PATCH 041/244] [IMP] subscription : Improvements in view

bzr revid: vir@tinyerp.com-20100929050657-v6b2hpiqzcxv59r1
---
 addons/subscription/subscription_view.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index abe58ced56d..b27414bb60c 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -15,11 +15,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscriptions">
-                    <group colspan="4">
+                    <group col="6" colspan="4">
                         <field name="name" select="1"/>
-                        <field name="active" select="1" groups="base.group_extended"/>
-                        <field name="user_id" select="1"/>
                         <field name="partner_id" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <field name="active" select="1" groups="base.group_extended"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Subsription Data">
@@ -92,7 +92,7 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="4">
                         <filter string="User" icon="terp-personal" name="User" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" icon="terp-personal" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Partner" icon="terp-partner" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
@@ -140,9 +140,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Document">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
-                    <field name="model" select="1"/>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="model" select="1"/>
+                        <field name="active" select="1"/>
+                    </group>
+                    <newline/>
                     <field colspan="4" name="field_ids" nolabel="1"/>
                 </form>
             </field>

From 7ed2a8b8b62936e7b608505319a12996ade15f17 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Wed, 29 Sep 2010 11:35:49 +0530
Subject: [PATCH 042/244] [MOD/IMP] survey: Improvements in survey
 wizrd,view,groups and access rights

bzr revid: amp@tinyerp.com-20100929060549-h3g518f6e6ertu3t
---
 addons/survey/security/ir.model.access.csv     | 13 +++++++++++++
 addons/survey/security/survey_security.xml     |  3 +++
 addons/survey/survey_view.xml                  | 17 ++++++++---------
 addons/survey/wizard/survey_send_invitation.py |  2 +-
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 2a64acdb0d4..5ea4017fb01 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -36,3 +36,16 @@
 "access_survey_request_employee","survey.request.employee","model_survey_request","base.group_user",1,0,0,0
 "access_survey_response_employee","survey.response employee","model_survey_response","base.group_user",1,0,0,0
 "access_survey_employee","survey.employee","model_survey","base.group_user",1,0,0,0
+"access_survey_survey_user","survey.survey.user","model_survey","group_survey_user",1,1,1,1
+"access_survey_type_survey_user","survey.type.survey.user","model_survey_type","group_survey_user",1,1,1,1
+"access_survey_page_survey_user","survey.page.survey.user","model_survey_page","group_survey_user",1,1,1,1
+"access_survey_request_survey_user","survey.request.survey.user","model_survey_request","group_survey_user",1,1,1,1
+"access_survey_question_survey_user","survey.question.survey.user","model_survey_question","group_survey_user",1,1,1,1
+"access_survey_answer_survey_user","survey.answer.survey.user","model_survey_answer","group_survey_user",1,1,1,1
+"access_survey_response_survey_user","survey.response.survey.user","model_survey_response","group_survey_user",1,1,1,1
+"access_survey_response_answer_survey_user","survey.response.answer.survey.user","model_survey_response_answer","group_survey_user",1,1,1,1
+"access_survey_history_survey_user","survey.history.survey.user","model_survey_history","group_survey_user",1,1,1,1
+"access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0
+"access_survey_tbl_column_heading_survey_user","survey.tbl.column.heading.survey.user","model_survey_tbl_column_heading","group_survey_user",1,1,1,1
+"access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","group_survey_user",1,1,1,1
+"access_survey_res_partner_address_survey_user","survey.res.partner.address.survey.user","base.model_res_partner_address","group_survey_user",1,1,1,0
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index 6c3559fa138..1506fdaec1b 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -11,6 +11,9 @@
    	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
+   	<record model="res.groups" id="group_survey_user">
+        	<field name="name">Survey / User</field>
+   	</record>
 
 </data>
 </openerp>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 745cf98c484..8152caed45c 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -4,11 +4,11 @@
 
             <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
             <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools"
-                        groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user" sequence="2"/>
+                        groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user,group_survey_user" sequence="2"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
-                 groups="base.group_tool_manager,base.group_tool_user,base.group_system"
+                 groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"
                  parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user"/>
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user,group_survey_user"/>
             <menuitem name="Reporting" parent="base.menu_tools"
                 id="base.menu_lunch_reporting" sequence="6"/>
             <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
@@ -291,7 +291,7 @@
 
         <menuitem name="Surveys" id="menu_survey_form"
             action="action_survey_form1" parent="menu_define_survey"
-            groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"/>
 
         <!--
             Survey Pages
@@ -491,7 +491,7 @@
 
         <menuitem name="Survey Pages" id="menu_survey_page_form1"
             action="action_survey_page_form" parent='menu_define_survey'
-            groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"/>
 
         <record model="ir.ui.view" id="survey_page_wizard_test1">
             <field name="name">survey_page_wizard_test</field>
@@ -1075,7 +1075,7 @@
             <field name="model">survey.request</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Evaluation Plan Phase">
+                <tree string="Evaluation Plan Phase" colors="red:date_deadline&lt;current_date">
                     <field name="date_deadline"/>
                     <field name="user_id"/>
                     <field name="survey_id"/>
@@ -1125,7 +1125,7 @@
 
         <menuitem name="Survey Requests" id="menu_survey_type_form1"
             action="action_survey_request_tree" parent='menu_answer_surveys'
-            groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"/>
 
         <!--
             Survey Type
@@ -1189,8 +1189,7 @@
             src_model="survey.question"/>
 
         <menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
-            action="action_view_survey_name" parent="menu_answer_surveys"
-            groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user" icon="STOCK_INDEX"/>
+            action="action_view_survey_name" parent="menu_answer_surveys"            groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user,group_survey_user" icon="STOCK_INDEX"/>
 
     </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index d0bb7ed87cc..fd7a35bfa89 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -100,7 +100,7 @@ class survey_send_invitation(osv.osv_memory):
         survey_ref= self.pool.get('survey')
 
         model_data_obj = self.pool.get('ir.model.data')
-        group_id = model_data_obj._get_id(cr, uid, 'base', 'group_tool_user')
+        group_id = model_data_obj._get_id(cr, uid, 'survey', 'group_survey_user')
         group_id = model_data_obj.browse(cr, uid, group_id, context=context).res_id
 
         act_id = self.pool.get('ir.actions.act_window')

From 9a82843d053bdaf11fca18240b352183008d1b95 Mon Sep 17 00:00:00 2001
From: dbr <dbr@dbr-desktop>
Date: Wed, 29 Sep 2010 11:37:54 +0530
Subject: [PATCH 043/244] [MOD/IMP]tools:usability improvement in tools Modules

bzr revid: dbr@dbr-desktop-20100929060754-wmlj8s6czjxxj2id
---
 addons/idea/idea_view.xml                    |  2 +-
 addons/idea/report/report_vote_view.xml      | 10 +++++-----
 addons/survey/survey_view.xml                |  2 +-
 addons/survey/wizard/survey_browse_answer.py |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index b6e8b926a0c..f7ddb8bf504 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -377,7 +377,7 @@
 <!-- Idea Votes Statistics Action -->
 
     <record model="ir.actions.act_window" id="action_idea_vote_stat">
-        <field name="name">Statistics on Votes</field>
+        <field name="name">Vote Statistics</field>
         <field name="res_model">idea.vote.stat</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 9556f86a281..711d6c0d29f 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -60,12 +60,12 @@
                             domain="[('idea_state','=',('cancel'))]"/>
                         <separator orientation="vertical"/>
                         <field name="idea_id" string="Idea"/>
-                        <field name="creater_id" string="creator"/>
+                        <field name="creater_id" string="Creator"/>
                         <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="10" col="12">
-                        <filter string="creator" icon="terp-personal" context="{'group_by':'creater_id'}"/>
+                        <filter string="Creator" icon="terp-personal" context="{'group_by':'creater_id'}"/>
                         <filter string="User" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Idea" icon="terp-idea" context="{'group_by':'idea_id'}"/>
@@ -74,9 +74,9 @@
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" name="State" context="{'group_by':'idea_state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by opendate"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of opendate"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of opendate"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 8152caed45c..6c9027a043e 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1114,7 +1114,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_survey_request_tree">
-            <field name="name">Survey Request</field>
+            <field name="name">Survey Requests</field>
             <field name="res_model">survey.request</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index cf047a0930c..c8979ee3a6f 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -46,7 +46,7 @@ class survey_browse_answer(osv.osv_memory):
 
     _columns = {
         'survey_id': fields.selection(_get_survey, "Survey", required="1"),
-        'response_id': fields.many2one("survey.response", "Survey Answers", help="If you want to print all answers of selected survey then don't select survey answer and if you select survey answer then print only selected survey answer."),
+        'response_id': fields.many2one("survey.response", "Survey Answers", help="If this field is empty, all answers of the selected survey will be print."),
     }
 
     def action_next(self, cr, uid, ids, context=None):

From 16e73105c1e70a79a9872fe674e388922faf67d8 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 29 Sep 2010 11:53:16 +0530
Subject: [PATCH 044/244] [IMP] survery : the button Test survey shouldn't be
 available before saving the survey

bzr revid: vir@tinyerp.com-20100929062316-a8nq1ps498pytof1
---
 addons/survey/survey_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 6c9027a043e..40288a601b7 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -25,9 +25,10 @@
                     <field name="title" select="1"/>
                     <group col="6" colspan="6">
                         <field name="responsible_id"/>
+                        <field name="id" invisible="1"/>
                         <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                             string="Test Survey" type="action" icon="gtk-new"
-                            context="{'active':True,'survey_id': active_id}"/>
+                            context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
                         <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                             string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
                         <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"

From 9d8bbcbb602f7f3461be85a118eb79eb8c061018 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 29 Sep 2010 08:54:41 +0200
Subject: [PATCH 045/244] [FIX] warnings in module.pyfix ordering and grouping
 of imports

bzr revid: xmo@openerp.com-20100929065441-3xdi5tkbh71qole8
---
 bin/addons/base/module/module.py | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index ad10e4e8e5f..a35a4f59f03 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -19,27 +19,24 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-import tarfile
-import re
-import urllib
-import os
 import imp
 import logging
-import tools
-from osv import fields, osv, orm
-import zipfile
-import release
+import os
+import re
+import urllib
 import zipimport
 
-import wizard
 import addons
-import pooler
 import netsvc
+import pooler
+import release
+import tools
 
 from tools.parse_version import parse_version
 from tools.translate import _
 
+from osv import fields, osv, orm
+
 class module_category(osv.osv):
     _name = "ir.module.category"
     _description = "Module Category"
@@ -126,7 +123,7 @@ class module(osv.osv):
                         res[mnames[data_id.module]]['menus_by_module'] += m.complete_name + '\n'
                     except:
                         pass
-            except KeyError, e:
+            except KeyError:
                 pass
         return res
 
@@ -393,7 +390,7 @@ class module(osv.osv):
                 fp = file(fname, 'wb')
                 fp.write(zipfile)
                 fp.close()
-            except Exception, e:
+            except Exception:
                 raise orm.except_orm(_('Error'), _('Can not create the module file:\n %s') % (fname,))
             terp = self.get_module_info(mod.name)
             self.write(cr, uid, mod.id, self.get_values_from_terp(terp))

From 54fb35b34b8c3e53d43ab9b7b69239aa8cdd78f1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 29 Sep 2010 09:03:46 +0200
Subject: [PATCH 046/244] [IMP] add logging to bare except in modules

bzr revid: xmo@openerp.com-20100929070346-zs7u7qy2xyp5ps3d
---
 bin/addons/base/module/module.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index a35a4f59f03..b446f39f5b5 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -77,8 +77,9 @@ class module(osv.osv):
             info = addons.load_information_from_description_file(name)
             if 'version' in info:
                 info['version'] = release.major_version + '.' + info['version']
-        except:
-            pass
+        except Exception:
+            self.__logger.debug('Error when trying to fetch informations for '
+                                'module %s', name, exc_info=True)
         return info
 
     def _get_latest_version(self, cr, uid, ids, field_name=None, arg=None, context={}):
@@ -113,16 +114,20 @@ class module(osv.osv):
                         v = view_obj.browse(cr,uid,data_id.res_id)
                         aa = v.inherit_id and '* INHERIT ' or ''
                         res[mnames[data_id.module]]['views_by_module'] += aa + v.name + ' ('+v.type+')\n'
-                    except:
-                        pass
+                    except Exception:
+                        self.__logger.debug(
+                            'Unknown error while browsing ir.ui.view[%s]',
+                            data_id.res_id, exc_info=True)
                 elif key=='ir.actions.report.xml':
                     res[mnames[data_id.module]]['reports_by_module'] += report_obj.browse(cr,uid,data_id.res_id).name + '\n'
                 elif key=='ir.ui.menu':
                     try:
                         m = menu_obj.browse(cr,uid,data_id.res_id)
                         res[mnames[data_id.module]]['menus_by_module'] += m.complete_name + '\n'
-                    except:
-                        pass
+                    except Exception:
+                        self.__logger.debug(
+                            'Unknown error while browsing ir.ui.menu[%s]',
+                            data_id.res_id, exc_info=True)
             except KeyError:
                 pass
         return res
@@ -391,6 +396,8 @@ class module(osv.osv):
                 fp.write(zipfile)
                 fp.close()
             except Exception:
+                self.__logger.exception('Error when trying to create module '
+                                        'file %s', fname)
                 raise orm.except_orm(_('Error'), _('Can not create the module file:\n %s') % (fname,))
             terp = self.get_module_info(mod.name)
             self.write(cr, uid, mod.id, self.get_values_from_terp(terp))

From 9b0e0fa9d834c26fa93c97d92b727eae231a669b Mon Sep 17 00:00:00 2001
From: "RGA (OpenERP)" <rga@tinyerp.com>
Date: Wed, 29 Sep 2010 13:07:41 +0530
Subject: [PATCH 047/244] Add UNIQUE constraint in ir.filters + refactor code

bzr revid: rga@tinyerp.com-20100929073741-kpnvws23uvj3g00e
---
 bin/addons/base/ir/ir_filters.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/bin/addons/base/ir/ir_filters.py b/bin/addons/base/ir/ir_filters.py
index 272d1c718c1..c9cdf16d31e 100644
--- a/bin/addons/base/ir/ir_filters.py
+++ b/bin/addons/base/ir/ir_filters.py
@@ -38,17 +38,14 @@ class ir_filters(osv.osv):
         return my_acts
     
     def create_or_replace(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        is_filter_exist = False
+        filter_id = None
         for filter in self.get_filters(cr, uid, vals['model_id']):
             if filter['name'].lower() == vals['name'].lower():
-                is_filter_exist = filter['id']
+                filter_id = filter['id']
                 break
-        if is_filter_exist:
-             return super(ir_filters, self).write(cr, uid, is_filter_exist, vals, context)
-        else:
-             return super(ir_filters, self).create(cr, uid, vals, context)
+        if filter_id:
+            return self.write(cr, uid, filter_id, vals, context)
+        return self.create(cr, uid, vals, context)
 
 
     _columns = {
@@ -58,6 +55,11 @@ class ir_filters(osv.osv):
         'context': fields.text('Context Value', required=True),
         'model_id': fields.selection(_list_all_models, 'Model', required=True),
     }
+    
+    _sql_constraints = [
+        ('name_model_uid_uniq', 'UNIQUE(name, model_id, user_id)', 'Filter name must be unique!'),
+    ]
+
 
 ir_filters()
 

From 55bec50ff09b29eb616ffbd56949b9ca194753d0 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Wed, 29 Sep 2010 13:28:01 +0530
Subject: [PATCH 048/244] [IMP]: base : Improvements in base module

bzr revid: jas@tinyerp.com-20100929075801-l569rvj9tiq2ha9w
---
 bin/addons/base/base_menu.xml                 |  7 +-
 bin/addons/base/ir/ir_model.py                | 99 +------------------
 .../module/wizard/base_module_import_view.xml |  2 +-
 .../base/module/wizard/base_module_update.py  |  2 +-
 .../module/wizard/base_module_update_view.xml |  2 +-
 .../wizard/base_module_upgrade_view.xml       |  2 +-
 .../module/wizard/base_update_translations.py |  6 ++
 bin/addons/base/res/res_config.xml            |  2 +-
 bin/addons/base/res/res_lang_view.xml         | 47 +++++----
 bin/addons/base/res/res_log.py                |  7 +-
 bin/addons/base/res/res_log_view.xml          |  7 +-
 11 files changed, 50 insertions(+), 133 deletions(-)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 5da97026e48..3049fbb17b2 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -13,14 +13,13 @@
         <menuitem id="menu_custom_action" name="Actions" parent="base.menu_custom" groups="base.group_extended" sequence="20"/>
         <menuitem id="menu_config" name="Configuration" parent="base.menu_administration" sequence="1"/>
         <menuitem id="menu_translation" name="Translations" parent="base.menu_administration" sequence="4"/>
-        <menuitem id="menu_translation_app" name="Application Terms" parent="base.menu_translation" sequence="4"/>
+        <menuitem id="menu_translation_app" name="Application Terms" parent="base.menu_translation" sequence="4" groups="base.group_extended"/>
         <menuitem id="menu_translation_export" name="Import / Export"
-            groups="base.group_extended"
-            parent="base.menu_translation" sequence="4"/>
+            groups="base.group_extended" parent="base.menu_translation" sequence="3"/>
         <menuitem id="menu_users" name="Users" parent="base.menu_administration" sequence="6"/>
         <menuitem id="menu_security" name="Security" parent="base.menu_administration" sequence="8"
             groups="base.group_extended"/>
-        <menuitem id="menu_management" name="Modules Management" parent="base.menu_administration" sequence="10"
+        <menuitem id="menu_management" name="Modules" parent="base.menu_administration" sequence="10"
             groups="base.group_extended"/>
         <menuitem icon="terp-graph" id="reporting_menu" name="Reporting" sequence="45"
             groups="group_extended"/>
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 69a9e2990c5..27ccb9286ee 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -142,103 +142,6 @@ class ir_model(osv.osv):
         x_custom_model._rec_name = x_name
 ir_model()
 
-
-class ir_model_grid(osv.osv):
-    _name = 'ir.model.grid'
-    _table = 'ir_model'
-    _inherit = 'ir.model'
-    _description = "Objects Security Grid"
-
-    def create(self, cr, uid, vals, context=None):
-        raise osv.except_osv('Error !', 'You cannot add an entry to this view !')
-
-    def unlink(self, *args, **argv):
-        raise osv.except_osv('Error !', 'You cannot delete an entry of this view !')
-
-    def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
-        result = super(osv.osv, self).read(cr, uid, ids, fields, context, load)
-        allgr = self.pool.get('res.groups').search(cr, uid, [], context=context)
-        acc_obj = self.pool.get('ir.model.access')
-
-        if not isinstance(result,list):
-            result=[result]
-
-        for res in result:
-            rules = acc_obj.search(cr, uid, [('model_id', '=', res['id'])])
-            rules_br = acc_obj.browse(cr, uid, rules, context=context)
-            for g in allgr:
-                res['group_'+str(g)] = ''
-            for rule in rules_br:
-                perm_list = []
-                if rule.perm_read:
-                    perm_list.append('r')
-                if rule.perm_write:
-                    perm_list.append('w')
-                if rule.perm_create:
-                    perm_list.append('c')
-                if rule.perm_unlink:
-                    perm_list.append('u')
-                perms = ",".join(perm_list)
-                if rule.group_id:
-                    res['group_%d'%rule.group_id.id] = perms
-                else:
-                    res['group_0'] = perms
-        return result
-
-    #
-    # This function do not write fields from ir.model because
-    # access rights may be different for managing models and
-    # access rights
-    #
-    def write(self, cr, uid, ids, vals, context=None):
-        vals_new = vals.copy()
-        acc_obj = self.pool.get('ir.model.access')
-        for grid in self.browse(cr, uid, ids, context=context):
-            model_id = grid.id
-            perms_rel = ['read','write','create','unlink']
-            for val in vals:
-                if not val[:6]=='group_':
-                    continue
-                group_id = int(val[6:]) or False
-                rules = acc_obj.search(cr, uid, [('model_id', '=', model_id),('group_id', '=', group_id)])
-                if not rules:
-                    rules = [acc_obj.create(cr, uid, {
-                        'name': grid.name,
-                        'model_id':model_id,
-                        'group_id':group_id
-                    }) ]
-                vals2 = dict(map(lambda x: ('perm_'+x, x[0] in (vals[val] or '')), perms_rel))
-                acc_obj.write(cr, uid, rules, vals2, context=context)
-        return True
-
-    def fields_get(self, cr, uid, fields=None, context=None):
-        result = super(ir_model_grid, self).fields_get(cr, uid, fields, context)
-        groups = self.pool.get('res.groups').search(cr, uid, [])
-        groups_br = self.pool.get('res.groups').browse(cr, uid, groups)
-        result['group_0'] = {'string': 'All Users','type': 'char','size': 7}
-        for group in groups_br:
-            result['group_%d'%group.id] = {'string': '%s'%group.name,'type': 'char','size': 7}
-        return result
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
-        result = super(ir_model_grid, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
-        groups = self.pool.get('res.groups').search(cr, uid, [])
-        groups_br = self.pool.get('res.groups').browse(cr, uid, groups)
-        cols = ['model', 'name']
-        xml = '''<?xml version="1.0"?>
-<%s editable="bottom">
-    <field name="name" select="1" readonly="1" required="1"/>
-    <field name="model" select="1" readonly="1" required="1"/>
-    <field name="group_0"/>
-    ''' % (view_type,)
-        for group in groups_br:
-            xml += '''<field name="group_%d"/>''' % (group.id, )
-        xml += '''</%s>''' % (view_type,)
-        result['arch'] = xml
-        result['fields'] = self.fields_get(cr, uid, cols, context)
-        return result
-ir_model_grid()
-
 class ir_model_fields(osv.osv):
     _name = 'ir.model.fields'
     _description = "Fields"
@@ -327,7 +230,7 @@ class ir_model_access(osv.osv):
         'perm_read': fields.boolean('Read Access'),
         'perm_write': fields.boolean('Write Access'),
         'perm_create': fields.boolean('Create Access'),
-        'perm_unlink': fields.boolean('Delete Permission'),
+        'perm_unlink': fields.boolean('Delete Access'),
     }
 
     def check_groups(self, cr, uid, group):
diff --git a/bin/addons/base/module/wizard/base_module_import_view.xml b/bin/addons/base/module/wizard/base_module_import_view.xml
index 8cb974167d9..9d1aa1bce49 100644
--- a/bin/addons/base/module/wizard/base_module_import_view.xml
+++ b/bin/addons/base/module/wizard/base_module_import_view.xml
@@ -7,7 +7,7 @@
             <field name="model">base.module.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Module import">
+            <form string="Import module">
             <separator string="Module Import" colspan="4"/>
             <label string="Please give your module .ZIP file to import." colspan="4"/>
             <field name="module_file"/>
diff --git a/bin/addons/base/module/wizard/base_module_update.py b/bin/addons/base/module/wizard/base_module_update.py
index 29e897b3a0c..eea5f5aaee4 100644
--- a/bin/addons/base/module/wizard/base_module_update.py
+++ b/bin/addons/base/module/wizard/base_module_update.py
@@ -92,7 +92,7 @@ class base_module_update_open(osv.osv_memory):
         """
         res = {
             'domain': str([]),
-            'name': 'Module List',
+            'name': 'Modules',
             'view_type': 'form',
             'view_mode': 'tree,form',
             'res_model': 'ir.module.module',
diff --git a/bin/addons/base/module/wizard/base_module_update_view.xml b/bin/addons/base/module/wizard/base_module_update_view.xml
index 08576006ba5..9091b5a1b9d 100644
--- a/bin/addons/base/module/wizard/base_module_update_view.xml
+++ b/bin/addons/base/module/wizard/base_module_update_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Scan for new modules">
-            <label string="This function will check for new modules in the 'addons' path" colspan="4" align="0.0"/>
+           <label string="This wizard will scan all module repositories (on the server side) to detect any new or updated modules. Please be patient as this operation may take a few seconds..." colspan="4" align="0.0"/>
             <separator string="" colspan="4" />
             <newline/>
             <group colspan="6" >
diff --git a/bin/addons/base/module/wizard/base_module_upgrade_view.xml b/bin/addons/base/module/wizard/base_module_upgrade_view.xml
index ce7d2e6b659..75e635b3ab4 100644
--- a/bin/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/bin/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -47,7 +47,7 @@
             <field name="model">base.module.upgrade</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="System update done">
+            <form string="Apply Scheduled Upgrades">
             <separator string="System update completed" colspan="4"/>
             <label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
             <label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
diff --git a/bin/addons/base/module/wizard/base_update_translations.py b/bin/addons/base/module/wizard/base_update_translations.py
index 7e61c0a2431..cc7a3361a29 100644
--- a/bin/addons/base/module/wizard/base_update_translations.py
+++ b/bin/addons/base/module/wizard/base_update_translations.py
@@ -50,6 +50,12 @@ class base_update_translations(osv.osv_memory):
         buf.close()
         return {'type': 'ir.actions.act_window_close'}
 
+    def default_get(self, cr, uid, fields, context=None):
+        lang_obj = self.pool.get('res.lang')
+        record_id = context and context.get('active_id', False) or False
+        lang=lang_obj.browse(cr,uid,record_id).code
+        return {'lang':lang}
+
     _name = 'base.update.translations'
     _columns = {
         'lang': fields.selection(_get_languages, 'Language', required=True),
diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index 5adbfb41ced..28bfa0d1911 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -19,7 +19,7 @@
            </group>
          </group>
          <group colspan="8" col="8">
-           <separator string="" colspan="8"/>
+           <separator string="" colspan="6"/>
            <group colspan="4" width="220">
              <field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
            </group>
diff --git a/bin/addons/base/res/res_lang_view.xml b/bin/addons/base/res/res_lang_view.xml
index bf1e611c3d6..cbe5fb388ba 100644
--- a/bin/addons/base/res/res_lang_view.xml
+++ b/bin/addons/base/res/res_lang_view.xml
@@ -24,22 +24,23 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Languages">
-                	<group col="4" colspan="4">
-                    <field name="name" colspan="4"/>
-                    <field name="code" />
-                    <field name="iso_code"/>
-                    <field name="active" />
-                    <field name="translatable"/>
-                    <field name="grouping" />
-                    <field name="direction" />
-                    <newline/>
-                    <field name="date_format"/>
-                    <field name="time_format"/>
-                    <field name="decimal_point"/>
-                    <field name="thousands_sep"/>
-                    <newline/>
-                    </group>
-                    <separator colspan="4" string="Legends for Date and Time Formats"/>
+                	<group col="6" colspan="4">
+                    	<field name="name"/>
+                   		<field name="code" />
+                    	<field name="iso_code"/>
+                    	<newline/>
+                    	<field name="grouping" />
+                    	<field name="date_format"/>
+              		    <field name="time_format"/>
+              		    <newline/>
+						<field name="direction" />
+           		        <field name="decimal_point"/>
+           		        <field name="thousands_sep"/>
+           		        <newline/>
+           		        <field name="active" />
+	                    <field name="translatable"/>
+           		    </group>
+					<separator colspan="4" string="Legends for Date and Time Formats"/>
                     <group col="4" colspan="4">
 	                     <label align="0.0" string="%%a - Abbreviated weekday name."/>
 	                     <label align="0.0" string="%%A - Full weekday name."/>
@@ -106,10 +107,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Languages">
-					<field name="name"/>
-					<field name="code"/>
-					<field name="iso_code"/>
-					<field name="direction"/>
+	                 <group>
+	                	<filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
+	                    <separator orientation="vertical"/>
+						<field name="name"/>
+						<field name="code"/>
+						<field name="iso_code"/>
+						<field name="direction"/>
+					</group>
                 </search>
             </field>
         </record>
@@ -121,6 +126,6 @@
             <field name="context">{'active_test': False}</field>
             <field name="search_view_id" ref="res_lang_search"/>
         </record>
-        <menuitem action="res_lang_act_window" id="menu_res_lang_act_window" parent="menu_translation"/>
+        <menuitem action="res_lang_act_window" id="menu_res_lang_act_window" parent="menu_translation" groups="base.group_extended" sequence="1"/>
     </data>
 </openerp>
diff --git a/bin/addons/base/res/res_log.py b/bin/addons/base/res/res_log.py
index 886221ada77..97ee249fccd 100644
--- a/bin/addons/base/res/res_log.py
+++ b/bin/addons/base/res/res_log.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
-import tools 
+import tools
 
 class res_log(osv.osv_memory):
     _name = 'res.log'
@@ -29,7 +29,8 @@ class res_log(osv.osv_memory):
         'user_id': fields.many2one('res.users','User', required=True),
         'res_model': fields.char('Object', size=128),
         'res_id': fields.integer('Object ID'),
-        'secondary': fields.boolean('Secondary Log', help='Do not display this log if it belongs to the same object the user is working on')
+        'secondary': fields.boolean('Secondary Log', help='Do not display this log if it belongs to the same object the user is working on'),
+        'create_date': fields.datetime('Created Date', readonly=True),
     }
     _defaults = {
         'user_id': lambda self,cr,uid,ctx: uid
diff --git a/bin/addons/base/res/res_log_view.xml b/bin/addons/base/res/res_log_view.xml
index 046d93f1788..24857831bfc 100644
--- a/bin/addons/base/res/res_log_view.xml
+++ b/bin/addons/base/res/res_log_view.xml
@@ -23,6 +23,7 @@
                 <tree string="Logs">
                     <field name="name"/>
                     <field name="user_id"/>
+                    <field name="create_date"/>
                 </tree>
             </field>
         </record>
@@ -32,11 +33,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Logs">
-                    <group colspan="4" col="6">
-                        <field name="name" colspan="4"/>
+                 <field name="name" colspan="3"/>
+                 <newline/>
+                    <group colspan="4" col="8">
                         <field name="user_id" />
                         <field name="res_model"/>
                         <field name="res_id"/>
+                        <field name="create_date" colspan="1"/>
                     </group>
                 </form>
             </field>

From 1a6eb1e917b78f3dffacf3cc2beb2e29dd0290e2 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 29 Sep 2010 13:28:17 +0530
Subject: [PATCH 049/244] [IMP]: base:Improvement in base module

bzr revid: ron@tinyerp.com-20100929075817-ve8a7w8gw6e6v7k1
---
 bin/addons/base/base_menu.xml            |  2 +-
 bin/addons/base/ir/ir_actions.py         |  2 +-
 bin/addons/base/ir/ir_filters.py         |  2 +-
 bin/addons/base/res/ir_property_view.xml |  2 +-
 bin/addons/base/res/res_request_view.xml | 31 +++++++++++++++---------
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 5da97026e48..3fe8e96a352 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -5,7 +5,7 @@
         <menuitem icon="terp-administration" id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
         <menuitem id="next_id_4" name="Low Level Objects"
             parent="base.menu_administration" sequence="3"
-            groups="base.group_extended"/>
+            groups="base.group_extended,base.group_no_one"  />
         <menuitem id="menu_low_workflow" name="Workflow Items" parent="base.next_id_4"/>
         <menuitem id="menu_custom" name="Customization"
             parent="base.menu_administration" sequence="2"
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 4b9d59743cb..09469e33450 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -36,7 +36,7 @@ class actions(osv.osv):
     _table = 'ir_actions'
     _columns = {
         'name': fields.char('Action Name', required=True, size=64),
-        'type': fields.char('Action Type', required=True, size=32),
+        'type': fields.char('Action Type', required=True, size=32,readonly=True),
         'usage': fields.char('Action Usage', size=32),
     }
     _defaults = {
diff --git a/bin/addons/base/ir/ir_filters.py b/bin/addons/base/ir/ir_filters.py
index 2821d0c94b7..8f9869a6922 100644
--- a/bin/addons/base/ir/ir_filters.py
+++ b/bin/addons/base/ir/ir_filters.py
@@ -42,7 +42,7 @@ class ir_filters(osv.osv):
         'user_id':fields.many2one('res.users', 'User', help='False means for every user'),
         'domain': fields.text('Domain Value', required=True),
         'context': fields.text('Context Value', required=True),
-        'model_id': fields.selection(_list_all_models, 'Model', required=True),
+        'model_id': fields.selection(_list_all_models, 'Object', required=True),
     }
 
 ir_filters()
diff --git a/bin/addons/base/res/ir_property_view.xml b/bin/addons/base/res/ir_property_view.xml
index f5a951d0c29..399cac47136 100644
--- a/bin/addons/base/res/ir_property_view.xml
+++ b/bin/addons/base/res/ir_property_view.xml
@@ -73,7 +73,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="ir_property_view_tree"/>
         </record>
-        <menuitem id="next_id_15" name="Parameters" parent="base.menu_config"/>
+        <menuitem id="next_id_15" name="Parameters" parent="base.menu_config" groups="base.group_extended" />
         <menuitem action="ir_property_form" id="menu_ir_property_form_all" parent="base.next_id_15"/>
     </data>
 </openerp>
diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml
index 3e83f6c3e96..2b1195df51c 100644
--- a/bin/addons/base/res/res_request_view.xml
+++ b/bin/addons/base/res/res_request_view.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+    	<menuitem name="Requests" id="menu_resquest_ref" parent="base.next_id_4" sequence="1"/>
+
         <record id="res_request_tree-view" model="ir.ui.view">
             <field name="name">res.request.tree</field>
             <field name="model">res.request</field>
@@ -40,9 +42,9 @@
                             <field colspan="4" name="body" nolabel="1"/>
                             <group col="5" colspan="4">
                                 <field name="state"/>
-                                <button name="request_close" states="waiting,draft,active" string="End of Request" type="object"/>
-                                <button name="request_send" states="draft,active" string="Send" type="object"/>
-                                <button name="request_reply" states="waiting" string="Reply" type="object"/>
+                                <button name="request_close" states="waiting,draft,active" string="Close" type="object" icon="gtk-stop"/>
+                                <button name="request_send" states="draft,active" string="Send" type="object" icon="terp-camera_test"/>
+                                <button name="request_reply" states="waiting" string="Reply" type="object" icon="gtk-undo"/>
                             </group>
                         </page>
                         <page string="References" groups="base.group_extended">
@@ -75,12 +77,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Requests">
-                    <group colspan="4" col="10">
-	                    <field name="act_from"/>
-	                    <field name="act_to" select="1"/>
-	                    <field name="name"/>
-	                    <field name="state"/>
-	                </group>
+                    <filter string="Current" icon="terp-camera_test" domain="['|',('state','=','draft'),('state','=','active')]"
+                    help="Draft and Active"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state','=','waiting')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="act_from"/>
+                    <field name="act_to" select="1"/>
+                    <field name="name"/>
+                    <field name="state"/>
 	                <newline/>
 	                <group expand="0" string="Group By" colspan="4">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -108,7 +113,7 @@
             <field name="search_view_id" ref="res_request_search_view"/>
             <field name="context">{"search_default_act_to":uid}</field>
         </record>
-        <menuitem action="res_request-act" id="menu_res_request_act" parent="base.next_id_4" sequence="1"/>
+        <menuitem action="res_request-act" id="menu_res_request_act" parent="menu_resquest_ref" />
 
         <record id="res_request_link-view" model="ir.ui.view">
             <field name="name">res.request.link.form</field>
@@ -146,14 +151,16 @@
         </record>
 
         <record id="res_request_link-act" model="ir.actions.act_window">
-            <field name="name">References Link</field>
+            <field name="name">Request Reference Types</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.request.link</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="res_request_link_search_view"/>
         </record>
-        <menuitem action="res_request_link-act" id="menu_res_request_link_act" parent="base.next_id_4" sequence="4"/>
+        <menuitem action="res_request_link-act" id="menu_res_request_link_act" parent="menu_resquest_ref" />
+
+
 
 
         <record id="res_request_history_tree-view" model="ir.ui.view">

From e5b5e202b46de0cf7ff824127b767281f56f9931 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 29 Sep 2010 15:57:23 +0530
Subject: [PATCH 050/244] [MOD] hr_recruitment : job position, state changed to
 old when expected and no of employee will be same

bzr revid: vir@tinyerp.com-20100929102723-eyxqhmhpo5rcir5j
---
 addons/hr_recruitment/hr_recruitment.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index b9241477409..fbb1287afb4 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -436,8 +436,10 @@ class hr_applicant(crm.crm_case, osv.osv):
         if applicant.job_id :
             emp_id = employee_obj.create(cr,uid,{'name':applicant.name,'job_id':applicant.job_id.id})
             job_data = job_obj.browse(cr,uid, applicant.job_id.id)
-            expected_emp = job_data['expected_employees'] - 1
-            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp,'state': 'old'})
+            if job_data.expected_employees == int(job_data.no_of_employee):
+                job_obj.write(cr,uid, [applicant.job_id.id],{'state':'old'})
+#            expected_emp = job_data['expected_employees'] - 1
+#            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
 
         return res
 

From 06b263590b67e20c48043646418326057116c3e8 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 29 Sep 2010 16:04:24 +0530
Subject: [PATCH 051/244] [MOD/IMP]hr_*:usability improvement

bzr revid: dbr@tinyerp.com-20100929103424-ffqsulgieop241zv
---
 addons/hr/hr_view.xml                   | 2 +-
 addons/hr_contract/hr_contract_view.xml | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 7d2cec69667..f3edf5ab4e2 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -147,7 +147,7 @@
             <field name="domain">[]</field>
             <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
-            <field name="help">The employee directory contains all data related to your employees: from their photo up to their hourly estimated costs for the timesheets. Employees are managed by departments and can be linked to users to manage their access rights.</field>
+            <field name="help">The employee directory contains all data related to your employees : from their photo up to their hourly estimated costs for the timesheets.Employees are managed by departments and can be linked to users to manage their access rights.</field>
         </record>
 
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index cb486df91b1..ba77b630385 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -155,8 +155,8 @@
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
                     <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
-                    <filter string="Working Schedule" icon="terp-personal+" domain="[]" context="{'group_by':'working_hours'}"/>
-                    <filter string="Current" icon="terp-stock_symbol-selection" 
+                    <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
+                    <filter string="Current" icon="terp-stock_symbol-selection" name="current"
                             domain="[('date_end','&gt;=', time.strftime('%%Y-%%m-%%d'))]" 
                             context="{'group_by':'date_end'}"/>                    
                    </group>
@@ -213,7 +213,7 @@
                     <field name="employee_id"/>
                     <field name="type_id"/>
                     <field name="job_id"/>
-                    <field name="department_id"/>
+                    <!--field name="department_id"/-->
                     <field name="working_hours"/>                    
                     <field name="date_start"/>
                     <field name="date_end"/>
@@ -229,6 +229,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
+            <field name="context">{'search_default_current':1}</field>
             <field name="search_view_id" ref="hr_contract_view_search"/>
         </record>
 

From 4d0025737fa148cbf0e9d258b53a4ce4d02c37ea Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 29 Sep 2010 16:37:18 +0530
Subject: [PATCH 052/244] [FIX]: base module :in action parent menu

bzr revid: ron@tinyerp.com-20100929110718-usm83e55csfc6tkd
---
 bin/addons/base/ir/ir.xml                    | 2 +-
 bin/addons/base/security/ir.model.access.csv | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 63d5daf071e..08c2b6af2bb 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -106,7 +106,6 @@
 	    </record>
 
 
-        <menuitem action="act_values_form_action" id="menu_values_form_action" parent="next_id_6"/>
 
 
         <!-- Values -->
@@ -342,6 +341,7 @@
         </record>
         <menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
         <menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/>
+        <menuitem action="act_values_form_action" id="menu_values_form_action" parent="next_id_6"/>
 
         <!--Filters form view-->
 
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 9168d93078d..481007d52b2 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -8,12 +8,10 @@
 "access_ir_exports_line_group_system","ir_exports_line group_system","model_ir_exports_line","base.group_user",1,1,1,1
 "access_ir_model_group_erp_manager","ir_model group_erp_manager","model_ir_model","group_erp_manager",1,1,1,1
 "access_ir_model_access_group_erp_manager","ir_model_access_group_erp_manager","model_ir_model_access","group_erp_manager",1,1,1,1
-"access_ir_model_grid_group_erp_manager","ir_model_access_grid_group_erp_manager","model_ir_model_grid","group_erp_manager",1,1,1,1
 "access_ir_model_data_group_erp_manager","ir_model_data group_erp_manager","model_ir_model_data","group_erp_manager",1,1,1,1
 "access_ir_model_fields_group_erp_manager","ir_model_fields group_erp_manager","model_ir_model_fields","group_erp_manager",1,1,1,1
 "access_ir_model_all","ir_model_all","model_ir_model",,1,0,0,0
 "access_ir_model_access_all","ir_model_access_all","model_ir_model_access",,1,0,0,0
-"access_ir_model_grid_all","ir_model_access_grid_all","model_ir_model_grid",,0,0,0,0
 "access_ir_model_data_all","ir_model_data all","model_ir_model_data",,1,0,0,0
 "access_ir_model_fields_all","ir_model_fields all","model_ir_model_fields",,1,0,0,0
 "access_ir_module_category_group_user","ir_module_category group_user","model_ir_module_category","group_system",1,0,0,0

From b4779a1bd361a979b997345bc66444f7b97d517f Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Wed, 29 Sep 2010 16:42:00 +0530
Subject: [PATCH 053/244] [IMP/FIX]: base : Improvement in User,Security menu

bzr revid: jas@tinyerp.com-20100929111200-fs00cbqhpo4uzz3z
---
 bin/addons/base/base_update.xml               |  45 +--
 bin/addons/base/ir/ir.xml                     | 293 ++++++++----------
 bin/addons/base/ir/ir_model.py                |   1 +
 .../base/maintenance/maintenance_view.xml     |  12 +-
 .../wizard/base_export_language_view.xml      |  62 ++--
 .../wizard/base_import_language_view.xml      |  32 +-
 .../base/module/wizard/base_module_upgrade.py |   4 +-
 bin/addons/base/res/res_log_view.xml          |   5 +-
 bin/addons/base/security/ir.model.access.csv  |   2 -
 9 files changed, 223 insertions(+), 233 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 361bbfa67a0..af6d4f59a22 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -114,21 +114,30 @@
                     <newline/>
                     <notebook colspan="4">
                         <page string="User">
-                            <field name="company_id" required="1"
-                                context="{'user_id': self, 'user_preference': 1}"
-                                on_change="on_change_company_id(company_id)"
-                                groups="base.group_multi_company"
-                                />                        
-                            <field name="address_id" select="1"/>
-                            <field name="user_email" widget="email"/>
-                            <field name="context_lang"/>   
-                            <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>                                                    
-                            <field name="action_id" required="True"/>
-
-
-                            <field name="context_tz"/>
-                            <field name="view" readonly="0"/>
-                            <field name="menu_tips" colspan="2"/>
+	                        <group colspan="1" col="2">
+	                          <separator string="Contact" colspan="2"/>
+	                            <field name="company_id" required="1"
+	                                context="{'user_id': self, 'user_preference': 1}"
+	                                on_change="on_change_company_id(company_id)"
+	                                groups="base.group_multi_company"
+	                                />
+	                            <field name="address_id" select="1"/>
+	                            <field name="user_email" widget="email"/>
+							</group>
+							<group colspan="1" col="2" groups="base.group_extended">
+							<separator string="Action" colspan="2"/>
+                           		 <field name="action_id" required="True"/>
+                           		 <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
+                            </group>
+                            <group colspan="1" col="2">
+							  <separator string="Preferences" colspan="2"/>
+                           		 <field name="context_lang"/>
+                          		 <field name="context_tz"/>
+                          		 <group colspan="2" col="4">
+	                                 <field name="view" readonly="0"/>
+	                                 <field name="menu_tips" colspan="2"/>
+                                 </group>
+                            </group>
                             <newline/>
                             <group colspan="2" col="2">
                                 <separator string="Signature" colspan="2"/>
@@ -142,7 +151,7 @@
                         <page string="Roles">
                             <field colspan="4" nolabel="1" name="roles_id"/>
                         </page>
-                        <page string="Companies">
+                        <page string="Companies" groups="base.group_multi_company">
                             <field colspan="4" nolabel="1" name="company_ids" select="1"/>
                         </page>
                     </notebook>
@@ -157,7 +166,7 @@
                 <tree string="Users">
                     <field name="name"/>
                     <field name="login"/>
-                    <field name="address_id" string="Address" />
+                    <field name="context_lang"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
@@ -172,7 +181,7 @@
                     <field name="name"/>
                     <field name="login"/>
                     <field name="address_id" string="Address"/>
-                    <field name="company_ids" string="Company"/>
+                    <field name="company_ids" string="Company" groups="base.group_multi_company"/>
                 </search>
             </field>
         </record>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index d6c092bd6f6..0e88dfc6bce 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -10,22 +10,14 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Connect Events to Actions">
-                	<group col="6" colspan="4">
                     <field name="name" required="1"/>
                     <field name="model_id" on_change="onchange_object_id(model_id)"/>
                     <field name="action_id" on_change="onchange_action_id(action_id)"/>
                     <field name="key2" required="1"/>
-                    <field name="res_id"/>
                     <field name="object" readonly="1"/>
-					</group>
-                	<group col="2" colspan="2">
-                        <separator colspan="2" string="Value"/>
-                    	<field name="value_unpickle" nolabel="1"/>
-                    </group>
-                	<group col="2" colspan="2">
-                        <separator colspan="2" string="Metadata"/>
-	                    <field name="meta_unpickle" nolabel="1"/>
-                    </group>
+                    <field name="res_id"/>
+                    <field name="value_unpickle"/>
+                    <field name="meta_unpickle"/>
                     <field name="user_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </form>
@@ -55,17 +47,12 @@
                     <field name="name"/>
                     <field name="model"/>
                     <field name="key2"/>
-                    <newline/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'key2'}"/>
-                    </group>
                 </search>
             </field>
         </record>
 
         <record id="act_values_form_action" model="ir.actions.act_window">
-            <field name="name">Client Events</field>
+            <field name="name">Client Actions</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.values</field>
             <field name="view_type">form</field>
@@ -89,9 +76,7 @@
 	        <field name="act_window_id" ref="act_values_form_action"/>
 	    </record>
 
-        <menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
-
-        <menuitem action="act_values_form_action" id="menu_values_form_action" parent="next_id_6"/>
+        <menuitem action="act_values_form_action" id="menu_values_form_action" parent="base.menu_custom_action"/>
 
 
         <!-- Values -->
@@ -269,7 +254,7 @@
         </record>
 
         <record id="ir_sequence_type" model="ir.actions.act_window">
-            <field name="name">Sequence Codes</field>
+            <field name="name">Sequence Types</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.sequence.type</field>
             <field name="view_type">form</field>
@@ -325,8 +310,7 @@
             <field name="view_id" ref="action_view_tree"/>
             <field name="search_view_id" ref="action_view_search"/>
         </record>
-
-
+        <menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
         <menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/>
 
         <!--Filters form view-->
@@ -842,29 +826,23 @@
                 <search string="Role">
                     <field name="name"/>
                     <field name="parent_id"/>
+                    <field name="description"/>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                        <filter string="Parent" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'parent_id'}"/>
+                	</group>
                 </search>
             </field>
         </record>
 
-        <record id="action_res_roles" model="ir.actions.act_window">
-            <field name="name">Roles Structure</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.roles</field>
-            <field name="view_type">tree</field>
-            <field eval="[('parent_id','=',False)]" name="domain"/>
-        </record>
-        <menuitem action="action_res_roles"
-            groups="base.group_extended"
-            id="menu_action_res_roles" parent="base.menu_users"/>
-
-        <record id="action_res_roles_form" model="ir.actions.act_window">
+       <record id="action_res_roles_form" model="ir.actions.act_window">
             <field name="name">Roles</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.roles</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_roles_search"/>
         </record>
-        <menuitem action="action_res_roles_form" id="menu_action_res_roles_form" parent="menu_action_res_roles"/>
+        <menuitem action="action_res_roles_form" id="menu_action_res_roles_form" parent="base.menu_users"/>
 
         <!-- View -->
         <record id="view_view_form" model="ir.ui.view">
@@ -873,25 +851,21 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Views">
-		            <group colspan="4" col="6">
-		                <field name="name" select="1" colspan="6"/>
-		                <field name="type" select="1"/>
-		                <field name="model" select="1"/>
-		                <field name="priority"/>
-		            </group>
-                    <notebook colspan="4">
-                    	<page string="Architecture">
-	                    	<field colspan="4" nolabel="1" name="arch"/>
-	                	</page>
-                    	<page string="Extra Info">
-	                        <separator string="Advanced" colspan="4"/>
-	                        <newline/>
-	                        <field name="field_parent"/>
-	                        <field name="inherit_id" select="1"/>
-	                        <field name="xml_id" select="1"/>
-	                	</page>
-
-	                </notebook>
+                    <group colspan="2" col="2">
+                        <separator string="General" colspan="2"/>
+                        <field name="name" select="1"/>
+                        <field name="type" select="1"/>
+                        <field name="model" select="1"/>
+                        <field name="priority"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Advanced" colspan="2"/>
+                        <field name="field_parent"/>
+                        <field name="inherit_id" select="1"/>
+                        <field name="xml_id" select="1"/>
+                    </group>
+                    <separator string="View architecture" colspan="4"/>
+                    <field colspan="4" nolabel="1" name="arch"/>
                 </form>
             </field>
         </record>
@@ -918,13 +892,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Views">
-                    <filter icon="terp-stock_zoom" string="Search"
-                        domain="[('type', '=', 'search')]" />
-                    <filter icon="gtk-indent" string="Tree"
-                        domain="[('type', '=', 'tree')]" />
-                    <filter icon="gtk-new" string="Form"
-                        domain="[('type', '=','form')]" />
-                    <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="type"/>
                     <field name="model"/>
@@ -932,7 +899,7 @@
                     <field name="xml_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Object" icon="terp-stage" domain="[]" context="{'group_by':'model'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
                 </search>
@@ -954,14 +921,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Attachments">
-                    <group colspan="4" col="2">
+                    <group colspan="4" col="4">
                         <field name="name" select="1" />
+                        <field name="type"/>
                     </group>
                     <notebook colspan="4">
                     <page string="Attachment">
                     <group col="4" colspan="4">
-                        <separator string="Data" colspan="2"/>
-                        <field name="type"/>
+                        <separator string="Data" colspan="4"/>
                         <newline />
                         <group col="2" colspan="4" attrs="{'invisible':[('type','=','url')]}">
                             <field name="datas" filename="datas_fname"/>
@@ -1010,13 +977,21 @@
             <field name="arch" type="xml">
                 <search string="Attachments">
                     <group colspan="4" col="10">
+                      <filter icon="terp-stage"
+                        string="URL"
+                        domain="[('type','=','url')]"/>
+                      <filter icon="terp-stock_align_left_24"
+                        string="Binary"
+                        domain="[('type','=','binary')]"/>
+                    <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="datas_fname"/>
                         <field name="type"/>
+                        <field name="datas_fname"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By" colspan="4">
-                        <filter string="File Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Creator" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
+                        <filter string="Date" icon="terp-calendar" domain="[]" context="{'group_by':'create_date'}"/>
                     </group>
                 </search>
             </field>
@@ -1182,7 +1157,7 @@
                                         <field name="translate"/>
                                         <field name="on_delete" attrs="{'readonly': [('ttype','!=','many2one')]}"/>
                                     </group>
-                                    <separator string="Security on Groups" colspan="4"/>
+                                    <separator string="Groups" colspan="4"/>
                                     <field name="groups" colspan="4" nolabel="1"/>
                                 </form>
                             </field>
@@ -1235,18 +1210,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Model Description">
-                    <filter icon="terp-camera_test" string="In Memory"
-                        domain="[('osv_memory', '=', True)]" />
-                    <separator orientation="vertical" />
-                    <filter icon="terp-stock_symbol-selection"
-                        string="Custom" domain="[('state', '=', 'manual')]" />
-                    <separator orientation="vertical" />
-                    <filter icon="terp-stock_align_left_24" string="Base"
-                        domain="[('state', '=', 'base')]" />
-                    <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="model"/>
-                    <newline/>
+                    <field name="osv_memory"/>
+                    <field name="state"/>
+                    <field name="access_ids"/>
+                    <field name="info"/>
                 </search>
             </field>
         </record>
@@ -1258,12 +1227,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fields">
-                	<group colspan="4" col="6">
-		                <field name="name" select="1" />
-		            	<field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
-		            	<field name="field_description"/>
-		            	<field name="state"/>
-           	   		</group>
+                    <group colspan="4" col="4">
+                        <field name="name" select="1"/>
+                        <field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
+                        <field name="field_description"/>
+                        <field name="state"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Properties">
                             <group colspan="2" col="2">
@@ -1313,29 +1282,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Fields">
-                	<filter icon="terp-camera_test"
-                        string="Required"
-                        domain="[('required', '=', True)]"/>
-                    <separator orientation="vertical"/>
-                	<filter icon="terp-stock_align_left_24"
-                        string="Readonly"
-                        domain="[('readonly', '=', True)]"/>
-                    <separator orientation="vertical"/>
-                	<filter icon="terp-translate"
-                        string="Translate"
-                        domain="[('translate', '=', True)]"/>
-                    <newline/>
                     <field name="name"/>
                     <field name="field_description"/>
                     <field name="model_id"/>
                     <field name="ttype"/>
                     <field name="required"/>
                     <field name="readonly"/>
-                    <newline/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
-                    </group>
-
                 </search>
             </field>
         </record>
@@ -1378,10 +1330,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Module Data">
-                	<filter icon="terp-stock_effects-object-colorize"
-                        string="Updatable"
-                        domain="[('noupdate', '=', False)]"/>
-                    <separator orientation="vertical"/>
                     <field name="module"/>
                     <field name="name"/>
                     <field name="model"/>
@@ -1389,8 +1337,8 @@
                     <field name="noupdate"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Module" icon="terp-folder-blue" domain="[]" context="{'group_by':'module'}"/>
-                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Module" icon="terp-stage" domain="[]" context="{'group_by':'module'}"/>
+                        <filter string="Object" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'model'}"/>
                     </group>
                 </search>
             </field>
@@ -1433,7 +1381,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Translations">
-                    <filter icon="terp-project"
+                    <filter icon="terp-document-new"
                         string="Untranslated"
                         domain="['|',('value', '=', False),('value','=','')]"/>
                     <separator orientation="vertical"/>
@@ -1454,16 +1402,15 @@
                     <field name="type"/>
                     <field name="name"/>
                     <field name="res_id"/>
-                    <group colspan="4" col="4">
-                        <group colspan="2" col="2">
-		                    <separator string="Source Term" colspan="2"/>
-		                    <field name="src" nolabel="1" height="400"/>
-	                    </group>
-	                    <group colspan="2" col="2">
-		                    <separator string="Tranlsation Term" colspan="2"/>
-		                    <field name="value" nolabel="1" height="400"/>
-		                </group>
+                    <group colspan="2" col="2">
+		               <separator string="Source Term" colspan="2"/>
+		               <field name="src" nolabel="1" height="400"/>
 	                </group>
+	                <group colspan="2" col="2">
+		               <separator string="Tranlsation" colspan="2"/>
+		               <field name="value" nolabel="1" height="400"/>
+		            </group>
+
                 </form>
             </field>
         </record>
@@ -1488,7 +1435,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_translation_tree"/>
         </record>
-        <menuitem action="action_translation" id="menu_action_translation" parent="base.menu_translation_app"/>
+        <menuitem action="action_translation" id="menu_action_translation" parent="base.menu_translation_app" />
 
         <!--
     =============================================================
@@ -1548,7 +1495,7 @@
                         <field name="icon_pict" widget="picture" nolabel="1" colspan="2"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Security on Groups">
+                        <page string="Groups">
 		                    <field name="groups_id" colspan="4" nolabel="1"/>
 		                </page>
 		            </notebook>
@@ -1569,13 +1516,13 @@
 	    </record>
 
         <record id="grant_menu_access" model="ir.actions.act_window">
-            <field name="name">Manage Menus</field>
+            <field name="name">Menu Items</field>
             <field name="res_model">ir.ui.menu</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_menu"/>
             <field name="search_view_id" ref="edit_menu_access_search"/>
         </record>
-        <menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.menu_security" sequence="1"/>
+        <menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.next_id_2" sequence="1"/>
 
         <!--
     =============================================================
@@ -1622,8 +1569,7 @@
                         <separator string="Action to Trigger" colspan="4"/>
                         <field name="model" groups="base.group_extended"/>
                         <field name="function"/>
-                        <separator string="Arguments" colspan="4"/>
-                        <field colspan="4" name="args" nolabel="1"/>
+                        <field colspan="4" name="args"/>
                     </page>
                     </notebook>
                 </form>
@@ -1642,8 +1588,8 @@
                     <field name="active"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Execution" icon="terp-go-month"
+                        <filter string="User" icon="terp-personal-" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Next Call" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'nextcall'}" />
                     </group>
                 </search>
@@ -1698,14 +1644,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Access Controls">
-                    <field colspan="4" name="name"/>
-                    <field name="model_id"/>
-                    <field name="group_id"/>
-                    <newline/>
-                    <field name="perm_read"/>
-                    <field name="perm_write"/>
-                    <field name="perm_create"/>
-                    <field name="perm_unlink"/>
+                    <group col="6" colspan="4">
+	                    <field name="name"/>
+	                    <field name="model_id"/>
+	                    <field name="group_id"/>
+	                </group>
+	                <separator string="Access" colspan="4"/>
+		                <group col="4" colspan="4">
+							<field name="perm_read"/>
+			                <field name="perm_write"/>
+			                <field name="perm_create"/>
+			                <field name="perm_unlink"/>
+			           </group>
                 </form>
             </field>
         </record>
@@ -1715,9 +1665,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Access Controls">
-                    <field name="name"/>
-                    <field name="model_id"/>
-                    <field name="group_id"/>
+                <group>
+                		<filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
+                        <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True),('perm_write','=',False),('perm_create','=',False),('perm_unlink','=',False)]"/>
+                        <filter string="Write Access" icon="terp-tools" domain="[('perm_read','=',False),('perm_write','=',True),('perm_create','=',False),('perm_unlink','=',False)]"/>
+	                    <separator orientation="vertical"/>
+                		<field name="name"/>
+	          			<field name="model_id"/>
+	            		<field name="group_id"/>
+	            </group>
+	            <newline/>
+	            <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                     <filter string="Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
+                     <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
+               	</group>
                 </search>
             </field>
         </record>
@@ -1729,8 +1692,7 @@
             <field name="view_id" ref="ir_access_view_tree"/>
             <field name="search_view_id" ref="ir_access_view_search"/>
         </record>
-        <menuitem name="Access Controls" id="menu_security_access" parent="menu_security" sequence="5"/>
-        <menuitem action="ir_access_act" id="menu_ir_access_act" parent="menu_security_access"/>
+      <menuitem action="ir_access_act" id="menu_ir_access_act" parent="base.menu_security"/>
 
         <!-- Rules -->
 
@@ -1796,9 +1758,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Record rules">
-                    <field name="model_id"/>
-                    <field name="global"/>
-                    <field name="groups"/>
+                	<group>
+                        <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
+                        <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True),('perm_write','=',False),('perm_create','=',False),('perm_unlink','=',False)]"/>
+                        <filter string="Write Access" icon="terp-tools" domain="[('perm_read','=',False),('perm_write','=',True),('perm_create','=',False),('perm_unlink','=',False)]"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="model_id"/>
+	                    <field name="global"/>
+	                    <field name="groups"/>
+	                </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
+                	</group>
                 </search>
             </field>
         </record>
@@ -1943,15 +1917,7 @@
             <field name="search_view_id" ref="view_server_action_search"/>
             <field name="context">{'key':'server_action'}</field>
         </record>
-        <menuitem action="action_server_action" id="menu_server_action" parent="base.next_id_6"/>
-
-        <record model="ir.actions.act_window" id="action_model_grid_security">
-            <field name="name">Access Controls Grid</field>
-            <field name="res_model">ir.model.grid</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem action="action_model_grid_security" id="menu_ir_access_grid" parent="menu_security_access"/>
+        <menuitem action="action_server_action" id="menu_server_action" parent="base.menu_custom_action"/>
 
         <record id="ir_actions_todo_tree" model="ir.ui.view">
             <field name="model">ir.actions.todo</field>
@@ -1961,10 +1927,11 @@
                 <tree editable="bottom" string="Config Wizard Steps">
                     <field name="sequence"/>
                     <field name="action_id"/>
-                    <field name="restart"/>
                     <field name="state" readonly="1"/>
-                    <button name="action_open" states="cancel,skip,done" string="Set as todo" type="object" icon="gtk-convert"/>
-                    <button name="action_launch" states="open" string="Launch this wizard" type="object" icon="gtk-execute"/>
+                    <button name="action_launch" states="open" string="Launch" type="object" icon="gtk-execute" help="Launch Configuration Wizard"/>
+                    <button name="action_open" states="cancel,skip,done"
+                            string="Todo" type="object" help="Set as Todo"
+                            icon="gtk-convert"/>
                 </tree>
             </field>
         </record>
@@ -1984,8 +1951,10 @@
                     <field name="groups_id" nolabel="1" colspan="4"/>
                     <group colspan="4" col="4">
                         <field name="state" colspan="2" readonly="1"/>
-                        <button name="action_launch" states="open" string="Launch" type="object" icon="gtk-execute" help="Launch this wizard"/>
-                        <button name="action_open" states="cancel,skip,done" string="Set as todo" type="object" icon="gtk-convert"/>
+                        <button name="action_launch" states="open" string="Launch" type="object" icon="gtk-execute" help="Launch Configuration Wizard"/>
+                        <button name="action_open" states="cancel,skip,done"
+                            string="Set as Todo" type="object"
+                            icon="gtk-convert"/>
                     </group>
                 </form>
             </field>
@@ -1999,8 +1968,8 @@
                 <search string="Search Actions">
                 	<filter string="To Do" name="todo" icon="terp-camera_test" domain=" ['|',('state','=','open'),'&amp;',('state','=','skip'),('restart','=','onskip')]" help="Todo State Or (Skip State And Onskip Restart)"/>
                 	<separator orientation="vertical"/>
-                	<field name="state"/>
-					<field name="restart"/>
+                    <field name="state"/>
+                    <field name="restart"/>
                 </search>
             </field>
         </record>
@@ -2013,8 +1982,14 @@
         </record>
         <menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="1"/>
 
+        <wizard id="wizard_configuration" model="ir.module.module" name="module.configuration" string="Start Configuration"/>
         <menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form"
                 parent="next_id_11" groups="base.group_extended" sequence="20"/>
 
+        <menuitem
+            action="wizard_configuration" name="Start Configuration"
+            id="menu_configurator_module" parent="next_id_11"
+            type="wizard"/>
+
     </data>
 </openerp>
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 27ccb9286ee..5410cba10a6 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -63,6 +63,7 @@ class ir_model(osv.osv):
         is_osv_mem = self._is_osv_memory(cr, uid, all_model_ids, 'osv_memory', arg=None, context=context)
         return [('id', 'in', [id for id in is_osv_mem if bool(is_osv_mem[id]) == value])]
 
+
     _columns = {
         'name': fields.char('Object Name', size=64, translate=True, required=True),
         'model': fields.char('Object', size=64, required=True, select=1),
diff --git a/bin/addons/base/maintenance/maintenance_view.xml b/bin/addons/base/maintenance/maintenance_view.xml
index 8b4021347d4..9a66e5b111e 100644
--- a/bin/addons/base/maintenance/maintenance_view.xml
+++ b/bin/addons/base/maintenance/maintenance_view.xml
@@ -23,10 +23,11 @@
             <field name="arch" type="xml">
                 <form string="Maintenance Contract">
                     <separator string="Information" colspan="4"/>
-                    <field name="name"/>
-                    <newline/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
+                    <group col="6" colspan="4">
+	                    <field name="name"/>
+	                    <field name="date_start"/>
+	                    <field name="date_stop"/>
+	                </group>
                     <separator string="Covered Modules" colspan="4"/>
                     <field name="module_ids" nolabel="1" colspan="4">
                         <tree string="Covered Modules">
@@ -89,8 +90,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Maintenance Contract" col="2">
-                    <image name="gtk-dialog-info" />
-                    <group col="1">
+                        <group col="1">
                         <separator string="Add Maintenance Contract" />
                         <group states="draft">
                             <field name="name" width="250" />
diff --git a/bin/addons/base/module/wizard/base_export_language_view.xml b/bin/addons/base/module/wizard/base_export_language_view.xml
index cae515425d5..99435be8736 100644
--- a/bin/addons/base/module/wizard/base_export_language_view.xml
+++ b/bin/addons/base/module/wizard/base_export_language_view.xml
@@ -7,38 +7,44 @@
             <field name="model">base.language.export</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Export language">
-                    <notebook>
-                        <page string="Export Data">
-                            <group colspan="4" states="choose">
-                                <separator colspan="4" string="Export translation file"/>
-                                <field name="lang" required="1"/>
-                                <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" fieldname="name" colspan="4"/>
-                                <field height="80" name="advice" nolabel="1" colspan="4"/>
-                            </group>
-                            <separator string="" colspan="4"/>
-                                <group col="2" colspan="2">
-                                </group>
-                                <group col="2" colspan="2">
-                                    <button icon="gtk-cancel" name="act_cancel" special="cancel" states="choose" string="_Cancel" type="object"/>
-                                    <button icon="gtk-ok" name="act_getfile" states="choose" string="_Export" type="object"></button>
-                                    <button icon="gtk-cancel" name="act_destroy" special="cancel" states="get" string="_Cancel" type="object"/>
-                                </group>
-                        </page>
-                        <page string="Help">
+                <form string="Export Translation File">
+                  <group colspan="3">
+                      <group colspan="1">
                             <label align="0.0" colspan="4" string="The official translations pack of all OpenERP/OpenObjects module are managed through launchpad. We use their online interface to synchronize all translations efforts."/>
+                            <label align="0.0" colspan="4" string=""/>
                             <label align="0.0" colspan="4" string="To improve some terms of the official translations of OpenERP, you should modify the terms directly on the launchpad interface. If you made lots of translations for your own module, you can also publish all your translation at once."/>
+                            <label align="0.0" colspan="4" string=""/>
                             <label align="0.0" colspan="4" string="To browse official translations, you can visit this link: "/>
                             <label align="0.0" colspan="4" string="https://translations.launchpad.net/openobject"/>
-                        </page>
-                    </notebook>
+                       </group>
+                       <group colspan="1">
+                       <separator orientation="vertical" rowspan="15"/>
+                       </group>
+  				       <group colspan="1">
+                          <group colspan="4" states="choose">
+                              <separator colspan="4" string="Export Translation File"/>
+                              <field name="lang" required="1"/>
+                              <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" fieldname="name" colspan="4"/>
+                              <field height="80" name="advice" nolabel="1" colspan="4"/>
+                          </group>
+                           <separator string="" colspan="4"/>
+                    		<group colspan="2" col="2">
+                    		</group>
+                          <group col="2" colspan="2">
+                             <button icon="gtk-cancel" name="act_cancel" special="cancel" states="choose" string="_Close" type="object"/>
+                             <button icon="gtk-ok" name="act_getfile" states="choose" string="_Export" type="object"></button>
+                             <button icon="gtk-close" name="act_destroy" special="cancel" states="get" string="_Close" type="object"/>
+                          </group>
+                        </group>
+                    </group>
+
                 </form>
             </field>
         </record>
diff --git a/bin/addons/base/module/wizard/base_import_language_view.xml b/bin/addons/base/module/wizard/base_import_language_view.xml
index eb73e8d4370..32c828ecd50 100644
--- a/bin/addons/base/module/wizard/base_import_language_view.xml
+++ b/bin/addons/base/module/wizard/base_import_language_view.xml
@@ -7,11 +7,21 @@
             <field name="model">base.language.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Import language">
-            <notebook colspan="4">
-                <page string="Import Data">
+            <form string="Import Translation File">
+            <group colspan="3">
+                 <group colspan="1">
+                      <label string="You have to import a .CSV file which is encoded in UTF-8."/>
+                      <label string="Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
+                      <label string="type,name,res_id,src,value" colspan="4"/>
+                      <label string="module,type,name,res_id,src,value" colspan="4"/>
+                      <label string="You can also import .po files." colspan="4" align="0.0"/>
+                 </group>
+                 <group colspan="1">
+                      <separator orientation="vertical" rowspan="8"/>
+                 </group>
+                 <group colspan="1">
                     <group colspan="4" col="4">
-                        <separator string="Import New Language" colspan="4"/>
+                        <separator string="Import Translation File" colspan="4"/>
                         <field name="name" width="200"/>
                         <field name="code"/>
                         <field name="data" colspan="4"/>
@@ -20,19 +30,11 @@
                     <group colspan="2" col="2">
                     </group>
                     <group colspan="2" col="2">
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                        <button special="cancel" string="_Close" icon="gtk-cancel"/>
                         <button name="import_lang" string="_Import" type="object" icon="gtk-ok"/>
                     </group>
-                </page>
-                <page string="Help">
-                    <label string="You have to import a .CSV file which is encoded in UTF-8."/>
-                    <label string="Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
-                    <label string="type,name,res_id,src,value" colspan="4"/>
-                    <label string="module,type,name,res_id,src,value" colspan="4"/>
-                    <label string="You can also import .po files." colspan="4" align="0.0"/>
-                </page>
-            </notebook>
-
+                </group>
+			</group>
             </form>
             </field>
         </record>
diff --git a/bin/addons/base/module/wizard/base_module_upgrade.py b/bin/addons/base/module/wizard/base_module_upgrade.py
index 500622489e7..79ec7c80997 100644
--- a/bin/addons/base/module/wizard/base_module_upgrade.py
+++ b/bin/addons/base/module/wizard/base_module_upgrade.py
@@ -39,7 +39,7 @@ class base_module_upgrade(osv.osv_memory):
          @param self: The object pointer.
          @param cr: A database cursor
          @param uid: ID of the user currently logged in
-         @param context: A standard dictionary 
+         @param context: A standard dictionary
          @return: New arch of view.
         """
         res = super(base_module_upgrade, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
@@ -50,7 +50,7 @@ class base_module_upgrade(osv.osv_memory):
 
         ids = self.get_module_list(cr, uid, context=context)
         if not ids:
-            res['arch'] = '''<form string="System update done">
+            res['arch'] = '''<form string="Apply Scheduled Upgrades">
                                 <separator string="System update completed" colspan="4"/>
                                 <label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
                                 <label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
diff --git a/bin/addons/base/res/res_log_view.xml b/bin/addons/base/res/res_log_view.xml
index 24857831bfc..59592fe9061 100644
--- a/bin/addons/base/res/res_log_view.xml
+++ b/bin/addons/base/res/res_log_view.xml
@@ -33,9 +33,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Logs">
-                 <field name="name" colspan="3"/>
-                 <newline/>
-                    <group colspan="4" col="8">
+                 <field name="name"/>
+                 <group colspan="4" col="8">
                         <field name="user_id" />
                         <field name="res_model"/>
                         <field name="res_id"/>
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 9168d93078d..481007d52b2 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -8,12 +8,10 @@
 "access_ir_exports_line_group_system","ir_exports_line group_system","model_ir_exports_line","base.group_user",1,1,1,1
 "access_ir_model_group_erp_manager","ir_model group_erp_manager","model_ir_model","group_erp_manager",1,1,1,1
 "access_ir_model_access_group_erp_manager","ir_model_access_group_erp_manager","model_ir_model_access","group_erp_manager",1,1,1,1
-"access_ir_model_grid_group_erp_manager","ir_model_access_grid_group_erp_manager","model_ir_model_grid","group_erp_manager",1,1,1,1
 "access_ir_model_data_group_erp_manager","ir_model_data group_erp_manager","model_ir_model_data","group_erp_manager",1,1,1,1
 "access_ir_model_fields_group_erp_manager","ir_model_fields group_erp_manager","model_ir_model_fields","group_erp_manager",1,1,1,1
 "access_ir_model_all","ir_model_all","model_ir_model",,1,0,0,0
 "access_ir_model_access_all","ir_model_access_all","model_ir_model_access",,1,0,0,0
-"access_ir_model_grid_all","ir_model_access_grid_all","model_ir_model_grid",,0,0,0,0
 "access_ir_model_data_all","ir_model_data all","model_ir_model_data",,1,0,0,0
 "access_ir_model_fields_all","ir_model_fields all","model_ir_model_fields",,1,0,0,0
 "access_ir_module_category_group_user","ir_module_category group_user","model_ir_module_category","group_system",1,0,0,0

From e02136b48c12ed6b859f8b7aeb5bb0565bde6cc5 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 29 Sep 2010 17:00:40 +0530
Subject: [PATCH 054/244] [FIX]: base module :update workflow item to workflows

bzr revid: ron@tinyerp.com-20100929113040-o1vrs2v6tyn7j5lt
---
 bin/addons/base/base_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 3fe8e96a352..b69cc44857d 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -6,7 +6,7 @@
         <menuitem id="next_id_4" name="Low Level Objects"
             parent="base.menu_administration" sequence="3"
             groups="base.group_extended,base.group_no_one"  />
-        <menuitem id="menu_low_workflow" name="Workflow Items" parent="base.next_id_4"/>
+        <menuitem id="menu_low_workflow" name="Workflows" parent="base.next_id_4"/>
         <menuitem id="menu_custom" name="Customization"
             parent="base.menu_administration" sequence="2"
             groups="base.group_extended"/>

From babd5d6703a6109ee7a75ad022c342cb6e734733 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 29 Sep 2010 17:05:50 +0530
Subject: [PATCH 055/244] [Fix] hr : job position, problem in o2m of employee
 is fixed

bzr revid: vir@tinyerp.com-20100929113550-m3lw0br1q59d14e7
---
 addons/hr/hr.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 9ce0b535401..11ad7bb279b 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -138,10 +138,14 @@ class hr_employee(osv.osv):
         return {'value':{}}
 
     def onchange_department(self, cr, uid, ids, department_id, context=None):
-        manager = self.pool.get('hr.department').browse(cr, uid, department_id).manager_id.id
-        return {'value': {'parent_id':manager or False}}
+        if not department_id:
+            return {'value':{'parent_id': False}}
+        manager = self.pool.get('hr.department').browse(cr, uid, department_id).manager_id
+        return {'value': {'parent_id':manager and manager.id or False}}
 
     def onchange_user(self, cr, uid, ids, user_id, context=None):
+        if not user_id:
+            return {'value':{'work_email': False}}
         mail = self.pool.get('res.users').browse(cr,uid,user_id)
         return {'value': {'work_email':mail.user_email}}          
         

From 557a2af8f98a3dafc0f86a053c93034cb28d3d84 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 29 Sep 2010 17:19:56 +0530
Subject: [PATCH 056/244] [MOD/IMP] hr_timesheet_sheet : usability improvement

bzr revid: dbr@tinyerp.com-20100929114956-29nacii3mqgbb46i
---
 addons/hr_attendance/hr_attendance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 6afd783323c..969637fcd0d 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -150,7 +150,7 @@ class hr_employee(osv.osv):
             res = {'action': type, 'employee_id': emp['id']}
             if dt:
                 res['name'] = dt
-            id = obj_attendance.create(cr, uid, res, context=context)
+        id = obj_attendance.create(cr, uid, res, context=context)
 
         if type != 'action':
             return id

From d631de7a6865c5e21b21326b4b2cebcaa10e6f43 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Wed, 29 Sep 2010 17:37:21 +0530
Subject: [PATCH 057/244] [FIX] Import : multiple O2M import corrected

bzr revid: jvo@tinyerp.com-20100929120721-sptc54u3dhqr0fu1
---
 bin/osv/orm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 1024136093f..44287a6d485 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -914,7 +914,7 @@ class orm_template(object):
                 nbrmax = max(nbrmax, max2)
                 warning = warning + w2
                 reduce(lambda x, y: x and y, newrow)
-                row[field] = (reduce(lambda x, y: x or y, newrow.values()) and \
+                row[field] = newrow and (reduce(lambda x, y: x or y, newrow.values()) and \
                         [(0, 0, newrow)]) or []
                 i = max2
                 while (position+i) < len(datas):
@@ -929,7 +929,7 @@ class orm_template(object):
                     (newrow, max2, w2, translate2, data_id2, data_res_id2) = process_liness(
                             self, datas, prefix+[field], current_module, relation_obj._name, newfd, position+i)
                     warning = warning + w2
-                    if reduce(lambda x, y: x or y, newrow.values()):
+                    if newrow and reduce(lambda x, y: x or y, newrow.values()):
                         row[field].append((0, 0, newrow))
                     i += max2
                     nbrmax = max(nbrmax, i)

From 95d032e5c90863b7d0e0c968da9297fa970ac135 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 29 Sep 2010 18:45:04 +0530
Subject: [PATCH 058/244] [ADD] hr_expense : onchange method on employee id

bzr revid: vir@tinyerp.com-20100929131504-s621aujpw7wpk570
---
 addons/hr_expense/hr_expense.py       | 7 +++++++
 addons/hr_expense/hr_expense_view.xml | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 4003cded168..e9e64f76c4e 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -97,6 +97,13 @@ class hr_expense_expense(osv.osv):
         'currency_id': _get_currency,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
+
+    def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
+        if not employee_id:
+            return {'value':{'department_id': False}}
+        dept = self.pool.get('hr.employee').browse(cr, uid, employee_id).department_id
+        return {'value': {'department_id':dept and dept.id or False}}
+
     def expense_confirm(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {
             'state':'confirm',
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 79c0d5513f0..71ed5cc6e68 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -67,7 +67,7 @@
             <field name="arch" type="xml">
                 <form string="Expenses Sheet">
                     <group colspan="4" col="6">
-                        <field name="employee_id"/>
+                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                         <field name="name" select="1"/>
                         <field name="ref" groups="base.group_extended"/>
                         <field name="date" select="1"/>

From 68c21a84ab78c0f032b64a4349d145b1f80138f0 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Wed, 29 Sep 2010 18:52:25 +0530
Subject: [PATCH 059/244] [IMP]: base : Improvements in Low Level Objects Menu

bzr revid: jas@tinyerp.com-20100929132225-kzm2rzzqr808hpl2
---
 bin/addons/base/base_menu.xml | 2 +-
 bin/addons/base/ir/ir.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 3049fbb17b2..08d4832c0c8 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -6,7 +6,7 @@
         <menuitem id="next_id_4" name="Low Level Objects"
             parent="base.menu_administration" sequence="3"
             groups="base.group_extended"/>
-        <menuitem id="menu_low_workflow" name="Workflow Items" parent="base.next_id_4"/>
+        <menuitem id="menu_low_workflow" name="Workflow Items" parent="base.next_id_4" sequence="1"/>
         <menuitem id="menu_custom" name="Customization"
             parent="base.menu_administration" sequence="2"
             groups="base.group_extended"/>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 0e88dfc6bce..ee8a21d2bb7 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -310,7 +310,7 @@
             <field name="view_id" ref="action_view_tree"/>
             <field name="search_view_id" ref="action_view_search"/>
         </record>
-        <menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
+        <menuitem id="next_id_6" name="Actions" parent="base.next_id_4" sequence="1"/>
         <menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/>
 
         <!--Filters form view-->

From 5d5fc92deac9f91c4e3332d13130c139c2201ff1 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 29 Sep 2010 19:19:31 +0530
Subject: [PATCH 060/244] [FIX]: base module :Add Active Filter Button to Low
 Level object - Workflows Menu

bzr revid: ron@tinyerp.com-20100929134931-7f6xk18zkyynhpjv
---
 bin/addons/base/ir/workflow/workflow_view.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 3fb98efb8f9..322859c3db1 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -299,6 +299,8 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Instances">
+          <filter icon="terp-camera_test"  string="Active" domain="[]" context="{'search_default_active': 1}"/>
+          <separator orientation="vertical"/>
           <field name="wkf_id"/>
           <field name="uid"/>
           <field name="res_id"/>
@@ -355,6 +357,8 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Workitems">
+          <filter icon="terp-camera_test"  string="Active" domain="[]" context="{'search_default_active': 1}"/>
+          <separator orientation="vertical"/>
           <field name="act_id"/>
           <field name="subflow_id"/>
           <field name="inst_id"/>

From 2bfcc53250ed9d9bee38220b177d83e436e3ab07 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 30 Sep 2010 04:38:08 +0000
Subject: [PATCH 061/244] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20100930043808-6b9xdye93e67rvvc
---
 bin/addons/base/i18n/bs.po    | 6 +++---
 bin/addons/base/i18n/en_GB.po | 6 +++---
 bin/addons/base/i18n/et.po    | 6 +++---
 bin/addons/base/i18n/fr.po    | 6 +++---
 bin/addons/base/i18n/it.po    | 6 +++---
 bin/addons/base/i18n/mn.po    | 4 ++--
 bin/addons/base/i18n/pl.po    | 6 +++---
 bin/addons/base/i18n/pt_BR.po | 4 ++--
 bin/addons/base/i18n/sv.po    | 6 +++---
 debian/po/ko.po               | 6 +++---
 debian/po/mn.po               | 4 ++--
 11 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/bin/addons/base/i18n/bs.po b/bin/addons/base/i18n/bs.po
index af99a2b5185..5eace0482b4 100644
--- a/bin/addons/base/i18n/bs.po
+++ b/bin/addons/base/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-12 21:46+0000\n"
-"Last-Translator: Bojan Markovic <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 08:03+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-09-29 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/en_GB.po b/bin/addons/base/i18n/en_GB.po
index 0e2166dc01f..098e3d1129a 100644
--- a/bin/addons/base/i18n/en_GB.po
+++ b/bin/addons/base/i18n/en_GB.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-11 15:00+0000\n"
-"Last-Translator: Martin Hood <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 08:03+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index 0814b45f278..2d639fd8d86 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-21 14:25+0000\n"
-"Last-Translator: Tanel Kurvits <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 07:51+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-09-29 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 49ba7240160..d3bbc43f35c 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-16 19:03+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 08:01+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-09-29 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index 75981ae4507..a43aa4a42de 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-19 17:45+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 08:28+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-09-29 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po
index 521063fcfbe..247e7f202fe 100644
--- a/bin/addons/base/i18n/mn.po
+++ b/bin/addons/base/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-13 08:00+0000\n"
+"PO-Revision-Date: 2010-09-29 08:13+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\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: 2010-09-29 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index e9604cd0de8..eca6c8a4393 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-26 10:02+0000\n"
-"Last-Translator: Michał Węgrzynek <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 08:34+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-09-29 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index 9bae937bb20..01a30d302a4 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-09 18:12+0000\n"
+"PO-Revision-Date: 2010-09-29 08:12+0000\n"
 "Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index ed47e2be7c6..657c35a352f 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-27 12:19+0000\n"
-"Last-Translator: Daniel Stenlöv (XCLUDE) <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 08:22+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-09-29 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/debian/po/ko.po b/debian/po/ko.po
index 5218c4ce019..155d2266c9a 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-09-15 02:58+0000\n"
-"Last-Translator: barge <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 08:30+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/mn.po b/debian/po/mn.po
index 6d686d6e110..47a4d6a3e6c 100644
--- a/debian/po/mn.po
+++ b/debian/po/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-09-10 03:13+0000\n"
+"PO-Revision-Date: 2010-09-29 08:02+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\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: 2010-09-29 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string

From 32847c3ebd4d684e2f4179c2029df2a648ad4638 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 30 Sep 2010 11:15:29 +0530
Subject: [PATCH 062/244] [FIX]: base module :Request menu - closed state (it
 desappears)

bzr revid: ron@tinyerp.com-20100930054529-a1e2cnlc27n4mdty
---
 bin/addons/base/ir/workflow/workflow_view.xml | 4 ++--
 bin/addons/base/res/res_request.py            | 8 ++++----
 bin/addons/base/res/res_request_view.xml      | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 322859c3db1..3fab4388877 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -299,7 +299,7 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Instances">
-          <filter icon="terp-camera_test"  string="Active" domain="[]" context="{'search_default_active': 1}"/>
+          <filter icon="terp-camera_test" string="Active" domain="[]" context="{'search_default_active': 1}"/>
           <separator orientation="vertical"/>
           <field name="wkf_id"/>
           <field name="uid"/>
@@ -357,7 +357,7 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Workitems">
-          <filter icon="terp-camera_test"  string="Active" domain="[]" context="{'search_default_active': 1}"/>
+          <filter icon="terp-camera_test" string="Active" domain="[]" context="{'search_default_active': 1}"/>
           <separator orientation="vertical"/>
           <field name="act_id"/>
           <field name="subflow_id"/>
diff --git a/bin/addons/base/res/res_request.py b/bin/addons/base/res/res_request.py
index bdbc6c0bdac..eceb670d17f 100644
--- a/bin/addons/base/res/res_request.py
+++ b/bin/addons/base/res/res_request.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -50,7 +50,7 @@ class res_request(osv.osv):
         return True
 
     def request_close(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state':'closed', 'active':False})
+        self.write(cr, uid, ids, {'state':'closed'})
         return True
 
     def request_get(self, cr, uid):
@@ -113,7 +113,7 @@ class res_request_history(osv.osv):
         'name': lambda *a: 'NoName',
         'act_from': lambda obj,cr,uid,context={}: uid,
         'act_to': lambda obj,cr,uid,context={}: uid,
-        'date_sent': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
+        'date_sent': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
 res_request_history()
 
diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml
index 2b1195df51c..53b7044f8ff 100644
--- a/bin/addons/base/res/res_request_view.xml
+++ b/bin/addons/base/res/res_request_view.xml
@@ -8,7 +8,7 @@
             <field name="model">res.request</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Requests" colors="blue:state in ('draft');gray:state in ('closed')">
+                <tree string="Requests" colors="blue:state in ('waiting');gray:state in ('closed')">
                     <field name="create_date"/>
                     <field name="act_from"/>
                     <field name="act_to"/>

From 8d0f0c90262fbe8d76ae896538bac87da6b1f016 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 30 Sep 2010 11:45:39 +0530
Subject: [PATCH 063/244] [IMP] hr_evaluation : search view improvement

bzr revid: vir@tinyerp.com-20100930061539-g4sb1offkra3xjc6
---
 addons/hr_expense/hr_expense_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 71ed5cc6e68..11e88bf361c 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -136,11 +136,13 @@
                       <separator orientation="vertical"/>
                       <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"
                         help="Confirmed Expense"/>
-                      <filter icon="terp-check" domain="[('state','=','accepted')]" string="To Pay"
+                      <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay"
                         help="Expenses to Invoice"/>
+                      <separator orientation="vertical"/>
                       <filter icon="terp-go-month" string="This Month" name="this"
                               domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>                        
                       <separator orientation="vertical"/>
+                      <field name="employee_id" select='1'/>
                       <field name="name" select='1'/>
                       <field name="date" select='1'/>
                       <field name="user_id"  string="User" invisible="True">

From 77c3f0abbfba2ab7dfa3e35b2d19569cc819941f Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Thu, 30 Sep 2010 12:13:01 +0530
Subject: [PATCH 064/244] [FIX] Removed required property for home action (web
 client dashboard).

bzr revid: vda@tinyerp.com-20100930064301-9o44xig9wj15l9kt
---
 bin/addons/base/base_update.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 361bbfa67a0..4218d6ce278 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -123,7 +123,7 @@
                             <field name="user_email" widget="email"/>
                             <field name="context_lang"/>   
                             <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>                                                    
-                            <field name="action_id" required="True"/>
+                            <field name="action_id"/>
 
 
                             <field name="context_tz"/>

From ac7ec1748c09d72b170831ae67dbdae66b1f3000 Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Thu, 30 Sep 2010 13:46:09 +0530
Subject: [PATCH 065/244] [FIX] Removed default for home action.

bzr revid: vda@tinyerp.com-20100930081609-5s4udd31is38ra9z
---
 bin/addons/base/res/res_user.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 3b25343d724..bfc60847eb2 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -357,7 +357,6 @@ class users(osv.osv):
         'context_lang': lambda *args: 'en_US',
         'active' : lambda *a: True,
         'menu_id': _get_menu,
-        'action_id': _get_menu,
         'company_id': _get_company,
         'company_ids': _get_companies,
         'groups_id': _get_group,

From d6a4bf08e5c2911f43be28cf224e90fbab1b41ff Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 30 Sep 2010 13:49:46 +0530
Subject: [PATCH 066/244] [REF]: base module :Reporting Menu

bzr revid: ron@tinyerp.com-20100930081946-zl5pkfsnja8n2rls
---
 bin/addons/base/base_menu.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index b69cc44857d..19b1bcd7e4a 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -22,7 +22,9 @@
             groups="base.group_extended"/>
         <menuitem id="menu_management" name="Modules Management" parent="base.menu_administration" sequence="10"
             groups="base.group_extended"/>
+<!--
         <menuitem icon="terp-graph" id="reporting_menu" name="Reporting" sequence="45"
             groups="group_extended"/>
+-->
     </data>
 </openerp>

From 73cee227e1fe2e83d04382ea401d3c3c222aedeb Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Thu, 30 Sep 2010 13:59:26 +0530
Subject: [PATCH 067/244] [FIX] Removed default for home action.

bzr revid: vda@tinyerp.com-20100930082926-13n8zl37zw8t3fro
---
 bin/addons/base/res/res_user.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index bfc60847eb2..c5e5e79a756 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -288,15 +288,7 @@ class users(osv.osv):
                 result = override_password(result)
             else:
                 result = map(override_password, result)
-
-        if isinstance(result, list):
-            for rec in result:
-                if not rec.get('action_id',True):
-                    rec['action_id'] = (self._get_menu(cr, uid),'Menu')
-        else:
-            if not result.get('action_id',True):
-                result['action_id'] = (self._get_menu(cr, uid),'Menu')
-
+                
         return result
 
 

From f05a5b8272c286ecec9cf7e04af57a7647783675 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Thu, 30 Sep 2010 14:11:47 +0530
Subject: [PATCH 068/244] [FIX]:Print screen should respect sort order

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

bzr revid: nch@tinyerp.com-20100930084147-hw4351m329tbrpnr
---
 bin/report/printscreen/ps_list.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index 142cb41d447..aa95eedeff8 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -98,6 +98,7 @@ class report_printscreen_list(report_int):
                             continue
                         child_ids = model.search(cr, uid, inner_domain)
                         res = model.read(cr, uid, child_ids, result['fields'].keys(), context)
+                        res.sort(lambda x,y: cmp(ids.index(x['id']), ids.index(y['id'])))
                         rows.extend(res)
             dom = [('id','in',ids)]
             if self.groupby_no_leaf and len(ids) and not ids[0]:

From 109f51e125ad04ab6a96091e4a8b21af54115fa5 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 30 Sep 2010 15:24:03 +0200
Subject: [PATCH 069/244] [ADD] osv: initial basic implementation of Query
 object: - added basic Query object to support more complex ORM use cases
 (LEFT OUTER JOINS at the moment) - added trivial unit tests for query object
 + run_test.py executable to launch them Warning: this is very basic and was
 only done as a low-risk fix to introduce support for OUTER joins in some
 cases. This will need to be improved and extended a lot to be really useful
 -> targeted for after v6.0...

bzr revid: odo@openerp.com-20100930132403-2dx0k9znzromsig7
---
 bin/addons/base/ir/ir_rule.py |   3 +-
 bin/osv/orm.py                | 204 ++++++++++++++--------------------
 bin/osv/query.py              | 116 +++++++++++++++++++
 bin/run_tests.py              |  27 +++++
 bin/test/__init__.py          |  22 ++++
 bin/test/test_osv.py          |  40 +++++++
 6 files changed, 293 insertions(+), 119 deletions(-)
 create mode 100644 bin/osv/query.py
 create mode 100644 bin/run_tests.py
 create mode 100644 bin/test/__init__.py
 create mode 100644 bin/test/test_osv.py

diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index 16c2c8275d9..799a411c15f 100644
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -137,7 +137,8 @@ class ir_rule(osv.osv):
     def domain_get(self, cr, uid, model_name, mode='read', context={}):
         dom = self._compute_domain(cr, uid, model_name, mode=mode)
         if dom:
-            return self.pool.get(model_name)._where_calc(cr, uid, dom, active_test=False)
+            query = self.pool.get(model_name)._where_calc(cr, uid, dom, active_test=False)
+            return query.where_clause, query.where_clause_params, query.tables
         return [], [], ['"'+self.pool.get(model_name)._table+'"']
 
     def unlink(self, cr, uid, ids, context=None):
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 1024136093f..d0d783dc144 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -54,6 +54,7 @@ from tools.config import config
 from tools.translate import _
 
 import fields
+from query import Query
 import tools
 from tools.safe_eval import safe_eval as eval
 
@@ -2203,35 +2204,15 @@ class orm(orm_template):
         if not fields:
             fields = self._columns.keys()
 
-        # compute the where, order by, limit and offset clauses
-        (where_clause, where_clause_params, tables) = self._where_calc(cr, uid, domain, context=context)
-
-        # apply direct ir.rules from current model
-        self._apply_ir_rules(cr, uid, where_clause, where_clause_params, tables, 'read', context=context)
-
-        # then apply the ir.rules from the parents (through _inherits), adding the appropriate JOINs if needed
-        for inherited_model in self._inherits:
-            previous_tables = list(tables)
-            if self._apply_ir_rules(cr, uid, where_clause, where_clause_params, tables, 'read', model_name=inherited_model, context=context):
-                # if some rules were applied, need to add the missing JOIN for them to make sense, passing the previous
-                # list of table in case the inherited table was not in the list before (as that means the corresponding
-                # JOIN(s) was(were) not present)
-                self._inherits_join_add(inherited_model, previous_tables, where_clause)
-                tables = list(set(tables).union(set(previous_tables)))
+        query = self._where_calc(cr, uid, domain, context=context)
+        self._apply_ir_rules(cr, uid, query, 'read', context=context)
 
         # Take care of adding join(s) if groupby is an '_inherits'ed field
         groupby_list = groupby
         if groupby:
             if isinstance(groupby, list):
                 groupby = groupby[0]
-            tables, where_clause, qfield = self._inherits_join_calc(groupby, tables, where_clause)
-
-        if len(where_clause):
-            where_clause = ' where ' + ' and '.join(where_clause)
-        else:
-            where_clause = ''
-        limit_str = limit and ' limit %d' % limit or ''
-        offset_str = offset and ' offset %d' % offset or ''
+            self._inherits_join_calc(groupby, query)
 
         assert not groupby or groupby in fields, "Fields in 'groupby' must appear in the list of fields to read (perhaps it's missing in the list view?)"
 
@@ -2263,8 +2244,13 @@ class orm(orm_template):
                     flist += ','
                 flist += operator+'('+f+') as '+f
 
-        gb = groupby and (' group by '+groupby) or ''
-        cr.execute('select min(%s.id) as id,' % self._table + flist + ' from ' + ','.join(tables) + where_clause + gb + limit_str + offset_str, where_clause_params)
+        gb = groupby and (' GROUP BY '+groupby) or ''
+
+        from_clause, where_clause, where_clause_params = query.get_sql()
+        where_clause = where_clause and ' WHERE ' + where_clause
+        limit_str = limit and ' limit %d' % limit or ''
+        offset_str = offset and ' offset %d' % offset or ''
+        cr.execute('SELECT min(%s.id) AS id,' % self._table + flist + ' FROM ' + from_clause + where_clause + gb + limit_str + offset_str, where_clause_params)
         alldata = {}
         groupby = group_by
         for r in cr.dictfetchall():
@@ -2303,43 +2289,37 @@ class orm(orm_template):
             del d['id']
         return data
 
-    def _inherits_join_add(self, parent_model_name, tables, where_clause):
+    def _inherits_join_add(self, parent_model_name, query):
         """
-        Add missing table SELECT and JOIN clause for reaching the parent table (no duplicates)
+        Add missing table SELECT and JOIN clause to ``query`` for reaching the parent table (no duplicates)
 
         :param parent_model_name: name of the parent model for which the clauses should be added
-        :param tables: list of table._table names enclosed in double quotes as returned
-                       by _where_calc()
-        :param where_clause: current list of WHERE clause params
+        :param query: query object on which the JOIN should be added 
         """
         inherits_field = self._inherits[parent_model_name]
         parent_model = self.pool.get(parent_model_name)
         parent_table_name = parent_model._table
         quoted_parent_table_name = '"%s"' % parent_table_name
-        if quoted_parent_table_name not in tables:
-            tables.append(quoted_parent_table_name)
-            where_clause.append('("%s".%s = %s.id)' % (self._table, inherits_field, parent_table_name))
-        return (tables, where_clause)
+        if quoted_parent_table_name not in query.tables:
+            query.tables.append(quoted_parent_table_name)
+            query.where_clause.append('("%s".%s = %s.id)' % (self._table, inherits_field, parent_table_name))
 
-    def _inherits_join_calc(self, field, tables, where_clause):
+    def _inherits_join_calc(self, field, query):
         """
-        Adds missing table select and join clause(s) for reaching
+        Adds missing table select and join clause(s) to ``query`` for reaching
         the field coming from an '_inherits' parent table (no duplicates).
 
-        :param tables: list of table._table names enclosed in double quotes as returned
-                        by _where_calc()
-        :param where_clause: current list of WHERE clause params
-        :return: (tables, where_clause, qualified_field) where ``tables`` and ``where_clause`` are the updated
-                 versions of the parameters, and ``qualified_field`` is the qualified name of ``field``
-                 in the form ``table.field``, to be referenced in queries.
+        :param field: name of inherited field to reach
+        :param query: query object on which the JOIN should be added
+        :return: qualified name of field, to be used in SELECT clause
         """
         current_table = self
         while field in current_table._inherit_fields and not field in current_table._columns:
             parent_model_name = current_table._inherit_fields[field][0]
             parent_table = self.pool.get(parent_model_name)
-            self._inherits_join_add(parent_model_name, tables, where_clause)
+            self._inherits_join_add(parent_model_name, query)
             current_table = parent_table
-        return (tables, where_clause, '"%s".%s' % (current_table._table, field))
+        return '"%s".%s' % (current_table._table, field)
 
     def _parent_store_compute(self, cr):
         if not self._parent_store:
@@ -3899,84 +3879,87 @@ class orm(orm_template):
         raise NotImplementedError(_('This method does not exist anymore'))
 
     # TODO: ameliorer avec NULL
-    def _where_calc(self, cr, user, args, active_test=True, context=None):
+    def _where_calc(self, cr, user, domain, active_test=True, context=None):
         """Computes the WHERE clause needed to implement an OpenERP domain.
-        :param args: the domain to compute
-        :type args: list
+        :param domain: the domain to compute
+        :type domain: list
         :param active_test: whether the default filtering of records with ``active``
                             field set to ``False`` should be applied.
-        :return: tuple with 3 elements: (where_clause, where_clause_params, tables) where
-                 ``where_clause`` contains a list of where clause elements (to be joined with 'AND'),
-                 ``where_clause_params`` is a list of parameters to be passed to the db layer
-                 for the where_clause expansion, and ``tables`` is the list of double-quoted
-                 table names that need to be included in the FROM clause.
-        :rtype: tuple
+        :return: the query expressing the given domain as provided in domain
+        :rtype: osv.query.Query
         """
         if not context:
             context = {}
-        args = args[:]
+        domain = domain[:]
         # if the object has a field named 'active', filter out all inactive
         # records unless they were explicitely asked for
         if 'active' in self._columns and (active_test and context.get('active_test', True)):
-            if args:
+            if domain:
                 active_in_args = False
-                for a in args:
+                for a in domain:
                     if a[0] == 'active':
                         active_in_args = True
                 if not active_in_args:
-                    args.insert(0, ('active', '=', 1))
+                    domain.insert(0, ('active', '=', 1))
             else:
-                args = [('active', '=', 1)]
+                domain = [('active', '=', 1)]
 
-        if args:
+        if domain:
             import expression
-            e = expression.expression(args)
+            e = expression.expression(domain)
             e.parse(cr, user, self, context)
             tables = e.get_tables()
-            qu1, qu2 = e.to_sql()
-            qu1 = qu1 and [qu1] or []
+            where_clause, where_params = e.to_sql()
+            where_clause = where_clause and [where_clause] or []
         else:
-            qu1, qu2, tables = [], [], ['"%s"' % self._table]
+            where_clause, where_params, tables = [], [], ['"%s"' % self._table]
 
-        return (qu1, qu2, tables)
+        return Query(tables, where_clause, where_params)
 
     def _check_qorder(self, word):
         if not regex_order.match(word):
             raise except_orm(_('AccessError'), _('Invalid "order" specified. A valid "order" specification is a comma-separated list of valid field names (optionally followed by asc/desc for the direction)'))
         return True
 
-    def _apply_ir_rules(self, cr, uid, where_clause, where_clause_params, tables, mode='read', model_name=None, context=None):
-        """Add what's missing in ``where_clause``, ``where_params``, ``tables`` to implement
-           all appropriate ir.rules (on the current object but also from it's _inherits parents)
+    def _apply_ir_rules(self, cr, uid, query, mode='read', context=None):
+        """Add what's missing in ``query`` to implement all appropriate ir.rules 
+          (using the ``model_name``'s rules or the current model's rules if ``model_name`` is None)
 
-           :param where_clause: list with current elements of the WHERE clause (strings)
-           :param where_clause_params: list with parameters for ``where_clause``
-           :param tables: list with double-quoted names of the tables that are joined
-                          in ``where_clause``
-           :param model_name: optional name of the model whose ir.rules should be applied (default:``self._name``)
-                              This could be useful for inheritance for example, but there is no provision to include
-                              the appropriate JOIN for linking the current model to the one referenced in model_name.
-           :return: True if additional clauses where applied.
+           :param query: the current query object
         """
-        added_clause, added_params, added_tables = self.pool.get('ir.rule').domain_get(cr, uid, model_name or self._name, mode, context=context)
-        if added_clause:
-            where_clause += added_clause
-            where_clause_params += added_params
-            for table in added_tables:
-                if table not in tables:
-                    tables.append(table)
-            return True
-        return False
+        def apply_rule(added_clause, added_params, added_tables):
+            if added_clause:
+                query.where_clause += added_clause
+                query.where_clause_params += added_params
+                for table in added_tables:
+                    if table not in query.tables:
+                        query.tables.append(table)
+                return True
+            return False
+        
+        # apply main rules on the object
+        rule_obj = self.pool.get('ir.rule')
+        apply_rule(*rule_obj.domain_get(cr, uid, self._name, mode, context=context))
 
-    def _generate_m2o_order_by(self, order_field, tables, where_clause):
+        # apply ir.rules from the parents (through _inherits), adding the appropriate JOINs if needed
+        for inherited_model in self._inherits:
+            if apply_rule(*rule_obj.domain_get(cr, uid, inherited_model, mode, context=context)):
+                # if some rules were applied, need to add the missing JOIN for them to make sense, passing the previous
+                # list of table in case the inherited table was not in the list before (as that means the corresponding
+                # JOIN(s) was(were) not present)
+                self._inherits_join_add(inherited_model, query)
+
+    def _generate_m2o_order_by(self, order_field, query):
         """
-        Add possibly missing JOIN and generate the ORDER BY clause for m2o fields,
+        Add possibly missing JOIN to ``query`` and generate the ORDER BY clause for m2o fields,
         either native m2o fields or function/related fields that are stored, including
         intermediate JOINs for inheritance if required.
+        
+        :return: the qualified field name to use in an ORDER BY clause to sort by ``order_field``
         """
         if order_field not in self._columns and order_field in self._inherit_fields:
             # also add missing joins for reaching the table containing the m2o field
-            tables, where_clause, qualified_field = self._inherits_join_calc(order_field, tables, where_clause)
+            qualified_field = self._inherits_join_calc(order_field, query)
             order_field_column = self._inherit_fields[order_field][2]
         else:
             qualified_field = '"%s"."%s"' % (self._table, order_field)
@@ -3995,16 +3978,14 @@ class orm(orm_template):
             # extract the first field name, to be able to qualify it and add desc/asc
             m2o_order = m2o_order.split(",",1)[0].strip().split(" ",1)[0]
 
-        # the perhaps missing join:
-        quoted_model_table = '"%s"' % dest_model._table
-        if quoted_model_table not in tables:
-            tables.append(quoted_model_table)
-            where_clause.append('%s = %s.id' % (qualified_field, quoted_model_table))
-
-        return ('%s.%s' % (quoted_model_table, m2o_order), tables, where_clause)
+        # Join the dest m2o table if it's not joined yet. We use [LEFT] OUTER join here 
+        # as we don't want to exclude results that have NULL values for the m2o
+        src_table, src_field = qualified_field.replace('"','').split('.', 1)
+        query.join((src_table, dest_model._table, src_field, 'id'), outer=True)
+        return '"%s"."%s"' % (dest_model._table, m2o_order)
 
 
-    def _generate_order_by(self, order_spec, tables, where_clause):
+    def _generate_order_by(self, order_spec, query):
         """
         Attempt to consruct an appropriate ORDER BY clause based on order_spec, which must be
         a comma-separated list of valid field names, optionally followed by an ASC or DESC direction.
@@ -4024,16 +4005,16 @@ class orm(orm_template):
                     if order_column._classic_read:
                         order_by_clause = '"%s"."%s"' % (self._table, order_field)
                     elif order_column._type == 'many2one':
-                        order_by_clause, tables, where_clause = self._generate_m2o_order_by(order_field, tables, where_clause)
+                        order_by_clause = self._generate_m2o_order_by(order_field, query)
                     else:
                         continue # ignore non-readable or "non-joignable" fields
                 elif order_field in self._inherit_fields:
                     parent_obj = self.pool.get(self._inherit_fields[order_field][0])
                     order_column = parent_obj._columns[order_field]
                     if order_column._classic_read:
-                        tables, where_clause, order_by_clause = self._inherits_join_calc(order_field, tables, where_clause)
+                        order_by_clause = self._inherits_join_calc(order_field, query)
                     elif order_column._type == 'many2one':
-                        order_by_clause, tables, where_clause = self._generate_m2o_order_by(order_field, tables, where_clause)
+                        order_by_clause = self._generate_m2o_order_by(order_field, query)
                     else:
                         continue # ignore non-readable or "non-joignable" fields
                 order_by_elements.append("%s %s" % (order_by_clause, order_direction))
@@ -4054,34 +4035,21 @@ class orm(orm_template):
         if context is None:
             context = {}
         self.pool.get('ir.model.access').check(cr, access_rights_uid or user, self._name, 'read', context=context)
-        # compute the where, order by, limit and offset clauses
-        (where_clause, where_clause_params, tables) = self._where_calc(cr, user, args, context=context)
 
-        # apply direct ir.rules from current model
-        self._apply_ir_rules(cr, user, where_clause, where_clause_params, tables, 'read', context=context)
+        query = self._where_calc(cr, user, args, context=context)
+        self._apply_ir_rules(cr, user, query, 'read', context=context)
+        order_by = self._generate_order_by(order, query)
+        from_clause, where_clause, where_clause_params = query.get_sql()
 
-        # then apply the ir.rules from the parents (through _inherits), adding the appropriate JOINs if needed
-        for inherited_model in self._inherits:
-            previous_tables = list(tables)
-            if self._apply_ir_rules(cr, user, where_clause, where_clause_params, tables, 'read', model_name=inherited_model, context=context):
-                # if some rules were applied, need to add the missing JOIN for them to make sense, passing the previous
-                # list of table in case the inherited table was not in the list before (as that means the corresponding
-                # JOIN(s) was(were) not present)
-                self._inherits_join_add(inherited_model, previous_tables, where_clause)
-                tables = list(set(tables).union(set(previous_tables)))
-
-        where = where_clause
-        order_by = self._generate_order_by(order, tables, where_clause)
         limit_str = limit and ' limit %d' % limit or ''
         offset_str = offset and ' offset %d' % offset or ''
-        where_str = where and (" WHERE %s" % " AND ".join(where)) or ''
+        where_str = where_clause and (" WHERE %s" % where_clause) or ''
 
         if count:
-            cr.execute('select count(%s.id) from ' % self._table +
-                    ','.join(tables) + where_str + limit_str + offset_str, where_clause_params)
+            cr.execute('SELECT count("%s".id) FROM ' % self._table + from_clause + where_str + limit_str + offset_str, where_clause_params)
             res = cr.fetchall()
             return res[0][0]
-        cr.execute('select %s.id from ' % self._table + ','.join(tables) + where_str + order_by + limit_str+offset_str, where_clause_params)
+        cr.execute('SELECT "%s".id FROM ' % self._table + from_clause + where_str + order_by + limit_str + offset_str, where_clause_params)
         res = cr.fetchall()
         return [x[0] for x in res]
 
diff --git a/bin/osv/query.py b/bin/osv/query.py
new file mode 100644
index 00000000000..b04e536ad60
--- /dev/null
+++ b/bin/osv/query.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP S.A. http://www.openerp.com
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+def _quote(to_quote):
+    if '"' not in to_quote:
+        return '"%s"' % to_quote
+    return to_quote
+
+
+class Query(object):
+    """
+     Dumb implementation of a Query object, using 3 string lists so far
+     for backwards compatibility with the (table, where_clause, where_params) previously used.
+     
+     TODO: To be improved after v6.0 to rewrite part of the ORM and add support for:
+      - auto-generated multiple table aliases
+      - multiple joins to the same table with different conditions
+      - dynamic right-hand-side values in domains  (e.g. a.name = a.description)
+      - etc.
+    """
+
+    def __init__(self, tables=None, where_clause=None, where_clause_params=None, joins=None):
+
+        # holds the list of tables joined using default JOIN.
+        # the table names are stored double-quoted (backwards compatibility)
+        self.tables = tables or []
+
+        # holds the list of WHERE clause elements, to be joined with
+        # 'AND' when generating the final query 
+        self.where_clause = where_clause or []
+
+        # holds the parameters for the formatting of `where_clause`, to be
+        # passed to psycopg's execute method.
+        self.where_clause_params = where_clause_params or []
+
+        # holds table joins done explicitly, supporting outer joins. The JOIN
+        # condition should not be in `where_clause`. The dict is used as follows:
+        #   self.joins = {
+        #                    'table_a': [
+        #                                  ('table_b', 'table_a_col1', 'table_b_col', 'LEFT JOIN'),
+        #                                  ('table_c', 'table_a_col2', 'table_c_col', 'LEFT JOIN'),
+        #                                  ('table_d', 'table_a_col3', 'table_d_col', 'JOIN'),
+        #                               ]
+        #                 }
+        #   which should lead to the following SQL:
+        #       SELECT ... FROM "table_a" LEFT JOIN "table_b" ON ("table_a"."table_a_col1" = "table_b"."table_b_col")
+        #                                 LEFT JOIN "table_c" ON ("table_a"."table_a_col2" = "table_c"."table_c_col")
+        self.joins = joins or {}
+
+    def join(self, connection, outer=False):
+        """Adds the JOIN specified in ``connection``.
+
+        :param connection: a tuple ``(lhs, table, lhs_col, col)``. 
+                           The join corresponds to the SQL equivalent of::
+
+                                ``(lhs.lhs_col = table.col)``
+
+        :param outer: True if a LEFT OUTER JOIN should be used, if possible
+                      (no promotion to OUTER JOIN is supported in case the JOIN
+                       was already present in the query, as for the moment
+                       implicit INNER JOINs are only connected from NON-NULL 
+                       columns so it would not be correct (e.g. for 
+                       ``_inherits`` or when a domain criterion explicitly 
+                       adds filtering)
+        """
+        (lhs, table, lhs_col, col) = connection
+        lhs = _quote(lhs)
+        table = _quote(table)
+        assert lhs in self.tables, "Left-hand-side table must already be part of the query!"
+        if table in self.tables:
+            # already joined, must ignore (promotion to outer and multiple joins not supported yet)
+            pass
+        else:
+            # add JOIN
+            self.tables.append(table)
+            self.joins.setdefault(lhs, []).append((table, lhs_col, col, outer and 'LEFT JOIN' or 'JOIN'))
+        return self 
+
+    def get_sql(self):
+        """Returns (query_from, query_where, query_params)"""
+        query_from = ''
+        tables_to_process = list(self.tables)
+        for table in tables_to_process:
+            query_from += ' %s ' % table
+            if table in self.joins:
+                for (dest_table, lhs_col, col, join) in self.joins[table]:
+                    tables_to_process.remove(dest_table)
+                    query_from += '%s %s ON (%s."%s" = %s."%s")' % \
+                        (join, dest_table, table, lhs_col, dest_table, col)
+            query_from += ','
+        query_from = query_from[:-1] # drop last comma
+        return (query_from, " AND ".join(self.where_clause), self.where_clause_params)
+
+    def __str__(self):
+        return '<osv.Query: "SELECT ... FROM %s WHERE %s" with params: %r>' % self.get_sql()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/bin/run_tests.py b/bin/run_tests.py
new file mode 100644
index 00000000000..5af29fdb3c5
--- /dev/null
+++ b/bin/run_tests.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP S.A. http://www.openerp.com
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import unittest
+
+import test
+ 
+if __name__ == '__main__':
+    unittest.TextTestRunner(verbosity=2).run(unittest.defaultTestLoader.loadTestsFromModule(test))
diff --git a/bin/test/__init__.py b/bin/test/__init__.py
new file mode 100644
index 00000000000..86872258874
--- /dev/null
+++ b/bin/test/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP S.A. http://www.openerp.com
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from test_osv import *
diff --git a/bin/test/test_osv.py b/bin/test/test_osv.py
new file mode 100644
index 00000000000..170aa47dc0f
--- /dev/null
+++ b/bin/test/test_osv.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP S.A. http://www.openerp.com
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import unittest
+from osv.query import Query
+
+class QueryTestCase(unittest.TestCase):
+
+    def test_basic_query(self):
+        query = Query()
+        query.tables.extend(['"product_product"','"product_template"'])
+        query.where_clause.append("product_product.template_id = product_template.id")
+        query.join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
+        query.join(("product_product", "res_user", "user_id", "id"), outer=True) # outer join
+        self.assertEquals(query.get_sql()[0].strip(), 
+            """"product_product" LEFT JOIN "res_user" ON ("product_product"."user_id" = "res_user"."id"), "product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") """.strip(), "Incorrect query")
+        self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id""".strip(), "Incorrect where clause")
+
+    def test_raise_missing_lhs(self):
+        query = Query()
+        query.tables.append('"product_product"')
+        self.assertRaises(AssertionError, query.join, ("product_template", "product_category", "categ_id", "id"), outer=False)
\ No newline at end of file

From 588710ce9119e43f2ec48ecc4c7a159ca5b37ca9 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 1 Oct 2010 11:53:53 +0530
Subject: [PATCH 070/244] [MOD] idea : small change in tooltip

bzr revid: vir@tinyerp.com-20101001062353-8q01xicpq3yprtyf
---
 addons/idea/report/report_vote_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 711d6c0d29f..b31a2075d20 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -74,9 +74,9 @@
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" name="State" context="{'group_by':'idea_state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by opendate"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of opendate"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of opendate"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Open date"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Open date"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Open date"/>
                     </group>
                 </search>
             </field>

From 807e733c398510d95decf473f0a4fcfb22ed06fb Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Fri, 1 Oct 2010 13:07:29 +0530
Subject: [PATCH 071/244] [IMP]: base : Improvements in the list view of the
 Users->Users

bzr revid: jas@tinyerp.com-20101001073729-jtdo3yd4yiuwkh7u
---
 bin/addons/base/base_update.xml | 1 +
 bin/addons/base/res/res_user.py | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index af6d4f59a22..f6af6d825be 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -167,6 +167,7 @@
                     <field name="name"/>
                     <field name="login"/>
                     <field name="context_lang"/>
+                    <field name="date"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 3b25343d724..483ea1ed102 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -28,6 +28,7 @@ import pooler
 from tools.translate import _
 from service import security
 import netsvc
+import time
 
 class groups(osv.osv):
     _name = "res.groups"
@@ -265,7 +266,7 @@ class users(osv.osv):
                                 string='Interface', help="Choose between the simplified interface and the extended one"),
         'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240),
         'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
-
+        'date': fields.datetime('Last Connection', readonly=True),
     }
 
     def on_change_company_id(self, cr, uid, ids, company_id):
@@ -445,12 +446,14 @@ class users(osv.osv):
         cr = pooler.get_db(db).cursor()
         cr.execute('select id from res_users where login=%s and password=%s and active', (tools.ustr(login), tools.ustr(password)))
         res = cr.fetchone()
-        cr.close()
+
         if res:
+            cr.execute("update res_users set date=%s where id=%s", (time.strftime('%Y-%m-%d %H:%M:%S'),res[0]))
+            cr.commit()
             return res[0]
         else:
             return False
-
+        cr.close()
     def check_super(self, passwd):
         if passwd == tools.config['admin_passwd']:
             return True

From 5607586667e3194a40628a99ca401c6a1d613bac Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 1 Oct 2010 08:47:23 +0000
Subject: [PATCH 072/244] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101001084723-t0gh6nh5alivjvig
---
 bin/addons/base/i18n/nl.po | 42 +++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index 0e1b62fa594..af960dcbd5f 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-09 18:36+0000\n"
-"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
+"PO-Revision-Date: 2010-09-30 12:03+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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: 2010-09-29 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-01 08:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -3366,7 +3366,7 @@ msgstr "U kunt het menu opnieuw laden met (Ctrl+t Ctrl+r)."
 #: view:ir.ui.view_sc:0
 #: field:res.partner.title,shortcut:0
 msgid "Shortcut"
-msgstr "Sneltoets"
+msgstr "Snelkoppeling"
 
 #. module: base
 #: field:ir.model.data,date_init:0
@@ -8109,34 +8109,35 @@ msgstr "U kunt niet twee gebruikers hebben met dezelfde gebruikersnaam !"
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
-msgstr ""
+msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
-msgstr ""
+msgstr "Dit menu heeft al een snelkoppeling!"
 
 #. module: base
 #: sql_constraint:ir.model.data:0
 msgid ""
 "You cannot have multiple records with the same id for the same module !"
 msgstr ""
+"U kunt niet meer records hebben met dezelfde id voor dezelfde module !"
 
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
-msgstr ""
+msgstr "Uw onderhoudscontract is al ingeschreven in het systeem !"
 
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
-msgstr ""
+msgstr "De modulenaam moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
-msgstr ""
+msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:res.partner.function:0
@@ -8146,38 +8147,38 @@ msgstr ""
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
-msgstr ""
+msgstr "De relatienaam moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "De landnaam moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "De landcode moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
-msgstr ""
+msgstr "De taalnaam moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
-msgstr ""
+msgstr "De taalcode moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
-msgstr ""
+msgstr "De groepsnaam moet uniek zijn !"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "Voorwaarde Fout"
 
 #. module: base
 #: code:addons/osv/osv.py:0
@@ -8188,6 +8189,10 @@ msgid ""
 "reference it\n"
 "- creation/update: a mandatory field is not correctly set"
 msgstr ""
+"De bewerking kan niet worden afgerond, waarschijnlijk vanwege:\n"
+"- verwijdering: u probeert een record te verwijderen terwijl er nog door een "
+"ander aan wordt gerefereerd\n"
+"- maken/wijzigen: een verplicht veld is niet correct ingevuld"
 
 #. module: base
 #: code:addons/osv/osv.py:0
@@ -8197,12 +8202,15 @@ msgid ""
 "\n"
 "[object with reference: %s - %s]"
 msgstr ""
+"\n"
+"\n"
+"[object met referentie: %s - %s]"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Integrity Error"
-msgstr ""
+msgstr "Integriteit Fout"
 
 #~ msgid "Main Company"
 #~ msgstr "Moederorganisatie"

From 7daff00debee27abbd05c2be1d54b7523fa98665 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 1 Oct 2010 14:27:54 +0530
Subject: [PATCH 073/244] [MOD] idea,survery : Small change

bzr revid: vir@tinyerp.com-20101001085754-hhi8akglto8slqz3
---
 addons/idea/report/report_vote_view.xml        | 8 ++++----
 addons/survey/wizard/survey_send_invitation.py | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index b31a2075d20..91564d4f786 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -64,7 +64,7 @@
                         <field name="user_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="10" col="12">
+                    <group expand="1" string="Group By..." colspan="10" col="12">
                         <filter string="Creator" icon="terp-personal" context="{'group_by':'creater_id'}"/>
                         <filter string="User" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
@@ -74,9 +74,9 @@
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" name="State" context="{'group_by':'idea_state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Open date"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Open date"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Open date"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Open date"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Open date"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Open date"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index fd7a35bfa89..b9740fba6ba 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -50,8 +50,8 @@ class survey_send_invitation(osv.osv_memory):
     _defaults = {
         'send_mail': lambda *a: 1,
         'send_mail_existing': lambda *a: 1,
-        'mail_subject': lambda *a: "New user account.",
-        'mail_subject_existing': lambda *a: "User account info.",
+        'mail_subject': lambda *a: "Invitation",
+        'mail_subject_existing': lambda *a: "Invitation",
         'mail_from': lambda *a: tools.config['email_from']
     }
 

From e7e91db2be005db572f3d223293f0c7abb5af978 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 1 Oct 2010 14:29:38 +0530
Subject: [PATCH 074/244] [MOD] idea : Small change

bzr revid: vir@tinyerp.com-20101001085938-ll4xjidy2p9fo0do
---
 addons/idea/report/report_vote_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 91564d4f786..8418377065c 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -74,9 +74,9 @@
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" name="State" context="{'group_by':'idea_state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Open date"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Open date"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Open date"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Open Date"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Open Date"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Open Date"/>
                     </group>
                 </search>
             </field>

From dc984c48b6a628707aafbd5b10e569882e85ff52 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Fri, 1 Oct 2010 14:54:27 +0530
Subject: [PATCH 075/244] [IMP]: base : Improvements in Users->Users

bzr revid: jas@tinyerp.com-20101001092427-8v4dily9reejsvtc
---
 bin/addons/base/base_update.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index f6af6d825be..92ea504606e 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -168,7 +168,6 @@
                     <field name="login"/>
                     <field name="context_lang"/>
                     <field name="date"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>

From 34230abf26b0570018362826626f818a0cd7c4ff Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 1 Oct 2010 15:45:02 +0530
Subject: [PATCH 076/244] [IMP]: base module :Instatnt menu Active filter
 Button

bzr revid: ron@tinyerp.com-20101001101502-8evwjsuocdgmqryw
---
 bin/addons/base/ir/workflow/workflow_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 3fab4388877..986630db921 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -299,7 +299,7 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Instances">
-          <filter icon="terp-camera_test" string="Active" domain="[]" context="{'search_default_active': 1}"/>
+          <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" context="{'search_default_active':1}"/>
           <separator orientation="vertical"/>
           <field name="wkf_id"/>
           <field name="uid"/>
@@ -357,7 +357,7 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Workitems">
-          <filter icon="terp-camera_test" string="Active" domain="[]" context="{'search_default_active': 1}"/>
+          <filter icon="terp-camera_test" string="Active" domain="['state','=','active']" context="{'search_default_active':1}"/>
           <separator orientation="vertical"/>
           <field name="act_id"/>
           <field name="subflow_id"/>

From 6b19c649768918837036ca5df2966e1eb95478c0 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Fri, 1 Oct 2010 13:12:54 +0200
Subject: [PATCH 077/244] [IMP] report engine: try to compute float digits
 based on field and decimal_precision

bzr revid: olt@tinyerp.com-20101001111254-s2r33l07xz62fyf7
---
 bin/report/report_sxw.py | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index aeb04ed21b6..542dc9ece25 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -39,6 +39,7 @@ import tools
 import warnings
 import zipfile
 import common
+from osv.fields import float as float_class, function as function_class
 
 DT_FORMAT = '%Y-%m-%d'
 DHM_FORMAT = '%Y-%m-%d %H:%M:%S'
@@ -240,9 +241,32 @@ class rml_parse(object):
         self.default_lang[lang] = self.lang_dict.copy()
         return True
 
-    def formatLang(self, value, digits=2, date=False,date_time=False, grouping=True, monetary=False):
+    def digits_fmt(self, obj=None, f=None, dp=None):
+        digits = self.get_digits(obj, f, dp)
+        return "%%.%df" % (digits, )
+
+    def get_digits(self, obj=None, f=None, dp=None):
+        d = DEFAULT_DIGITS = 2
+        if dp:
+            decimal_precision_obj = self.pool.get('decimal.precision')
+            ids = decimal_precision_obj.search(self.cr, self.uid, [('name', '=', dp)])
+            if ids:
+                d = decimal_precision_obj.browse(self.cr, self.uid, ids)[0].digits
+        elif obj and f:
+            d = getattr(obj._columns[f], 'digits', lambda x: ((16,DEFAULT_DIGITS)))(self.cr)[1]
+        elif (hasattr(obj, '_field') and\
+                isinstance(obj._field, (float_class, function_class)) and\
+                obj._field.digits):
+                d = obj._field.digits[1] or DEFAULT_DIGITS
+        return d
+
+    def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False):
+        if digits is None:
+            digits = self.get_digits(value)
+
         if isinstance(value, (str, unicode)) and not value:
             return ''
+
         if not self.lang_dict_called:
             self._get_lang_dict()
             self.lang_dict_called = True
@@ -250,6 +274,7 @@ class rml_parse(object):
         if date or date_time:
             if not str(value):
                 return ''
+
             date_format = self.lang_dict['date_format']
             parse_format = DT_FORMAT
             if date_time:
@@ -258,9 +283,11 @@ class rml_parse(object):
                 parse_format = DHM_FORMAT
             if not isinstance(value, time.struct_time):
                 return time.strftime(date_format, time.strptime(value, parse_format))
+
             else:
                 date = datetime(*value.timetuple()[:6])
             return date.strftime(date_format)
+
         return self.lang_dict['lang_obj'].format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary)
 
     def repeatIn(self, lst, name,nodes_parent=False):
@@ -305,6 +332,8 @@ class rml_parse(object):
     def set_context(self, objects, data, ids, report_type = None):
         self.localcontext['data'] = data
         self.localcontext['objects'] = objects
+        self.localcontext['digits_fmt'] = self.digits_fmt
+        self.localcontext['get_digits'] = self.get_digits
         self.datas = data
         self.ids = ids
         self.objects = objects

From 9dc1071c82b49d0f3a1af1ee821d9e65b1a21697 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 1 Oct 2010 16:56:52 +0530
Subject: [PATCH 078/244] [MOD] hr_expense : Improvements in expense analysis
 report

bzr revid: vir@tinyerp.com-20101001112652-mufn92jp5ex3hfxu
---
 addons/hr_expense/report/hr_expense_report_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 0037831391a..a5043c90589 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -65,8 +65,8 @@
                   <separator orientation="vertical"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
                     help = "Confirm Expenses"/>
-                    <filter string="Accepted" icon="terp-camera_test" domain="[('state','=','accepted')]"
-                      help = "Accepted Expenses"/>
+                    <filter string="Approved" icon="terp-camera_test" domain="[('state','=','accepted')]"
+                      help = "Approved Expenses"/>
                     <separator orientation="vertical"/>
                     <filter string="Invoiced" icon="terp-dolar" domain="[('state','=','invoiced')]"
                       help = "Invoiced Expenses"/>
@@ -82,7 +82,7 @@
                 <separator orientation="vertical"/>
                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 <newline/>
-                <field name="date"/>
+                <field name="date" string="Creation Date"/>
                 <field name="date_confirm"/>
                 <field name="date_valid"/>
             </group>
@@ -99,9 +99,9 @@
                 <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                 <separator orientation="vertical"/>
-                <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Create Date"/>
-                <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Create Date"/>
-                <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Create Date"/>
+                <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
+                <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
+                <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
             </group>
             </search>
         </field>

From 5fce56cab36c661c2ed579cc56af64f74746eb83 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Fri, 1 Oct 2010 13:32:25 +0200
Subject: [PATCH 079/244] [FIX] report engine: fixed an error in 'get_digits'

bzr revid: olt@tinyerp.com-20101001113225-wpmxc31htrj02ssf
---
 bin/report/report_sxw.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 542dc9ece25..2c505e98622 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -253,7 +253,11 @@ class rml_parse(object):
             if ids:
                 d = decimal_precision_obj.browse(self.cr, self.uid, ids)[0].digits
         elif obj and f:
-            d = getattr(obj._columns[f], 'digits', lambda x: ((16,DEFAULT_DIGITS)))(self.cr)[1]
+            res_digits = getattr(obj._columns[f], 'digits', lambda x: ((16,DEFAULT_DIGITS)))
+            if isinstance(res_digits, tuple):
+                d = res_digits[1]
+            else:
+                d = res_digits(self.cr)[1]
         elif (hasattr(obj, '_field') and\
                 isinstance(obj._field, (float_class, function_class)) and\
                 obj._field.digits):

From cbc6d182c9f54048c8c98d21f381e44875ad3f98 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 1 Oct 2010 13:25:52 +0200
Subject: [PATCH 080/244] [IMP] report: moved the register_all() function as a
 method of ir.actions.report.xml model, to make it easier to inherit/extend
 for additional report engines

bzr revid: odo@openerp.com-20101001112552-2br8ftpi94ootfrw
---
 bin/addons/base/ir/ir_actions.py | 28 ++++++++++++++++++++++++++--
 bin/pooler.py                    |  3 +--
 bin/report/interface.py          | 20 --------------------
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 4b9d59743cb..65bff3f7adf 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -28,8 +28,9 @@ from tools.translate import _
 import netsvc
 import re
 import copy
-import sys
+import os
 from xml import dom
+from report.report_sxw import report_sxw, report_rml
 
 class actions(osv.osv):
     _name = 'ir.actions.actions'
@@ -89,6 +90,29 @@ class report_xml(osv.osv):
                 res[report.id] = False
         return res
 
+    def register_all(self, cr):
+        """Report registration handler that may be overridden by subclasses to
+           add their own kinds of report services.
+           Loads all reports with no manual loaders (auto==True) and
+           registers the appropriate services to implement them.
+        """
+        opj = os.path.join
+        cr.execute("SELECT * FROM ir_act_report_xml WHERE auto=%s ORDER BY id", (True,))
+        result = cr.dictfetchall()
+        svcs = netsvc.Service._services
+        import pdb
+        pdb.set_trace()
+        for r in result:
+            if svcs.has_key('report.'+r['report_name']):
+                continue
+            if r['report_rml'] or r['report_rml_content_data']:
+                report_sxw('report.'+r['report_name'], r['model'],
+                        opj('addons',r['report_rml'] or '/'), header=r['header'])
+            if r['report_xsl']:
+                report_rml('report.'+r['report_name'], r['model'],
+                        opj('addons',r['report_xml']),
+                        r['report_xsl'] and opj('addons',r['report_xsl']))
+
     _name = 'ir.actions.report.xml'
     _table = 'ir_act_report_xml'
     _sequence = 'ir_actions_id_seq'
@@ -98,7 +122,7 @@ class report_xml(osv.osv):
         'type': fields.char('Action Type', size=32, required=True),
         'report_name': fields.char('Service Name', size=64, required=True),
         'usage': fields.char('Action Usage', size=32),
-        'report_type': fields.selection([ ('pdf','pdf'), ('html','html'), ('raw','raw'), ('sxw','sxw'), ('txt','txt'), ('odt','odt'), ('html2html','HTML from HTML'), ('mako2html','HTML from Mako'), ], string='Report Type', required=True),
+        'report_type': fields.char('Report Type', size=32, required=True, help="Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."),
         'groups_id': fields.many2many('res.groups', 'res_groups_report_rel', 'uid', 'gid', 'Groups'),
         'multi': fields.boolean('On multiple doc.', help="If set to true, the action will not be displayed on the right toolbar of a form view."),
         'attachment': fields.char('Save As Attachment Prefix', size=128, help='This is the filename of the attachment used to store the printing result. Keep empty to not save the printed reports. You can use a python expression with the object and time variables.'),
diff --git a/bin/pooler.py b/bin/pooler.py
index 7a572e71e0d..684bc6210d4 100644
--- a/bin/pooler.py
+++ b/bin/pooler.py
@@ -44,12 +44,11 @@ def get_db_and_pool(db_name, force_demo=False, status=None, update_module=False,
         cr = db.cursor()
         try:
             pool.init_set(cr, False)
+            pool.get('ir.actions.report.xml').register_all(cr)
             cr.commit()
         finally:
             cr.close()
 
-        import report
-        report.interface.register_all(db)
         if pooljobs:
             pool.get('ir.cron').restart(db.dbname)
     return db, pool
diff --git a/bin/report/interface.py b/bin/report/interface.py
index 6aecfe66133..0ee9f432883 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -219,25 +219,5 @@ class report_rml(report_int):
         obj.render()
         return obj.get()
 
-from report_sxw import report_sxw
-
-def register_all(db):
-    opj = os.path.join
-    cr = db.cursor()
-    cr.execute("SELECT * FROM ir_act_report_xml WHERE auto=%s ORDER BY id", (True,))
-    result = cr.dictfetchall()
-    cr.close()
-    svcs = netsvc.Service._services
-    for r in result:
-        if svcs.has_key('report.'+r['report_name']):
-            continue
-        if r['report_rml'] or r['report_rml_content_data']:
-            report_sxw('report.'+r['report_name'], r['model'],
-                    opj('addons',r['report_rml'] or '/'), header=r['header'])
-        if r['report_xsl']:
-            report_rml('report.'+r['report_name'], r['model'],
-                    opj('addons',r['report_xml']),
-                    r['report_xsl'] and opj('addons',r['report_xsl']))
-
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From efdd499c787a23b407e8df82a217e57642bcf254 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 1 Oct 2010 17:18:42 +0530
Subject: [PATCH 081/244] [MOD/IMP] hr_evaluation : usability improvement

bzr revid: dbr@tinyerp.com-20101001114842-iff1syjh3i9dmu3e
---
 addons/hr_evaluation/hr_evaluation_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 5dcc7b6f346..02f551a28b8 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -237,7 +237,7 @@
                     <filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"
                         domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/> 
-                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Overpassed Deadline"
+                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                         help="Evaluations that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/>
                     <field name="employee_id" />
@@ -246,6 +246,7 @@
                     <newline/>
                     <group expand='0' string='Group by...'>
                     <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
+                    <separator orientation="vertical"/>
                     <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
                     <filter string='State' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
                     <separator orientation="vertical"/>

From ab773ebb3f40826e7fb810bef45077c6bebdb4d6 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 1 Oct 2010 17:24:15 +0530
Subject: [PATCH 082/244] [IMP] base: * remove icon on reporting menu * add
 wkf_id related field in workitem * correct close button icon on request form

bzr revid: hmo@tinyerp.com-20101001115415-pbaj7bz46bkkf41l
---
 bin/addons/base/base_menu.xml                 | 2 +-
 bin/addons/base/ir/workflow/workflow.py       | 2 +-
 bin/addons/base/ir/workflow/workflow_view.xml | 8 ++++----
 bin/addons/base/res/res_request_view.xml      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index b37b78f6740..9aab35b5d81 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -21,7 +21,7 @@
             groups="base.group_extended"/>
         <menuitem id="menu_management" name="Modules" parent="base.menu_administration" sequence="10"
             groups="base.group_extended"/>
-        <menuitem icon="STOCK_OPEN" id="reporting_menu"
+        <menuitem id="reporting_menu"
             parent="base.menu_custom" name="Reporting" sequence="30"
              />
     </data>
diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py
index 8074d784e3c..30fd666c03e 100644
--- a/bin/addons/base/ir/workflow/workflow.py
+++ b/bin/addons/base/ir/workflow/workflow.py
@@ -171,7 +171,6 @@ class wkf_instance(osv.osv):
     _log_access = False
     _columns = {
         'wkf_id': fields.many2one('workflow', 'Workflow', ondelete='cascade', select=True),
-        'uid': fields.integer('User ID'),
         'res_id': fields.integer('Resource ID', select=True),
         'res_type': fields.char('Resource Object', size=64, select=True),
         'state': fields.char('State', size=32, select=True),
@@ -194,6 +193,7 @@ class wkf_workitem(osv.osv):
     _rec_name = 'state'
     _columns = {
         'act_id': fields.many2one('workflow.activity', 'Activity', required=True, ondelete="cascade", select=True),
+        'wkf_id': fields.related('act_id','wkf_id', type='many2one', relation='workflow', string='Workflow'),
         'subflow_id': fields.many2one('workflow.instance', 'Subflow', ondelete="cascade", select=True),
         'inst_id': fields.many2one('workflow.instance', 'Instance', required=True, ondelete="cascade", select=True),
         'state': fields.char('State', size=64, select=True),
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index c3e5c3f3c98..9adbec0fc56 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -272,7 +272,6 @@
       <field name="arch" type="xml">
         <form string="Workflow Instances">
           <field name="wkf_id" readonly="1"/>
-          <field name="uid" readonly="1"/>
           <field name="res_id" readonly="1"/>
           <field name="res_type" readonly="1"/>
           <field name="state" readonly="1"/>
@@ -286,7 +285,6 @@
       <field name="arch" type="xml">
         <tree string="Workflow Instances">
           <field name="wkf_id"/>
-          <field name="uid"/>
           <field name="res_id"/>
           <field name="res_type"/>
           <field name="state"/>
@@ -301,8 +299,7 @@
         <search string="Workflow Instances">
           <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
           <separator orientation="vertical"/>
-          <field name="wkf_id"/>
-          <field name="uid"/>
+          <field name="wkf_id" widget="selection"/>
           <field name="res_id"/>
           <field name="res_type"/>
           <field name="state"/>
@@ -332,6 +329,7 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Workflow Workitems">
+          <field name="wkf_id" readonly="1"/>  
           <field name="act_id" readonly="1"/>
           <field name="subflow_id" readonly="1"/>
           <field name="inst_id" readonly="1"/>
@@ -345,6 +343,7 @@
       <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="Workflow Workitems">
+          <field name="wkf_id"/>  
           <field name="act_id"/>
           <field name="subflow_id"/>
           <field name="inst_id"/>
@@ -360,6 +359,7 @@
         <search string="Workflow Workitems">
           <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
           <separator orientation="vertical"/>
+          <field name="wkf_id" widget="selection"/>  
           <field name="act_id"/>
           <field name="subflow_id"/>
           <field name="inst_id"/>
diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml
index 53b7044f8ff..7cec248b990 100644
--- a/bin/addons/base/res/res_request_view.xml
+++ b/bin/addons/base/res/res_request_view.xml
@@ -42,7 +42,7 @@
                             <field colspan="4" name="body" nolabel="1"/>
                             <group col="5" colspan="4">
                                 <field name="state"/>
-                                <button name="request_close" states="waiting,draft,active" string="Close" type="object" icon="gtk-stop"/>
+                                <button name="request_close" states="waiting,draft,active" string="Close" type="object" icon="gtk-close"/>
                                 <button name="request_send" states="draft,active" string="Send" type="object" icon="terp-camera_test"/>
                                 <button name="request_reply" states="waiting" string="Reply" type="object" icon="gtk-undo"/>
                             </group>

From 808d546b2ee634c28567a756c2e1cd6151f9cf1b Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 1 Oct 2010 18:00:32 +0530
Subject: [PATCH 083/244] [MOD] hr_recruitment : Improvements in report

bzr revid: vir@tinyerp.com-20101001123032-l3i6o30chre0nx1j
---
 .../report/hr_recruitment_report_view.xml     | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index d1f06577fb2..2e1476b9de6 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -67,7 +67,7 @@
                     	icon="terp-document-new"
                     	domain="[('state','=','draft')]"
                     	help = "Draft recruitment"/>
-	                <filter string="Current"
+	                <filter string="In progress"
 	                	icon="terp-check"
 	                	domain="[('state', '=' ,'open')]"
 	                	help = "In progress recruitment"/>
@@ -91,36 +91,34 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="job_id" widget="selection"/>
-                    <field name="type_id" widget="selection"/>
+                    <field name="job_id" />
                     <field name="priority"/>
                     <field name="stage_id" widget="selection"/>
-                    <field name="state"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <newline/>
-                    <field name="date"/>
+                    <field name="date" string="Creation Date"/>
                     <field name="date_closed"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By ...">
                    <filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                   <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
+                   <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
                    <separator orientation="vertical"/>
                     <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                    <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                    <separator orientation="vertical"/>
                    <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
             	   <separator orientation="vertical"/>
+            	   <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                   <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                    <separator orientation="vertical"/>
-            	   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
-            	   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
-            	   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
+            	   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
+            	   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
+            	   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
 
-                
+
                 </search>
         </field>
     </record>

From 05c30d29f42de9bf5fd27ba9beb576c419135a4a Mon Sep 17 00:00:00 2001
From: Ferdinand <>
Date: Fri, 1 Oct 2010 18:13:01 +0530
Subject: [PATCH 084/244] [IMP] Bank : If partner has an account number, he
 must have a bank linked and thus bank has to be a required field

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

bzr revid: jvo@tinyerp.com-20101001124301-7rruihe46ku5zezq
---
 bin/addons/base/res/partner/partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 466a8de0786..05630dea85b 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -392,7 +392,7 @@ class res_partner_bank(osv.osv):
     _columns = {
         'name': fields.char('Description', size=128),
         'acc_number': fields.char('Account Number', size=64, required=False),
-        'bank': fields.many2one('res.bank', 'Bank'),
+        'bank': fields.many2one('res.bank', 'Bank', required=True),
         'owner_name': fields.char('Account Owner', size=64),
         'street': fields.char('Street', size=128),
         'zip': fields.char('Zip', change_default=True, size=24),

From 8f99c6ebcd536a72f1404a50f9664bed4b257141 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 1 Oct 2010 14:51:34 +0200
Subject: [PATCH 085/244] [FIX] ir.actions: remove leftover debug breakpoint -
 sorry about it :-( - also note that previous commit changed the report_type
 field of ir.actions.report.xml from selection to char to be more easily
 extended

bzr revid: odo@openerp.com-20101001125134-b6dovx9vs12lcndy
---
 bin/addons/base/ir/ir_actions.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 65bff3f7adf..27704687f93 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -100,8 +100,6 @@ class report_xml(osv.osv):
         cr.execute("SELECT * FROM ir_act_report_xml WHERE auto=%s ORDER BY id", (True,))
         result = cr.dictfetchall()
         svcs = netsvc.Service._services
-        import pdb
-        pdb.set_trace()
         for r in result:
             if svcs.has_key('report.'+r['report_name']):
                 continue

From cd02d15c08e9b17785cbca6d508323db207f9a6e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 1 Oct 2010 18:47:02 +0530
Subject: [PATCH 086/244] [MOD/IMP] hr_* : usability improvement

bzr revid: dbr@tinyerp.com-20101001131702-a76c1fyi9nzsmr1r
---
 .../hr_evaluation/report/hr_evaluation_report_view.xml |  6 +++---
 addons/hr_holidays/report/hr_holidays_report_view.xml  | 10 +++++-----
 .../report/timesheet_report_view.xml                   |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index a8aaeb2ec93..f30e473d030 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -79,9 +79,9 @@
                     <separator orientation="vertical"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by create Date"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Group by month of create Date"/>
-                    <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}" help="Group by year of create Date"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Creation Date"/>
+                    <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
             </search>
         </field>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 89cdb6014bb..ab8afeae30b 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -75,7 +75,7 @@
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter icon="terp-personal" string="Employee" name="Employee" context="{'group_by':'employee_id'}"
                             help="Leaves by empolyee"/>
-                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                      <filter string="Department" name="department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
@@ -85,16 +85,16 @@
                     <separator orientation="vertical"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by create date"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of create date"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of create date"/>
+                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
             </search>
         </field>
     </record>
 
     <record id="action_hr_holidays_report_all" model="ir.actions.act_window">
-        <field name="name">Leaves</field>
+        <field name="name">Leaves Analysis</field>
         <field name="res_model">hr.holidays.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 08abc6db63b..a015ff933d2 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -34,11 +34,11 @@
                     <field name="year" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="month" invisible="1"/>
+					<field name="total_attendance" sum="#Total Attendance"/>
+                    <field name="total_timesheet" sum="#Total Timesheet"/>
+                    <field name="total_diff" sum="#Total Diff"/>
                     <field name="quantity" sum="#Quantity"/>
                     <field name="cost" sum="#Cost"/>
-                    <field name="total_diff" sum="#Total Diff"/>
-                    <field name="total_timesheet" sum="#Total Timesheet"/>
-                    <field name="total_attendance" sum="#Total Attendance"/>
                 </tree>
             </field>
         </record>

From 48d9c128e050c9280df5c6c211fa558999889d8c Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Fri, 1 Oct 2010 19:23:58 +0530
Subject: [PATCH 087/244] [REM]:base:removed ir.actions.report.custom and
 ir.report.custom

bzr revid: jas@tinyerp.com-20101001135358-ndjdcdw9hojno9kh
---
 bin/addons/base/ir/ir.xml                    |  89 -------------
 bin/addons/base/ir/ir_actions.py             |  17 ---
 bin/addons/base/ir/ir_report_custom.py       | 127 ++-----------------
 bin/addons/base/ir/ir_ui_menu.py             |   2 -
 bin/addons/base/security/ir.model.access.csv |   3 -
 5 files changed, 12 insertions(+), 226 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index ee8a21d2bb7..9b4e0e3e38a 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -389,59 +389,6 @@
         <menuitem parent="base.next_id_6" name="Filters"
             id="menu_ir_filters" action="actions_ir_filters_view" />
 
-
-        <record id="act_report_custom_view" model="ir.ui.view">
-            <field name="name">ir.actions.report.custom</field>
-            <field name="model">ir.actions.report.custom</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Report custom">
-                    <field name="name"/>
-                    <field name="type"/>
-                    <field name="report_id"/>
-                    <field name="usage"/>
-                </form>
-            </field>
-        </record>
-        <record id="act_report_custom_view_tree" model="ir.ui.view">
-            <field name="name">ir.actions.report.custom.tree</field>
-            <field name="model">ir.actions.report.custom</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Report custom">
-                    <field name="name"/>
-                    <field name="type"/>
-                </tree>
-            </field>
-        </record>
-        <record id="act_report_custom_search_view" model="ir.ui.view">
-            <field name="name">ir.actions.report.custom.search</field>
-            <field name="model">ir.actions.report.custom</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Report custom">
-                    <group colspan="4" col="10">
-                        <field name="name"/>
-                        <field name="type"/>
-                    </group>
-                    <newline/>
-                    <group expand="0" string="Group By" colspan="4">
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
-                    </group>
-                </search>
-           </field>
-        </record>
-
-        <record id="ir_action_report_custom" model="ir.actions.act_window">
-            <field name="name">Report Custom</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">ir.actions.report.custom</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="act_report_custom_view_tree"/>
-            <field name="search_view_id" ref="act_report_custom_search_view"/>
-        </record>
-        <menuitem action="ir_action_report_custom" id="menu_ir_action_report_custom" parent="base.next_id_6"/>
-
         <record id="act_report_xml_view" model="ir.ui.view">
             <field name="name">ir.actions.report.xml</field>
             <field name="model">ir.actions.report.xml</field>
@@ -1067,42 +1014,6 @@
             </field>
         </record>
 
-        <record id="view_report_custom_form" model="ir.ui.view">
-            <field name="name">ir.report.custom</field>
-            <field name="model">ir.report.custom</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Custom Report">
-                    <field name="name" select="1"/>
-                    <field name="model_id" on_change="onchange_model_id(model_id)" select="1"/>
-                    <field name="title"/>
-                    <field name="type"/>
-                    <field name="print_format"/>
-                    <field name="print_orientation"/>
-                    <field name="repeat_header"/>
-                    <field name="footer"/>
-                    <field name="sortby"/>
-                    <field name="field_parent"/>
-                    <field name="frequency"/>
-                    <field name="limitt"/>
-                    <field name="menu_id"/>
-                    <field colspan="4" name="fields_child0" widget="one2many_list"/>
-                    <field name="state" readonly="1" select="1"/>
-                    <group col="2" colspan="2">
-                        <button name="subscribe" states="unsubscribed" string="Subscribe Report" type="object"/>
-                        <button name="unsubscribe" states="subscribed" string="Unsubscribe Report" type="object"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-        <record id="action_report_custom" model="ir.actions.act_window">
-            <field name="name">Custom Report</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">ir.report.custom</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="view_report_custom_form"/>
-        </record>
-
         <!--
         <menuitem name="Administration/Report/Report Custom" action="action_report_custom"/>
         -->
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 4b9d59743cb..e956ee2bf59 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -44,23 +44,6 @@ class actions(osv.osv):
     }
 actions()
 
-class report_custom(osv.osv):
-    _name = 'ir.actions.report.custom'
-    _table = 'ir_act_report_custom'
-    _sequence = 'ir_actions_id_seq'
-    _columns = {
-        'name': fields.char('Report Name', size=64, required=True, translate=True),
-        'type': fields.char('Report Type', size=32, required=True),
-        'model':fields.char('Object', size=64, required=True),
-        'report_id': fields.integer('Report Ref.', required=True),
-        'usage': fields.char('Action Usage', size=32),
-        'multi': fields.boolean('On multiple doc.', help="If set to true, the action will not be displayed on the right toolbar of a form view.")
-    }
-    _defaults = {
-        'multi': lambda *a: False,
-        'type': lambda *a: 'ir.actions.report.custom',
-    }
-report_custom()
 
 class report_xml(osv.osv):
 
diff --git a/bin/addons/base/ir/ir_report_custom.py b/bin/addons/base/ir/ir_report_custom.py
index 3c7daa09d34..ff81e48ff53 100644
--- a/bin/addons/base/ir/ir_report_custom.py
+++ b/bin/addons/base/ir/ir_report_custom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,127 +27,24 @@ from tools.translate import _
 from tools.safe_eval import safe_eval as eval
 import netsvc
 
-class report_custom(osv.osv):
-    _name = 'ir.report.custom'
-    _columns = {
-        'name': fields.char('Report Name', size=64, required=True, translate=True),
-        'model_id': fields.many2one('ir.model','Object', required=True, change_default=True),
-        'type': fields.selection([('table','Tabular'),('pie','Pie Chart'),('bar','Bar Chart'),('line','Line Plot')], "Report Type", size=64, required='True'),
-        'title': fields.char("Report Title", size=64, required='True', translate=True),
-        'print_format': fields.selection((('A4','a4'),('A5','a5')), 'Print format', required=True),
-        'print_orientation': fields.selection((('landscape','Landscape'),('portrait','Portrait')), 'Print orientation', required=True, size=16),
-        'repeat_header': fields.boolean('Repeat Header'),
-        'footer': fields.char('Report Footer', size=64, required=True),
-        'sortby': fields.char('Sorted By', size=64),
-        'fields_child0': fields.one2many('ir.report.custom.fields', 'report_id','Fields', required=True),
-        'field_parent': fields.many2one('ir.model.fields','Child Field'),
-        'state': fields.selection([('unsubscribed','Unsubscribed'),('subscribed','Subscribed')], 'State', size=64),
-        'frequency': fields.selection([('Y','Yearly'),('M','Monthly'),('D','Daily')], 'Frequency', size=64),
-        'limitt': fields.char('Limit', size=9),
-        'menu_id': fields.many2one('ir.ui.menu', 'Menu')
-    }
-    _defaults = {
-        'print_format': lambda *a: 'A4',
-        'print_orientation': lambda *a: 'portrait',
-        'state': lambda *a: 'unsubscribed',
-        'type': lambda *a: 'table',
-        'footer': lambda *a: 'Generated by OpenERP'
-    }
-    
-    def onchange_model_id(self, cr, uid, ids, model_id):
-        if not(model_id):
-            return {}
-        return {'domain': {'field_parent': [('model_id','=',model_id)]}}
-
-    def unsubscribe(self, cr, uid, ids, context={}):
-#TODO: should delete the ir.actions.report.custom for these reports and do an ir_del
-        self.write(cr, uid, ids, {'state':'unsubscribed'})
-        return True
-
-    def subscribe(self, cr, uid, ids, context={}):
-        for report in self.browse(cr, uid, ids):
-            report.fields_child0.sort(lambda x,y : x.sequence - y.sequence)
-        
-            # required on field0 does not seem to work( cause we use o2m_l ?)
-            if not report.fields_child0:
-                raise osv.except_osv(_('Invalid operation'), _('Enter at least one field !'))
-            
-            if report.type in ['pie', 'bar', 'line'] and report.field_parent:
-                raise osv.except_osv(_('Invalid operation'), _('Tree can only be used in tabular reports'))
-            
-            # Otherwise it won't build a good tree. See level.pop in custom.py.
-            if report.type == 'table' and report.field_parent and report.fields_child0 and not report.fields_child0[0].groupby:
-                raise osv.except_osv('Invalid operation :', 'When creating tree (field child) report, data must be group by the first field')
-
-            if report.type == 'pie':
-                if len(report.fields_child0) != 2:
-                    raise osv.except_osv(_('Invalid operation'), _('Pie charts need exactly two fields'))
-                else:
-                    c_f = {}
-                    for i in range(2):
-                        c_f[i] = []
-                        tmp = report.fields_child0[i]
-                        for j in range(3):
-                            c_f[i].append((not isinstance(eval('tmp.field_child'+str(j),{},{'tmp':tmp}), browse_null) and eval('tmp.field_child'+str(j)+'.ttype',{},{'tmp':tmp})) or None)
-                    if not reduce(lambda x,y : x or y, map(lambda x: x in ['integer', 'float'], c_f[1])):
-                        raise osv.except_osv(_('Invalid operation'), _('Second field should be figures'))
-                    
-            if report.type == 'bar':
-                if len(report.fields_child0) < 2:
-                    raise osv.except_osv(_('Invalid operation'), _('Bar charts need at least two fields'))
-                else:
-                    c_f = {}
-                    for i in range(len(report.fields_child0)):
-                        c_f[i] = []
-                        tmp = report.fields_child0[i]
-                        for j in range(3):
-                            c_f[i].append((not isinstance(eval('tmp.field_child'+str(j),{},{'tmp':tmp}), browse_null) and eval('tmp.field_child'+str(j)+'.ttype',{},{'tmp':tmp})) or None)
-
-                        if i == 0:
-                            pass
-                        else:
-                            if not reduce(lambda x,y : x or y, map(lambda x: x in ['integer', 'float'], c_f[i])):
-                                raise osv.except_osv(_('Invalid operation'), _('Field %d should be a figure') %(i,))
-
-            if report.state=='subscribed':
-                continue
-
-            name = report.name
-            model = report.model_id.model
-
-            action_def = {'report_id':report.id, 'type':'ir.actions.report.custom', 'model':model, 'name':name}
-            id = self.pool.get('ir.actions.report.custom').create(cr, uid, action_def)
-            m_id = report.menu_id.id
-            action = "ir.actions.report.custom,%d" % (id,)
-            if not report.menu_id:
-                ir.ir_set(cr, uid, 'action', 'client_print_multi', name, [(model, False)], action, False, True)
-            else:
-                ir.ir_set(cr, uid, 'action', 'tree_but_open', 'Menuitem', [('ir.ui.menu', int(m_id))], action, False, True)
-
-            self.write(cr, uid, [report.id], {'state':'subscribed'}, context)
-        return True
-report_custom()
-
-
 class report_custom_fields(osv.osv):
     _name = 'ir.report.custom.fields'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'report_id': fields.many2one('ir.report.custom', 'Report Ref', select=True),
         'field_child0': fields.many2one('ir.model.fields', 'Field child0', required=True),
-        'fc0_operande': fields.many2one('ir.model.fields', 'Constraint'), 
+        'fc0_operande': fields.many2one('ir.model.fields', 'Constraint'),
         'fc0_condition': fields.char('Condition', size=64),
         'fc0_op': fields.selection((('>','>'),('<','<'),('==','='),('in','in'),('gety,==','(year)=')), 'Relation'),
         'field_child1': fields.many2one('ir.model.fields', 'Field child1'),
-        'fc1_operande': fields.many2one('ir.model.fields', 'Constraint'), 
+        'fc1_operande': fields.many2one('ir.model.fields', 'Constraint'),
         'fc1_condition': fields.char('condition', size=64),
         'fc1_op': fields.selection((('>','>'),('<','<'),('==','='),('in','in'),('gety,==','(year)=')), 'Relation'),
         'field_child2': fields.many2one('ir.model.fields', 'Field child2'),
-        'fc2_operande': fields.many2one('ir.model.fields', 'Constraint'), 
+        'fc2_operande': fields.many2one('ir.model.fields', 'Constraint'),
         'fc2_condition': fields.char('condition', size=64),
         'fc2_op': fields.selection((('>','>'),('<','<'),('==','='),('in','in'),('gety,==','(year)=')), 'Relation'),
         'field_child3': fields.many2one('ir.model.fields', 'Field child3'),
-        'fc3_operande': fields.many2one('ir.model.fields', 'Constraint'), 
+        'fc3_operande': fields.many2one('ir.model.fields', 'Constraint'),
         'fc3_condition': fields.char('condition', size=64),
         'fc3_op': fields.selection((('>','>'),('<','<'),('==','='),('in','in'),('gety,==','(year)=')), 'Relation'),
         'alignment':  fields.selection((('left','left'),('right','right'),('center','center')), 'Alignment', required=True),
@@ -180,9 +77,9 @@ class report_custom_fields(osv.osv):
             if id:
                 return {
                     'domain': {
-                        next_level_field_name: [('model_id', '=', id)], 
+                        next_level_field_name: [('model_id', '=', id)],
                         next_level_operande: [('model_id', '=', id)]
-                    }, 
+                    },
                     'required': {
                         next_level_field_name: True
                     }
@@ -192,13 +89,13 @@ class report_custom_fields(osv.osv):
                 return {'required': {next_level_field_name: True}}
         else:
             return {'domain': {next_level_field_name: []}}
-            
+
     def get_field_child_onchange_method(level):
         return lambda self, cr, uid, ids, field_id: self.onchange_any_field_child(cr, uid, ids, field_id, level)
 
-    onchange_field_child0 = get_field_child_onchange_method(0)  
-    onchange_field_child1 = get_field_child_onchange_method(1)  
-    onchange_field_child2 = get_field_child_onchange_method(2)  
+    onchange_field_child0 = get_field_child_onchange_method(0)
+    onchange_field_child1 = get_field_child_onchange_method(1)
+    onchange_field_child2 = get_field_child_onchange_method(2)
 report_custom_fields()
 
 
diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py
index d16b4554d41..6b4d98962b4 100644
--- a/bin/addons/base/ir/ir_ui_menu.py
+++ b/bin/addons/base/ir/ir_ui_menu.py
@@ -125,7 +125,6 @@ class ir_ui_menu(osv.osv):
                 data = menu.action
                 if data:
                     model_field = { 'ir.actions.act_window':    'res_model',
-                                    'ir.actions.report.custom': 'model',
                                     'ir.actions.report.xml':    'model',
                                     'ir.actions.wizard':        'model',
                                     'ir.actions.server':        'model_id',
@@ -272,7 +271,6 @@ class ir_ui_menu(osv.osv):
         'action': fields.function(_action, fnct_inv=_action_inv,
             method=True, type='reference', string='Action',
             selection=[
-                ('ir.actions.report.custom', 'ir.actions.report.custom'),
                 ('ir.actions.report.xml', 'ir.actions.report.xml'),
                 ('ir.actions.act_window', 'ir.actions.act_window'),
                 ('ir.actions.wizard', 'ir.actions.wizard'),
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 481007d52b2..d70c2b9bba6 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -19,7 +19,6 @@
 "access_ir_module_module_dependency_group_system","ir_module_module_dependency group_system","model_ir_module_module_dependency","group_system",1,1,1,1
 "access_ir_property_group_user","ir_property group_user","model_ir_property",,1,0,0,0
 "access_ir_property_group_user_manager","ir_property group_manager","model_ir_property","base.group_partner_manager",1,1,1,0
-"access_ir_report_custom_group_system","ir_report_custom group_system","model_ir_report_custom",,1,0,0,0
 "access_ir_report_custom_fields_group_system","ir_report_custom_fields group_system","model_ir_report_custom_fields",,1,0,0,0
 "access_ir_rule_group_user","ir_rule group_user","model_ir_rule",,1,0,0,0
 "access_ir_rule_group_erp_manager","ir_rule group_erp_manager","model_ir_rule","group_erp_manager",1,1,1,1
@@ -99,8 +98,6 @@
 "access_workflow_triggers_all","workflow_triggers_all","model_workflow_triggers",,1,0,0,0
 "access_workflow_triggers_group_system","workflow_triggers_group_system","model_workflow_triggers","group_system",1,1,1,1
 "access_workflow_workitem_all","workflow_workitem_all","model_workflow_workitem",,1,1,1,1
-"access_actions_report_custom_all","ir_actions_report_custom_all","model_ir_actions_report_custom",,1,0,0,0
-"access_actions_report_custom_group_system","ir_actions_report_custom_group_system","model_ir_actions_report_custom","group_system",1,1,1,1
 "access_ir_actions_act_window_view_all","ir_actions_act_window_view_all","model_ir_actions_act_window_view",,1,0,0,0
 "access_ir_actions_act_window_view_group_system","ir_actions_act_window_view_group_system","model_ir_actions_act_window_view","group_system",1,1,1,1
 "access_ir_actions_url_all","ir_actions_url_all","model_ir_actions_url",,1,0,0,0

From 6c505a4f582169a648625859f6713a56ae3391ff Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 1 Oct 2010 19:37:24 +0530
Subject: [PATCH 088/244] Improved Pagenumber and Pagecount.(need to more
 improved it..)

bzr revid: apa@tinyerp.com-20101001140724-qllak4zp967ke7dz
---
 bin/report/render/rml2pdf/trml2pdf.py | 56 ++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 848b0f29215..5ec38a405df 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -35,9 +35,58 @@ from lxml import etree
 import base64
 from reportlab.platypus.doctemplate import ActionFlowable
 from tools.safe_eval import safe_eval as eval
+from reportlab.lib.units import inch,cm,mm
 
 encoding = 'utf-8'
 
+class NumberedCanvas(canvas.Canvas):
+
+    def __init__(self, *args, **kwargs):
+        canvas.Canvas.__init__(self, *args, **kwargs)
+        self._codes = []
+        self._flag=False
+        self._pageCount=0
+        self.i =0
+        self.k=0
+        self.pages={}
+
+    def showPage(self):
+        self.i +=1
+        if not self._flag:
+           self._pageCount += 1
+        else:
+            self.pages.update({self.i:self._pageCount})
+        self._codes.append({'code': self._code, 'stack': self._codeStack})
+        self._startPage()
+        self._flag=False
+
+    def pageCount(self):
+        if self.pages.get(self.k,False):
+            self._pageNumber=0
+        self.k +=1
+        key=self.k
+        if not self.pages.get(key,False):
+            while not self.pages.get(key,False):
+                key = key + 1
+        self.setFont("Helvetica", 15)
+        self.drawRightString(200*mm, 20*mm,
+            "page %(this)i of %(total)i" % {
+               'this': self._pageNumber+1,
+               'total': self.pages.get(key,False),
+            }
+        )
+
+    def save(self):
+        """add page info to each page (page x of y)"""
+        # reset page counter
+        self._pageNumber = 0
+        for code in self._codes:
+            self._code = code['code']
+            self._codeStack = code['stack']
+            self.pageCount()
+            canvas.Canvas.showPage(self)
+        self._doc.SaveToFile(self._filename, self)
+
 class PageCount(platypus.Flowable):
     def draw(self):
         self.canv.beginForm("pageCount")
@@ -762,6 +811,9 @@ class TinyDocTemplate(platypus.BaseDocTemplate):
         self.handle_frameBegin()
     def afterFlowable(self, flowable):
         if isinstance(flowable, PageReset):
+            self.canv._pageCount=self.page
+            self.page=0
+            self.canv._flag=True
             self.canv._pageNumber = 0
 
 class _rml_template(object):
@@ -808,13 +860,15 @@ class _rml_template(object):
         for node_story in node_stories:
             if story_cnt > 0:
                 fis.append(platypus.PageBreak())
+
             fis += r.render(node_story)
             # Reset Page Number with new story tag
             fis.append(PageReset())
+            self.doc_tmpl.afterFlowable(fis)
             story_cnt += 1
         if self.localcontext:
             fis.append(PageCount())
-        self.doc_tmpl.build(fis)
+        self.doc_tmpl.build(fis,canvasmaker=NumberedCanvas)
 
 def parseNode(rml, localcontext = {},fout=None, images={}, path='.',title=None):
     node = etree.XML(rml)

From 9454f780af6dbb141574d807a9947fc70494bbfe Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 1 Oct 2010 16:36:42 +0200
Subject: [PATCH 089/244] [FIX] osv.query: improve support of chained explicit
 JOINs + corresponding tests

bzr revid: odo@openerp.com-20101001143642-z3ahichcj55csxib
---
 bin/osv/query.py     | 16 +++++++++++-----
 bin/test/test_osv.py | 30 +++++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/bin/osv/query.py b/bin/osv/query.py
index b04e536ad60..5ba74e49a1c 100644
--- a/bin/osv/query.py
+++ b/bin/osv/query.py
@@ -99,13 +99,19 @@ class Query(object):
         """Returns (query_from, query_where, query_params)"""
         query_from = ''
         tables_to_process = list(self.tables)
+
+        def add_joins_for_table(table, query_from):
+            for (dest_table, lhs_col, col, join) in self.joins.get(table,[]):
+                tables_to_process.remove(dest_table)
+                query_from += ' %s %s ON (%s."%s" = %s."%s")' % \
+                    (join, dest_table, table, lhs_col, dest_table, col)
+                query_from = add_joins_for_table(dest_table, query_from)
+            return query_from
+
         for table in tables_to_process:
-            query_from += ' %s ' % table
+            query_from += table
             if table in self.joins:
-                for (dest_table, lhs_col, col, join) in self.joins[table]:
-                    tables_to_process.remove(dest_table)
-                    query_from += '%s %s ON (%s."%s" = %s."%s")' % \
-                        (join, dest_table, table, lhs_col, dest_table, col)
+                query_from = add_joins_for_table(table, query_from)
             query_from += ','
         query_from = query_from[:-1] # drop last comma
         return (query_from, " AND ".join(self.where_clause), self.where_clause_params)
diff --git a/bin/test/test_osv.py b/bin/test/test_osv.py
index 170aa47dc0f..6e9f9c1e173 100644
--- a/bin/test/test_osv.py
+++ b/bin/test/test_osv.py
@@ -31,10 +31,34 @@ class QueryTestCase(unittest.TestCase):
         query.join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
         query.join(("product_product", "res_user", "user_id", "id"), outer=True) # outer join
         self.assertEquals(query.get_sql()[0].strip(), 
-            """"product_product" LEFT JOIN "res_user" ON ("product_product"."user_id" = "res_user"."id"), "product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") """.strip(), "Incorrect query")
-        self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id""".strip(), "Incorrect where clause")
+            """"product_product" LEFT JOIN "res_user" ON ("product_product"."user_id" = "res_user"."id"),"product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") """.strip())
+        self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id""".strip())
+
+    def test_query_chained_explicit_joins(self):
+        query = Query()
+        query.tables.extend(['"product_product"','"product_template"'])
+        query.where_clause.append("product_product.template_id = product_template.id")
+        query.join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
+        query.join(("product_category", "res_user", "user_id", "id"), outer=True) # CHAINED outer join
+        self.assertEquals(query.get_sql()[0].strip(), 
+            """"product_product","product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") LEFT JOIN "res_user" ON ("product_category"."user_id" = "res_user"."id")""".strip())
+        self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id""".strip())
+
+    def test_mixed_query_chained_explicit_implicit_joins(self):
+        query = Query()
+        query.tables.extend(['"product_product"','"product_template"'])
+        query.where_clause.append("product_product.template_id = product_template.id")
+        query.join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
+        query.join(("product_category", "res_user", "user_id", "id"), outer=True) # CHAINED outer join
+        query.tables.append('"account.account"')
+        query.where_clause.append("product_category.expense_account_id = account_account.id") # additional implicit join 
+        self.assertEquals(query.get_sql()[0].strip(), 
+            """"product_product","product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") LEFT JOIN "res_user" ON ("product_category"."user_id" = "res_user"."id"),"account.account" """.strip())
+        self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id AND product_category.expense_account_id = account_account.id""".strip())
+
 
     def test_raise_missing_lhs(self):
         query = Query()
         query.tables.append('"product_product"')
-        self.assertRaises(AssertionError, query.join, ("product_template", "product_category", "categ_id", "id"), outer=False)
\ No newline at end of file
+        self.assertRaises(AssertionError, query.join, ("product_template", "product_category", "categ_id", "id"), outer=False)
+

From 037d12f3fa54464065acd0d10e10d2efde1c0c82 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 1 Oct 2010 18:37:17 +0200
Subject: [PATCH 090/244] [IMP] base: completely remove default value for
 action_id of res.users + cleanup + tooltips

bzr revid: odo@openerp.com-20101001163717-bf1xnz6qm76y4s7h
---
 bin/addons/base/base.sql        |  3 +--
 bin/addons/base/base_data.xml   |  2 --
 bin/addons/base/base_demo.xml   |  2 --
 bin/addons/base/res/res_user.py | 17 ++++++-----------
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/bin/addons/base/base.sql b/bin/addons/base/base.sql
index 84676a7f59b..eb9eb5b9d75 100644
--- a/bin/addons/base/base.sql
+++ b/bin/addons/base/base.sql
@@ -148,7 +148,6 @@ CREATE TABLE res_users (
     context_lang varchar(64) default '',
     -- No FK references below, will be added later by ORM
     -- (when the destination rows exist)
-    action_id int,
     company_id int,
     primary key(id)
 );
@@ -345,7 +344,7 @@ CREATE TABLE ir_model_data (
 -- Users
 ---------------------------------
 
-insert into res_users (id,login,password,name,action_id,active,company_id) values (1,'admin','admin','Administrator',NULL,True,1);
+insert into res_users (id,login,password,name,active,company_id) values (1,'admin','admin','Administrator',True,1);
 insert into ir_model_data (name,module,model,noupdate,res_id) values ('user_root','base','res.users',True,1);
 
 -- Compatibility purpose, to remove V6.0
diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 5082adfbfe0..6625d84402b 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1053,8 +1053,6 @@
             <field name="address_id" ref="main_address"/>
             <field name="company_id" ref="main_company"/>
             <field name="company_ids" eval="[(4, ref('main_company'))]"/>
-            <field name="action_id" ref="action_menu_admin"/>
-            <field name="menu_id" ref="action_menu_admin"/>
         </record>
 
         <record id="main_partner" model="res.partner">
diff --git a/bin/addons/base/base_demo.xml b/bin/addons/base/base_demo.xml
index 235e7e77b75..7779171fe08 100644
--- a/bin/addons/base/base_demo.xml
+++ b/bin/addons/base/base_demo.xml
@@ -6,8 +6,6 @@
             <field name="password">demo</field>
             <field name="name">Demo User</field>
             <field name="signature">Mr Demo</field>
-            <field name="action_id" ref="action_menu_admin"/>
-            <field name="menu_id" ref="action_menu_admin"/>
             <field name="address_id" ref="main_address"/>
             <field name="company_id" ref="main_company"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user')])]"/> 
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index c5e5e79a756..e310f5716b8 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -242,8 +242,8 @@ class users(osv.osv):
         'signature': fields.text('Signature', size=64),
         'address_id': fields.many2one('res.partner.address', 'Company Address'),
         'active': fields.boolean('Active'),
-        'action_id': fields.many2one('ir.actions.actions', 'Home Action'),
-        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),
+        'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."),
+        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action', help="If specified, the action will replace the standard menu for this user."),
         'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
         'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
 
@@ -288,7 +288,6 @@ class users(osv.osv):
                 result = override_password(result)
             else:
                 result = map(override_password, result)
-                
         return result
 
 
@@ -319,10 +318,6 @@ class users(osv.osv):
             self.__admin_ids[cr.dbname] = ir_model_data_obj.read(cr, 1, [mdid], ['res_id'])[0]['res_id']
         return self.__admin_ids[cr.dbname]
 
-    def _get_action(self,cr, uid, context={}):
-        ids = self.pool.get('ir.ui.menu').search(cr, uid, [('usage','=','menu')])
-        return ids and ids[0] or False
-
     def _get_company(self,cr, uid, context=None, uid2=False):
         if not uid2:
             uid2 = uid
@@ -336,12 +331,12 @@ class users(osv.osv):
             return [c]
         return False
 
-    def _get_menu(self,cr, uid, context={}):
-        ids = self.pool.get('ir.actions.act_window').search(cr, uid, [('usage','=','menu')])
+    def _get_menu(self,cr, uid, context=None):
+        ids = self.pool.get('ir.actions.act_window').search(cr, uid, [('usage','=','menu')], context=context)
         return ids and ids[0] or False
 
-    def _get_group(self,cr, uid, context={}):
-        ids = self.pool.get('res.groups').search(cr, uid, [('name','=','Employee')])
+    def _get_group(self,cr, uid, context=None):
+        ids = self.pool.get('res.groups').search(cr, uid, [('name','=','Employee')], context=context)
         return ids or False
 
     _defaults = {

From 8e317c082bf71ddd10c1da380c77e156e030b226 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 1 Oct 2010 18:54:11 +0200
Subject: [PATCH 091/244] [IMP] osv.query,orm: removed trailing whitespace
 introduced by previous commits

bzr revid: odo@openerp.com-20101001165411-cid1ut6rmf7m826n
---
 bin/osv/orm.py       |  6 +++---
 bin/osv/query.py     | 14 +++++++-------
 bin/run_tests.py     |  2 +-
 bin/test/test_osv.py |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index d0d783dc144..4836bf2916e 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2294,7 +2294,7 @@ class orm(orm_template):
         Add missing table SELECT and JOIN clause to ``query`` for reaching the parent table (no duplicates)
 
         :param parent_model_name: name of the parent model for which the clauses should be added
-        :param query: query object on which the JOIN should be added 
+        :param query: query object on which the JOIN should be added
         """
         inherits_field = self._inherits[parent_model_name]
         parent_model = self.pool.get(parent_model_name)
@@ -3936,7 +3936,7 @@ class orm(orm_template):
                         query.tables.append(table)
                 return True
             return False
-        
+
         # apply main rules on the object
         rule_obj = self.pool.get('ir.rule')
         apply_rule(*rule_obj.domain_get(cr, uid, self._name, mode, context=context))
@@ -3954,7 +3954,7 @@ class orm(orm_template):
         Add possibly missing JOIN to ``query`` and generate the ORDER BY clause for m2o fields,
         either native m2o fields or function/related fields that are stored, including
         intermediate JOINs for inheritance if required.
-        
+
         :return: the qualified field name to use in an ORDER BY clause to sort by ``order_field``
         """
         if order_field not in self._columns and order_field in self._inherit_fields:
diff --git a/bin/osv/query.py b/bin/osv/query.py
index 5ba74e49a1c..ab4f4143634 100644
--- a/bin/osv/query.py
+++ b/bin/osv/query.py
@@ -30,7 +30,7 @@ class Query(object):
     """
      Dumb implementation of a Query object, using 3 string lists so far
      for backwards compatibility with the (table, where_clause, where_params) previously used.
-     
+
      TODO: To be improved after v6.0 to rewrite part of the ORM and add support for:
       - auto-generated multiple table aliases
       - multiple joins to the same table with different conditions
@@ -45,7 +45,7 @@ class Query(object):
         self.tables = tables or []
 
         # holds the list of WHERE clause elements, to be joined with
-        # 'AND' when generating the final query 
+        # 'AND' when generating the final query
         self.where_clause = where_clause or []
 
         # holds the parameters for the formatting of `where_clause`, to be
@@ -69,7 +69,7 @@ class Query(object):
     def join(self, connection, outer=False):
         """Adds the JOIN specified in ``connection``.
 
-        :param connection: a tuple ``(lhs, table, lhs_col, col)``. 
+        :param connection: a tuple ``(lhs, table, lhs_col, col)``.
                            The join corresponds to the SQL equivalent of::
 
                                 ``(lhs.lhs_col = table.col)``
@@ -77,9 +77,9 @@ class Query(object):
         :param outer: True if a LEFT OUTER JOIN should be used, if possible
                       (no promotion to OUTER JOIN is supported in case the JOIN
                        was already present in the query, as for the moment
-                       implicit INNER JOINs are only connected from NON-NULL 
-                       columns so it would not be correct (e.g. for 
-                       ``_inherits`` or when a domain criterion explicitly 
+                       implicit INNER JOINs are only connected from NON-NULL
+                       columns so it would not be correct (e.g. for
+                       ``_inherits`` or when a domain criterion explicitly
                        adds filtering)
         """
         (lhs, table, lhs_col, col) = connection
@@ -93,7 +93,7 @@ class Query(object):
             # add JOIN
             self.tables.append(table)
             self.joins.setdefault(lhs, []).append((table, lhs_col, col, outer and 'LEFT JOIN' or 'JOIN'))
-        return self 
+        return self
 
     def get_sql(self):
         """Returns (query_from, query_where, query_params)"""
diff --git a/bin/run_tests.py b/bin/run_tests.py
index 5af29fdb3c5..7c0ee2a2431 100644
--- a/bin/run_tests.py
+++ b/bin/run_tests.py
@@ -22,6 +22,6 @@
 import unittest
 
 import test
- 
+
 if __name__ == '__main__':
     unittest.TextTestRunner(verbosity=2).run(unittest.defaultTestLoader.loadTestsFromModule(test))
diff --git a/bin/test/test_osv.py b/bin/test/test_osv.py
index 6e9f9c1e173..191ca792a2f 100644
--- a/bin/test/test_osv.py
+++ b/bin/test/test_osv.py
@@ -30,7 +30,7 @@ class QueryTestCase(unittest.TestCase):
         query.where_clause.append("product_product.template_id = product_template.id")
         query.join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
         query.join(("product_product", "res_user", "user_id", "id"), outer=True) # outer join
-        self.assertEquals(query.get_sql()[0].strip(), 
+        self.assertEquals(query.get_sql()[0].strip(),
             """"product_product" LEFT JOIN "res_user" ON ("product_product"."user_id" = "res_user"."id"),"product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") """.strip())
         self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id""".strip())
 
@@ -40,7 +40,7 @@ class QueryTestCase(unittest.TestCase):
         query.where_clause.append("product_product.template_id = product_template.id")
         query.join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
         query.join(("product_category", "res_user", "user_id", "id"), outer=True) # CHAINED outer join
-        self.assertEquals(query.get_sql()[0].strip(), 
+        self.assertEquals(query.get_sql()[0].strip(),
             """"product_product","product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") LEFT JOIN "res_user" ON ("product_category"."user_id" = "res_user"."id")""".strip())
         self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id""".strip())
 
@@ -51,8 +51,8 @@ class QueryTestCase(unittest.TestCase):
         query.join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
         query.join(("product_category", "res_user", "user_id", "id"), outer=True) # CHAINED outer join
         query.tables.append('"account.account"')
-        query.where_clause.append("product_category.expense_account_id = account_account.id") # additional implicit join 
-        self.assertEquals(query.get_sql()[0].strip(), 
+        query.where_clause.append("product_category.expense_account_id = account_account.id") # additional implicit join
+        self.assertEquals(query.get_sql()[0].strip(),
             """"product_product","product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") LEFT JOIN "res_user" ON ("product_category"."user_id" = "res_user"."id"),"account.account" """.strip())
         self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id AND product_category.expense_account_id = account_account.id""".strip())
 

From 50c925d6ae17c9143a624bce5c3295d8b16fab43 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 2 Oct 2010 05:05:25 +0000
Subject: [PATCH 092/244] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101002050525-csd5qr5dfb8deam5
---
 bin/addons/base/i18n/nl.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index af960dcbd5f..534a06b7f62 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-30 12:03+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-01 11:47+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-10-01 08:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-02 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From 709ff19f2a1e429e71f2d9bb89bc8feb5c49f2f2 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Mon, 4 Oct 2010 14:04:03 +0530
Subject: [PATCH 093/244] [FIX] base: res.bank demo data added

bzr revid: ach@tinyerp.com-20101004083403-pz54686nngv27w6g
---
 bin/addons/base/base_data.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 6625d84402b..9597ac83f92 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1373,6 +1373,9 @@
             <field name="currency_id" ref="UAH"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-
+        <record id="res_bank_1" model="res.bank">
+            <field name="name">Reserve</field>
+            <field name="code">RSV</field>
+        </record>
     </data>
 </openerp>

From 1b8aa2b44a3ac6389cc22442956f2cf8009b575d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 4 Oct 2010 11:28:52 +0200
Subject: [PATCH 094/244] [FIX] ir.module.module needs to be readable by all so
 web modules can work correctly

bzr revid: xmo@openerp.com-20101004092852-je0xiz3dzdll5g7f
---
 bin/addons/base/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 9168d93078d..67c79c552c1 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -18,6 +18,7 @@
 "access_ir_model_fields_all","ir_model_fields all","model_ir_model_fields",,1,0,0,0
 "access_ir_module_category_group_user","ir_module_category group_user","model_ir_module_category","group_system",1,0,0,0
 "access_ir_module_module_group_user","ir_module_module group_user","model_ir_module_module","group_system",1,1,1,1
+"access_ir_module_module_user","ir_module_module user","model_ir_module_module",,1,0,0,0
 "access_ir_module_module_dependency_group_system","ir_module_module_dependency group_system","model_ir_module_module_dependency","group_system",1,1,1,1
 "access_ir_property_group_user","ir_property group_user","model_ir_property",,1,0,0,0
 "access_ir_property_group_user_manager","ir_property group_manager","model_ir_property","base.group_partner_manager",1,1,1,0

From 3f5c0315a0774ab14213b9dd8679cd945508b55d Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 4 Oct 2010 15:54:31 +0530
Subject: [PATCH 095/244] [MOD] hr : imprvements in onchange method

bzr revid: vir@tinyerp.com-20101004102431-mmmtnwlshcyrfilq
---
 addons/hr/hr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 11ad7bb279b..03af527359d 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -135,7 +135,7 @@ class hr_employee(osv.osv):
         company_id = self.pool.get('res.company').browse(cr,uid,company)
         for address in company_id.partner_id.address:
             return {'value': {'address_id': address.id}}
-        return {'value':{}}
+        return {'value':{'address_id':False}}
 
     def onchange_department(self, cr, uid, ids, department_id, context=None):
         if not department_id:

From 315e8acd928e2a9df1da8682b3cd141eee204f08 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 4 Oct 2010 16:17:35 +0530
Subject: [PATCH 096/244] [MOD] hr_timesheet : employee timesheet report and
 wizard, instead of selecting user, from employee report is generated

bzr revid: vir@tinyerp.com-20101004104735-hlo0co1gt7z3rx7i
---
 addons/hr_timesheet/report/user_timesheet.py      |  4 ++--
 .../wizard/hr_timesheet_print_employee.py         | 15 +++++++++++----
 .../wizard/hr_timesheet_print_employee_view.xml   |  5 ++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index dc048748f46..93c425af995 100644
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -63,7 +63,7 @@ class report_custom(report_rml):
             "and product_uom_id = unit.id "\
             "and line.user_id=%s and line.date >= %s and line.date < %s "
             "order by line.date",
-            (data['form']['user_id'], som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d')))
+            (uid, som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d')))
 
         # Sum attendence by account, then by day
         accounts = {}
@@ -97,7 +97,7 @@ class report_custom(report_rml):
             account_xml.append('</account>')
 
         # Computing the employee
-        cr.execute("select name from res_users where id=%s", (data['form']['user_id'],))
+        cr.execute("select name from res_users where id=%s", (str(uid)))
         emp = cr.fetchone()[0]
 
         # Computing the xml
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
index 4bcdb614e2f..2983166ad56 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
@@ -21,6 +21,7 @@
 import datetime
 
 from osv import osv, fields
+from tools.translate import _
 
 class analytical_timesheet_employee(osv.osv_memory):
     _name = 'hr.analytical.timesheet.employee'
@@ -29,18 +30,24 @@ class analytical_timesheet_employee(osv.osv_memory):
         'month': fields.selection([(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)],
                                   'Month', required=True),
         'year': fields.integer('Year', required=True),
-        'user_id': fields.many2one('res.users', 'User', required=True)
+        'employee_id': fields.many2one('hr.employee', 'Employee', required=True)
+    
                 }
 
     def _get_user(self, cr, uid, context=None):
+
+        emp_obj = self.pool.get('hr.employee')
         if context is None:
             context = {}
-        return uid
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
+        if not emp_id:
+            raise osv.except_osv(_("Warning"), _("No employee defined for this user"))
+        return emp_id and emp_id[0] or False
 
     _defaults = {
          'month': datetime.date.today().month,
          'year': datetime.date.today().year,
-         'user_id': _get_user
+         'employee_id': _get_user
              }
 
     def print_report(self, cr, uid, ids, context=None):
@@ -59,4 +66,4 @@ class analytical_timesheet_employee(osv.osv_memory):
             }
 analytical_timesheet_employee()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 3b110b52f1d..63e493cfab7 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -8,12 +8,11 @@
             <field name="model">hr.analytical.timesheet.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Employee Timesheet">
+				<form string="Monthly Employee Timesheet">
 					<group colspan="4">
-					<separator string="This wizard will print monthly timesheet of employee" colspan="4"/>
 						<field name="month"/>
 						<field name="year"/>
-						<field name="user_id" colspan="3"/>
+						<field name="employee_id" colspan="3"/>
 					</group>
 					<separator colspan="4"/>
                     <group colspan="4" col="6">

From 0f71e3f1004b80a4332234b066a94a7b406d15e8 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 4 Oct 2010 16:28:37 +0530
Subject: [PATCH 097/244] [MOD/IMP] hr_* : usability improvement

bzr revid: dbr@tinyerp.com-20101004105837-4572nv8w947docei
---
 addons/hr_attendance/hr_attendance_view.xml   |  2 +-
 addons/hr_contract/hr_contract_view.xml       |  2 +-
 addons/hr_evaluation/hr_evaluation.py         |  2 +-
 .../hr_holidays/report/available_holidays.py  |  6 +++++
 .../report/available_holidays_view.xml        | 26 ++++++++++++-------
 .../wizard/hr_holidays_summary_department.py  |  6 ++++-
 .../hr_holidays_summary_department_view.xml   | 18 ++++++-------
 7 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 9339bf72939..c49c25cd5fc 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -116,7 +116,7 @@
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
 
-        <menuitem sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Time Tracking" />
+        <menuitem sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendances" />
         <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config"/>
 
         <record id="hr_attendance_employee" model="ir.ui.view">
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index ea8b2f4e79a..0f38a783d73 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -224,7 +224,7 @@
         </record>
 
         <record id="action_hr_contract" model="ir.actions.act_window">
-            <field name="name">Contract</field>
+            <field name="name">Contracts</field>
             <field name="res_model">hr.contract</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 263b34322b9..752028be527 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -33,7 +33,7 @@ class hr_evaluation_plan(osv.osv):
         'name': fields.char("Evaluation Plan", size=64, required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'phase_ids': fields.one2many('hr_evaluation.plan.phase', 'plan_id', 'Evaluation Phases'),
-        'month_first': fields.integer('First Evaluation After'),
+        'month_first': fields.integer('Next Evaluation After'),
         'month_next': fields.integer('After the Date of Start'),
         'active': fields.boolean('Active')
     }
diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py
index 8ab371c67d7..8d91e0d02e4 100644
--- a/addons/hr_holidays/report/available_holidays.py
+++ b/addons/hr_holidays/report/available_holidays.py
@@ -40,6 +40,12 @@ class available_holidays_report(osv.osv):
         'remaining_leave': fields.float('Remaining Leaves', readonly=True),
         'department_id': fields.many2one('hr.department', 'Department', readonly=True),
         'user_id': fields.many2one('res.users', 'User', readonly=True),
+        'state': fields.selection([('draft', 'Draft'),
+                                   ('confirm', 'Waiting Validation'),
+                                   ('refuse', 'Refused'),
+                                   ('validate', 'Validated'),
+                                   ('cancel', 'Cancelled')]
+                                   ,'State', readonly=True),
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'available_holidays_report')
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 372d9158599..b4cb2a99b7a 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -11,6 +11,7 @@
             <field name="arch" type="xml">
                <tree string="Available Holidays">
                     <field name="employee_id" invisible="1"/>
+					<field name="user_id" invisible="1"/>
                     <field name="category_id" invisible="1"/>
                     <field name="holiday_status_id" invisible="1"/>
                     <field name="department_id" invisible="1"/>
@@ -18,6 +19,7 @@
                     <field name="month" invisible="1"/>
                     <field name="year" invisible="1"/>
                     <field name="date" invisible="1"/>
+                    <field name="state" invisible="1"/>
                     <field name="max_leave" sum="Allocated Leaves"/>
                     <field name="taken_leaves" sum="Taken Leaves"/>
                     <field name="remaining_leave" sum="Remaining Leaves"/>
@@ -48,13 +50,11 @@
 	        <field name="arch" type="xml">
 	            <search string="Leaves">
 	            	<group>
-		            	<filter icon="terp-go-year" string="This Year"
-			                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-			                    help="Leaves in this year"/>
-		                <filter icon="terp-go-month" string="This Month" name="month"
-		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Leaves in this month"/>
-			            <filter icon="terp-go-week" string="    7 Days    " separator="1"
-		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Leaves during last 7 days"/>
+						<filter icon="terp-go-year" string=" Year " domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Available Leaves of current year"/>
+						<filter icon="terp-go-month" string=" Month " name="month" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Available Leaves of current month"/>
+						<filter icon="terp-go-month" string="    Month-1    " separator="1" domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Available Leaves of last month"/>
+						<separator orientation="vertical"/>
+						<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"/>
 		                <separator orientation="vertical"/>
                     <field name="employee_id"/>
 		            </group>
@@ -65,13 +65,19 @@
 	                </group>
 	                <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="12">
-                        <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-                        <filter icon="terp-personal" string="Employee"
+						<filter icon="terp-personal" string="Employee"
                           name="user" context="{'group_by':'employee_id'}"
                           help="Leaves by employee"/>
-                        <separator orientation="vertical"/>
+						<filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+		                <separator orientation="vertical"/>
+                        <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
+                       <separator orientation="vertical"/>
+                    	<filter icon="terp-stock_symbol-selection" string="Category" context="{'group_by':'category_id'}"
+                            help="Leaves by category"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
                         <separator orientation="vertical"/>
+                    	<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                   		<separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index 9a99d9eff63..d6a5fd1ecb9 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -29,8 +29,9 @@ class hr_holidays_summary_dept(osv.osv_memory):
     _description = 'HR Holidays Summary Report By Department'
     _columns = {
         'date_from': fields.date('From', required=True),
+        'date_to': fields.date('To', required=True),
         'depts': fields.many2many('hr.department', 'summary_dept_rel', 'sum_id', 'dept_id', 'Department(s)'),
-        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holiday Type', required=True)
+        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holyday State', required=True)
     }
 
     _defaults = {
@@ -42,6 +43,8 @@ class hr_holidays_summary_dept(osv.osv_memory):
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
+        print context
+        print data
         if not data['depts']:
             raise osv.except_osv(_('Error'), _('You have to select at least 1 Department. And try again'))
         datas = {
@@ -49,6 +52,7 @@ class hr_holidays_summary_dept(osv.osv_memory):
              'model': 'ir.ui.menu',
              'form': data
             }
+        print datas
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'holidays.summary',
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index 01d3f4372ce..ca8e7e75dcf 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -9,16 +9,16 @@
             <field name="arch" type="xml">
 			<form string="Holidays by Department">
 			    <group col="4" colspan="6">
-				    <field name="date_from"/>
+				    <field name="date_from" />
+				    <field name="date_to" />
 				    <newline/>
-				    <field name="holiday_type"/>
+				    <field name="holiday_type" colspan="4"/>
 				    <newline/>
-				    <field name="depts"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
+				    <field name="depts" colspan="4"/>
+					<separator colspan="4"/>
+					<label align="0.0" colspan="2" string="" />
+					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
+					<button colspan="1" icon="gtk-print" name="print_report" string="Print" type="object"/>
 				</group>
 			</form>
             </field>
@@ -42,4 +42,4 @@
 	        icon="STOCK_PRINT"/>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>

From 12dad77b6ab2ad66fc6b63decc2dc21389146c91 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Mon, 4 Oct 2010 16:44:42 +0530
Subject: [PATCH 098/244] [MOD] usability improvement

bzr revid: amp@tinyerp.com-20101004111442-njhnokcljhulji4g
---
 addons/hr_evaluation/report/hr_evaluation_report_view.xml   | 3 ---
 addons/hr_holidays/wizard/hr_holidays_summary_department.py | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index f30e473d030..84ebf598e9d 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -22,7 +22,6 @@
                 <field name="progress_bar" widget="progressbar"/>
                 <field name="delay_date"/>
                 <field name="overpass_delay"/>
-                <field name="state" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -77,8 +76,6 @@
                     <filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/>
                     <filter string="Appreciation" icon="terp-rating-rated" context="{'group_by':'rating'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Creation Date"/>
                     <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}" help="Creation Date"/>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index d6a5fd1ecb9..a7c0d274194 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -43,8 +43,6 @@ class hr_holidays_summary_dept(osv.osv_memory):
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
-        print context
-        print data
         if not data['depts']:
             raise osv.except_osv(_('Error'), _('You have to select at least 1 Department. And try again'))
         datas = {
@@ -52,7 +50,6 @@ class hr_holidays_summary_dept(osv.osv_memory):
              'model': 'ir.ui.menu',
              'form': data
             }
-        print datas
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'holidays.summary',

From afe202a227165b2728479cdf6269526a936ce139 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 4 Oct 2010 17:30:12 +0530
Subject: [PATCH 099/244] [MOD] hr_timesheet : employees timesheet report and
 wizard, instead of selecting user, from employee report is generated

bzr revid: vir@tinyerp.com-20101004120012-rzi4tyn14ixw4aoe
---
 addons/hr_timesheet/report/users_timesheet.py          | 10 ++++++----
 addons/hr_timesheet/wizard/hr_timesheet_print_users.py |  4 ++--
 .../wizard/hr_timesheet_print_users_view.xml           |  8 ++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index 35c86fd08b9..5a52e9ce9c8 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -59,7 +59,7 @@ def emp_create_xml(cr, id, som, eom):
     time_xml = ([xml % (day, amount) for day, amount in month.iteritems()])
 
     # Computing the employee
-    cr.execute("select name from res_users where id=%s", (id,))
+    cr.execute("select name from resource_resource where id=%s", (id,))
     emp = cr.fetchone()[0]
 
     # Computing the xml
@@ -91,9 +91,11 @@ class report_custom(report_rml):
         date_xml.append('<cols>2.5cm%s,2cm</cols>\n' % (',0.7cm' * lengthmonth(som.year, som.month)))
 
         emp_xml=''
-        for id in data['form']['user_ids']:
-            emp_xml += emp_create_xml(cr, id, som, eom)
-
+        emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')        
+        for id in data['form']['employee_ids']:
+            user = emp_obj.browse(cr, uid, id).user_id.id
+            if user:
+                emp_xml += emp_create_xml(cr, id, som, eom)
         # Computing the xml
         #Without this, report don't show non-ascii characters (TO CHECK)
         date_xml = '\n'.join(date_xml)
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
index 27533710f35..b0a0c3c0f05 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
@@ -30,7 +30,7 @@ class analytical_timesheet_employees(osv.osv_memory):
         'month': fields.selection([(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)],
                                   'Month', required=True),
         'year': fields.integer('Year', required=True),
-        'user_ids': fields.many2many('res.users', 'timesheet_users_rel', 'timesheet_id', 'user_id', 'Users', required=True)
+        'employee_ids': fields.many2many('hr.employee', 'timesheet_employee_rel', 'timesheet_id', 'employee_id', 'employees', required=True)
                 }
 
     _defaults = {
@@ -55,4 +55,4 @@ class analytical_timesheet_employees(osv.osv_memory):
 
 analytical_timesheet_employees()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index d71946abfd9..95b7bd3b93e 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -8,16 +8,16 @@
             <field name="model">hr.analytical.timesheet.users</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Employees Timesheet">
+				<form string="Monthly Employees Timesheet">
 					<group height="260" width="460">
 						<group colspan="4">
-							<separator string="This wizard will print monthly timesheet of employees" colspan="4"/>
 							<field name="month"/>
 							<field name="year"/>
-							<field name="user_ids" colspan="4"/>
+                            <separator string="Employees" colspan="4"/>
+							<field name="employee_ids" colspan="4" nolabel="1"/>
 						</group>
 						<separator colspan="4"/>
-						<group colspan="4" col="6">
+						<group colspan="4">
 							<button icon="gtk-cancel" special="cancel" string="Cancel"/>
 							<button icon="gtk-print" string="Print" name="print_report" type="object"/>
 						</group>

From f9c1a32a7084971927f006e2cab03f9a31af102e Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Mon, 4 Oct 2010 17:37:23 +0530
Subject: [PATCH 100/244] [MOD/IMP] hr_payroll : Improvementin yml

bzr revid: amp@tinyerp.com-20101004120723-1rm0krq66x65qf4w
---
 addons/hr_payroll/test/payslip.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml
index 705270d7c82..e8706aeee1f 100644
--- a/addons/hr_payroll/test/payslip.yml
+++ b/addons/hr_payroll/test/payslip.yml
@@ -2,6 +2,11 @@
   I test the 'Payment Advice' in order to check the hr_payroll in OpenERP
 -
   I Create a bank record
+-
+  !record {model: res.bank, id: res_bank_0}:
+    name: Argenta
+-
+  I Create a bank record for a partner
 -
   !record {model: res.partner.bank, id: res_partner_bank_0}:
     acc_number: '987654321'
@@ -9,6 +14,7 @@
     sequence: 0.0
     name: Fortis
     state: bank
+    bank: res_bank_0
 -
   I create a new employee “Richard”
 -

From a5e8742e93df22b0be303d3e4903ea21c92ef3e9 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 4 Oct 2010 17:39:26 +0530
Subject: [PATCH 101/244] [IMP] hr_timesheet_invoice : improve in view for
 timesheet profit wizard

bzr revid: vir@tinyerp.com-20101004120926-hzv7cc00tb3l22q0
---
 .../wizard/hr_timesheet_analytic_profit_view.xml       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index 87648a61642..7bdae9bee1d 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -8,12 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 				<form string="Timesheet Profit">
-					<group height="340" width="480">
+					<group height="400" width="480">
 						<group col="4" colspan="6">
 							<field name="date_from"/>
 							<field name="date_to"/>
-							<field name="journal_ids" colspan="4"/>
-							<field name="employee_ids" colspan="4"/>
+                            <separator string="Journals" colspan="4"/>
+							<field name="journal_ids" colspan="4" nolabel="1"/>
+                            <separator string="Employees" colspan="4"/>
+							<field name="employee_ids" colspan="4" nolabel="1"/>
 						</group>
 						<separator colspan="4"/>
 						<group col="2" colspan="4">
@@ -39,4 +41,4 @@
         	parent="hr_timesheet.menu_hr_reporting_timesheet" groups="base.group_extended" icon="STOCK_PRINT"/>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>

From 1711150d969c9e15cdb4440769e5c944a03444e0 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 4 Oct 2010 18:11:06 +0530
Subject: [PATCH 102/244] [MOD/IMP] hr_* : In HR all fields department
 prefiltered with user department filter

bzr revid: dbr@tinyerp.com-20101004124106-kqqnanm7cxdrmgj9
---
 addons/hr/hr_view.xml                         | 3 ++-
 addons/hr_expense/hr_expense_view.xml         | 2 +-
 addons/hr_holidays/hr_holidays_view.xml       | 5 +++--
 addons/hr_recruitment/hr_recruitment_menu.xml | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f3edf5ab4e2..ca9cd3bc158 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -145,6 +145,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
+            <field name="context">{"search_default_department_id": department_id}</field>
             <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
             <field name="help">The employee directory contains all data related to your employees : from their photo up to their hourly estimated costs for the timesheets.Employees are managed by departments and can be linked to users to manage their access rights.</field>
@@ -395,7 +396,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_job_filter"/>
-            <field name="context">{'search_default_Current':1}</field>
+            <field name="context">{"search_default_Current":1,"search_default_department_id": department_id}</field>
             <field name="help">Job Positions are used to define the jobs, the requirements. You can attach a survey to a job position. This survey will be used in the recruitement process to evaluate the applicants for this job position.</field>
         </record>
 
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 11e88bf361c..0763d76d1b4 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -167,7 +167,7 @@
             <field name="name">Expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_user_id":uid,'search_default_this':1}</field>
+            <field name="context">{"search_default_user_id":uid,"search_default_department_id": department_id,"search_default_this":1}</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
             <field name="help">The OpenERP expenses management module allows you to track the full flow. Every month, the employees record their expenses. At the end of the month, their managers validates the expenses sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.</field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 12d347cd876..ca3d940f858 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -269,6 +269,7 @@
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
+            <field name="context">{"search_default_department_id": department_id}</field>
             <field name="domain">[('type','=','remove')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help">Leaves requests can be recorded by employees and validated by their managers. Once a leave request is validated it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc) and manage allowances per type.</field>
@@ -302,7 +303,7 @@
             <field name="name">Allocation Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
-            <field name="context">{'search_default_user_id':uid,'type':'add'}</field>
+            <field name="context">{'search_default_user_id':uid,'type':'add',"search_default_department_id": department_id}</field>
             <field name="domain">[('type','=','add')]</field>
             <field name="view_id" ref="allocation_leave_new"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
@@ -330,7 +331,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_holiday_simple"/>
-            <field name="context">{'allocation_type':'company', 'report':True}</field>
+            <field name="context">{'allocation_type':'company', 'report':True,"search_default_department_id": department_id}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 21f9074545a..7c158bb8795 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -8,7 +8,7 @@
             <field name="res_model">hr.applicant</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="view_id" ref="crm_case_tree_view_job"/>
-            <field name="context">{"search_default_user_id":uid, 'search_default_current': 1}</field>
+            <field name="context">{"search_default_user_id":uid, 'search_default_current': 1,"search_default_department_id": department_id}</field>
             <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
         </record>
 

From 7ff12c07510712138a08a567869b9df2d0d8b914 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 4 Oct 2010 19:05:06 +0530
Subject: [PATCH 103/244] Improved PageCount for internal header

bzr revid: apa@tinyerp.com-20101004133506-9ixrru1nf2kdwl0k
---
 bin/addons/base/res/res_company.py    |  6 -----
 bin/report/render/rml2pdf/trml2pdf.py | 34 ++++++++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index 6d78062a0e9..426731348f2 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -211,9 +211,6 @@ class res_company(osv.osv):
         <drawString x="25" y="725"> [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]]  [[ time.strftime("%H:%M") ]]</drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="490" y="725">[[ company.partner_id.name ]]</drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="1073" y="725"><pageNumber/>/</drawRightString>
-        <drawString x="1073" y="725"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>25 720 1085 720</lines>
     </pageGraphics>
@@ -231,9 +228,6 @@ class res_company(osv.osv):
         <drawString x="1.3cm" y="28.3cm"> [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]]  [[ time.strftime("%H:%M") ]]</drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="9.8cm" y="28.3cm">[[ company.partner_id.name ]]</drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="19.7cm" y="28.3cm"><pageNumber/>/</drawRightString>
-        <drawString x="19.7cm" y="28.3cm"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
         </pageGraphics>
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 5ec38a405df..abba6eacd13 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -40,37 +40,36 @@ from reportlab.lib.units import inch,cm,mm
 encoding = 'utf-8'
 
 class NumberedCanvas(canvas.Canvas):
-
     def __init__(self, *args, **kwargs):
         canvas.Canvas.__init__(self, *args, **kwargs)
         self._codes = []
         self._flag=False
         self._pageCount=0
-        self.i =0
-        self.k=0
+        self._currentPage =0
+        self._pageCounter=0
         self.pages={}
 
     def showPage(self):
-        self.i +=1
+        self._currentPage +=1
         if not self._flag:
            self._pageCount += 1
         else:
-            self.pages.update({self.i:self._pageCount})
+            self.pages.update({self._currentPage:self._pageCount})
         self._codes.append({'code': self._code, 'stack': self._codeStack})
         self._startPage()
         self._flag=False
 
     def pageCount(self):
-        if self.pages.get(self.k,False):
+        if self.pages.get(self._pageCounter,False):
             self._pageNumber=0
-        self.k +=1
-        key=self.k
+        self._pageCounter +=1
+        key=self._pageCounter
         if not self.pages.get(key,False):
             while not self.pages.get(key,False):
                 key = key + 1
-        self.setFont("Helvetica", 15)
-        self.drawRightString(200*mm, 20*mm,
-            "page %(this)i of %(total)i" % {
+        self.setFont("Helvetica", 8)
+        self.drawRightString((self._pagesize[0]-35), (self._pagesize[1]-40),
+            "%(this)i / %(total)i" % {
                'this': self._pageNumber+1,
                'total': self.pages.get(key,False),
             }
@@ -85,6 +84,7 @@ class NumberedCanvas(canvas.Canvas):
             self._codeStack = code['stack']
             self.pageCount()
             canvas.Canvas.showPage(self)
+#        self.restoreState()
         self._doc.SaveToFile(self._filename, self)
 
 class PageCount(platypus.Flowable):
@@ -452,6 +452,7 @@ class _rml_canvas(object):
             else:
                 args['height'] = sy * args['width'] / sx
         self.canvas.drawImage(img, **args)
+#        self.canvas._doc.SaveToFile(self.canvas._filename, self.canvas)
 
     def _path(self, node):
         self.path = self.canvas.beginPath()
@@ -832,6 +833,7 @@ class _rml_template(object):
         self.page_templates = []
         self.styles = doc.styles
         self.doc = doc
+        self.image=[]
         pts = node.findall('pageTemplate')
         for pt in pts:
             frames = []
@@ -846,6 +848,7 @@ class _rml_template(object):
             except Exception: # FIXME: be even more specific, perhaps?
                 gr=''
             if len(gr):
+                self.image=[ n for n in utils._child_get(gr[0], self) if n.tag=='image' or not self.localcontext]
                 drw = _rml_draw(self.localcontext,gr[0], self.doc, images=images, path=self.path, title=self.title)
                 self.page_templates.append( platypus.PageTemplate(frames=frames, onPage=drw.render, **utils.attr_get(pt, [], {'id':'str'}) ))
             else:
@@ -860,15 +863,18 @@ class _rml_template(object):
         for node_story in node_stories:
             if story_cnt > 0:
                 fis.append(platypus.PageBreak())
-
             fis += r.render(node_story)
             # Reset Page Number with new story tag
             fis.append(PageReset())
-            self.doc_tmpl.afterFlowable(fis)
+            if not self.image:
+                self.doc_tmpl.afterFlowable(fis)
             story_cnt += 1
         if self.localcontext:
             fis.append(PageCount())
-        self.doc_tmpl.build(fis,canvasmaker=NumberedCanvas)
+        if not self.image:
+            self.doc_tmpl.build(fis,canvasmaker=NumberedCanvas)
+        else:
+            self.doc_tmpl.build(fis)
 
 def parseNode(rml, localcontext = {},fout=None, images={}, path='.',title=None):
     node = etree.XML(rml)

From 85bb4e09bc8ebec89b98df32c090c4693a90ef5b Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Mon, 4 Oct 2010 15:55:30 +0200
Subject: [PATCH 104/244] [IMP] report engine: printscreen: total computation
 now uses digits attribute from field if present [FIX] report engine:
 printscreen: fixed wrong indentation

bzr revid: olt@tinyerp.com-20101004135530-lj37yioz8kcfk0xd
---
 bin/report/printscreen/ps_list.py | 33 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index aa95eedeff8..7fb20eab0dc 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -105,13 +105,13 @@ class report_printscreen_list(report_int):
                 dom = datas.get('_domain',[])
             get_groupby_data(self.groupby, dom)
         else:
-             rows = model.read(cr, uid, datas['ids'], result['fields'].keys(), context)
-             ids2 = map(itemgetter('id'), rows) # getting the ids from read result
-             if datas['ids'] != ids2: # sorted ids were not taken into consideration for print screen
-                 rows_new = []
-                 for id in datas['ids']:
-                     rows_new += [elem for elem in rows if elem['id'] == id]
-                 rows = rows_new
+            rows = model.read(cr, uid, datas['ids'], result['fields'].keys(), context)
+            ids2 = map(itemgetter('id'), rows) # getting the ids from read result
+            if datas['ids'] != ids2: # sorted ids were not taken into consideration for print screen
+                rows_new = []
+                for id in datas['ids']:
+                    rows_new += [elem for elem in rows if elem['id'] == id]
+                rows = rows_new
         res = self._create_table(uid, datas['ids'], result['fields'], fields_order, rows, context, model_desc)
         return (self.obj.get(), 'pdf')
 
@@ -232,7 +232,7 @@ class report_printscreen_list(report_int):
                 if line[f] != None:
                     col.text = tools.ustr(line[f] or '')
                     if float_flag:
-                       col.set('tree','float')
+                        col.set('tree','float')
                     if line.get('__no_leaf') and temp[count] == 1 and f != 'id' and not line['__context']['group_by']:
                         tsum[count] = float(tsum[count]) + float(line[f])
                     if not line.get('__group') and f != 'id' and temp[count] == 1:
@@ -240,19 +240,18 @@ class report_printscreen_list(report_int):
                 else:
                     col.text = '/'
 
-
-
         node_line = etree.SubElement(lines, 'row')
         for f in range(0, len(fields_order)):
             col = etree.SubElement(node_line, 'col', para='group', tree='no')
-            col.set('tree','float')
+            col.set('tree', 'float')
             if tsum[f] != None:
-               if tsum[f] >= 0.01 :
-                   prec = '%.2f'
-                   total = prec%(tsum[f])
-                   txt = str(total or '')
-               else:
-                   txt = str(tsum[f] or '')
+                if tsum[f] != 0.0:
+                    digits = fields[fields_order[f]].get('digits', (16, 2))
+                    prec = '%%.%sf' % (digits[1], )
+                    total = prec % (tsum[f], )
+                    txt = str(total or '')
+                else:
+                    txt = str(tsum[f] or '')
             else:
                 txt = '/'
             if f == 0:

From 4d406ba4748c4d84f2261f081595271ee065f7c3 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:08:23 +0200
Subject: [PATCH 105/244] [FIX] base/res.groups: cleanup duplicate copy()
 method

bzr revid: odo@openerp.com-20101004140823-6a1rp4yq17csobas
---
 bin/addons/base/res/res_user.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 003571d3935..506538bd48b 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -47,7 +47,7 @@ class groups(osv.osv):
 
     def copy(self, cr, uid, id, default=None, context={}):
         group_name = self.read(cr, uid, [id], ['name'])[0]['name']
-        default.update({'name': group_name +' (copy)'})
+        default.update({'name': _('%s (copy)')%group_name})
         return super(groups, self).copy(cr, uid, id, default, context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -75,14 +75,6 @@ class groups(osv.osv):
                 aid.write({'groups_id': [(4, gid)]})
         return gid
 
-    def copy(self, cr, uid, id, default={}, context={}, done_list=[], local=False):
-        group = self.browse(cr, uid, id, context=context)
-        default = default.copy()
-        if not 'name' in default:
-            default['name'] = group['name']
-        default['name'] = default['name'] + _(' (copy)')
-        return super(groups, self).copy(cr, uid, id, default, context=context)
-
     def get_extended_interface_group(self, cr, uid, context=None):
         data_obj = self.pool.get('ir.model.data')
         extended_group_data_id = data_obj._get_id(cr, uid, 'base', 'group_extended')

From cd527b6c9d3a7337ae689b54325a1bb574b3b285 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:33:36 +0200
Subject: [PATCH 106/244] [IMP] base: refactor/unify base module wizards

bzr revid: odo@openerp.com-20101004143336-nh0vnvbipt5dvmna
---
 .../module/wizard/base_export_language.py     | 13 +--
 .../wizard/base_export_language_view.xml      | 76 ++++++++---------
 .../module/wizard/base_import_language.py     |  2 +-
 .../wizard/base_import_language_view.xml      | 54 ++++++------
 .../module/wizard/base_language_install.py    | 36 +++-----
 .../wizard/base_language_install_view.xml     | 62 +++++++-------
 .../base/module/wizard/base_module_import.py  | 67 +++++----------
 .../module/wizard/base_module_import_view.xml | 80 +++++++++---------
 .../base/module/wizard/base_module_scan.py    |  5 +-
 .../base/module/wizard/base_module_update.py  | 82 ++++---------------
 .../module/wizard/base_module_update_view.xml | 72 ++++++++--------
 .../base/module/wizard/base_module_upgrade.py |  4 +-
 .../module/wizard/base_update_translations.py | 13 +--
 .../wizard/base_update_translations_view.xml  | 29 +++++--
 bin/addons/base/res/res_config.py             | 19 +----
 15 files changed, 259 insertions(+), 355 deletions(-)

diff --git a/bin/addons/base/module/wizard/base_export_language.py b/bin/addons/base/module/wizard/base_export_language.py
index ca2e3059cfb..1b43b561ac3 100644
--- a/bin/addons/base/module/wizard/base_export_language.py
+++ b/bin/addons/base/module/wizard/base_export_language.py
@@ -68,6 +68,7 @@ class base_language_export(osv.osv_memory):
         return self.write(cr, uid, ids, {'state':'get', 'data':out, 'advice':this.advice, 'name':this.name}, context=context)
 
     _name = "base.language.export"
+    _inherit = "ir.wizard.screen"
     _columns = {
             'name': fields.char('Filename', 16, readonly=True),
             'lang': fields.selection(_get_languages, 'Language', help='To export a new language, do not select a language.'), # not required: unset = new language
@@ -78,11 +79,11 @@ class base_language_export(osv.osv_memory):
             'state': fields.selection( ( ('choose','choose'),   # choose language
                                          ('get','get'),         # get the file
                                        ) ),
-            }
-    _defaults = { 'state': lambda *a: 'choose',
-                  'name': lambda *a: 'lang.tar.gz'
-                }
+    }
+    _defaults = { 
+        'state': lambda *a: 'choose',
+        'name': lambda *a: 'lang.tar.gz'
+    }
 base_language_export()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/bin/addons/base/module/wizard/base_export_language_view.xml b/bin/addons/base/module/wizard/base_export_language_view.xml
index 07c5a34f0da..c908c5ce03a 100644
--- a/bin/addons/base/module/wizard/base_export_language_view.xml
+++ b/bin/addons/base/module/wizard/base_export_language_view.xml
@@ -3,48 +3,50 @@
     <data>
 
         <record id="wizard_lang_export" model="ir.ui.view">
-            <field name="name">Export Translation</field>
+            <field name="name">Export Translations</field>
             <field name="model">base.language.export</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Export Translation">
-                  <group colspan="3">
-                      <group colspan="1">
-                            <label align="0.0" colspan="4" string="The official translations pack of all OpenERP/OpenObjects module are managed through launchpad. We use their online interface to synchronize all translations efforts."/>
-                            <label align="0.0" colspan="4" string=""/>
-                            <label align="0.0" colspan="4" string="To improve some terms of the official translations of OpenERP, you should modify the terms directly on the launchpad interface. If you made lots of translations for your own module, you can also publish all your translation at once."/>
-                            <label align="0.0" colspan="4" string=""/>
-                            <label align="0.0" colspan="4" string="To browse official translations, you can visit this link: "/>
-                            <label align="0.0" colspan="4" string="https://translations.launchpad.net/openobject"/>
-                       </group>
-                       <group colspan="1">
-                       <separator orientation="vertical" rowspan="15"/>
-                       </group>
-  				       <group colspan="1">
-                          <group colspan="4" states="choose">
-                              <separator colspan="4" string="Export Translation"/>
-                              <field name="lang" required="1"/>
-                              <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" fieldname="name" colspan="4"/>
-                              <field height="80" name="advice" nolabel="1" colspan="4"/>
-                          </group>
-                           <separator string="" colspan="4"/>
-                    		<group colspan="2" col="2">
-                    		</group>
-                          <group col="2" colspan="2">
-                             <button icon="gtk-cancel" name="act_cancel" special="cancel" states="choose" string="_Close" type="object"/>
-                             <button icon="gtk-ok" name="act_getfile" states="choose" string="_Export" type="object"></button>
-                             <button icon="gtk-close" name="act_destroy" special="cancel" states="get" string="_Close" type="object"/>
-                          </group>
+                <form string="Export Translations">
+                    <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" fieldname="name" colspan="4"/>
+                                <field height="80" name="advice" nolabel="1" colspan="4"/>
+                            </group>
+                        </group>
+                        <group colspan="8" col="8" states="choose">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button icon="gtk-cancel" name="act_cancel" special="cancel" string="_Close" type="object"/>
+                            <button icon="gtk-ok" name="act_getfile" string="_Export" type="object"/>
+                        </group>
+                        <group colspan="8" col="8" states="get">
+                            <separator string="" colspan="8"/>
+                            <label colspan="7" width="220"/>
+                            <button icon="gtk-close" name="act_destroy" special="cancel" string="_Close" type="object"/>
                         </group>
                     </group>
-
                 </form>
             </field>
         </record>
diff --git a/bin/addons/base/module/wizard/base_import_language.py b/bin/addons/base/module/wizard/base_import_language.py
index ca45c0a6c1c..6608ade03ef 100644
--- a/bin/addons/base/module/wizard/base_import_language.py
+++ b/bin/addons/base/module/wizard/base_import_language.py
@@ -21,7 +21,6 @@
 
 import tools
 import base64
-import pooler
 from tempfile import TemporaryFile
 from osv import osv, fields
 
@@ -30,6 +29,7 @@ class base_language_import(osv.osv_memory):
 
     _name = "base.language.import"
     _description = "Language Import"
+    _inherit = "ir.wizard.screen"
 
     _columns = {
         'name': fields.char('Language Name',size=64 , required=True),
diff --git a/bin/addons/base/module/wizard/base_import_language_view.xml b/bin/addons/base/module/wizard/base_import_language_view.xml
index 70a48850448..c7cdac663b5 100644
--- a/bin/addons/base/module/wizard/base_import_language_view.xml
+++ b/bin/addons/base/module/wizard/base_import_language_view.xml
@@ -7,35 +7,33 @@
             <field name="model">base.language.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Import Language">
-            <group colspan="3">
-                 <group colspan="1">
-                      <label string="You have to import a .CSV file which is encoded in UTF-8."/>
-                      <label string="Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
-                      <label string="type,name,res_id,src,value" colspan="4"/>
-                      <label string="module,type,name,res_id,src,value" colspan="4"/>
-                      <label string="You can also import .po files." colspan="4" align="0.0"/>
-                 </group>
-                 <group colspan="1">
-                      <separator orientation="vertical" rowspan="8"/>
-                 </group>
-                 <group colspan="1">
-                    <group colspan="4" col="4">
-                        <separator string="Import Translation" colspan="4"/>
-                        <field name="name" width="200"/>
-                        <field name="code"/>
-                        <field name="data" colspan="4"/>
+                <form string="Import Translation">
+                    <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="Supported file formats: *.csv (Comma-separated values) or *.po (GetText Portable Objects)"/>
+                            <label colspan="4" width="220" string="Please double-check that the file encoding is set to UTF-8 (sometimes called Unicode) when the translator exports it."/>
+                            <label colspan="4" width="220"/>
+                            <label colspan="4" width="220" string="When using CSV format, please also check that the first line of your file is one of the following:"/>
+                            <label colspan="4" width="220" string="- type,name,res_id,src,value"/>
+                            <label colspan="4" width="220" string="- module,type,name,res_id,src,value"/>
+                        </group>
+                        <separator orientation="vertical" rowspan="15"/>
+                        <group colspan="4" col="4">
+                            <separator string="Import Translation" colspan="4"/>
+                            <field name="name" width="200"/>
+                            <field name="code"/>
+                            <field name="data" colspan="4"/>
+                        </group>
+                        <group colspan="8" col="8">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                                <button special="cancel" string="_Close" icon="gtk-cancel"/>
+                                <button name="import_lang" string="_Import" type="object" icon="gtk-ok"/>
+                        </group>
                     </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="2" col="2">
-                    </group>
-                    <group colspan="2" col="2">
-                        <button special="cancel" string="_Close" icon="gtk-cancel"/>
-                        <button name="import_lang" string="_Import" type="object" icon="gtk-ok"/>
-                    </group>
-                </group>
-			</group>
-            </form>
+                </form>
             </field>
         </record>
 
diff --git a/bin/addons/base/module/wizard/base_language_install.py b/bin/addons/base/module/wizard/base_language_install.py
index 140cc4cc033..7a3b8cc75aa 100644
--- a/bin/addons/base/module/wizard/base_language_install.py
+++ b/bin/addons/base/module/wizard/base_language_install.py
@@ -20,17 +20,22 @@
 ##############################################################################
 
 import tools
-import pooler
 from osv import osv, fields
 
 class base_language_install(osv.osv_memory):
     """ Install Language"""
 
     _name = "base.language.install"
+    _inherit = "ir.wizard.screen"
     _description = "Install Language"
 
     _columns = {
-        'lang': fields.selection(tools.scan_languages(),'Language'),
+        'lang': fields.selection(tools.scan_languages(),'Language', required=True),
+        'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True),
+    }
+
+    _defaults = {  
+        'state': 'init',
     }
 
     def lang_install(self, cr, uid, ids, context):
@@ -40,30 +45,9 @@ class base_language_install(osv.osv_memory):
             modobj = self.pool.get('ir.module.module')
             mids = modobj.search(cr, uid, [('state', '=', 'installed')])
             modobj.update_translations(cr, uid, mids, lang)
-
-        data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'base', 'view_base_language_install_msg')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-
-        return {
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'base.module.import.msg',
-            'views': [(id2, 'form')],
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }
+            self.write(cr, uid, ids, {'state': 'done'}, context=context)
+        return False
 
 base_language_install()
 
-class base_language_install_msg(osv.osv_memory):
-    """ Install Language"""
-
-    _name = "base.language.install.msg"
-    _description = "Install Language"
-
-base_language_install_msg()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/bin/addons/base/module/wizard/base_language_install_view.xml b/bin/addons/base/module/wizard/base_language_install_view.xml
index 3d9f4eabe3b..38edf4d4a82 100644
--- a/bin/addons/base/module/wizard/base_language_install_view.xml
+++ b/bin/addons/base/module/wizard/base_language_install_view.xml
@@ -8,13 +8,38 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Load Official Translation">
-                    <separator string="Load an Official Translation" colspan="4"/>
-                    <group colspan="4"><field name="lang"/></group>
-                    <label string="" colspan="4"/>
-                    <label string="Please be patient, as this operation may take a few minutes..." colspan="4"/>
-                    <separator string="" colspan="4"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="lang_install" string="Load" type="object" icon="gtk-ok"/>
+                    <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 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" rowspan="15"/>
+                        <group colspan="4">
+                            <separator string="Load Official Translation" colspan="4"/>
+                            <group states="init" colspan="4">
+                                <field name="lang" colspan="4"/>
+                            </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 colspan="8" col="8" states="init">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                            <button name="lang_install" string="Load" type="object" icon="gtk-ok"/>
+                        </group>
+                        <group colspan="8" col="8" states="done">
+                            <separator string="" colspan="8"/>
+                            <label colspan="7" width="220"/>
+                            <button special="cancel" string="Close" icon="gtk-ok"/>
+                        </group>
+                    </group>
                 </form>
            </field>
         </record>
@@ -33,29 +58,6 @@
         action="action_view_base_language_install"
         id="menu_view_base_language_install"
         parent="menu_translation" sequence="2"/>
-
-        <record id="view_base_language_install_msg" model="ir.ui.view">
-            <field name="name">Official Translation Loaded</field>
-            <field name="model">base.module.import.msg</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="Official Translation Loaded">
-                <separator string="Official Translation Loaded" colspan="4"/>
-                <label string="The selected language has been successfully installed.\nYou must change the preferences of the user and open a new menu to view the changes." colspan="4"/>
-                <separator string="" colspan="4"/>
-                <button special="cancel" string="OK" icon="gtk-ok"/>
-            </form>
-            </field>
-        </record>
-
-        <record id="action_view_base_language_install_msg" model="ir.actions.act_window">
-            <field name="name">Official Translation Loaded</field>
-            <field name="res_model">base.module.import.msg</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_base_language_install"/>
-            <field name="target">new</field>
-        </record>
     </data>
 </openerp>
 
diff --git a/bin/addons/base/module/wizard/base_module_import.py b/bin/addons/base/module/wizard/base_module_import.py
index 990a77ce8cd..68822690f45 100644
--- a/bin/addons/base/module/wizard/base_module_import.py
+++ b/bin/addons/base/module/wizard/base_module_import.py
@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-
-import pooler
 import os
 import tools
 
@@ -34,19 +32,24 @@ class base_module_import(osv.osv_memory):
     """ Import Module """
 
     _name = "base.module.import"
+    _inherit = "ir.wizard.screen"
     _description = "Import Module"
 
     _columns = {
           'module_file': fields.binary('Module .ZIP file', required=True),
+          'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True),
+          'module_name': fields.char('Module Name', size=128),
+    }
+
+    _defaults = {  
+        'state': 'init',
     }
 
     def importzip(self, cr, uid, ids, context):
-        module_obj= self.pool.get('ir.module.module')
-        active_ids = context and context.get('active_ids', False)
-        data = self.browse(cr, uid, ids , context=context)[0]
+        (data,) = self.browse(cr, uid, ids , context=context)
         module_data = data.module_file
 
-        val =base64.decodestring(module_data)
+        val = base64.decodestring(module_data)
         fp = StringIO()
         fp.write(val)
         fdata = zipfile.ZipFile(fp, 'r')
@@ -55,62 +58,30 @@ class base_module_import(osv.osv_memory):
 
         ad = tools.config['addons_path']
 
-        fname = os.path.join(ad,module_name+'.zip')
+        fname = os.path.join(ad, module_name+'.zip')
         try:
             fp = file(fname, 'wb')
             fp.write(val)
             fp.close()
-        except IOError, e:
+        except IOError:
             raise osv.except_osv(_('Error !'), _('Can not create the module file: %s !') % (fname,) )
 
-        module_obj.update_list(cr, uid,{'module_name': module_name,})
-        data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_import_msg')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-
-        module_name = module_obj.browse(cr, uid, ids, context=context)
-        return {
-            'domain': str([('name', '=', module_name)]),
-            'name': 'Message',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'base.module.import.msg',
-            'views': [(id2, 'form')],
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }
-
-base_module_import()
-
-class base_module_import_msg(osv.osv_memory):
-    """   message    """
-    _name = "base.module.import.msg"
-    _description = "Message"
+        self.pool.get('ir.module.module').update_list(cr, uid, {'module_name': module_name,})
+        self.write(cr, uid, ids, {'state':'done', 'module_name': module_name}, context)
+        return False
 
     def action_module_open(self, cr, uid, ids, context):
-        module_obj = self.pool.get('base.module.import')
-        data = module_obj.browse(cr, uid, ids , context=context)[0]
-        module_data = data.module_file
-
-        val =base64.decodestring(module_data)
-        fp = StringIO()
-        fp.write(val)
-        fdata = zipfile.ZipFile(fp, 'r')
-        fname = fdata.namelist()[0]
-        module_name = os.path.split(fname)[0]
-
+        (data,) = self.browse(cr, uid, ids , context=context)
         return {
-            'domain': str([('name', '=', module_name)]),
-            'name': 'Module List',
+            'domain': str([('name', '=', data.module_name)]),
+            'name': 'Modules',
             'view_type': 'form',
             'view_mode': 'tree,form',
             'res_model': 'ir.module.module',
             'type': 'ir.actions.act_window',
         }
 
-base_module_import_msg()
+base_module_import()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/bin/addons/base/module/wizard/base_module_import_view.xml b/bin/addons/base/module/wizard/base_module_import_view.xml
index 9d1aa1bce49..b04bc050e97 100644
--- a/bin/addons/base/module/wizard/base_module_import_view.xml
+++ b/bin/addons/base/module/wizard/base_module_import_view.xml
@@ -7,17 +7,41 @@
             <field name="model">base.module.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Import module">
-            <separator string="Module Import" colspan="4"/>
-            <label string="Please give your module .ZIP file to import." colspan="4"/>
-            <field name="module_file"/>
-            <separator string="" colspan="4" />
-            <newline/>
-            <group colspan="6" >
-                <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                <button name="importzip" string="Import module" type="object" icon="gtk-ok"/>
-            </group>
-             </form>
+                <form string="Import module">
+                    <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 helps you add a new language to you 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" rowspan="15"/>
+                        <group colspan="4">
+                            <separator string="Module Import" colspan="4"/>
+                            <group states="init" colspan="4" col="4">
+                                <label string="Select module package to import (.zip file):" colspan="4"/>
+                                <field name="module_file" colspan="4"/>
+                            </group>
+                            <group states="done" colspan="4" col="4">
+                                <label string="Module file successfully imported!" colspan="4"/>
+                            </group>
+                        </group>
+                        <group colspan="8" col="8" states="init">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                            <button name="importzip" string="Import module" type="object" icon="gtk-apply"/>
+                        </group>
+                        <group colspan="8" col="8" states="done">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button special="cancel" string="Close" icon="gtk-ok"/>
+                            <button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward"/>
+                        </group>
+                    </group>
+                </form>
             </field>
         </record>
 
@@ -31,36 +55,12 @@
         </record>
 
         <menuitem
-        name="Import Module"
-        action="action_view_base_module_import"
-        id="menu_view_base_module_import"
-       parent="menu_management"
-       sequence="1"/>
+            name="Import Module"
+            action="action_view_base_module_import"
+            id="menu_view_base_module_import"
+            parent="menu_management"
+            sequence="1"/>
 
-        <record id="view_base_module_import_msg" model="ir.ui.view">
-            <field name="name">Module Import Message</field>
-            <field name="model">base.module.import.msg</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="Message">
-            <label string="Module successfully imported !"/>
-            <separator string="" colspan="4"/>
-            <newline/>
-            <group>
-            <button name="action_module_open" string="Cancel" type="object" icon="gtk-cancel"/>
-            </group>
-            </form>
-            </field>
-        </record>
-
-        <record id="action_view_base_module_import_msg" model="ir.actions.act_window">
-            <field name="name">Module Import Message</field>
-            <field name="res_model">base.module.import.msg</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_base_module_import"/>
-            <field name="target">new</field>
-        </record>
     </data>
 </openerp>
 
diff --git a/bin/addons/base/module/wizard/base_module_scan.py b/bin/addons/base/module/wizard/base_module_scan.py
index cd8d4ab7ec5..d47e091955f 100644
--- a/bin/addons/base/module/wizard/base_module_scan.py
+++ b/bin/addons/base/module/wizard/base_module_scan.py
@@ -19,16 +19,13 @@
 #
 ##############################################################################
 import os
-import re
 import glob
-import time
 import imp
 
 import tools
-import pooler
 
 import zipfile
-from osv import osv, fields
+from osv import osv
 
 class base_module_scan(osv.osv_memory):
     """ scan module """
diff --git a/bin/addons/base/module/wizard/base_module_update.py b/bin/addons/base/module/wizard/base_module_update.py
index eea5f5aaee4..a0d21840d90 100644
--- a/bin/addons/base/module/wizard/base_module_update.py
+++ b/bin/addons/base/module/wizard/base_module_update.py
@@ -18,8 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import netsvc
-import pooler
 from osv import osv, fields
 
 class base_module_update(osv.osv_memory):
@@ -27,69 +25,25 @@ class base_module_update(osv.osv_memory):
 
     _name = "base.module.update"
     _description = "Update Module"
-
-    def update_module(self, cr, uid, ids, context):
-        """
-           Update Module
-
-            @param cr: the current row, from the database cursor.
-            @param uid: the current user’s ID for security checks.
-            @param ids: the ID or list of IDs
-            @param context: A standard dictionary
-        """
-        data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_update_open')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-
-        return {
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'base.module.update.open',
-            'views': [(id2, 'form')],
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-
-        }
-
-base_module_update()
-
-class base_module_update_open(osv.osv_memory):
-    """ Update Module Open """
-
-    _name = "base.module.update.open"
-    _description = "Update Module Open"
-
-    def default_get(self, cr, uid, fields, context=None):
-        """
-        This function gets default values
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-        @return : default values of fields.
-        """
-
-        module_obj = self.pool.get('ir.module.module')
-        update, add = module_obj.update_list(cr, uid,)
-        return {'update': update, 'add': add}
+    _inherit = "ir.wizard.screen"
 
     _columns = {
-          'update': fields.integer('Number of modules updated', readonly=True),
-          'add': fields.integer('Number of modules added', readonly=True),
+        'update': fields.integer('Number of modules updated', readonly=True),
+        'add': fields.integer('Number of modules added', readonly=True),
+        'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True),
     }
 
-    def action_module_open(self, cr, uid, ids, context):
-        """
-           Update Module List Open
+    _defaults = {  
+        'state': 'init',
+    }
 
-            @param cr: the current row, from the database cursor.
-            @param uid: the current user’s ID for security checks.
-            @param ids: the ID or list of IDs
-            @param context: A standard dictionary
-        """
+    def update_module(self, cr, uid, ids, context=None):
+        module_obj = self.pool.get('ir.module.module')
+        update, add = module_obj.update_list(cr, uid,)
+        self.write(cr, uid, ids, {'update': update, 'add': add, 'state': 'done'}, context=context)
+        return False
+
+    def action_module_open(self, cr, uid, ids, context):
         res = {
             'domain': str([]),
             'name': 'Modules',
@@ -99,13 +53,9 @@ class base_module_update_open(osv.osv_memory):
             'view_id': False,
             'type': 'ir.actions.act_window',
         }
-        view_obj = self.pool.get('ir.ui.view')
-        search_view_id = view_obj.search(cr, uid, [('name','=','ir.module.module.list.select')], context=context)
-        if search_view_id:
-            res.update({'search_view_id' : search_view_id[0]})
         return res
 
-base_module_update_open()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+base_module_update()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/bin/addons/base/module/wizard/base_module_update_view.xml b/bin/addons/base/module/wizard/base_module_update_view.xml
index 9091b5a1b9d..21bff3fb935 100644
--- a/bin/addons/base/module/wizard/base_module_update_view.xml
+++ b/bin/addons/base/module/wizard/base_module_update_view.xml
@@ -7,15 +7,41 @@
             <field name="model">base.module.update</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Scan for new modules">
-           <label string="This wizard will scan all module repositories (on the server side) to detect any new or updated modules. Please be patient as this operation may take a few seconds..." colspan="4" align="0.0"/>
-            <separator string="" colspan="4" />
-            <newline/>
-            <group colspan="6" >
-                <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                <button name="update_module" string="Check new modules" type="object" icon="gtk-ok"/>
-            </group>
-             </form>
+                <form string="Update Module List">
+                    <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 colspan="8" col="8" states="init">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                            <button name="update_module" string="Update" type="object" icon="gtk-ok"/>
+                        </group>
+                        <group colspan="8" col="8" states="done">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button special="cancel" string="Close" icon="gtk-ok"/>
+                            <button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward"/>
+                        </group>
+                    </group>
+                </form>
             </field>
         </record>
 
@@ -36,33 +62,5 @@
        sequence="2"
        icon="STOCK_CONVERT"/>
 
-       <record id="view_base_module_update_open" model="ir.ui.view">
-            <field name="name">Update ModuleList</field>
-            <field name="model">base.module.update.open</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="New modules">
-            <field name="update" colspan="4"/>
-            <field name="add" colspan="4"/>
-            <separator string="" colspan="4" />
-            <newline/>
-            <group colspan="6" >
-                <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                <button name="action_module_open" string="OK" type="object" icon="gtk-ok"/>
-            </group>
-             </form>
-            </field>
-        </record>
-
-          <record id="action_view_base_module_update_open" model="ir.actions.act_window">
-            <field name="name">Update ModuleList</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">base.module.update.open</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_base_module_update"/>
-            <field name="target">new</field>
-        </record>
-
     </data>
 </openerp>
\ No newline at end of file
diff --git a/bin/addons/base/module/wizard/base_module_upgrade.py b/bin/addons/base/module/wizard/base_module_upgrade.py
index 79ec7c80997..4db4028bdb0 100644
--- a/bin/addons/base/module/wizard/base_module_upgrade.py
+++ b/bin/addons/base/module/wizard/base_module_upgrade.py
@@ -20,8 +20,6 @@
 ##############################################################################
 
 import pooler
-import os
-import tools
 from osv import osv, fields
 
 class base_module_upgrade(osv.osv_memory):
@@ -98,7 +96,7 @@ class base_module_upgrade(osv.osv_memory):
             raise osv.except_osv('Unmet dependency !', 'Following modules are uninstalled or unknown. \n\n'+'\n'.join(unmet_packages))
         mod_obj.download(cr, uid, ids, context=context)
         cr.commit()
-        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
+        _, pool = pooler.restart_pool(cr.dbname, update_module=True)
 
         id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_upgrade_install')
         if id2:
diff --git a/bin/addons/base/module/wizard/base_update_translations.py b/bin/addons/base/module/wizard/base_update_translations.py
index cc7a3361a29..94cb0ee2e18 100644
--- a/bin/addons/base/module/wizard/base_update_translations.py
+++ b/bin/addons/base/module/wizard/base_update_translations.py
@@ -35,7 +35,7 @@ class base_update_translations(osv.osv_memory):
         lang_obj=pooler.get_pool(cr.dbname).get('res.lang')
         ids=lang_obj.search(cr, uid, [('code', '=', lang_code)])
         if not ids:
-            raise osv.orm_except('Bad lang')
+            raise osv.except_osv(_('No language with code "%s" exists') % lang_code)
         lang = lang_obj.browse(cr, uid, ids[0])
         return lang.name
     def act_cancel(self, cr, uid, ids, context=None):
@@ -51,14 +51,17 @@ class base_update_translations(osv.osv_memory):
         return {'type': 'ir.actions.act_window_close'}
 
     def default_get(self, cr, uid, fields, context=None):
-        lang_obj = self.pool.get('res.lang')
+        res = super(base_update_translations, self).default_get(cr, uid, fields, context=context)
         record_id = context and context.get('active_id', False) or False
-        lang=lang_obj.browse(cr,uid,record_id).code
-        return {'lang':lang}
+        if record_id:
+            lang = self.pool.get('res.lang').browse(cr, uid, record_id).code
+            res.update(lang=lang)
+        return res
 
     _name = 'base.update.translations'
+    _inherit = "ir.wizard.screen"
     _columns = {
         'lang': fields.selection(_get_languages, 'Language', required=True),
     }
 
-base_update_translations()
+base_update_translations()
\ No newline at end of file
diff --git a/bin/addons/base/module/wizard/base_update_translations_view.xml b/bin/addons/base/module/wizard/base_update_translations_view.xml
index 781f3d142d8..60d30440ca1 100644
--- a/bin/addons/base/module/wizard/base_update_translations_view.xml
+++ b/bin/addons/base/module/wizard/base_update_translations_view.xml
@@ -2,23 +2,34 @@
 <openerp>
     <data>
          <record id="wizard_update_translations" model="ir.ui.view">
-            <field name="name">Update Translations</field>
+            <field name="name">Synchronize Translations</field>
             <field name="model">base.update.translations</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form col="3" string="Update Translations">
-                    <field name="lang"/>
-                    <label align="0.0" colspan="4" string="This wizard will detect new terms in the application so that you can update them manually."/>
-                    <separator colspan="4"/>
-                    <group col="2" colspan="4" fill="0">
-                        <button icon="gtk-cancel" name="act_cancel" special="cancel" string="Cancel" type="object"/>
-                        <button icon="gtk-ok" name="act_update" string="Update" type="object"/>
+                <form string="Synchronize Translations">
+                    <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 colspan="8" col="8">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button icon="gtk-cancel" name="act_cancel" special="cancel" string="Cancel" type="object"/>
+                            <button icon="gtk-ok" name="act_update" string="Update" type="object"/>
+                        </group>
                     </group>
                 </form>
             </field>
         </record>
         <record id="action_wizard_update_translations" model="ir.actions.act_window">
-            <field name="name">Resynchronise Terms</field>
+            <field name="name">Synchronize Translations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">base.update.translations</field>
             <field name="view_type">form</field>
diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index f94c4fbeaa6..47667a5ba81 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -19,19 +19,14 @@
 #
 ##############################################################################
 
-import os
-import base64
-import random
 from operator import attrgetter
 
 from osv import osv, fields
-import tools
 from tools.translate import _
 import netsvc
 import pooler
 
 
-
 class res_config_configurable(osv.osv_memory):
     ''' Base classes for new-style configuration items
 
@@ -40,6 +35,7 @@ class res_config_configurable(osv.osv_memory):
     their view inherit from the related res_config_view_base view.
     '''
     _name = 'res.config'
+    _inherit = 'ir.wizard.screen'
     logger = netsvc.Logger()
 
     def get_current_progress(self, cr, uid, context=None):
@@ -57,20 +53,13 @@ class res_config_configurable(osv.osv_memory):
             return round(closed*100./total)
         return 100.
 
-    def _get_image(self, cr, uid, context=None):
-        file_no = str(random.randint(1,3))
-        path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)
-        file_data = tools.file_open(path,'rb').read()
-        return base64.encodestring(file_data)
-
     _columns = dict(
         progress = fields.float('Configuration Progress', readonly=True),
-        config_logo = fields.binary('Image', readonly=True),
-        )
+    )
+
     _defaults = dict(
         progress = _progress,
-        config_logo = _get_image
-        )
+    )
 
     def _next_action(self, cr, uid, context=None):
         todos = self.pool.get('ir.actions.todo')

From 4ca2280a36a6131ff3cc1f242cc3301ebee01f4a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:37:21 +0200
Subject: [PATCH 107/244] [IMP] base/res.users: cleanup + improved label

bzr revid: odo@openerp.com-20101004143721-75tqs7y3e8fd2r98
---
 bin/addons/base/res/res_user.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 506538bd48b..38cf1fc21a7 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -145,10 +145,8 @@ class users(osv.osv):
         return self.WELCOME_MAIL_BODY
 
     def get_current_company(self, cr, uid):
-        res=[]
         cr.execute('select company_id, res_company.name from res_users left join res_company on res_company.id = company_id where res_users.id=%s' %uid)
-        res = cr.fetchall()
-        return res
+        return cr.fetchall()
 
     def send_welcome_email(self, cr, uid, id, context=None):
         logger= netsvc.Logger()
@@ -233,7 +231,7 @@ class users(osv.osv):
                  " aren't configured, it won't be possible to email new "
                  "users."),
         'signature': fields.text('Signature', size=64),
-        'address_id': fields.many2one('res.partner.address', 'Company Address'),
+        'address_id': fields.many2one('res.partner.address', 'Address'),
         'active': fields.boolean('Active'),
         'action_id': fields.many2one('ir.actions.actions', 'Home Action'),
         'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),

From 72e5a0102c269ac946612d928c582c9c83ab9fd5 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:37:41 +0200
Subject: [PATCH 108/244] [IMP] base/workflow: shorter menu label

bzr revid: odo@openerp.com-20101004143741-1qxnva3fda8okd0b
---
 bin/addons/base/ir/workflow/workflow_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 9adbec0fc56..b4e9b0daf46 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-    <menuitem id="menu_workflow_root" name="Workflow Definitions" parent="base.menu_custom" groups="base.group_extended"/>
+    <menuitem id="menu_workflow_root" name="Workflows" parent="base.menu_custom" groups="base.group_extended"/>
 
     <!--
         ================================

From 128a11714a0d64617c90894a4da331af68fecbd7 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:38:26 +0200
Subject: [PATCH 109/244] [IMP] base: refactor/unify base module wizards

bzr revid: odo@openerp.com-20101004143826-tfc7k01rv7b52fas
---
 bin/addons/base/ir/wizard/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/ir/wizard/__init__.py b/bin/addons/base/ir/wizard/__init__.py
index b1a92b51272..99c6cdcd0de 100644
--- a/bin/addons/base/ir/wizard/__init__.py
+++ b/bin/addons/base/ir/wizard/__init__.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 import wizard_menu
+import wizard_screen
 import create_action
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From c92e531a1af30cfb08c6aeccc99782f96a0e0012 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:39:04 +0200
Subject: [PATCH 110/244] [IMP] base/ir_cron: better tooltips

bzr revid: odo@openerp.com-20101004143904-n5j7anltcnh2mo25
---
 bin/addons/base/ir/ir_cron.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py
index c4d4e72260f..06121533922 100644
--- a/bin/addons/base/ir/ir_cron.py
+++ b/bin/addons/base/ir/ir_cron.py
@@ -50,12 +50,12 @@ class ir_cron(osv.osv, netsvc.Agent):
         'interval_number': fields.integer('Interval Number',help="Repeat every x."),
         'interval_type': fields.selection( [('minutes', 'Minutes'),
             ('hours', 'Hours'), ('work_days','Work Days'), ('days', 'Days'),('weeks', 'Weeks'), ('months', 'Months')], 'Interval Unit'),
-        'numbercall': fields.integer('Number of Calls', help='Number of time the function is called,\na negative number indicates that the function will always be called'),
-        'doall' : fields.boolean('Repeat Missed',help="Select this if you want to run the scheduler for the missed occurencs."),
-        'nextcall' : fields.datetime('Next Execution Date', required=True,help="Date when this schedular will call next time"),
-        'model': fields.char('Object', size=64,help="Name of object whose function will be called when this scheduler will run. e.g. 'res.partener'"),
-        'function': fields.char('Function', size=64,help="Name of the function to be called by this scheduler. "),
-        'args': fields.text('Arguments',help="Arguments to be passed to the function. e.g. (uid,)"),
+        'numbercall': fields.integer('Number of Calls', help='Number of time the function is called,\na negative number indicates no limit'),
+        'doall' : fields.boolean('Repeat Missed', help="Enable this if you want to execute missed occurences as soon as the server restarts."),
+        'nextcall' : fields.datetime('Next Execution Date', required=True, help="Next planned execution date for this scheduler"),
+        'model': fields.char('Object', size=64, help="Name of object whose function will be called when this scheduler will run. e.g. 'res.partener'"),
+        'function': fields.char('Function', size=64, help="Name of the method to be called on the object when this scheduler is executed."),
+        'args': fields.text('Arguments', help="Arguments to be passed to the method. e.g. (uid,)"),
         'priority': fields.integer('Priority', help='0=Very Urgent\n10=Not urgent')
     }
 

From a0d132ba5caa6d3f07462ce0366e516586ab5b82 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:39:44 +0200
Subject: [PATCH 111/244] [IMP] base/ir_action: removed unused m2m + lint
 cleanup

bzr revid: odo@openerp.com-20101004143944-m1ewxgouv3y50vda
---
 bin/addons/base/ir/ir_actions.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index c100087ba89..37f1ab19643 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -28,7 +28,6 @@ from tools.translate import _
 import netsvc
 import re
 import copy
-import sys
 from xml import dom
 
 class actions(osv.osv):
@@ -220,7 +219,6 @@ class act_window(osv.osv):
         'search_view_id': fields.many2one('ir.ui.view', 'Search View Ref.'),
         'filter': fields.boolean('Filter'),
         'auto_search':fields.boolean('Auto Search'),
-        'default_user_ids': fields.many2many('res.users', 'ir_act_window_user_rel', 'act_id', 'uid', 'Users'),
         'search_view' : fields.function(_search_view, type='text', method=True, string='Search View'),
         'menus': fields.char('Menus', size=4096),
         'help': fields.text('Action description',

From b6b618c61bc30daeda75490882f27a415892367f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:41:40 +0200
Subject: [PATCH 112/244] [IMP] base: Administration review: improved
 menus/views

bzr revid: odo@openerp.com-20101004144140-3b7trmv8phl7k0bf
---
 bin/addons/base/base_menu.xml |  2 +-
 bin/addons/base/ir/ir.xml     | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 9aab35b5d81..830ead09f6f 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -5,7 +5,7 @@
         <menuitem icon="terp-administration" id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
         <menuitem id="next_id_4" name="Low Level Objects"
             parent="base.menu_administration" sequence="3"
-            groups="base.group_extended,base.group_no_one"  />
+            groups="base.group_no_one"/>
         <menuitem id="menu_low_workflow" name="Workflows" parent="base.next_id_4"/>
         <menuitem id="menu_custom" name="Customization"
             parent="base.menu_administration" sequence="2"
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index bf21eea7e08..8d35e469bd8 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -353,8 +353,8 @@
                 <form string="Filters">
                     <group colspan="4" col="6" >
                         <field name="name"/>
-                        <field name="user_id"/>
                         <field name="model_id"/>
+                        <field name="user_id"/>
                     </group>
                     <group col="4" expand="1">
                         <separator string="Domain" colspan="2" />
@@ -425,14 +425,13 @@
             <field name="model">ir.actions.report.xml</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Report xml">
+                <form string="Report">
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
                         <field name="model" select="1"/>
-                        <field name="type" select="1"/>
+                        <field name="usage"/>
 
                         <field name="report_name" select="1"/>
-                        <field name="usage"/>
                         <field name="report_type"/>
                     </group>
 
@@ -503,7 +502,7 @@
         </record>
 
         <record id="ir_action_report_xml" model="ir.actions.act_window">
-            <field name="name">XML Reports</field>
+            <field name="name">Reports</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.actions.report.xml</field>
             <field name="view_type">form</field>
@@ -831,7 +830,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Views">
-                   <separator string="General" colspan="4"/>
                     <group colspan="4" col="6">
                         <field name="name" select="1" colspan="6"/>
                         <field name="type" select="1"/>
@@ -1337,7 +1335,7 @@
                        <field name="src" nolabel="1" height="400"/>
                     </group>
                     <group colspan="2" col="2">
-                       <separator string="Tranlsation" colspan="2"/>
+                       <separator string="Translation" colspan="2"/>
                        <field name="value" nolabel="1" height="400"/>
                     </group>
 
@@ -1858,6 +1856,7 @@
                 <tree editable="bottom" string="Config Wizard Steps">
                     <field name="sequence"/>
                     <field name="action_id"/>
+                    <field name="restart"/>
                     <field name="state" readonly="1"/>
                     <button name="action_launch" states="open" string="Launch" type="object" icon="gtk-execute" help="Launch Configuration Wizard"/>
                     <button name="action_open" states="cancel,skip,done"

From 683fbd05a71d8d3faeab54f1aab52e62346a47af Mon Sep 17 00:00:00 2001
From: "rga@openerp.com" <>
Date: Mon, 4 Oct 2010 17:23:37 +0200
Subject: [PATCH 113/244] [FIX] ir_values: attempt to return items in a more
 deterministic order

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

bzr revid: odo@openerp.com-20101004152337-35g54q0dw2b2qmf5
---
 bin/addons/base/ir/ir_values.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_values.py b/bin/addons/base/ir/ir_values.py
index 1f9a54516b6..310f3552403 100644
--- a/bin/addons/base/ir/ir_values.py
+++ b/bin/addons/base/ir/ir_values.py
@@ -176,7 +176,7 @@ class ir_values(osv.osv):
                     where.append('res_id=%s')
                     params.append(res_id)
 
-            where.append('(user_id=%s or (user_id IS NULL))')
+            where.append('(user_id=%s or (user_id IS NULL)) order by id')
             params.append(uid)
             clause = ' and '.join(where)
             cr.execute('select id,name,value,object,meta, key from ir_values where ' + clause, params)

From baba6829dc1586acf86eb845eb0be727bed62b13 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 17:25:36 +0200
Subject: [PATCH 114/244] [IMP] base: Administration review (bis): added
 previously missing wizard_screen file

bzr revid: odo@openerp.com-20101004152536-cz5j7tokhdxpu9sb
---
 bin/addons/base/ir/wizard/wizard_screen.py | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 bin/addons/base/ir/wizard/wizard_screen.py

diff --git a/bin/addons/base/ir/wizard/wizard_screen.py b/bin/addons/base/ir/wizard/wizard_screen.py
new file mode 100644
index 00000000000..56f104d0b13
--- /dev/null
+++ b/bin/addons/base/ir/wizard/wizard_screen.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2010 OpenERP s.a. (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import base64
+import os
+import random
+
+import tools
+from osv import fields,osv
+
+# Simple base class for wizards that wish to use random images on the left
+# side of the form.
+class wizard_screen(osv.osv_memory):
+    _name = 'ir.wizard.screen'
+
+    def _get_image(self, cr, uid, context=None):
+        path = os.path.join('base','res','config_pixmaps','%d.png'%random.randrange(1,4))
+        file_data = tools.file_open(path,'rb').read()
+        return base64.encodestring(file_data)
+
+    def _get_image_fn(self, cr, uid, ids, name, args, context=None):
+        image = self._get_image(cr, uid, context)
+        return dict.fromkeys(ids, image) # ok to use .fromkeys() as the image is same for all 
+
+    _columns = {
+        'config_logo': fields.function(_get_image_fn, string='Image', type='binary', method=True),
+    }
+
+    _defaults = {
+        'config_logo': _get_image
+    }
+wizard_screen()
\ No newline at end of file

From 3c1c74df2cf513a27ac56ae132785330c6dcc498 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 4 Oct 2010 20:46:30 +0200
Subject: [PATCH 115/244] fix

bzr revid: fp@tinyerp.com-20101004184630-x4k02bxow4weam3x
---
 bin/addons/base/res/res_user.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 1f502fc9cff..929a7018f7d 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -327,8 +327,9 @@ class users(osv.osv):
         return ids and ids[0] or False
 
     def _get_group(self,cr, uid, context=None):
-        ids = self.pool.get('res.groups').search(cr, uid, [('name','=','Employee')], context=context)
-        return ids or False
+        dataobj = self.pool.get('ir.model.data')
+        data_id = dataobj._get_id(cr, 1, 'base', 'group_user')
+        return data_id and [data_id] or False
 
     _defaults = {
         'password' : lambda *a : '',

From 863766e16afe32b046e5e5bf0f7e0a6384be025b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 4 Oct 2010 20:47:15 +0200
Subject: [PATCH 116/244] fix

bzr revid: fp@tinyerp.com-20101004184715-0nrs39omt5irivai
---
 bin/addons/base/security/base_security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/security/base_security.xml b/bin/addons/base/security/base_security.xml
index 76b725b5826..d7d39ea27e9 100644
--- a/bin/addons/base/security/base_security.xml
+++ b/bin/addons/base/security/base_security.xml
@@ -14,7 +14,7 @@
     </record>
 
     <record model="res.groups" id="group_user">
-        <field name="name">Employee</field>
+        <field name="name">Internal User</field>
     </record>
 
     <record model="res.groups" context="{'noadmin':True}" id="group_multi_company">

From dfab2f19c9daad458886223e90eb3a9e637d10ae Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 5 Oct 2010 10:08:41 +0530
Subject: [PATCH 117/244] [MOD] hr : displays the category name with its
 parents

bzr revid: vir@tinyerp.com-20101005043841-8cnkrnfzv64pugq8
---
 addons/hr/hr.py       | 18 ++++++++++++++++++
 addons/hr/hr_view.xml |  3 +--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 03af527359d..e2da2b9cf7b 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -26,10 +26,28 @@ import tools
 from tools.translate import _
 
 class hr_employee_category(osv.osv):
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not len(ids):
+            return []
+        reads = self.read(cr, uid, ids, ['name','parent_id'], context)
+        res = []
+        for record in reads:
+            name = record['name']
+            if record['parent_id']:
+                name = record['parent_id'][1]+' / '+name
+            res.append((record['id'], name))
+        return res
+
+    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context):
+        res = self.name_get(cr, uid, ids, context)
+        return dict(res)
+
     _name = "hr.employee.category"
     _description = "Employee Category"
     _columns = {
         'name': fields.char("Category", size=64, required=True),
+        'complete_name': fields.function(_name_get_fnc, method=True, type="char", string='Name'),
         'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True),
         'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories')
     }
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index ca9cd3bc158..496e24bbb08 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -259,8 +259,7 @@
             <field eval="8" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Employees Categories">
-                    <field name="name"/>
-                    <field name="parent_id"/>
+                    <field name="complete_name"/>
                 </tree>
             </field>
         </record>

From 2b644cce5e1640aec932efed67961c67b26d1bc8 Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Tue, 5 Oct 2010 11:45:56 +0530
Subject: [PATCH 118/244] [IMP] Twitter widget for openerp web.

bzr revid: vda@tinyerp.com-20101005061556-sotgy22ty52xc2n8
---
 bin/addons/base/__openerp__.py               |  5 ++-
 bin/addons/base/res/__init__.py              |  1 +
 bin/addons/base/res/res_widget.py            | 30 ++++++++++++++
 bin/addons/base/res/res_widget_data.xml      | 42 ++++++++++++++++++++
 bin/addons/base/res/res_widget_view.xml      | 37 +++++++++++++++++
 bin/addons/base/security/ir.model.access.csv |  1 +
 6 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 bin/addons/base/res/res_widget.py
 create mode 100644 bin/addons/base/res/res_widget_data.xml
 create mode 100644 bin/addons/base/res/res_widget_view.xml

diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py
index 86a0229358a..2bf126f5300 100644
--- a/bin/addons/base/__openerp__.py
+++ b/bin/addons/base/__openerp__.py
@@ -73,13 +73,14 @@
         'security/base_security.xml',
         'maintenance/maintenance_view.xml',
 
-        'security/ir.model.access.csv'
-
+        'security/ir.model.access.csv',
+        'res/res_widget_view.xml',
     ],
     'demo_xml': [
         'base_demo.xml',
         'res/partner/partner_demo.xml',
         'res/partner/crm_demo.xml',
+        'res/res_widget_data.xml',
     ],
     'test': [
         'test/base_test.xml',
diff --git a/bin/addons/base/res/__init__.py b/bin/addons/base/res/__init__.py
index b7a14c78a93..1536f8b2d75 100644
--- a/bin/addons/base/res/__init__.py
+++ b/bin/addons/base/res/__init__.py
@@ -33,4 +33,5 @@ import res_request
 import res_lang 
 import res_log 
 import ir_property
+import res_widget
 
diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
new file mode 100644
index 00000000000..d59975b5e8a
--- /dev/null
+++ b/bin/addons/base/res/res_widget.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields,osv
+
+class openerp_feedback(osv.osv):
+    _name = "twitter.widget"
+    _columns = {
+                'title' : fields.char('Title', size=64,help="ABC"),
+                'content': fields.text('Content')
+                }
+openerp_feedback()
\ No newline at end of file
diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml
new file mode 100644
index 00000000000..eaaf0ff3869
--- /dev/null
+++ b/bin/addons/base/res/res_widget_data.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="openerp_twitter_favorites" model="twitter.widget">
+      <field name="title">OpenERP Favorites</field>
+      <field name="content"><![CDATA[
+<script type="text/javascript" src="http://widgets.twimg.com/j/2/widget.js"></script>
+<script type="text/javascript">
+new TWTR.Widget({
+  version: 2,
+  type: 'faves',
+  rpp: 10,
+  interval: 6000,
+  title: '',
+  subject: '',
+  width: 'auto',
+  height: 300,
+  theme: {
+    shell: {
+      background: '#F0EEEE',
+      color: '#444444'
+    },
+    tweets: {
+      background: '#F0EEEE',
+      color: '#444444',
+      links: '#43c43f'
+    }
+  },
+  features: {
+    scrollbar: false,
+    loop: false,
+    live: true,
+    hashtags: true,
+    timestamp: true,
+    avatars: true,
+    behavior: 'all'
+  }
+}).render().setUser('openerp').start();
+</script>]]> </field>
+    </record>
+  </data>
+</openerp>
\ No newline at end of file
diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml
new file mode 100644
index 00000000000..0002ae08020
--- /dev/null
+++ b/bin/addons/base/res/res_widget_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="twitter_widget_form" model="ir.ui.view">
+            <field name="name">twitter.widget.form</field>
+            <field name="model">twitter.widget</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="OpenERP Feedback">
+                    <field name="title"/>
+                    <field name="content"/>
+                </form>
+            </field>
+        </record>
+        <record id="twitter_widget_tree" model="ir.ui.view">
+            <field name="name">twitter.widget.tree</field>
+            <field name="model">twitter.widget</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="OpenERP Feedback">
+                    <field name="title"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="twitter_widget_act_window" model="ir.actions.act_window">
+            <field name="name">OpenERP Feedback</field>
+            <field name="res_model">twitter.widget</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="twitter_widget_tree"/>
+        </record>
+        <menuitem
+            action="twitter_widget_act_window"
+            id="menu_twitter_widget_act_window"
+            parent="base.menu_users"/>
+    </data>
+</openerp>
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index cbbeb30fa0d..76f525a613c 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -120,3 +120,4 @@
 "access_ir_filter employee","ir_filters employee","model_ir_filters","group_user",1,1,1,1
 "access_ir_filters","ir_filters_all","model_ir_filters",,1,1,1,1
 "access_res_partner_address","res.partner.address","model_res_partner_address","group_system",1,1,1,1
+"access_res_widget","res.widget","model_twitter_widget","group_erp_manager",1,1,1,1

From 29d7b9ad30fea820d1b342d909bbc99786bafa4a Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 5 Oct 2010 12:43:17 +0530
Subject: [PATCH 119/244] [MOD] small changes

bzr revid: vir@tinyerp.com-20101005071317-f4c4fk4ie3zg6lq9
---
 addons/hr_evaluation/hr_evaluation.py   | 9 ++++-----
 addons/hr_recruitment/hr_recruitment.py | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 752028be527..041ec2d1fd8 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -115,12 +115,11 @@ class hr_employee(osv.osv):
         return True
 
     def onchange_evaluation_plan_id(self, cr, uid, ids, evaluation_plan_id, evaluation_date, context=None):
-        evaluation_date = evaluation_date or False
-        evaluation_plan_obj=self.pool.get('hr_evaluation.plan')
-        obj_evaluation = self.pool.get('hr_evaluation.evaluation')
         if context is None:
             context = {}
         if evaluation_plan_id:
+            evaluation_plan_obj=self.pool.get('hr_evaluation.plan')
+            obj_evaluation = self.pool.get('hr_evaluation.evaluation')
             flag = False
             evaluation_plan =  evaluation_plan_obj.browse(cr, uid, [evaluation_plan_id], context=context)[0]
             if not evaluation_date:
@@ -192,11 +191,11 @@ class hr_evaluation(osv.osv):
         return res
 
     def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
-        employee_obj=self.pool.get('hr.employee')
         if context is None:
             context = {}
-        evaluation_plan_id=''
+        evaluation_plan_id=False
         if employee_id:
+            employee_obj=self.pool.get('hr.employee')
             for employee in employee_obj.browse(cr, uid, [employee_id], context=context):
                 if employee and employee.evaluation_plan_id and employee.evaluation_plan_id.id:
                     evaluation_plan_id=employee.evaluation_plan_id.id
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index fbb1287afb4..e589a81bde7 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -181,15 +181,15 @@ class hr_applicant(crm.crm_case, osv.osv):
     }
 
     def onchange_job(self,cr, uid, ids, job, context=None):
-        job_obj = self.pool.get('hr.job')
         if context is None:
             context = {}
         result = {}
 
         if job:
+            job_obj = self.pool.get('hr.job')
             result['department_id'] = job_obj.browse(cr, uid, job, context=context).department_id.id
             return {'value': result}
-        return {'value': {'department_id': []}}
+        return {'value': {'department_id': False}}
 
     def stage_previous(self, cr, uid, ids, context=None):
         """This function computes previous stage for case from its current stage

From c841c95c3998c1c6d6b1ac6c93699937f098db4f Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 5 Oct 2010 12:57:09 +0530
Subject: [PATCH 120/244] [IMP]:improved for pagecount

bzr revid: apa@tinyerp.com-20101005072709-y8sl7zq4ctxcgryn
---
 .../base/report/custom_default_printscreen.xsl    |  2 --
 bin/report/interface.py                           |  2 ++
 bin/report/render/rml2pdf/trml2pdf.py             | 15 ++++++++++-----
 bin/report/report_sxw.py                          |  1 +
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/report/custom_default_printscreen.xsl b/bin/addons/base/report/custom_default_printscreen.xsl
index 46bcb0b843a..b8b30222953 100644
--- a/bin/addons/base/report/custom_default_printscreen.xsl
+++ b/bin/addons/base/report/custom_default_printscreen.xsl
@@ -9,8 +9,6 @@
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//header-date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines size="8">1.3cm 19.3cm 28.5cm 19.3cm</lines>
 	</xsl:template>
diff --git a/bin/report/interface.py b/bin/report/interface.py
index 0ee9f432883..4d565bb2003 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -174,6 +174,8 @@ class report_rml(report_int):
         return xml
 
     def create_pdf(self, rml, localcontext = None, logo=None, title=None):
+        if not localcontext:
+            localcontext={'header':False}
         if logo:
             self.bin_datas['logo'] = logo
         else:
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index abba6eacd13..51461ec36fc 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -68,8 +68,8 @@ class NumberedCanvas(canvas.Canvas):
             while not self.pages.get(key,False):
                 key = key + 1
         self.setFont("Helvetica", 8)
-        self.drawRightString((self._pagesize[0]-35), (self._pagesize[1]-40),
-            "%(this)i / %(total)i" % {
+        self.drawRightString((self._pagesize[0]-35), (self._pagesize[1]-43),
+            "Page %(this)i of %(total)i" % {
                'this': self._pageNumber+1,
                'total': self.pages.get(key,False),
             }
@@ -820,9 +820,12 @@ class TinyDocTemplate(platypus.BaseDocTemplate):
 class _rml_template(object):
     def __init__(self, localcontext, out, node, doc, images={}, path='.', title=None):
         self.localcontext = localcontext
+        if not self.localcontext:
+            self.localcontext={'header':'internal'}
         self.images= images
         self.path = path
         self.title = title
+
         if not node.get('pageSize'):
             pageSize = (utils.unit_get('21cm'), utils.unit_get('29.7cm'))
         else:
@@ -848,7 +851,7 @@ class _rml_template(object):
             except Exception: # FIXME: be even more specific, perhaps?
                 gr=''
             if len(gr):
-                self.image=[ n for n in utils._child_get(gr[0], self) if n.tag=='image' or not self.localcontext]
+#                self.image=[ n for n in utils._child_get(gr[0], self) if n.tag=='image' or not self.localcontext]
                 drw = _rml_draw(self.localcontext,gr[0], self.doc, images=images, path=self.path, title=self.title)
                 self.page_templates.append( platypus.PageTemplate(frames=frames, onPage=drw.render, **utils.attr_get(pt, [], {'id':'str'}) ))
             else:
@@ -866,12 +869,14 @@ class _rml_template(object):
             fis += r.render(node_story)
             # Reset Page Number with new story tag
             fis.append(PageReset())
-            if not self.image:
+            if self.localcontext and self.localcontext.get('header',False) and \
+               (self.localcontext['header']=='internal' or self.localcontext['header']=='internal landscape'):
                 self.doc_tmpl.afterFlowable(fis)
             story_cnt += 1
         if self.localcontext:
             fis.append(PageCount())
-        if not self.image:
+        if self.localcontext and self.localcontext.get('header',False) and \
+           (self.localcontext['header']=='internal' or self.localcontext['header']=='internal landscape'):
             self.doc_tmpl.build(fis,canvasmaker=NumberedCanvas)
         else:
             self.doc_tmpl.build(fis)
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 2c505e98622..343806c6625 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -360,6 +360,7 @@ class report_sxw(report_rml, preprocess.report):
         return table_obj.browse(cr, uid, ids, list_class=browse_record_list, context=context, fields_process=_fields_process)
 
     def create(self, cr, uid, ids, data, context=None):
+        context.update({'header':self.header})
         pool = pooler.get_pool(cr.dbname)
         ir_obj = pool.get('ir.actions.report.xml')
         report_xml_ids = ir_obj.search(cr, uid,

From 0fe4e77b57ab3b59a22fb4beb7b61e7d15d553e3 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 5 Oct 2010 13:02:21 +0530
Subject: [PATCH 121/244] improve

bzr revid: apa@tinyerp.com-20101005073221-92b343fpetaacum9
---
 bin/report/interface.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bin/report/interface.py b/bin/report/interface.py
index 4d565bb2003..0ee9f432883 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -174,8 +174,6 @@ class report_rml(report_int):
         return xml
 
     def create_pdf(self, rml, localcontext = None, logo=None, title=None):
-        if not localcontext:
-            localcontext={'header':False}
         if logo:
             self.bin_datas['logo'] = logo
         else:

From 7e09be4b9827997ca31a21d2111843e6705e9ecc Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 5 Oct 2010 10:00:17 +0200
Subject: [PATCH 122/244] fix

bzr revid: fp@tinyerp.com-20101005080017-czdp6ddpzqqf589g
---
 bin/addons/base/res/partner/partner_data.xml | 10 +++++-----
 bin/addons/base/res/partner/partner_view.xml |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/res/partner/partner_data.xml b/bin/addons/base/res/partner/partner_data.xml
index 642c4cc46bf..46e9faac130 100644
--- a/bin/addons/base/res/partner/partner_data.xml
+++ b/bin/addons/base/res/partner/partner_data.xml
@@ -3,8 +3,8 @@
     <data noupdate="True">
 
         <!--
-		Resource: res.partner.title
-		-->
+        Resource: res.partner.title
+        -->
         <record id="res_partner_title_pvt_ltd" model="res.partner.title">
             <field name="domain">partner</field>
             <field name="name">Corp.</field>
@@ -49,9 +49,9 @@
             <field name="bank_type_id" ref="bank_normal"/>
         </record>
 
-		<!--
-		Resource: res.request.link
-		-->
+        <!--
+        Resource: res.request.link
+        -->
 
         <record id="req_link_partner" model="res.request.link">
             <field name="name">Partner</field>
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index dbe19959445..fcf007deb0f 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -123,7 +123,7 @@
             <field name="act_window_id" ref="action_partner_address_form"/>
         </record>
         <menuitem action="action_partner_address_form" id="menu_partner_address_form"
-            groups="base.group_extended,base.group_system,group_sale_manager,group_sale_salesman"
+            groups="base.group_extended"
             parent="base.menu_address_book" sequence="30"/>
 
         <!--
@@ -207,7 +207,7 @@
             <field name="domain">[('domain','=','partner')]</field>
         </record>
 
-        <menuitem action="action_partner_title_partner" id="menu_partner_title_partner" name="Partner Title" parent="menu_config_address_book" sequence="2"/>
+        <menuitem action="action_partner_title_partner" id="menu_partner_title_partner" parent="menu_config_address_book" sequence="2"/>
 
         <record id="action_partner_title_contact" model="ir.actions.act_window">
             <field name="name">Contact Titles</field>

From 5edaa42c3f889bae8770428b679d057aacfa5a9e Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Tue, 5 Oct 2010 14:57:02 +0530
Subject: [PATCH 123/244] [FIX] Fixes users right, model name.

bzr revid: vda@tinyerp.com-20101005092702-28d10t9idqvk0kcw
---
 bin/addons/base/res/res_widget.py            |  6 ++--
 bin/addons/base/res/res_widget_data.xml      |  2 +-
 bin/addons/base/res/res_widget_view.xml      | 32 +++++++++++---------
 bin/addons/base/security/base_security.xml   |  4 +++
 bin/addons/base/security/ir.model.access.csv |  4 ++-
 5 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index d59975b5e8a..2cddaa73ca8 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -21,10 +21,10 @@
 
 from osv import fields,osv
 
-class openerp_feedback(osv.osv):
-    _name = "twitter.widget"
+class res_widget(osv.osv):
+    _name = "res.widget"
     _columns = {
                 'title' : fields.char('Title', size=64,help="ABC"),
                 'content': fields.text('Content')
                 }
-openerp_feedback()
\ No newline at end of file
+res_widget()
\ No newline at end of file
diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml
index eaaf0ff3869..b4e110b21cc 100644
--- a/bin/addons/base/res/res_widget_data.xml
+++ b/bin/addons/base/res/res_widget_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-    <record id="openerp_twitter_favorites" model="twitter.widget">
+    <record id="openerp_twitter_favorites" model="res.widget">
       <field name="title">OpenERP Favorites</field>
       <field name="content"><![CDATA[
 <script type="text/javascript" src="http://widgets.twimg.com/j/2/widget.js"></script>
diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml
index 0002ae08020..690d456691c 100644
--- a/bin/addons/base/res/res_widget_view.xml
+++ b/bin/addons/base/res/res_widget_view.xml
@@ -1,37 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="twitter_widget_form" model="ir.ui.view">
-            <field name="name">twitter.widget.form</field>
-            <field name="model">twitter.widget</field>
+        <record id="res_widget_form" model="ir.ui.view">
+            <field name="name">res.widget.form</field>
+            <field name="model">res.widget</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="OpenERP Feedback">
+                <form string="OpenERP Favourites">
                     <field name="title"/>
                     <field name="content"/>
                 </form>
             </field>
         </record>
-        <record id="twitter_widget_tree" model="ir.ui.view">
-            <field name="name">twitter.widget.tree</field>
-            <field name="model">twitter.widget</field>
+        <record id="res_widget_tree" model="ir.ui.view">
+            <field name="name">res.widget.tree</field>
+            <field name="model">res.widget</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="OpenERP Feedback">
+                <tree string="OpenERP Favourites">
                     <field name="title"/>
                 </tree>
             </field>
         </record>
 
-        <record id="twitter_widget_act_window" model="ir.actions.act_window">
-            <field name="name">OpenERP Feedback</field>
-            <field name="res_model">twitter.widget</field>
+        <record id="res_widget_act_window" model="ir.actions.act_window">
+            <field name="name">OpenERP Favourites</field>
+            <field name="res_model">res.widget</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="twitter_widget_tree"/>
+            <field name="view_id" ref="res_widget_tree"/>
         </record>
+        
         <menuitem
-            action="twitter_widget_act_window"
-            id="menu_twitter_widget_act_window"
-            parent="base.menu_users"/>
+            action="res_widget_act_window"
+            id="menu_res_widget_act_window"
+            parent="base.menu_users"
+            />
     </data>
 </openerp>
diff --git a/bin/addons/base/security/base_security.xml b/bin/addons/base/security/base_security.xml
index d7d39ea27e9..016204e7241 100644
--- a/bin/addons/base/security/base_security.xml
+++ b/bin/addons/base/security/base_security.xml
@@ -8,6 +8,10 @@
     <record model="res.groups" id="group_system">
         <field name="name">Administration / Configuration</field>
     </record>
+    
+    <!--<record model="res.groups" id="group_widget">
+        <field name="name">Administration / Widget</field>
+    </record> -->
 
     <record model="res.groups" id="group_erp_manager">
         <field name="name">Administration / Access Rights</field>
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 76f525a613c..a8144a44834 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -120,4 +120,6 @@
 "access_ir_filter employee","ir_filters employee","model_ir_filters","group_user",1,1,1,1
 "access_ir_filters","ir_filters_all","model_ir_filters",,1,1,1,1
 "access_res_partner_address","res.partner.address","model_res_partner_address","group_system",1,1,1,1
-"access_res_widget","res.widget","model_twitter_widget","group_erp_manager",1,1,1,1
+"access_res_widget","res.widget","model_res_widget","group_erp_manager",1,1,1,1
+"access_res_widget_user","res.widget.user","model_res_widget",,1,0,0,0
+

From ceedb2fc81a3131a9c27ace460c52dfe106476f9 Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Tue, 5 Oct 2010 15:03:01 +0530
Subject: [PATCH 124/244] [FIX] Remove unnecessary code.

bzr revid: vda@tinyerp.com-20101005093301-4t0dzqhivdmqwng1
---
 bin/addons/base/res/res_widget.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index 2cddaa73ca8..80706084df1 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -24,7 +24,7 @@ from osv import fields,osv
 class res_widget(osv.osv):
     _name = "res.widget"
     _columns = {
-                'title' : fields.char('Title', size=64,help="ABC"),
+                'title' : fields.char('Title', size=64),
                 'content': fields.text('Content')
                 }
 res_widget()
\ No newline at end of file

From a23c020583840c2f451f2a6cb00b12fe002b8b67 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Tue, 5 Oct 2010 11:45:29 +0200
Subject: [PATCH 125/244] [IMP] report engine: decimal precision can now be
 passed to formatLang. digits argument has an upper precedence

bzr revid: olt@tinyerp.com-20101005094529-bkavp9g994lflx3u
---
 bin/report/report_sxw.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 2c505e98622..efde8cb036f 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -253,7 +253,7 @@ class rml_parse(object):
             if ids:
                 d = decimal_precision_obj.browse(self.cr, self.uid, ids)[0].digits
         elif obj and f:
-            res_digits = getattr(obj._columns[f], 'digits', lambda x: ((16,DEFAULT_DIGITS)))
+            res_digits = getattr(obj._columns[f], 'digits', lambda x: ((16, DEFAULT_DIGITS)))
             if isinstance(res_digits, tuple):
                 d = res_digits[1]
             else:
@@ -264,9 +264,18 @@ class rml_parse(object):
                 d = obj._field.digits[1] or DEFAULT_DIGITS
         return d
 
-    def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False):
+    def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False, dp=False):
+        """
+            Assuming 'Account' decimal.precision=3:
+                formatLang(value, digits=4) -> digits=4
+                formatLang(value, dp='Account') -> digits=3 ('Account' decimal.precision=3)
+                formatLang(value, digits=5, dp='Account') -> digits=5
+        """
         if digits is None:
-            digits = self.get_digits(value)
+            if dp:
+                digits = self.get_digits(dp=dp)
+            else:
+                digits = self.get_digits(value)
 
         if isinstance(value, (str, unicode)) and not value:
             return ''

From 9ad4df7f1629ad48a948e01c27781553bd92dc1e Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Tue, 5 Oct 2010 11:47:55 +0200
Subject: [PATCH 126/244] [IMP] report engine: decimal precision can now be
 passed to formatLang (changed the docstring)

bzr revid: olt@tinyerp.com-20101005094755-edh3p1hx6v1pg01f
---
 bin/report/report_sxw.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index efde8cb036f..3cd448eac58 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -267,8 +267,9 @@ class rml_parse(object):
     def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False, dp=False):
         """
             Assuming 'Account' decimal.precision=3:
+                formatLang(value) -> digits=2 (default)
                 formatLang(value, digits=4) -> digits=4
-                formatLang(value, dp='Account') -> digits=3 ('Account' decimal.precision=3)
+                formatLang(value, dp='Account') -> digits=3
                 formatLang(value, digits=5, dp='Account') -> digits=5
         """
         if digits is None:

From c76794e0bb40ff998559830cfb8ea17580787218 Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Tue, 5 Oct 2010 15:36:06 +0530
Subject: [PATCH 127/244] [FIX] Link colors according to OpenERP web links.

bzr revid: vda@tinyerp.com-20101005100606-1o1rrm9heb2eg7qe
---
 bin/addons/base/res/res_widget_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml
index b4e110b21cc..4ee85646b04 100644
--- a/bin/addons/base/res/res_widget_data.xml
+++ b/bin/addons/base/res/res_widget_data.xml
@@ -23,7 +23,7 @@ new TWTR.Widget({
     tweets: {
       background: '#F0EEEE',
       color: '#444444',
-      links: '#43c43f'
+      links: '#9A0404'
     }
   },
   features: {

From 31680ea2589481693e348636b572841de95bd871 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 5 Oct 2010 16:16:26 +0530
Subject: [PATCH 128/244] [FIX] base: cr.close() before return on login

bzr revid: hmo@tinyerp.com-20101005104626-mfb50prd55ljpyy0
---
 bin/addons/base/res/res_user.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 929a7018f7d..d2d44039f80 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -423,14 +423,13 @@ class users(osv.osv):
         cr = pooler.get_db(db).cursor()
         cr.execute('select id from res_users where login=%s and password=%s and active', (tools.ustr(login), tools.ustr(password)))
         res = cr.fetchone()
-
+        result = False
         if res:
             cr.execute("update res_users set date=%s where id=%s", (time.strftime('%Y-%m-%d %H:%M:%S'),res[0]))
             cr.commit()
-            return res[0]
-        else:
-            return False
+            result = res[0]
         cr.close()
+        return result
     def check_super(self, passwd):
         if passwd == tools.config['admin_passwd']:
             return True

From 55da21f5b634485b520adc10e2f5afc60ce231aa Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 5 Oct 2010 16:17:59 +0530
Subject: [PATCH 129/244] [FIX] base : _get_group() method corrected

bzr revid: ach@tinyerp.com-20101005104759-2mdxxuu4emvwc785
---
 bin/addons/base/res/res_user.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index d2d44039f80..e5927fe2ac1 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -328,8 +328,8 @@ class users(osv.osv):
 
     def _get_group(self,cr, uid, context=None):
         dataobj = self.pool.get('ir.model.data')
-        data_id = dataobj._get_id(cr, 1, 'base', 'group_user')
-        return data_id and [data_id] or False
+        dummy,group_id = dataobj.get_object_reference(cr, 1, 'base', 'group_user')
+        return [group_id] or False
 
     _defaults = {
         'password' : lambda *a : '',

From a694aff5c0bde00ff7038b9246263ace977a8d95 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 5 Oct 2010 16:24:19 +0530
Subject: [PATCH 130/244] [REF] base : _get_group() method corrected

bzr revid: ach@tinyerp.com-20101005105419-pfzidxgf3yimfs4b
---
 bin/addons/base/res/res_user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index e5927fe2ac1..fa3e87aab74 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -329,7 +329,7 @@ class users(osv.osv):
     def _get_group(self,cr, uid, context=None):
         dataobj = self.pool.get('ir.model.data')
         dummy,group_id = dataobj.get_object_reference(cr, 1, 'base', 'group_user')
-        return [group_id] or False
+        return [group_id]
 
     _defaults = {
         'password' : lambda *a : '',

From 489e6ded3924658d9c8d3dfe2e79c040931a464a Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Tue, 5 Oct 2010 16:47:53 +0530
Subject: [PATCH 131/244] [FIX] Removed unnecessary commented code.

bzr revid: vda@tinyerp.com-20101005111753-s54kt87wf1uflmzn
---
 bin/addons/base/security/base_security.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bin/addons/base/security/base_security.xml b/bin/addons/base/security/base_security.xml
index 016204e7241..d7d39ea27e9 100644
--- a/bin/addons/base/security/base_security.xml
+++ b/bin/addons/base/security/base_security.xml
@@ -8,10 +8,6 @@
     <record model="res.groups" id="group_system">
         <field name="name">Administration / Configuration</field>
     </record>
-    
-    <!--<record model="res.groups" id="group_widget">
-        <field name="name">Administration / Widget</field>
-    </record> -->
 
     <record model="res.groups" id="group_erp_manager">
         <field name="name">Administration / Access Rights</field>

From 794c319ec9864fa404a404066f6e5f5c47272212 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 5 Oct 2010 16:56:53 +0530
Subject: [PATCH 132/244] [FIX]:search_view 'groups=' attribute in the child of
 a field tag was never evaluted: Example: <field name='user_id' select='1'>   
 <filter domain='[('user_id','=',uid)]' help='My Sale Orders'
 icon='terp-personal' groups='base.group_extended'/>

bzr revid: nch@tinyerp.com-20101005112653-vg4qh4x5uzt0k2j5
---
 bin/osv/orm.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 55d2a4e226e..b003e5597d6 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1359,8 +1359,8 @@ class orm_template(object):
                 if trans:
                     node.set('sum', trans)
 
-        if childs:
-            for f in node:
+        for f in node:
+            if childs or (node.tag == 'field' and f.tag in ('filter','separator')):
                 fields.update(self.__view_look_dom(cr, user, f, view_id, context))
 
         return fields
@@ -3922,7 +3922,7 @@ class orm(orm_template):
         return True
 
     def _apply_ir_rules(self, cr, uid, query, mode='read', context=None):
-        """Add what's missing in ``query`` to implement all appropriate ir.rules 
+        """Add what's missing in ``query`` to implement all appropriate ir.rules
           (using the ``model_name``'s rules or the current model's rules if ``model_name`` is None)
 
            :param query: the current query object
@@ -3978,7 +3978,7 @@ class orm(orm_template):
             # extract the first field name, to be able to qualify it and add desc/asc
             m2o_order = m2o_order.split(",",1)[0].strip().split(" ",1)[0]
 
-        # Join the dest m2o table if it's not joined yet. We use [LEFT] OUTER join here 
+        # Join the dest m2o table if it's not joined yet. We use [LEFT] OUTER join here
         # as we don't want to exclude results that have NULL values for the m2o
         src_table, src_field = qualified_field.replace('"','').split('.', 1)
         query.join((src_table, dest_model._table, src_field, 'id'), outer=True)

From 78000cae6d03c9416daca95f2d18c805dbaaea04 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 5 Oct 2010 14:37:30 +0200
Subject: [PATCH 133/244] [IMP] netsvc: increase a bit default verbosity of
 debug_* levels for RPC query and results + lint cleanup

bzr revid: odo@openerp.com-20101005123730-f75h4gu1ac8fjtfj
---
 bin/netsvc.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index e5a60f9d3ae..54a8ac68b14 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -211,7 +211,7 @@ def init_logger():
                 handler = logging.handlers.WatchedFileHandler(logf)
             else:
                 handler = logging.handlers.FileHandler(logf)
-        except Exception, ex:
+        except Exception:
             sys.stderr.write("ERROR: couldn't create the logfile directory. Logging to the standard output.\n")
             handler = logging.StreamHandler(sys.stdout)
     else:
@@ -269,11 +269,11 @@ class Logger(object):
                     level_method('[%02d]: %s' % (idx+1, s,))
             elif result:
                 level_method(result[0])
-        except IOError,e:
+        except IOError:
             # TODO: perhaps reset the logger streams?
             #if logrotate closes our files, we end up here..
             pass
-        except:
+        except Exception:
             # better ignore the exception and carry on..
             pass
 
@@ -473,13 +473,13 @@ class OpenERPDispatcher:
 
     def dispatch(self, service_name, method, params):
         try:
+            logger = logging.getLogger('result')
             self.log('service', service_name)
             self.log('method', method)
-            self.log('params', params)
+            self.log('params', params, depth=(logger.isEnabledFor(logging.DEBUG_RPC_ANSWER) and 3 or 1))
             auth = getattr(self, 'auth_provider', None)
             result = ExportService.getService(service_name).dispatch(method, auth, params)
-            logger = logging.getLogger('result')
-            self.log('result', result, channel=logging.DEBUG_RPC_ANSWER, depth=(logger.isEnabledFor(logging.DEBUG_SQL) and 1 or None))
+            self.log('result', result, channel=logging.DEBUG_RPC_ANSWER, depth=(logger.isEnabledFor(logging.DEBUG_SQL) and 5 or 3))
             return result
         except Exception, e:
             self.log('exception', tools.exception_to_unicode(e))

From 50853e12cb9888f8ac337c8b84d29f5d7be9e710 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 5 Oct 2010 14:46:33 +0200
Subject: [PATCH 134/244] [FIX] base: re-added explicit menu_id for super-user
 as it is not created by ORM initially

bzr revid: odo@openerp.com-20101005124633-003uft5v4wkza3f8
---
 bin/addons/base/base_data.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 9597ac83f92..b4340e3faf0 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1052,6 +1052,7 @@
             <field name="signature">Administrator</field>
             <field name="address_id" ref="main_address"/>
             <field name="company_id" ref="main_company"/>
+            <field name="menu_id" ref="action_menu_admin"/>
             <field name="company_ids" eval="[(4, ref('main_company'))]"/>
         </record>
 

From 0888189083c3864907de412f6ac96519e9e0ab75 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 5 Oct 2010 19:02:52 +0530
Subject: [PATCH 135/244] [MOD/IMP] tools : Survey,Idea,Lunch,Subscription
 Usability improvement in access rights

bzr revid: amp@tinyerp.com-20101005133252-hz7jww5xuzjrxal1
---
 addons/idea/idea_view.xml                     |  9 ++++---
 addons/idea/report/report_vote_view.xml       |  2 +-
 addons/idea/security/idea_security.xml        |  5 ----
 addons/idea/security/ir.model.access.csv      | 18 -------------
 addons/lunch/lunch_view.xml                   |  4 +--
 addons/lunch/security/ir.model.access.csv     | 14 +---------
 addons/lunch/security/lunch_security.xml      |  3 ---
 .../lunch/wizard/lunch_order_cancel_view.xml  |  2 +-
 .../lunch/wizard/lunch_order_confirm_view.xml |  2 +-
 .../subscription/security/ir.model.access.csv | 10 +++----
 addons/subscription/subscription_view.xml     |  2 +-
 addons/survey/security/ir.model.access.csv    | 27 ++-----------------
 addons/survey/survey_view.xml                 | 14 +++++-----
 13 files changed, 25 insertions(+), 87 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index f7ddb8bf504..456c4dd1f7a 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -65,7 +65,7 @@
     </record>
 
     <menuitem name="Configuration" parent="base.menu_tools"
-         id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system"/>
+         id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
 
     <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas" sequence="3"/>
 
@@ -90,7 +90,8 @@
 
     <menuitem name="Give Vote" parent="menu_ideas1"
         id="menu_give_vote"
-        action="action_idea_select"/>
+        action="action_idea_select"
+        groups="base.group_tool_user"/>
 
 
     <!-- Open Ideas Action  -->
@@ -382,12 +383,12 @@
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
     </record>
-    <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="6"/>
+    <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="6" groups="base.group_tool_manager,base.group_tool_user"/>
 
     <menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting" sequence="3"/>
 
     <menuitem name="Vote Statistics" parent="menu_idea_reporting"
-        id="menu_idea_vote_stat" action="action_idea_vote_stat" groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
+        id="menu_idea_vote_stat" action="action_idea_vote_stat" groups="base.group_tool_user"/>
 
     <!-- Vote For Idea Action  -->
     <record model="ir.actions.act_window" id="action_idea_vote">
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 8418377065c..c68c829794b 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -91,7 +91,7 @@
             <field name="context">{'search_default_User':1,'search_default_State':1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
 
-        <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1" groups="base.group_tool_manager,base.group_system"/>
+        <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1" groups="base.group_tool_manager"/>
     </data>
 </openerp>
 
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index ef377c799c9..4b060c51e6c 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -2,10 +2,6 @@
 <openerp>
 	<data>
 
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
    	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
@@ -13,7 +9,6 @@
         	<field name="name">Tools / User</field>
    	</record>
 
-
 	</data>
 </openerp>
 
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index 30dc0850c3f..b76cc9bd58a 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -1,26 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_idea_category","idea.category","model_idea_category","base.group_user",1,1,1,1
-"access_idea_idea","idea.idea","model_idea_idea","base.group_user",1,1,1,1
-"access_idea_vote","idea.vote","model_idea_vote","base.group_user",1,1,1,1
-"access_idea_vote_stat","idea.vote.stat","model_idea_vote_stat","base.group_user",1,1,1,1
-"access_idea_category_system","idea.category system","model_idea_category","base.group_system",1,1,1,1
-"access_idea_comment","idea.comment","model_idea_comment","base.group_system",1,1,1,1
-"access_idea_comment_base_user","idea.comment.base.user","model_idea_comment","base.group_user",1,1,1,1
-"access_report_vote","report.vote","model_report_vote","base.group_user",1,1,1,1
-"access_idea_idea_sale_salesman","idea.idea.sale","model_idea_idea","base.group_sale_salesman",1,1,1,1
-"access_idea_vote_sale_salesman","idea.vote.sale","model_idea_vote","base.group_sale_salesman",1,1,1,1
 "access_idea_category_user","idea.category user","model_idea_category","base.group_tool_user",1,1,1,1
 "access_idea_idea_user","idea.idea user","model_idea_idea","base.group_tool_user",1,1,1,1
 "access_idea_vote_user","idea.vote user","model_idea_vote","base.group_tool_user",1,1,1,1
-"access_idea_category_manager","idea.category manager","model_idea_category","base.group_tool_manager",1,1,1,1
-"access_idea_idea_manager","idea.idea manager","model_idea_idea","base.group_tool_manager",1,1,1,1
 "access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_tool_manager",1,1,1,1
 "access_idea_vote_stat_user","idea.vote.stat user","model_idea_vote_stat","base.group_tool_user",1,1,1,1
 "access_idea_comment_user","idea.comment user","model_idea_comment","base.group_tool_user",1,1,1,1
 "access_report_vote_manager","report.vote manager","model_report_vote","base.group_tool_manager",1,1,1,1
-"access_idea_idea_system","idea.idea system","model_idea_idea","base.group_system",1,0,0,0
-"access_idea_vote_system","idea.vote system","model_idea_vote","base.group_system",1,0,0,0
-"access_report_vote_system","report.vote system","model_report_vote","base.group_system",1,0,0,0
-"access_idea_vote_stat_manager","idea.vote.stat manager","model_idea_vote_stat","base.group_tool_manager",1,1,1,1
-"access_idea_vote_stat_system","idea.vote.stat system","model_idea_vote_stat","base.group_system",1,1,1,1
-"access_idea_comment_manager","idea.comment.manager","model_idea_comment","base.group_tool_manager",1,1,1,1
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 6b0e4c4b8c7..0ecdea5c017 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -6,14 +6,14 @@
               id="menu_lunch" sequence="1" />
 
           <menuitem name="Reporting" parent="base.menu_tools"
-              id="base.menu_lunch_reporting" sequence="6" groups="base.group_system,base.group_tool_manager"/>
+              id="base.menu_lunch_reporting" sequence="6" groups="base.group_tool_manager"/>
 
           <menuitem name="Lunch Orders"
               parent="base.menu_lunch_reporting"
               id="menu_lunch_reporting_order" sequence="1" />
 
           <menuitem name="Configuration" parent="base.menu_tools"
-              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system"/>
+              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
 
           <menuitem name="Lunch" parent="base.menu_lunch_survey_root"
               id="menu_lunch_category_root_configuration" sequence="1" />
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
index b936b26a55e..59670a8d1b1 100644
--- a/addons/lunch/security/ir.model.access.csv
+++ b/addons/lunch/security/ir.model.access.csv
@@ -1,20 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_lunch_category","lunch.category","model_lunch_category","base.group_user",1,1,1,1
-"access_lunch_product","lunch.product","model_lunch_product","base.group_user",1,1,1,1
-"access_lunch_cashbox","lunch.cashbox","model_lunch_cashbox","base.group_user",1,1,1,1
-"access_lunch_order","lunch.order","model_lunch_order","base.group_user",1,1,1,1
-"access_report_lunch_amount","report.lunch.amount","model_report_lunch_amount","base.group_user",1,1,1,1
-"access_lunch_order_sale_salesman","lunch.order.sale","model_lunch_order","base.group_sale_salesman",1,1,1,1
 "access_lunch_order_user","lunch.order user","model_lunch_order","base.group_tool_user",1,1,1,1
-"access_lunch_order_manager","lunch.order manager","model_lunch_order","base.group_tool_manager",1,1,1,1
 "access_lunch_cashmove_user","lunch.cashmove user","model_lunch_cashmove","base.group_tool_user",1,1,1,1
-"access_lunch_cashmove_manager","lunch.cashmove manager","model_lunch_cashmove","base.group_tool_manager",1,1,1,1
 "access_report_lunch_amount_manager","report.lunch.amount manager","model_report_lunch_amount","base.group_tool_manager",1,1,1,1
-"access_lunch_category_system","lunch.category system","model_lunch_category","base.group_system",1,1,1,1
-"access_lunch_product_system","lunch.product system","model_lunch_product","base.group_system",1,1,1,1
-"access_lunch_cashbox_system","lunch.cashbox system","model_lunch_cashbox","base.group_system",1,1,1,1
-"access_lunch_order_system","lunch.order system","model_lunch_order","base.group_system",1,0,0,0
-"access_lunch_cashmove_system","lunch.cashmove system","model_lunch_cashmove","base.group_system",1,0,0,0
+"access_lunch_category_manager","lunch.category.user","model_lunch_category","base.group_tool_user",1,1,1,1
 "access_report_lunch_order_manager","report.lunch.order manager","model_report_lunch_order","base.group_tool_manager",1,1,1,1
 "access_lunch_product_user","lunch.product user","model_lunch_product","base.group_tool_user",1,1,1,1
 "access_lunch_cashbox_user","lunch.cashbox user","model_lunch_cashbox","base.group_tool_user",1,1,1,1
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index 6c3559fa138..0014f38182b 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -2,9 +2,6 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
    	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index d47cc6d8ee9..e50f4ad222c 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -34,7 +34,7 @@
         <act_window id="action_lunch_order_cancel_values"
     		key2="client_action_multi" name="Cancel Order"
     		res_model="lunch.order.cancel" src_model="lunch.order"
-    		view_mode="form" target="new" view_type="form" groups="base.group_tool_manager"/>
+    		view_mode="form" target="new" view_type="form"/>
 
     </data>
 </openerp>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index dabcd7d5e84..eba7d12c846 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -36,7 +36,7 @@
         <act_window id="action_lunch_order_confirm_values"
     		key2="client_action_multi" name="Confirm Order"
     		res_model="lunch.order.confirm" src_model="lunch.order"
-    		view_mode="form" target="new" view_type="form" groups="base.group_tool_manager"/>
+    		view_mode="form" target="new" view_type="form"/>
 
     </data>
 </openerp>
diff --git a/addons/subscription/security/ir.model.access.csv b/addons/subscription/security/ir.model.access.csv
index e19fdde993b..4d4f829092b 100644
--- a/addons/subscription/security/ir.model.access.csv
+++ b/addons/subscription/security/ir.model.access.csv
@@ -1,10 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_subscription_document,subscription.document,model_subscription_document,base.group_system,1,1,1,1
-access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_system,1,1,1,1
-access_subscription_subscription,subscription.subscription,model_subscription_subscription,base.group_user,1,1,1,1
-access_subscription_subscription_history,subscription.subscription.history,model_subscription_subscription_history,base.group_user,1,1,1,1
+access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_tool_manager,1,1,1,1
 access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,1
-access_subscription_subscription_manager,subscription.subscription manager,model_subscription_subscription,base.group_tool_manager,1,0,0,0
 access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1
-access_subscription_subscription_system,subscription.subscription system,model_subscription_subscription,base.group_system,1,0,0,0
 access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1
+access_res_partner_user,res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
+access_res_partner_address_user,res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,1
+access_ir_cron_user,ir.cron.user,base.model_ir_cron,base.group_tool_user,1,1,1,1
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index b27414bb60c..37841919b1b 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -212,7 +212,7 @@
             <field name="search_view_id" ref="view_subscription_document_filter" />
         </record>
         <menuitem name="Configuration" parent="base.menu_tools"
-              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system" />
+              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager" />
         <menuitem id="config_recuuring_event" name="Recurring Events" parent="base.menu_lunch_survey_root" sequence="4"/>
         <menuitem action="action_document_form" id="menu_action_document_form" parent="config_recuuring_event"/>
     </data>
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 5ea4017fb01..5d4501e36bd 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -1,41 +1,17 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_survey_type_manager","survey.type manager","model_survey_type","base.group_tool_manager",1,1,1,1
 "access_survey_type_user","survey.type user","model_survey_type","base.group_tool_user",1,1,1,1
-"access_survey_manager","survey","model_survey","base.group_tool_manager",1,1,1,1
-"access_survey_system","survey","model_survey","base.group_system",1,0,0,0
 "access_survey_user","survey","model_survey","base.group_tool_user",1,1,1,1
-"access_survey_page_manager","survey.page manager","model_survey_page","base.group_tool_manager",1,1,1,1
-"access_survey_page_system","survey.page system","model_survey_page","base.group_system",1,0,0,0
 "access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
-"access_survey_question_manager","survey.question manager","model_survey_question","base.group_tool_manager",1,1,1,1
 "access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
-"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_tool_manager",1,1,1,1
 "access_survey_answer_user","survey.answer user","model_survey_answer","base.group_tool_user",1,1,1,1
-"access_survey_response_manager","survey.response manager","model_survey_response","base.group_tool_manager",1,1,1,1
 "access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
-"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_tool_manager",1,1,1,1
 "access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_tool_user",1,1,1,1
 "access_survey_history_user","survey.history.user","model_survey_history","base.group_tool_user",1,1,1,1
-"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
 "access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,0,0,0
-"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,1,1,1
 "access_survey_request_user","survey.request user","model_survey_request","base.group_tool_user",1,1,1,1
-"access_survey_request_system","survey.request system","model_survey_request","base.group_system",1,0,0,0
-"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
 "access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_tool_user",1,1,1,1
-"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
 "access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1
-"access_survey_history_survey_manager","survey.history manager","model_survey_history","base.group_tool_manager",1,1,1,1
-"access_survey_type_system","survey.type system","model_survey_type","base.group_system",1,0,0,0
-"access_survey_question_system","survey.question system","model_survey_question","base.group_system",1,0,0,0
-"access_survey_history_system","survey.history.system","model_survey_history","base.group_system",1,0,0,0
-"access_survey_answer_system","survey.answer system","model_survey_answer","base.group_system",1,0,0,0
-"access_survey_answer_base_user","survey.answer.base.user","model_survey_answer","base.group_user",1,1,1,1
-"access_survey_question_base_user","survey.question.base.user","model_survey_question","base.group_user",1,1,1,1
 "access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
-"access_survey_request_employee","survey.request.employee","model_survey_request","base.group_user",1,0,0,0
-"access_survey_response_employee","survey.response employee","model_survey_response","base.group_user",1,0,0,0
-"access_survey_employee","survey.employee","model_survey","base.group_user",1,0,0,0
 "access_survey_survey_user","survey.survey.user","model_survey","group_survey_user",1,1,1,1
 "access_survey_type_survey_user","survey.type.survey.user","model_survey_type","group_survey_user",1,1,1,1
 "access_survey_page_survey_user","survey.page.survey.user","model_survey_page","group_survey_user",1,1,1,1
@@ -48,4 +24,5 @@
 "access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0
 "access_survey_tbl_column_heading_survey_user","survey.tbl.column.heading.survey.user","model_survey_tbl_column_heading","group_survey_user",1,1,1,1
 "access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","group_survey_user",1,1,1,1
-"access_survey_res_partner_address_survey_user","survey.res.partner.address.survey.user","base.model_res_partner_address","group_survey_user",1,1,1,0
+"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_manager",1,1,1,1
+
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 4fc58962442..b6cc394ad8a 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -4,11 +4,11 @@
 
             <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
             <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools"
-                        groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user,group_survey_user" sequence="2"/>
+                        groups="base.group_tool_user,group_survey_user" sequence="2"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
-                 groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"
+                 groups="base.group_tool_user,group_survey_user"
                  parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user,group_survey_user"/>
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,group_survey_user"/>
             <menuitem name="Reporting" parent="base.menu_tools"
                 id="base.menu_lunch_reporting" sequence="6"/>
             <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
@@ -292,7 +292,7 @@
 
         <menuitem name="Surveys" id="menu_survey_form"
             action="action_survey_form1" parent="menu_define_survey"
-            groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"/>
+            groups="base.group_tool_user,group_survey_user"/>
 
         <!--
             Survey Pages
@@ -492,7 +492,7 @@
 
         <menuitem name="Survey Pages" id="menu_survey_page_form1"
             action="action_survey_page_form" parent='menu_define_survey'
-            groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"/>
+            groups="base.group_tool_user,group_survey_user"/>
 
         <record model="ir.ui.view" id="survey_page_wizard_test1">
             <field name="name">survey_page_wizard_test</field>
@@ -1126,7 +1126,7 @@
 
         <menuitem name="Survey Requests" id="menu_survey_type_form1"
             action="action_survey_request_tree" parent='menu_answer_surveys'
-            groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"/>
+            groups="base.group_tool_user,group_survey_user"/>
 
         <!--
             Survey Type
@@ -1193,7 +1193,7 @@
             src_model="survey.question"/>
 
         <menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
-            action="action_view_survey_name" parent="menu_answer_surveys"            groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user,group_survey_user" icon="STOCK_INDEX"/>
+            action="action_view_survey_name" parent="menu_answer_surveys"            groups="base.group_tool_user,group_survey_user" icon="STOCK_INDEX"/>
 
     </data>
 </openerp>

From 7f30ad68d56a78aee746389192a1acac245f67ac Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 5 Oct 2010 15:49:08 +0200
Subject: [PATCH 136/244] [FIX] orm.search: properly JOIN parent table when
 applying inherited ir.rules

bzr revid: odo@openerp.com-20101005134908-17yblagoww1orrtk
---
 bin/osv/orm.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index b003e5597d6..44a519f991e 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -3927,8 +3927,12 @@ class orm(orm_template):
 
            :param query: the current query object
         """
-        def apply_rule(added_clause, added_params, added_tables):
+        def apply_rule(added_clause, added_params, added_tables, parent_model=None, child_object=None):
             if added_clause:
+                if parent_model and child_object:
+                    # as inherited rules are being applied, we need to add the missing JOIN
+                    # to reach the parent table (if it was not JOINed yet in the query)
+                    child_object._inherits_join_add(parent_model, query)
                 query.where_clause += added_clause
                 query.where_clause_params += added_params
                 for table in added_tables:
@@ -3941,13 +3945,11 @@ class orm(orm_template):
         rule_obj = self.pool.get('ir.rule')
         apply_rule(*rule_obj.domain_get(cr, uid, self._name, mode, context=context))
 
-        # apply ir.rules from the parents (through _inherits), adding the appropriate JOINs if needed
+        # apply ir.rules from the parents (through _inherits)
         for inherited_model in self._inherits:
-            if apply_rule(*rule_obj.domain_get(cr, uid, inherited_model, mode, context=context)):
-                # if some rules were applied, need to add the missing JOIN for them to make sense, passing the previous
-                # list of table in case the inherited table was not in the list before (as that means the corresponding
-                # JOIN(s) was(were) not present)
-                self._inherits_join_add(inherited_model, query)
+            apply_rule(*rule_obj.domain_get(cr, uid, inherited_model, mode, context=context),
+                       parent_model=inherited_model,
+                       child_object=self)
 
     def _generate_m2o_order_by(self, order_field, query):
         """

From 39d514218fa63ac51bd7fa46f7f61e4af1de1035 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 6 Oct 2010 09:37:57 +0200
Subject: [PATCH 137/244] [FIX] orm: backwards compatibility with python2.5

bzr revid: odo@openerp.com-20101006073757-exs2vdgyvg3d3m0m
---
 bin/osv/orm.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 44a519f991e..c4195dc00fa 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -3947,9 +3947,8 @@ class orm(orm_template):
 
         # apply ir.rules from the parents (through _inherits)
         for inherited_model in self._inherits:
-            apply_rule(*rule_obj.domain_get(cr, uid, inherited_model, mode, context=context),
-                       parent_model=inherited_model,
-                       child_object=self)
+            kwargs = dict(parent_model=inherited_model, child_object=self) #workaround for python2.5
+            apply_rule(*rule_obj.domain_get(cr, uid, inherited_model, mode, context=context), **kwargs)
 
     def _generate_m2o_order_by(self, order_field, query):
         """

From 5afbd9c6635ef08ba44cb9130997ce4e5326444d Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 6 Oct 2010 14:58:07 +0530
Subject: [PATCH 138/244] [MOD] Survey : Improvements in access rights

bzr revid: vir@tinyerp.com-20101006092807-yctppi8ub7t8jx8s
---
 addons/survey/security/ir.model.access.csv | 28 +++++++++++++++++-----
 addons/survey/survey_view.xml              | 15 ++++++------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 5d4501e36bd..b44d52c6c08 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -1,17 +1,33 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_survey_type_user","survey.type user","model_survey_type","base.group_tool_user",1,1,1,1
-"access_survey_user","survey","model_survey","base.group_tool_user",1,1,1,1
+"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
+"access_survey_type_manager","survey.type.manager","model_survey_type","base.group_tool_manager",1,1,1,1
+"access_survey_manager","survey.manager","model_survey","base.group_tool_manager",1,1,1,1
+"access_survey_page_manager","survey.page manager","model_survey_page","base.group_tool_manager",1,1,1,1
+"access_survey_question_manager","survey.question manager","model_survey_question","base.group_tool_manager",1,1,1,1
+"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_tool_manager",1,1,1,1
+"access_survey_response_manager","survey.response manager","model_survey_response","base.group_tool_manager",1,1,1,1
+"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_tool_manager",1,1,1,1
+"access_survey_history_manager","survey.history.manager","model_survey_history","base.group_tool_manager",1,1,1,1
+"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
+"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,1,1,1
+"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
+"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
+"access_survey_res_partner_address_manager","survey.res.partner.address.manager","base.model_res_partner_address","base.group_tool_manager",1,1,1,0
+"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
+"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
+"access_survey_type_user","survey.type.user","model_survey_type","base.group_tool_user",1,1,1,1
+"access_survey_user","survey.user","model_survey","base.group_tool_user",1,1,1,1
 "access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
 "access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
 "access_survey_answer_user","survey.answer user","model_survey_answer","base.group_tool_user",1,1,1,1
 "access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
 "access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_tool_user",1,1,1,1
 "access_survey_history_user","survey.history.user","model_survey_history","base.group_tool_user",1,1,1,1
-"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,0,0,0
-"access_survey_request_user","survey.request user","model_survey_request","base.group_tool_user",1,1,1,1
+"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,1,1,1
 "access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_tool_user",1,1,1,1
 "access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1
 "access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
+"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
 "access_survey_survey_user","survey.survey.user","model_survey","group_survey_user",1,1,1,1
 "access_survey_type_survey_user","survey.type.survey.user","model_survey_type","group_survey_user",1,1,1,1
 "access_survey_page_survey_user","survey.page.survey.user","model_survey_page","group_survey_user",1,1,1,1
@@ -24,5 +40,5 @@
 "access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0
 "access_survey_tbl_column_heading_survey_user","survey.tbl.column.heading.survey.user","model_survey_tbl_column_heading","group_survey_user",1,1,1,1
 "access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","group_survey_user",1,1,1,1
-"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_manager",1,1,1,1
-
+"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,0
+"access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index b6cc394ad8a..576ef37885e 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -3,12 +3,11 @@
     <data>
 
             <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
-            <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools"
-                        groups="base.group_tool_user,group_survey_user" sequence="2"/>
+            <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,group_survey_user"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
-                 groups="base.group_tool_user,group_survey_user"
+                 groups="base.group_tool_manager"
                  parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,group_survey_user"/>
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,group_survey_user"/>
             <menuitem name="Reporting" parent="base.menu_tools"
                 id="base.menu_lunch_reporting" sequence="6"/>
             <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
@@ -292,7 +291,7 @@
 
         <menuitem name="Surveys" id="menu_survey_form"
             action="action_survey_form1" parent="menu_define_survey"
-            groups="base.group_tool_user,group_survey_user"/>
+            groups="base.group_tool_manager"/>
 
         <!--
             Survey Pages
@@ -492,7 +491,7 @@
 
         <menuitem name="Survey Pages" id="menu_survey_page_form1"
             action="action_survey_page_form" parent='menu_define_survey'
-            groups="base.group_tool_user,group_survey_user"/>
+            groups="base.group_tool_manager"/>
 
         <record model="ir.ui.view" id="survey_page_wizard_test1">
             <field name="name">survey_page_wizard_test</field>
@@ -1126,7 +1125,7 @@
 
         <menuitem name="Survey Requests" id="menu_survey_type_form1"
             action="action_survey_request_tree" parent='menu_answer_surveys'
-            groups="base.group_tool_user,group_survey_user"/>
+            groups="base.group_tool_manager"/>
 
         <!--
             Survey Type
@@ -1193,7 +1192,7 @@
             src_model="survey.question"/>
 
         <menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
-            action="action_view_survey_name" parent="menu_answer_surveys"            groups="base.group_tool_user,group_survey_user" icon="STOCK_INDEX"/>
+            action="action_view_survey_name" parent="menu_answer_surveys"            groups="base.group_tool_user,base.group_tool_manager,group_survey_user" icon="STOCK_INDEX"/>
 
     </data>
 </openerp>

From ef28e951f503fc2bef3003690d288d379dff5d81 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 6 Oct 2010 15:01:47 +0530
Subject: [PATCH 139/244] [MOD/IMP] hr : Usability Improvenment in Accessrights

bzr revid: dbr@tinyerp.com-20101006093147-xaqdyfd23izwtfmm
---
 addons/hr/hr_department_view.xml              |  2 +-
 addons/hr/hr_view.xml                         | 10 ++++----
 addons/hr/security/ir.model.access.csv        | 23 ++++++++-----------
 .../report/holidays_summary_report.py         |  1 -
 .../wizard/hr_holidays_summary_department.py  |  1 -
 .../hr_holidays_summary_department_view.xml   |  1 -
 6 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index c80c0cd91d4..3e02c3e539c 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -67,7 +67,7 @@
             <field name="help">Your Company's Departments Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitements, etc.</field>
         </record>
 
-       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6"/>
+       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6" groups="base.group_user"/>
 
        <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 496e24bbb08..628f631351d 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -4,9 +4,9 @@
 
         <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
-        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_system" sequence="50"/>
+        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
-        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_system" name="Employees" sequence="1" />
+        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_hr_manager" name="Employees" sequence="1" />
 
         <!--
         ==========
@@ -151,7 +151,7 @@
             <field name="help">The employee directory contains all data related to your employees : from their photo up to their hourly estimated costs for the timesheets.Employees are managed by departments and can be linked to users to manage their access rights.</field>
         </record>
 
-        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
+        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
 
         <!--
         =======================
@@ -284,7 +284,7 @@
         </record>
 
         <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
-            parent="menu_view_employee_category_configuration_form" sequence="1" groups="base.group_extended"/>
+            parent="menu_view_employee_category_configuration_form" sequence="1" groups="base.group_extended,base.group_user"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories structure</field>
@@ -399,7 +399,7 @@
             <field name="help">Job Positions are used to define the jobs, the requirements. You can attach a survey to a job position. This survey will be used in the recruitement process to evaluate the applicants for this job position.</field>
         </record>
 
-        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager,base.group_system"/>
+        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager"/>
         <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
 
     </data>
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index a9fb4fdaae3..4f29f004c50 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,20 +1,15 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,0,0,0
+"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
+"access_hr_employee_category_employee","hr.employee.category.employee","model_hr_employee_category","base.group_user",1,0,0,0
+"access_hr_employee_employee","hr.employee.employee","model_hr_employee","base.group_user",1,0,0,0
 "access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
 "access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
-"access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
-"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
-"access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
-"access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","base.group_system",1,1,1,1
-"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,0,0,0
-"access_hr_employee_category_system","hr.employee.category.system","model_hr_employee_category","base.group_system",1,1,1,1
-"access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1
 "access_hr_employee_resource_manager","resource.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
-"access_hr_department_system","hr.department.system","model_hr_department","base.group_system",1,1,1,1
-"access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
-"access_hr_job_manager","hr.job.manager","model_hr_job","base.group_hr_manager",1,1,1,1
-"access_hr_employee_system","hr.employee.system","model_hr_employee","base.group_system",1,0,0,0
-"access_hr_job_system","hr.job system","model_hr_job","base.group_system",1,0,0,0
-"access_hr_employee_employee","hr.employee.employee","model_hr_employee","base.group_user",1,0,0,0
-"access_hr_employee_category_employee","hr.employee.category.employee","model_hr_employee_category","base.group_user",1,0,0,0
+"access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
 "access_hr_department_employee","hr.department.employee","model_hr_department","base.group_user",1,0,0,0
+"access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
+"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,0,0,0
+"access_hr_job_manager","hr.job.manager","model_hr_job","base.group_hr_manager",1,1,1,1
+"access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
+"access_hr_employee_marital_status_manager","hr.employee.marital.status.manager","model_hr_employee_marital_status","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index a14970b31e5..92dedd1a14d 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -100,7 +100,6 @@ class report_custom(report_rml):
         today=datetime.datetime.today()
 
         first_date=data['form']['date_from']
-
         som = strToDate(first_date)
         eom = som+datetime.timedelta(59)
         day_diff=eom-som
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index a7c0d274194..4409254c16e 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -29,7 +29,6 @@ class hr_holidays_summary_dept(osv.osv_memory):
     _description = 'HR Holidays Summary Report By Department'
     _columns = {
         'date_from': fields.date('From', required=True),
-        'date_to': fields.date('To', required=True),
         'depts': fields.many2many('hr.department', 'summary_dept_rel', 'sum_id', 'dept_id', 'Department(s)'),
         'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holyday State', required=True)
     }
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index ca8e7e75dcf..cd7665be123 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -10,7 +10,6 @@
 			<form string="Holidays by Department">
 			    <group col="4" colspan="6">
 				    <field name="date_from" />
-				    <field name="date_to" />
 				    <newline/>
 				    <field name="holiday_type" colspan="4"/>
 				    <newline/>

From d935a5d80efa93d9b79d61ce5c0b66e26111c47f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 6 Oct 2010 11:40:03 +0200
Subject: [PATCH 140/244] [IMP] ir.filters: improve create_or_replace() and
 make unique constraint case insensitive

bzr revid: odo@openerp.com-20101006094003-dlj24xrmotnbwvhv
---
 bin/addons/base/ir/ir_filters.py | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/bin/addons/base/ir/ir_filters.py b/bin/addons/base/ir/ir_filters.py
index c9cdf16d31e..541dbdb60c6 100644
--- a/bin/addons/base/ir/ir_filters.py
+++ b/bin/addons/base/ir/ir_filters.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import osv, fields
+from tools.translate import _
 
 class ir_filters(osv.osv):
     '''
@@ -36,30 +37,31 @@ class ir_filters(osv.osv):
         act_ids = self.search(cr,uid,[('model_id','=',model),('user_id','=',uid)])
         my_acts = self.read(cr, uid, act_ids, ['name', 'domain','context'])
         return my_acts
-    
+
     def create_or_replace(self, cr, uid, vals, context=None):
         filter_id = None
-        for filter in self.get_filters(cr, uid, vals['model_id']):
-            if filter['name'].lower() == vals['name'].lower():
-                filter_id = filter['id']
-                break
-        if filter_id:
-            return self.write(cr, uid, filter_id, vals, context)
+        lower_name = vals['name'].lower()
+        matching_filters = [x for x in self.get_filters(cr, uid, vals['model_id'])
+                                if x['name'].lower() == lower_name]
+        if matching_filters:
+            self.write(cr, uid, matching_filters[0]['id'], vals, context)
+            return False
         return self.create(cr, uid, vals, context)
 
+    def _auto_init(self, cr, context={}):
+        super(ir_filters, self)._auto_init(cr, context)
+        # Use unique index to implement unique constraint on the lowercase name (not possible using a constraint)
+        cr.execute("SELECT indexname FROM pg_indexes WHERE indexname = 'ir_filters_name_model_uid_unique_index'")
+        if not cr.fetchone():
+            cr.execute('CREATE UNIQUE INDEX "ir_filters_name_model_uid_unique_index" ON ir_filters (lower(name), model_id, user_id)')
 
     _columns = {
         'name': fields.char('Action Name', size=64, translate=True, required=True),
         'user_id':fields.many2one('res.users', 'User', help='False means for every user'),
         'domain': fields.text('Domain Value', required=True),
         'context': fields.text('Context Value', required=True),
-        'model_id': fields.selection(_list_all_models, 'Model', required=True),
+        'model_id': fields.selection(_list_all_models, 'Object', required=True),
     }
-    
-    _sql_constraints = [
-        ('name_model_uid_uniq', 'UNIQUE(name, model_id, user_id)', 'Filter name must be unique!'),
-    ]
-
 
 ir_filters()
 

From e711609f2690505243522e7feae70cfc9b16ecbe Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 6 Oct 2010 16:06:57 +0530
Subject: [PATCH 141/244] [MOD/IMP] survey : Usability Improvement in
 Accessrights

bzr revid: dbr@tinyerp.com-20101006103657-2579vov188co0oc9
---
 addons/survey/security/ir.model.access.csv | 11 ++---------
 addons/survey/wizard/survey_selection.py   |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index b44d52c6c08..1a1c8cab818 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -15,7 +15,6 @@
 "access_survey_res_partner_address_manager","survey.res.partner.address.manager","base.model_res_partner_address","base.group_tool_manager",1,1,1,0
 "access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
 "access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
-"access_survey_type_user","survey.type.user","model_survey_type","base.group_tool_user",1,1,1,1
 "access_survey_user","survey.user","model_survey","base.group_tool_user",1,1,1,1
 "access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
 "access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
@@ -23,22 +22,16 @@
 "access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
 "access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_tool_user",1,1,1,1
 "access_survey_history_user","survey.history.user","model_survey_history","base.group_tool_user",1,1,1,1
-"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,1,1,1
-"access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_tool_user",1,1,1,1
 "access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1
 "access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
 "access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
 "access_survey_survey_user","survey.survey.user","model_survey","group_survey_user",1,1,1,1
-"access_survey_type_survey_user","survey.type.survey.user","model_survey_type","group_survey_user",1,1,1,1
 "access_survey_page_survey_user","survey.page.survey.user","model_survey_page","group_survey_user",1,1,1,1
-"access_survey_request_survey_user","survey.request.survey.user","model_survey_request","group_survey_user",1,1,1,1
 "access_survey_question_survey_user","survey.question.survey.user","model_survey_question","group_survey_user",1,1,1,1
 "access_survey_answer_survey_user","survey.answer.survey.user","model_survey_answer","group_survey_user",1,1,1,1
 "access_survey_response_survey_user","survey.response.survey.user","model_survey_response","group_survey_user",1,1,1,1
 "access_survey_response_answer_survey_user","survey.response.answer.survey.user","model_survey_response_answer","group_survey_user",1,1,1,1
 "access_survey_history_survey_user","survey.history.survey.user","model_survey_history","group_survey_user",1,1,1,1
-"access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0
-"access_survey_tbl_column_heading_survey_user","survey.tbl.column.heading.survey.user","model_survey_tbl_column_heading","group_survey_user",1,1,1,1
 "access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","group_survey_user",1,1,1,1
-"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,0
-"access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
+"access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0
+"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,1,1,1
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index 92097d99333..69cc8e10796 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -62,7 +62,7 @@ class survey_name_wiz(osv.osv_memory):
             for sur in surv_obj.browse(cr, uid, [context.get('survey_id',False)]):
                 result.append((sur.id, sur.title))
             return result
-        group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Tools / Manager','Tools / User'))])
+        group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Tools / Manager','Tools / User','Survey / User'))])
         user_obj = self.pool.get('res.users')
         user_rec = user_obj.read(cr, uid, uid)
         for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):

From 99c74952a7f3676dcf92573d2646a28b8bffd6e8 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 6 Oct 2010 16:45:17 +0530
Subject: [PATCH 142/244] [MOD] hr,hr_attendance : Improvements in access
 rights

bzr revid: vir@tinyerp.com-20101006111517-91jab3steqyimmev
---
 addons/hr/hr_view.xml                                    | 6 +++---
 addons/hr/security/ir.model.access.csv                   | 4 ++--
 addons/hr_attendance/hr_attendance_view.xml              | 8 ++++----
 addons/hr_attendance/security/hr_security.xml            | 4 ----
 addons/hr_attendance/security/ir.model.access.csv        | 9 ---------
 .../wizard/hr_attendance_sign_in_out_view.xml            | 2 +-
 6 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 628f631351d..b47bf23d6fc 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
-        <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
+        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" groups="base.group_hr_manager,base.group_hr_user"/>
+        <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0" groups="base.group_hr_manager,base.group_hr_user"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
         <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_hr_manager" name="Employees" sequence="1" />
@@ -399,7 +399,7 @@
             <field name="help">Job Positions are used to define the jobs, the requirements. You can attach a survey to a job position. This survey will be used in the recruitement process to evaluate the applicants for this job position.</field>
         </record>
 
-        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager"/>
+        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_user"/>
         <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
 
     </data>
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 4f29f004c50..0b9a721e1ea 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -3,13 +3,13 @@
 "access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
 "access_hr_employee_category_employee","hr.employee.category.employee","model_hr_employee_category","base.group_user",1,0,0,0
 "access_hr_employee_employee","hr.employee.employee","model_hr_employee","base.group_user",1,0,0,0
+"access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1
 "access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
 "access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
 "access_hr_employee_resource_manager","resource.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
 "access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
 "access_hr_department_employee","hr.department.employee","model_hr_department","base.group_user",1,0,0,0
 "access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
-"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,0,0,0
-"access_hr_job_manager","hr.job.manager","model_hr_job","base.group_hr_manager",1,1,1,1
+"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,1,1,1
 "access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
 "access_hr_employee_marital_status_manager","hr.employee.marital.status.manager","model_hr_employee_marital_status","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index c49c25cd5fc..44d09bec6cd 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -81,7 +81,7 @@
 
         <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="4"/>
 
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" groups="base.group_hr_user" sequence="3"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="3"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
@@ -89,8 +89,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Define attendance reason">
-                    <field colspan="4" name="name"  />
-                    <field name="action_type" />
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="action_type" select="1"/>
                 </form>
             </field>
         </record>
@@ -101,7 +101,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Attendance reasons">
-                    <field name="name"/>
+                    <field name="name" />
                     <field name="action_type"/>
                 </tree>
             </field>
diff --git a/addons/hr_attendance/security/hr_security.xml b/addons/hr_attendance/security/hr_security.xml
index 15c4ec2693c..39f923a895b 100644
--- a/addons/hr_attendance/security/hr_security.xml
+++ b/addons/hr_attendance/security/hr_security.xml
@@ -2,9 +2,5 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="base.group_hr_attendance" model="res.groups">
-            <field name="name">Human Resources / Attendances User</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index e5ff0997db2..edcc675b8ef 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,13 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_action_reason_attendance","hr.action.reason.attendance","model_hr_action_reason","base.group_hr_attendance",1,0,0,0
 "access_hr_action_reason_manager","hr.action.reason.manager","model_hr_action_reason","base.group_hr_manager",1,1,1,1
 "access_hr_action_reason_employee_user","hr.action.reason.employee.user","model_hr_attendance","base.group_hr_user",1,1,1,1
 "access_hr_attendance_manager","hr.attendance.manager","model_hr_attendance","base.group_hr_manager",1,1,1,1
-"access_hr_attendance_attendance","hr.attendance.attendance","model_hr_attendance","base.group_hr_attendance",1,1,1,1
-"access_hr_employee_attendance","hr.employee.attendance","hr.model_hr_employee","base.group_hr_attendance",1,0,0,0
-"access_resource_resource_attendance","resource.resource.attendance","resource.model_resource_resource","base.group_hr_attendance",1,1,1,1
-"access_hr_job_attendance","hr.job.attendance","hr.model_hr_job","base.group_hr_attendance",1,0,0,0
-"access_hr_department_attendance","hr.department attendance","hr.model_hr_department","base.group_hr_attendance",1,0,0,0
-"access_hr_action_reason_system","hr.action.reason.system","model_hr_action_reason","base.group_system",1,1,1,1
-"access_hr_attendance_system","hr.attendance.system","model_hr_attendance","base.group_system",1,0,0,0
-"access_hr_attendance_employee","hr.attendance.employee","model_hr_attendance","base.group_user",1,0,0,0
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index cf86710ac93..dbabd9463f1 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -47,7 +47,7 @@
         </record>
 
         <menuitem action="action_hr_attendance_sigh_in_out" id="menu_hr_attendance_sigh_in_out"
-            parent="menu_hr_attendance" sequence="4" groups="base.group_hr_manager,base.group_hr_user,base.group_hr_attendance"/>
+            parent="menu_hr_attendance" sequence="4"/>
 
        <record id="view_hr_attendance_so_ask" model="ir.ui.view">
             <field name="name">hr.sign.in.out.ask.form</field>

From 382669fa1c46d9b8d5ba96b58153c6be8330e840 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 6 Oct 2010 17:28:06 +0530
Subject: [PATCH 143/244] improved for pageCount in like survey type report

bzr revid: apa@tinyerp.com-20101006115806-2ub94u9sfrspo9w8
---
 bin/report/interface.py               | 8 ++++++++
 bin/report/render/rml2pdf/trml2pdf.py | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bin/report/interface.py b/bin/report/interface.py
index 0ee9f432883..0a42d8d74b0 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -70,6 +70,7 @@ class report_rml(report_int):
     def __init__(self, name, table, tmpl, xsl):
         super(report_rml, self).__init__(name)
         self.table = table
+        self.pageCount=False
         self.tmpl = tmpl
         self.xsl = xsl
         self.bin_datas = {}
@@ -174,6 +175,13 @@ class report_rml(report_int):
         return xml
 
     def create_pdf(self, rml, localcontext = None, logo=None, title=None):
+        if not localcontext:
+            localcontext={}
+            if self.tmpl=='' and not self.pageCount:
+                self.pageCount=True
+            else:
+              self.pageCount=False
+            localcontext.update({'header':self.pageCount})
         if logo:
             self.bin_datas['logo'] = logo
         else:
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 51461ec36fc..1cd5a9b938a 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -820,8 +820,9 @@ class TinyDocTemplate(platypus.BaseDocTemplate):
 class _rml_template(object):
     def __init__(self, localcontext, out, node, doc, images={}, path='.', title=None):
         self.localcontext = localcontext
-        if not self.localcontext:
-            self.localcontext={'header':'internal'}
+        if not self.localcontext or not self.localcontext.get('header',False):
+            self.localcontext={}
+            self.localcontext.update({'header':'internal'})
         self.images= images
         self.path = path
         self.title = title

From 1cbfb6fdf9066eeefe415a84ba1e0e057c85cf6c Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 6 Oct 2010 17:59:49 +0530
Subject: [PATCH 144/244] improved

bzr revid: apa@tinyerp.com-20101006122949-u2h74kq5hrvuuvkw
---
 bin/report/interface.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/report/interface.py b/bin/report/interface.py
index 0a42d8d74b0..28197c7872d 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -70,7 +70,7 @@ class report_rml(report_int):
     def __init__(self, name, table, tmpl, xsl):
         super(report_rml, self).__init__(name)
         self.table = table
-        self.pageCount=False
+        self.pageCount=True
         self.tmpl = tmpl
         self.xsl = xsl
         self.bin_datas = {}
@@ -180,8 +180,9 @@ class report_rml(report_int):
             if self.tmpl=='' and not self.pageCount:
                 self.pageCount=True
             else:
-              self.pageCount=False
+                self.pageCount=False
             localcontext.update({'header':self.pageCount})
+
         if logo:
             self.bin_datas['logo'] = logo
         else:
@@ -189,6 +190,7 @@ class report_rml(report_int):
                 del self.bin_datas['logo']
         obj = render.rml(rml, localcontext, self.bin_datas, tools.config['root_path'],title)
         obj.render()
+        self.pageCount=True
         return obj.get()
 
     def create_html(self, rml, localcontext = None, logo=None, title=None):

From 34a533beba83349e46c3cfed13f33d3600e49ef5 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 6 Oct 2010 18:01:08 +0530
Subject: [PATCH 145/244] [MOD/IMP] hr_contract : Usability Improvement in
 Accessrights

bzr revid: dbr@tinyerp.com-20101006123108-zdrz31iewg7xfpvq
---
 addons/hr_contract/hr_contract_view.xml       |  4 +--
 .../hr_contract/security/ir.model.access.csv  | 25 ++++++++-----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 0f38a783d73..ede2c11c5bb 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -57,7 +57,7 @@
             <field name="search_view_id" ref="hr_contract_wage_type_view_search"/>
         </record>
 
-        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5" groups="base.group_system"/>
+        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5" groups="base.group_hr_manager"/>
         <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56" sequence="7"/>
 
         <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
@@ -277,7 +277,7 @@
         </record>
 
         <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56" sequence="6"/>
-        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_system,base.group_hr_manager,base.group_hr_contract"/>
+        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager,base.group_hr_user"/>
 
         <!-- Contracts Button on Employee Form -->
         <act_window 
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index 9ed14b14755..00b1410ffa3 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -1,20 +1,17 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_contract_wage_type_period_manager","hr.contract.wage.type.period.manager","model_hr_contract_wage_type_period","base.group_hr_manager",1,1,1,1
+"access_hr_contract_wage_type_period_user","hr.contract.wage.type.period.user","model_hr_contract_wage_type_period","base.group_hr_user",1,1,1,1
 "access_hr_contract_wage_type_manager","hr.contract.wage.type.manager","model_hr_contract_wage_type","base.group_hr_manager",1,1,1,1
-"access_hr_contract_wage_type_contract","hr.contract.wage.type.contract","model_hr_contract_wage_type","base.group_hr_contract",1,1,1,1
-"access_hr_contract_wage_type_period_contract","hr.contract.wage.type.period.contract","model_hr_contract_wage_type_period","base.group_hr_contract",1,1,1,1
-"access_hr_contract_contract","hr.contract.contract","model_hr_contract","base.group_hr_contract",1,1,1,1
-"access_hr_employee_contract_contract","hr.employee.contract.contract","hr.model_hr_employee","base.group_hr_contract",1,1,1,1
-"access_hr_resource_contract","hr.employee.resource.contract","resource.model_resource_resource","base.group_hr_contract",1,1,1,1
-"access_hr_resource_calendar_contract","hr.employee.resource.calendar.contract","resource.model_resource_calendar","base.group_hr_contract",1,1,1,1
-"access_hr_job_contract","hr.job contract","hr.model_hr_job","base.group_hr_contract",1,1,1,1
-"access_hr_contract_type_contract","hr.contract.type.contract","model_hr_contract_type","base.group_hr_contract",1,1,1,1
-"access_hr_contract_wage_type_system","hr.contract.wage.type.system","model_hr_contract_wage_type","base.group_system",1,1,1,1
-"access_hr_contract_wage_type_period_system","hr.contract.wage.type.period.system","model_hr_contract_wage_type_period","base.group_system",1,1,1,1
-"access_hr_contract_type_system","hr.contract.type.system","model_hr_contract_type","base.group_system",1,1,1,1
-"access_hr_contract_system","hr.contract.system","model_hr_contract","base.group_system",1,1,1,1
-"access_hr_employee_category_contract","hr.employee.category.contract","hr.model_hr_employee_category","base.group_hr_contract",1,1,1,1
-"access_hr_department_contract","hr.department.contract","hr.model_hr_department","base.group_hr_contract",1,1,1,1
+"access_hr_contract_wage_type_user","hr.contract.wage.type.user","model_hr_contract_wage_type","base.group_hr_user",1,1,1,1
 "access_hr_contract_manager","hr.contract.manager","model_hr_contract","base.group_hr_manager",1,1,1,1
 "access_hr_contract_employee","hr.contract.employee","model_hr_contract","base.group_user",1,0,0,0
+"access_hr_contract_user","hr.contract.user","model_hr_contract","base.group_hr_user",1,1,1,1
+"access_hr_employee_contract_manager","hr.employee.contract.manager","hr.model_hr_employee","base.group_hr_manager",1,1,1,1
+"access_hr_employee_category_manager","hr.employee.category.manager","hr.model_hr_employee_category","base.group_hr_manager",1,1,1,1
+"access_hr_resource_manager","hr.employee.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
+"access_hr_resource_calendar_manager","hr.employee.resource.calendar.manager","resource.model_resource_calendar","base.group_hr_manager",1,1,1,1
+"access_hr_resource_calendar_user","hr.employee.resource.calendar.user","resource.model_resource_calendar","base.group_hr_user",1,1,1,1
+"access_hr_job_manager","hr.job manager","hr.model_hr_job","base.group_hr_manager",1,1,1,1
+"access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1
+"access_hr_department_manager","hr.department.manager","hr.model_hr_department","base.group_hr_manager",1,1,1,1
 "access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1

From a3efd4f1a02c2c7ffd113a20d4633caaba8b7355 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 6 Oct 2010 18:21:28 +0530
Subject: [PATCH 146/244] [MOD/IMP] hr_expence : Usability Improvement in
 Accessrights

bzr revid: dbr@tinyerp.com-20101006125128-85urgfc27zuhvcx7
---
 addons/hr_expense/security/ir.model.access.csv | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index f0208425ba8..ec44936c3b4 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -7,7 +7,6 @@
 "access_product_uom_hr_expense","product.uom.hr.expense","product.model_product_uom","base.group_hr_user",1,0,0,0
 "access_product_price_type","product.price.type","product.model_product_price_type","base.group_hr_user",1,1,1,1
 "access_hr_expense_expense_manager","hr.expense.expense.manager","model_hr_expense_expense","base.group_hr_manager",1,1,1,1
-"access_hr_expense_expense_system","hr.expense.expense.system","model_hr_expense_expense","base.group_system",1,0,0,0
 "access_hr_expense_line_manager","hr.expense.line.manager","model_hr_expense_line","base.group_hr_manager",1,1,1,1
 "access_product_product_hr_expense_manager","product.product.hr.expense.manager","product.model_product_product","base.group_hr_manager",1,1,1,1
 "access_product_template_hr_expense_manager","product.template.hr.expense.manager","product.model_product_template","base.group_hr_manager",1,1,1,1

From 10bb97ea320ee60d67c1d85c1ac7039d969a1cad Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 6 Oct 2010 18:55:34 +0530
Subject: [PATCH 147/244] improved

bzr revid: apa@tinyerp.com-20101006132534-6nzxh5d8ngby0fy0
---
 bin/report/render/rml2pdf/trml2pdf.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 1cd5a9b938a..b88bbbb0050 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -819,10 +819,11 @@ class TinyDocTemplate(platypus.BaseDocTemplate):
 
 class _rml_template(object):
     def __init__(self, localcontext, out, node, doc, images={}, path='.', title=None):
+        if not localcontext:
+            localcontext={'header':'internal'}
+        if not localcontext.get('header',True):
+            localcontext.update({'header':'internal'})
         self.localcontext = localcontext
-        if not self.localcontext or not self.localcontext.get('header',False):
-            self.localcontext={}
-            self.localcontext.update({'header':'internal'})
         self.images= images
         self.path = path
         self.title = title

From c14910003c28fa892a724396eb140a7ba8680028 Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Wed, 6 Oct 2010 19:13:29 +0530
Subject: [PATCH 148/244] [Fix] Add Search view, Fixes for views.

bzr revid: vda@tinyerp.com-20101006134329-bb9xbojglh0zqbth
---
 bin/addons/base/res/res_widget.py       |  1 +
 bin/addons/base/res/res_widget_view.xml | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index 80706084df1..978a092c5db 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -23,6 +23,7 @@ from osv import fields,osv
 
 class res_widget(osv.osv):
     _name = "res.widget"
+    _rec_name = "title"
     _columns = {
                 'title' : fields.char('Title', size=64),
                 'content': fields.text('Content')
diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml
index 690d456691c..69c801e14a7 100644
--- a/bin/addons/base/res/res_widget_view.xml
+++ b/bin/addons/base/res/res_widget_view.xml
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <record id="view_res_widget_search" model="ir.ui.view">
+            <field name="name">res.widget.search</field>
+            <field name="model">res.widget</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Widget">
+                    <field name="title" />
+                 </search>
+            </field>
+        </record>
+        
         <record id="res_widget_form" model="ir.ui.view">
             <field name="name">res.widget.form</field>
             <field name="model">res.widget</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="OpenERP Favourites">
+                <form string="Widgets">
                     <field name="title"/>
                     <field name="content"/>
                 </form>
@@ -17,17 +28,18 @@
             <field name="model">res.widget</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="OpenERP Favourites">
+                <tree string="Widgets">
                     <field name="title"/>
                 </tree>
             </field>
         </record>
 
         <record id="res_widget_act_window" model="ir.actions.act_window">
-            <field name="name">OpenERP Favourites</field>
+            <field name="name">Widgets</field>
             <field name="res_model">res.widget</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="res_widget_tree"/>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_res_widget_search"/>
         </record>
         
         <menuitem

From a74c490c6d38224ab3365e09b17eb227fe0d696e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 6 Oct 2010 19:21:54 +0530
Subject: [PATCH 149/244] [MOD/IMP] hr_holidays : Usability Improvement in
 Accessrights

bzr revid: dbr@tinyerp.com-20101006135154-oovxhs611nk4tzso
---
 addons/hr_attendance/security/ir.model.access.csv   | 1 +
 addons/hr_expense/board_hr_expense_manager_view.xml | 8 ++++----
 addons/hr_holidays/hr_holidays_view.xml             | 2 +-
 addons/hr_holidays/security/ir.model.access.csv     | 2 --
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index edcc675b8ef..838a8d6e2f7 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,4 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_action_reason_manager","hr.action.reason.manager","model_hr_action_reason","base.group_hr_manager",1,1,1,1
+"access_hr_action_reason_user","hr.action.reason.user","model_hr_action_reason","base.group_hr_user",1,1,1,1
 "access_hr_action_reason_employee_user","hr.action.reason.employee.user","model_hr_attendance","base.group_hr_user",1,1,1,1
 "access_hr_attendance_manager","hr.attendance.manager","model_hr_attendance","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_expense/board_hr_expense_manager_view.xml b/addons/hr_expense/board_hr_expense_manager_view.xml
index 9063ac32458..f0b3c26dfc4 100644
--- a/addons/hr_expense/board_hr_expense_manager_view.xml
+++ b/addons/hr_expense/board_hr_expense_manager_view.xml
@@ -9,14 +9,14 @@
             <field name="domain">[('state','in',('confirm', 'accepted'))]</field>
             <field name="view_id" ref="hr_expense.view_editable_expenses_tree"/>
         </record>
-        
+
         <record id="board_hr_manager_expense_form" model="ir.ui.view">
             <field name="name">board.hr.manager.expense.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="hr.board_hr_manager_form"/>              
+			<field name="inherit_id" ref="hr.board_hr_manager_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-      		<xpath expr="/form/hpaned/child1" position="inside"> 
+      		<xpath expr="/form/hpaned/child1" position="inside">
 				 <action colspan="4" height="220" name="%(action_employee_expense)d" string="All Employee Expenses" />
 			</xpath>
             </field>
@@ -26,7 +26,7 @@
             icon="terp-graph"
             id="base.menu_hr_manager"
             parent="base.menu_hr_dasboard"
-            groups = "base.group_hr_manager"
+            groups = "base.group_hr_manager,base.group_hr_user"
             sequence="5"/>
     </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index ca3d940f858..9f8e5409e8d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -380,7 +380,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays" groups="base.group_system"/>
+        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays" groups="base.group_hr_manager"/>
         <menuitem name="Leave Type"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 238d526bf5e..ccc766ac2c7 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -7,8 +7,6 @@
 "access_hr_holidays_report","hr.holidays.report","model_hr_holidays_report","base.group_hr_manager",1,1,1,1
 "access_hr_holidays_remaining_leaves_manager","hr.hr.holidays.remaining.leaves.manager","model_hr_holidays_remaining_leaves_user","base.group_hr_manager",1,1,1,1
 "access_available_holidays_report","hr.available.holidays.report","model_available_holidays_report","base.group_hr_manager",1,1,1,1
-"access_hr_holydays_status_system","hr.holidays.status.system","model_hr_holidays_status","base.group_system",1,1,1,1
-"access_hr_holidays_system","hr.holidays.system","model_hr_holidays","base.group_system",1,0,0,0
 "access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,0,0,0
 "access_hr_holydays_status_employee","hr.holidays.status.employee","model_hr_holidays_status","base.group_user",1,0,0,0
 "access_resource_calendar_leaves_manager","resource_calendar_leaves_manager","resource.model_resource_calendar_leaves","base.group_hr_manager",1,1,1,1

From 9f2d1a15a0be0ccd96ff150a8fd87d9da64f1a1f Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 6 Oct 2010 19:41:09 +0530
Subject: [PATCH 150/244] [IMP]:added a function field on ir.actions.act_window
 to show/hide the menu action tips on that action.

bzr revid: nch@tinyerp.com-20101006141109-peuk7j2mh8hqig5e
---
 bin/addons/base/ir/ir_actions.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 074bfa04f85..297aebaf5dc 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -214,6 +214,10 @@ class act_window(osv.osv):
                 res[act.id] = str(form_arch)
         return res
 
+    def _get_help_status(self, cr, uid, ids, name, arg, context={}):
+        activate_tips = self.pool.get('res.users').browse(cr, uid, uid).menu_tips
+        return dict([(id, activate_tips) for id in ids])
+
     _columns = {
         'name': fields.char('Action Name', size=64, translate=True),
         'type': fields.char('Action Type', size=32, required=True),
@@ -246,7 +250,8 @@ class act_window(osv.osv):
         'menus': fields.char('Menus', size=4096),
         'help': fields.text('Action description',
             help='Optional help text for the users with a description of the target view, such as its usage and purpose.'),
-
+        'display_menu_tip':fields.function(_get_help_status, type='boolean', method=True, string='Display Menu Tips',
+            help='It gives the status if the tip has to be displayed or not when a user executes an action')
     }
     _defaults = {
         'type': lambda *a: 'ir.actions.act_window',

From 51a12143a05e8944c33d88efb092ff5b8d55a784 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 6 Oct 2010 18:16:26 +0200
Subject: [PATCH 151/244] modifs

bzr revid: fp@tinyerp.com-20101006161626-bs6vbh8lv0y68xld
---
 bin/addons/base/base_update.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 7f6cb5e58df..e89106bb8f3 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -359,6 +359,7 @@
         </record>
         <record id="config_wizard_simple_view" model="ir.actions.todo">
             <field name="action_id" ref="action_config_simple_view_form"/>
+            <field name="restart">always</field>
             <field name="sequence">1</field>
         </record>
     </data>

From 40ed04d094f5654333d638112cec8c06a8f07cf2 Mon Sep 17 00:00:00 2001
From: "Anup,Jay" <>
Date: Wed, 6 Oct 2010 23:34:32 +0530
Subject: [PATCH 152/244] [FIX] Expression : Corrected operator handling for
 domains containing Many2one fields

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

bzr revid: jvo@tinyerp.com-20101006180432-mkaqstcuvakci7hq
---
 bin/osv/expression.py | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/bin/osv/expression.py b/bin/osv/expression.py
index f251f0bc444..26ac7ec4faa 100644
--- a/bin/osv/expression.py
+++ b/bin/osv/expression.py
@@ -284,11 +284,16 @@ class expression(object):
                             context = {}                        
                         c = context.copy()
                         c['active_test'] = False
-                        dict_op = {'not in':'!=','in':'='}
+                        #Special treatment to ill-formed domains
+                        operator = ( operator in ['<','>','<=','>='] ) and 'in' or operator
+                        
+                        dict_op = {'not in':'!=','in':'=','=':'in','!=':'not in','<>':'not in'}
                         if isinstance(right,tuple):
                             right = list(right)
                         if (not isinstance(right,list)) and operator in ['not in','in']:
                             operator = dict_op[operator]
+                        elif isinstance(right,list) and operator in ['<>','!=','=']: #for domain (FIELD,'=',['value1','value2'])
+                            operator = dict_op[operator]
                         res_ids = field_obj.name_search(cr, uid, right, [], operator, limit=None, context=c)
                         if not res_ids:
                            return ('id','=',0)
@@ -297,14 +302,22 @@ class expression(object):
                             return (left, 'in', right)
 
                     m2o_str = False
-                    if isinstance(right, basestring): # and not isinstance(field, fields.related):
-                        m2o_str = True
-                    elif isinstance(right, list) or isinstance(right, tuple):
-                        m2o_str = True
-                        for ele in right:
-                            if not isinstance(ele, basestring): 
-                                m2o_str = False
-                                break
+                    if right:
+                        if isinstance(right, basestring): # and not isinstance(field, fields.related):
+                            m2o_str = True
+                        elif isinstance(right,(list,tuple)):
+                            m2o_str = True
+                            for ele in right:
+                                if not isinstance(ele, basestring): 
+                                    m2o_str = False
+                                    break
+                    else:
+                        new_op = '='
+                        if operator in  ['not like','not ilike','not in','<>','!=']:
+                            new_op = '!='
+                        #Is it ok to put 'left' and not 'id' ?
+                        self.__exp[i] = (left,new_op,False)
+                        
                     if m2o_str:
                         self.__exp[i] = _get_expression(field_obj,cr, uid, left, right, operator, context=context)
             else:

From fec76a4931d61d17fe6fb7d96fb30989ddf288a4 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 7 Oct 2010 12:39:23 +0530
Subject: [PATCH 153/244] [Fix] hr : once in the form view, there is always a
 message that prompts to say that the record have been modified even if
 nothing has been done

bzr revid: vir@tinyerp.com-20101007070923-c6602jlppu2iiiql
---
 addons/hr/hr.py       | 2 +-
 addons/hr/hr_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index e2da2b9cf7b..803210ddbff 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -136,7 +136,7 @@ class hr_employee(osv.osv):
         'department_id':fields.many2one('hr.department', 'Department'),
         'address_id': fields.many2one('res.partner.address', 'Working Address'),
         'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
-        'work_phone': fields.related('address_id', 'phone', type='char', string='Work Phone', readonly=True),
+        'work_phone': fields.related('address_id', 'phone', type='char', size=32, string='Work Phone', readonly=True),
         'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail'),
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index b47bf23d6fc..929afbe3d84 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -99,7 +99,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <filter icon="terp-personal+" domain="[('active','=',True)]" string="Active" groups="base.group_extended"/>
+                    <filter icon="terp-personal+" domain="[('active','=',True)]" name="active" string="Active" groups="base.group_extended"/>
                     <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="department_id" widget="selection">
@@ -145,7 +145,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
-            <field name="context">{"search_default_department_id": department_id}</field>
+            <field name="context">{"search_default_department_id": department_id,"search_default_active":eval('True')}</field>
             <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
             <field name="help">The employee directory contains all data related to your employees : from their photo up to their hourly estimated costs for the timesheets.Employees are managed by departments and can be linked to users to manage their access rights.</field>

From 389a623545cc80358c8b74e57b38f30ba39615af Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Oct 2010 12:41:57 +0530
Subject: [PATCH 154/244] [MOD/IMP] hr_* : Usability Improvement in
 Accessrights

bzr revid: dbr@tinyerp.com-20101007071157-z52414z1sz9h85qh
---
 addons/hr/security/ir.model.access.csv        |  9 +-----
 .../security/ir.model.access.csv              |  2 --
 .../hr_contract/security/ir.model.access.csv  |  6 ----
 .../board_hr_expense_manager_view.xml         |  2 +-
 .../hr_expense/security/ir.model.access.csv   | 31 ++++++++++---------
 addons/hr_holidays/board_hr_holidays_view.xml |  2 +-
 .../hr_holidays/security/ir.model.access.csv  | 16 +++-------
 7 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 0b9a721e1ea..4b2d72b017d 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,15 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,0,0,0
-"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
-"access_hr_employee_category_employee","hr.employee.category.employee","model_hr_employee_category","base.group_user",1,0,0,0
-"access_hr_employee_employee","hr.employee.employee","model_hr_employee","base.group_user",1,0,0,0
-"access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1
+"access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,1,1,1
 "access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
 "access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
-"access_hr_employee_resource_manager","resource.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
 "access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
-"access_hr_department_employee","hr.department.employee","model_hr_department","base.group_user",1,0,0,0
-"access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
 "access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,1,1,1
 "access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
 "access_hr_employee_marital_status_manager","hr.employee.marital.status.manager","model_hr_employee_marital_status","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index 838a8d6e2f7..a934f859c4f 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,5 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_action_reason_manager","hr.action.reason.manager","model_hr_action_reason","base.group_hr_manager",1,1,1,1
 "access_hr_action_reason_user","hr.action.reason.user","model_hr_action_reason","base.group_hr_user",1,1,1,1
 "access_hr_action_reason_employee_user","hr.action.reason.employee.user","model_hr_attendance","base.group_hr_user",1,1,1,1
-"access_hr_attendance_manager","hr.attendance.manager","model_hr_attendance","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index 00b1410ffa3..51d833d8607 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -1,17 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_contract_wage_type_period_manager","hr.contract.wage.type.period.manager","model_hr_contract_wage_type_period","base.group_hr_manager",1,1,1,1
 "access_hr_contract_wage_type_period_user","hr.contract.wage.type.period.user","model_hr_contract_wage_type_period","base.group_hr_user",1,1,1,1
-"access_hr_contract_wage_type_manager","hr.contract.wage.type.manager","model_hr_contract_wage_type","base.group_hr_manager",1,1,1,1
 "access_hr_contract_wage_type_user","hr.contract.wage.type.user","model_hr_contract_wage_type","base.group_hr_user",1,1,1,1
-"access_hr_contract_manager","hr.contract.manager","model_hr_contract","base.group_hr_manager",1,1,1,1
-"access_hr_contract_employee","hr.contract.employee","model_hr_contract","base.group_user",1,0,0,0
 "access_hr_contract_user","hr.contract.user","model_hr_contract","base.group_hr_user",1,1,1,1
 "access_hr_employee_contract_manager","hr.employee.contract.manager","hr.model_hr_employee","base.group_hr_manager",1,1,1,1
 "access_hr_employee_category_manager","hr.employee.category.manager","hr.model_hr_employee_category","base.group_hr_manager",1,1,1,1
 "access_hr_resource_manager","hr.employee.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
-"access_hr_resource_calendar_manager","hr.employee.resource.calendar.manager","resource.model_resource_calendar","base.group_hr_manager",1,1,1,1
 "access_hr_resource_calendar_user","hr.employee.resource.calendar.user","resource.model_resource_calendar","base.group_hr_user",1,1,1,1
 "access_hr_job_manager","hr.job manager","hr.model_hr_job","base.group_hr_manager",1,1,1,1
 "access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1
 "access_hr_department_manager","hr.department.manager","hr.model_hr_department","base.group_hr_manager",1,1,1,1
-"access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_expense/board_hr_expense_manager_view.xml b/addons/hr_expense/board_hr_expense_manager_view.xml
index f0b3c26dfc4..d5c761f7b68 100644
--- a/addons/hr_expense/board_hr_expense_manager_view.xml
+++ b/addons/hr_expense/board_hr_expense_manager_view.xml
@@ -26,7 +26,7 @@
             icon="terp-graph"
             id="base.menu_hr_manager"
             parent="base.menu_hr_dasboard"
-            groups = "base.group_hr_manager,base.group_hr_user"
+            groups = "base.group_hr_user"
             sequence="5"/>
     </data>
 </openerp>
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index ec44936c3b4..525b55bf681 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -1,17 +1,18 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_expense_expense_user","hr.expense.expense.user","model_hr_expense_expense","base.group_hr_user",1,1,1,1
-"access_hr_expense_line","hr.expense.line","model_hr_expense_line","base.group_hr_user",1,1,1,1
-"access_hr_expense_report","hr.expense.report","model_hr_expense_report","base.group_hr_manager",1,1,1,1
-"access_product_product_hr_expense","product.product.hr.expense","product.model_product_product","base.group_hr_user",1,0,0,0
-"access_product_template_hr_expense","product.template.hr.expense","product.model_product_template","base.group_hr_user",1,0,0,0
-"access_product_uom_hr_expense","product.uom.hr.expense","product.model_product_uom","base.group_hr_user",1,0,0,0
-"access_product_price_type","product.price.type","product.model_product_price_type","base.group_hr_user",1,1,1,1
-"access_hr_expense_expense_manager","hr.expense.expense.manager","model_hr_expense_expense","base.group_hr_manager",1,1,1,1
-"access_hr_expense_line_manager","hr.expense.line.manager","model_hr_expense_line","base.group_hr_manager",1,1,1,1
-"access_product_product_hr_expense_manager","product.product.hr.expense.manager","product.model_product_product","base.group_hr_manager",1,1,1,1
-"access_product_template_hr_expense_manager","product.template.hr.expense.manager","product.model_product_template","base.group_hr_manager",1,1,1,1
-"access_product_uom_hr_expense_manager","product.uom.hr.expense.manager","product.model_product_uom","base.group_hr_manager",1,1,1,1
-"access_product_price_type_manager","product.price.type.manager","product.model_product_price_type","base.group_hr_manager",1,1,1,1
-"access_hr_expense_expense_employee","hr.expense.expense.employee","model_hr_expense_expense","base.group_user",1,0,0,0
-"access_hr_employee_employee","hr.employee.employee","hr.model_hr_employee","base.group_user",1,0,0,0
-"access_hr_expense_line_employee","hr.expense.line.employee","model_hr_expense_line","base.group_user",1,0,0,0
+"access_hr_expense_line_user","hr.expense.line.user","model_hr_expense_line","base.group_hr_user",1,1,1,1
+"access_hr_expense_report_manager","hr.expense.report.manager","model_hr_expense_report","base.group_hr_manager",1,1,1,1
+"access_product_product_hr_expense_user","product.product.hr.expense.user","product.model_product_product","base.group_hr_user",1,1,1,1
+"access_product_template_hr_expense_user","product.template.hr.expense.user","product.model_product_template","base.group_hr_user",1,1,1,1
+"access_product_uom_hr_expense_user","product.uom.hr.expense.user","product.model_product_uom","base.group_hr_user",1,1,1,1
+"access_product_price_type_user","product.price.type.user","product.model_product_price_type","base.group_hr_user",1,1,1,1
+"access_account_journal_user","account.journal.user","account.model_account_journal","base.group_hr_user",1,1,1,1
+"access_account_invoice_user","account.invoice.user","account.model_account_invoice","base.group_hr_user",1,1,1,1
+"access_account_invoice_line_user","account.invoice.line.user","account.model_account_invoice_line","base.group_hr_user",1,1,1,1
+"access_account_analytic_journal_user","account.ianalytic.journal.user","account.model_account_analytic_journal","base.group_hr_user",1,1,1,1
+"access_account_invoice_tax_user","account.invoice.tax.user","account.model_account_invoice_tax","base.group_hr_user",1,1,1,1
+"access_account_period_user","account.period.user","account.model_account_period","base.group_hr_user",1,1,1,1
+"access_account_fiscalyear_user","account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
+"access_account_move_user","account.move.user","account.model_account_move","base.group_hr_user",1,1,1,1
+"access_account_move_line_user","account.move.line.user","account.model_account_move_line","base.group_hr_user",1,1,1,1
+"access_account_analytic_line_user","account.ianalytic.line.user","account.model_account_analytic_line","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index 8659e3de51d..86786ad1baf 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
     
-        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
+        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_user"/>
         <menuitem
             action="hr.open_board_hr"
             icon="terp-graph"
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index ccc766ac2c7..20da4832fe2 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,13 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,0,0,0
-"access_hr_holidays_user","hr.holidays.user","model_hr_holidays","base.group_hr_user",1,1,1,0
-"access_hr_holydays_status_manager","hr.holidays.status.manager","model_hr_holidays_status","base.group_hr_manager",1,1,1,1
-"access_hr_holidays_manager","hr.holidays.manager","model_hr_holidays","base.group_hr_manager",1,1,1,1
-"access_hr_holidays_remain_user","hr.holidays.ramain.user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,0,0,0
-"access_hr_holidays_report","hr.holidays.report","model_hr_holidays_report","base.group_hr_manager",1,1,1,1
-"access_hr_holidays_remaining_leaves_manager","hr.hr.holidays.remaining.leaves.manager","model_hr_holidays_remaining_leaves_user","base.group_hr_manager",1,1,1,1
-"access_available_holidays_report","hr.available.holidays.report","model_available_holidays_report","base.group_hr_manager",1,1,1,1
-"access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,0,0,0
-"access_hr_holydays_status_employee","hr.holidays.status.employee","model_hr_holidays_status","base.group_user",1,0,0,0
+"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,1,1,1
+"access_hr_holidays_user","hr.holidays.user","model_hr_holidays","base.group_hr_user",1,1,1,1
+"access_hr_holidays_remain_user","hr.holidays.ramain.user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,1,1,1
+"access_hr_holidays_report_manager","hr.holidays.report.manager","model_hr_holidays_report","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_manager",1,1,1,1
-"access_available_holidays_report_user","hr.available.holidays.report.user","model_available_holidays_report","base.group_hr_user",1,1,1,0
+"access_available_holidays_report_user","hr.available.holidays.report.user","model_available_holidays_report","base.group_hr_user",1,1,1,1

From 393ae5bfcd13ceab08b352b516f91083035dfe35 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 7 Oct 2010 14:18:38 +0530
Subject: [PATCH 155/244] [IMP] hr_contract, hr_timesheet_sheet : improvements

bzr revid: vir@tinyerp.com-20101007084838-z09rntox0nrecgih
---
 addons/hr_contract/hr_contract_view.xml               | 11 ++++++-----
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index ede2c11c5bb..bfcd9ff8b76 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -146,6 +146,9 @@
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group col='15' colspan='4'>
+                   <filter string="Current" icon="terp-check" name="current"  domain="[('date_end','&gt;=', time.strftime('%%Y-%%m-%%d'))]"                       context="{'group_by':'date_end'}" help="Contracts in progress"/> 
+                   <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]"                          context="{'group_by':'date_end'}" help="Contracts whose end date already passed"/>   
+                   <separator orientation="vertical"/>                  
                    <field name="name"/>
                    <field name="employee_id"/>
                    <field name="working_hours"/>
@@ -154,11 +157,9 @@
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
-                    <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
-                    <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
-                    <filter string="Current" icon="terp-stock_symbol-selection" name="current"
-                            domain="[('date_end','&gt;=', time.strftime('%%Y-%%m-%%d'))]" 
-                            context="{'group_by':'date_end'}"/>                    
+                   <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+                   <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
+                   <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 231aba040e7..a000737fba6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -67,19 +67,19 @@
                                 <button icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
                             </group>
 
-                            <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1" groups="base.group_hr_attendance">
+                            <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1">
                                 <tree string="Attendances" editable="bottom">
                                     <field name="name"/>
                                     <field name="action"/>
                                     <field invisible="1" name="employee_id"/>
                                 </tree>
                             </field>
-                            <group col="1" colspan="1" groups="base.group_hr_attendance">
+                            <group col="1" colspan="1">
                                 <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
                                 <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
                             </group>
-                            <field name="state_attendance" groups="base.group_hr_attendance"/>
-                            <field name="total_attendance_day" widget="float_time" groups="base.group_hr_attendance"/>
+                            <field name="state_attendance"/>
+                            <field name="total_attendance_day" widget="float_time"/>
                             <field colspan="4" context="date=date_current,user_id=user_id" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet">
                                     <field invisible="1" name="date"/>

From 1a0f5847792d711b2989fdd5fa64b8352515a6d9 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 7 Oct 2010 14:19:05 +0530
Subject: [PATCH 156/244] [FIX] fields_get() of Property corrected

bzr revid: jvo@tinyerp.com-20101007084905-k661pw6phxn3kqpt
---
 bin/addons/base/res/ir_property.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/ir_property.py b/bin/addons/base/res/ir_property.py
index 27536ff80f5..43451f824a1 100644
--- a/bin/addons/base/res/ir_property.py
+++ b/bin/addons/base/res/ir_property.py
@@ -37,7 +37,7 @@ class ir_property(osv.osv):
         res = set()
         for o in obj.browse(cr, uid, ids, context=context):
             res.add(get(o))
-        return res
+        return list(res)
 
     def _models_get(self, cr, uid, context=None):
         return self._models_field_get(cr, uid, 'model', 'model_id.name', context)

From 4caffbf3b398d2005605612db617c3dbd890b8dd Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 7 Oct 2010 14:26:41 +0530
Subject: [PATCH 157/244] [MOD] hr_recruitment : set widget=selection in degree
 field

bzr revid: vir@tinyerp.com-20101007085641-wexufdny3nql1ka3
---
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 3da942873b6..edd3bd77599 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -114,7 +114,7 @@
                         <group col="2" colspan="2">
                             <separator colspan="2" string="Qualification"/>
                             <!-- <field name="type_id" domain="[('object_id.model', '=', 'hr.applicant')]"/>-->
-                            <field name="type_id"/>
+                            <field name="type_id" widget="selection"/>
                             <field name="priority" string="Appreciation"/>
                             <field name="reference"/>
                         </group>

From c6ec288b6133479dabf6fc01354945469833f0d7 Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Thu, 7 Oct 2010 14:33:34 +0530
Subject: [PATCH 158/244] [FIX] Fix parent view and scrollabe widget.

bzr revid: vda@tinyerp.com-20101007090334-jy9q574yo1gxg5ir
---
 bin/addons/base/res/res_widget_data.xml | 2 +-
 bin/addons/base/res/res_widget_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml
index 4ee85646b04..b0648b9ce32 100644
--- a/bin/addons/base/res/res_widget_data.xml
+++ b/bin/addons/base/res/res_widget_data.xml
@@ -27,7 +27,7 @@ new TWTR.Widget({
     }
   },
   features: {
-    scrollbar: false,
+    scrollbar: true,
     loop: false,
     live: true,
     hashtags: true,
diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml
index 69c801e14a7..7164c504993 100644
--- a/bin/addons/base/res/res_widget_view.xml
+++ b/bin/addons/base/res/res_widget_view.xml
@@ -45,7 +45,7 @@
         <menuitem
             action="res_widget_act_window"
             id="menu_res_widget_act_window"
-            parent="base.menu_users"
+            parent="base.next_id_2"
             />
     </data>
 </openerp>

From 4572cbebba113684e3c15ab274136a643a0a5855 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 7 Oct 2010 15:05:09 +0530
Subject: [PATCH 159/244] [MOD] hr_recruitment,hr : changes in code and added
 state field in group by of search view of job position

bzr revid: vir@tinyerp.com-20101007093509-d2qh2t2tivr7qngl
---
 addons/hr/hr_view.xml                   | 1 +
 addons/hr_recruitment/hr_recruitment.py | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 929afbe3d84..acfa17b6993 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -383,6 +383,7 @@
                     <newline />
                     <group expand="0" string="Group By...">
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                     </group>
                 </search>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index e589a81bde7..a8f3af8b20b 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -436,11 +436,11 @@ class hr_applicant(crm.crm_case, osv.osv):
         if applicant.job_id :
             emp_id = employee_obj.create(cr,uid,{'name':applicant.name,'job_id':applicant.job_id.id})
             job_data = job_obj.browse(cr,uid, applicant.job_id.id)
-            if job_data.expected_employees == int(job_data.no_of_employee):
+            total_expected_emp = job_data['expected_employees']
+            expected_emp = job_data['expected_employees'] - 1
+            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
+            if total_expected_emp == int(job_data.no_of_employee):
                 job_obj.write(cr,uid, [applicant.job_id.id],{'state':'old'})
-#            expected_emp = job_data['expected_employees'] - 1
-#            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
-
         return res
 
     def case_reset(self, cr, uid, ids, *args):

From 92c78d14e68b6e5dcfa6e72a4f4a162ae008cacb Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Thu, 7 Oct 2010 15:17:29 +0530
Subject: [PATCH 160/244] [MOD/IMP] hr_* :
 hr,hr_attendance,hr_contract,hr_expence,hr_timesheet,hr_timesheet_invoice,hr_timesheet_sheet
 Usability improvement in access rights

bzr revid: amp@tinyerp.com-20101007094729-1sdtsxube9ti5lw2
---
 addons/hr/hr_department_view.xml              |  2 +-
 addons/hr/hr_view.xml                         |  6 ++---
 .../security/ir.model.access.csv              |  2 +-
 .../hr_contract/security/ir.model.access.csv  |  4 ---
 .../board_hr_expense_manager_view.xml         |  2 +-
 .../hr_timesheet/security/ir.model.access.csv | 20 +++++---------
 .../hr_timesheet/test/test_hr_timesheet.yml   |  1 -
 .../security/ir.model.access.csv              | 26 ++++++++-----------
 .../hr_timesheet_sheet_view.xml               |  8 +++---
 .../security/ir.model.access.csv              |  9 +------
 10 files changed, 28 insertions(+), 52 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 3e02c3e539c..b64f7ca0413 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -67,7 +67,7 @@
             <field name="help">Your Company's Departments Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitements, etc.</field>
         </record>
 
-       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6" groups="base.group_user"/>
+       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6" />
 
        <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index acfa17b6993..b3fda124052 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" groups="base.group_hr_manager,base.group_hr_user"/>
+        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0" groups="base.group_hr_manager,base.group_hr_user"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
@@ -151,7 +151,7 @@
             <field name="help">The employee directory contains all data related to your employees : from their photo up to their hourly estimated costs for the timesheets.Employees are managed by departments and can be linked to users to manage their access rights.</field>
         </record>
 
-        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
+        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_hr_manager,base.group_hr_user"/>
 
         <!--
         =======================
@@ -284,7 +284,7 @@
         </record>
 
         <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
-            parent="menu_view_employee_category_configuration_form" sequence="1" groups="base.group_extended,base.group_user"/>
+            parent="menu_view_employee_category_configuration_form" sequence="1" groups="base.group_extended"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories structure</field>
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index a934f859c4f..4b686dcb1b2 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_action_reason_user","hr.action.reason.user","model_hr_action_reason","base.group_hr_user",1,1,1,1
-"access_hr_action_reason_employee_user","hr.action.reason.employee.user","model_hr_attendance","base.group_hr_user",1,1,1,1
+"access_hr_attendance_user","hr.attendance.user","model_hr_attendance","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index 51d833d8607..36456284856 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -2,10 +2,6 @@
 "access_hr_contract_wage_type_period_user","hr.contract.wage.type.period.user","model_hr_contract_wage_type_period","base.group_hr_user",1,1,1,1
 "access_hr_contract_wage_type_user","hr.contract.wage.type.user","model_hr_contract_wage_type","base.group_hr_user",1,1,1,1
 "access_hr_contract_user","hr.contract.user","model_hr_contract","base.group_hr_user",1,1,1,1
-"access_hr_employee_contract_manager","hr.employee.contract.manager","hr.model_hr_employee","base.group_hr_manager",1,1,1,1
-"access_hr_employee_category_manager","hr.employee.category.manager","hr.model_hr_employee_category","base.group_hr_manager",1,1,1,1
 "access_hr_resource_manager","hr.employee.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
 "access_hr_resource_calendar_user","hr.employee.resource.calendar.user","resource.model_resource_calendar","base.group_hr_user",1,1,1,1
-"access_hr_job_manager","hr.job manager","hr.model_hr_job","base.group_hr_manager",1,1,1,1
 "access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1
-"access_hr_department_manager","hr.department.manager","hr.model_hr_department","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_expense/board_hr_expense_manager_view.xml b/addons/hr_expense/board_hr_expense_manager_view.xml
index d5c761f7b68..d86c7614d7f 100644
--- a/addons/hr_expense/board_hr_expense_manager_view.xml
+++ b/addons/hr_expense/board_hr_expense_manager_view.xml
@@ -26,7 +26,7 @@
             icon="terp-graph"
             id="base.menu_hr_manager"
             parent="base.menu_hr_dasboard"
-            groups = "base.group_hr_user"
+            groups = "base.group_hr_manager"
             sequence="5"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index 2b01017fb65..40ac84200ef 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -1,16 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","base.group_hr_user",1,1,1,1
-"access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","base.group_hr_user",1,1,1,0
-"access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","base.group_hr_user",1,0,0,0
-"access_product_product_user","product.product user","product.model_product_product","base.group_hr_user",1,0,0,0
-"access_product_template_hr_timesheet","product.template.hr.timesheet","product.model_product_template","base.group_hr_user",1,0,0,0
-"access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,0,0,0
-"access_hr_analytic_timesheet_manager","hr.analytic.timesheet.manager","model_hr_analytic_timesheet","base.group_hr_manager",1,1,1,1
-"access_hr_analytic_timesheet_system","hr.analytic.timesheet.system","model_hr_analytic_timesheet","base.group_system",1,0,0,0
-"access_hr_account_analytic_line_manager","account.account.analytic.line.manager","account.model_account_analytic_line","base.group_hr_manager",1,1,1,1
-"access_account_analytic_journal_manager","account.account.analytic.journal.manager","account.model_account_analytic_journal","base.group_hr_manager",1,1,1,1
-"access_product_product_manager","product.product.manager","product.model_product_product","base.group_hr_manager",1,1,1,1
-"access_product_template_hr_timesheet_manager","product.template.hr.timesheet.manager","product.model_product_template","base.group_hr_manager",1,1,1,1
-"access_product_uom_hr_timesheet_manager","product.uom.hr.timesheet.manager","product.model_product_uom","base.group_hr_manager",1,1,1,1
-"access_hr_analytic_timesheet_employee","hr.analytic.timesheet.employee","model_hr_analytic_timesheet","base.group_user",1,1,1,0
-"access_account_analytic_line_user","account.account.analytic.line.user","account.model_account_analytic_line","base.group_user",1,0,0,0
+"access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","base.group_hr_user",1,1,1,1
+"access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","base.group_hr_user",1,1,1,1
+"access_product_product_user","product.product user","product.model_product_product","base.group_hr_user",1,1,1,1
+"access_product_template_hr_timesheet","product.template.hr.timesheet","product.model_product_template","base.group_hr_user",1,1,1,1
+"access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,1,1,1
+"access_account_fiscalyear_hr_user","account.account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml
index d962c627cdd..18d94edbed8 100644
--- a/addons/hr_timesheet/test/test_hr_timesheet.yml
+++ b/addons/hr_timesheet/test/test_hr_timesheet.yml
@@ -21,7 +21,6 @@
     context_lang: en_US
     groups_id:
       - base.group_hr_user
-      - base.group_hr_attendance
       - base.group_user
       - base.group_extended
       - base.group_hr_manager
diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv
index 2dd928fc924..c647fec62cf 100644
--- a/addons/hr_timesheet_invoice/security/ir.model.access.csv
+++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv
@@ -1,20 +1,16 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_timesheet_invoice_factor_hr_user","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","base.group_hr_user",1,0,0,0
+"access_hr_timesheet_invoice_factor_hr_user","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_invoice_factor_acc_inv","hr_timesheet_invoice.factor.account.invoice","model_hr_timesheet_invoice_factor","account.group_account_invoice",1,1,1,1
 "access_report_analytic_account_close","report.analytic.account.close","model_report_analytic_account_close","account.group_account_manager",1,0,0,0
 "access_report_account_analytic_line_to_invoice","report.account.analytic.line.to.invoice","model_report_account_analytic_line_to_invoice","account.group_account_manager",1,0,0,0
-"access_report_timesheet_user","report_timesheet.user","model_report_timesheet_user","base.group_hr_manager",1,0,0,0
-"access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_hr_manager",1,0,0,0
-"access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_hr_manager",1,0,0,0
-"access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_hr_manager",1,0,0,0
-"access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","base.group_hr_manager",1,0,0,0
-"access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","base.group_hr_manager",1,0,0,0
-"access_report_analytic_account_close_system","report.analytic.account.close system","model_report_analytic_account_close","base.group_system",1,1,1,1
-"access_report_account_analytic_line_to_invoice_system","report.account.analytic.line.to.invoice system","model_report_account_analytic_line_to_invoice","base.group_system",1,1,1,1
-"access_report_timesheet_line","report.timesheet.line","model_report_timesheet_line","base.group_hr_manager",1,0,0,0
-"access_account_invoice_hr_user","account.invoice.hr.user","account.model_account_invoice","base.group_hr_user",1,1,1,0
-"access_account_fiscalyear_hr_user","account.fiscalyear.hr.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,0
-"access_account_invoice_hr_manager","account.invoice.hr.manager","account.model_account_invoice","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_invoice_factor_hr_manager","hr_timesheet_invoice.factor.hr.manager","model_hr_timesheet_invoice_factor","base.group_hr_manager",1,1,1,1
+"access_report_timesheet_user","report_timesheet.user","model_report_timesheet_user","base.group_hr_manager",1,1,1,1
+"access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_hr_manager",1,1,1,1
+"access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_hr_manager",1,1,1,1
+"access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_hr_manager",1,1,1,1
+"access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","base.group_hr_manager",1,1,1,1
+"access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","base.group_hr_manager",1,1,1,1
+"access_report_analytic_account_close_manager","report.analytic.account.close.manager","model_report_analytic_account_close","base.group_hr_manager",1,1,1,1
+"access_report_account_analytic_line_to_invoice_manager","report.account.analytic.line.to.invoice.manager","model_report_account_analytic_line_to_invoice","base.group_hr_manager",1,1,1,1
+"access_account_invoice_hr_user","account.invoice.hr.user","account.model_account_invoice","base.group_hr_user",1,1,1,1
 "access_account_invoice_tax_hr_manager","account.invoice.tax.hr.manager","account.model_account_invoice_tax","base.group_hr_manager",1,1,1,1
-"access_report_timesheet_line_employee","report.timesheet.line.employee","model_report_timesheet_line","base.group_user",1,1,1,0
+"access_report_timesheet_line_employee","report.timesheet.line.employee","model_report_timesheet_line","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index a000737fba6..f646021253b 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -115,9 +115,9 @@
                             <field colspan="4" name="period_ids" nolabel="1">
                                 <tree colors="red:total_difference&lt;0.1;blue:total_difference&gt;=0.1" string="Period">
                                     <field name="name"/>
-                                    <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
+                                    <field name="total_attendance" widget="float_time"/>
                                     <field name="total_timesheet" widget="float_time"/>
-                                    <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
+                                    <field name="total_difference" widget="float_time"/>
                                 </tree>
                             </field>
                             <group colspan="4" col="6">
@@ -303,9 +303,9 @@
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="department_id"/>
-                    <field name="total_attendance" groups="base.group_hr_attendance"/>
+                    <field name="total_attendance"/>
                     <field name="total_timesheet"/>
-                    <field name="total_difference" groups="base.group_hr_attendance"/>
+                    <field name="total_difference"/>
                     <field name="state"/>
                 </tree>
             </field>
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 116396612e8..79bc9263ec5 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -3,11 +3,4 @@
 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_sheet_sheet_manager","hr_timesheet_sheet.sheet.manager","model_hr_timesheet_sheet_sheet","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_sheet_sheet_system","hr_timesheet_sheet.sheet.system","model_hr_timesheet_sheet_sheet","base.group_system",1,0,0,0
-"access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_user",1,1,1,0
-"access_hr_timesheet_sheet_sheet_employee","hr_timesheet_sheet.sheet.employee","model_hr_timesheet_sheet_sheet","base.group_user",1,1,1,0
-"access_hr_timesheet_sheet_sheet_day_manager","hr_timesheet_sheet.sheet.day.manager","model_hr_timesheet_sheet_sheet_day","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_sheet_sheet_account_manager","hr_timesheet_sheet.sheet.account.manager","model_hr_timesheet_sheet_sheet_account","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_sheet_sheet_day_employee","hr_timesheet_sheet.sheet.day.employee","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0
-"access_hr_timesheet_sheet_sheet_account_employee","hr_timesheet_sheet.sheet.account.employee","model_hr_timesheet_sheet_sheet_account","base.group_user",1,0,0,0
+"access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_hr_user",1,1,1,1

From 18a984866273086caa18267cb645ea300c01a7c7 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 15:21:27 +0530
Subject: [PATCH 161/244] improve code

bzr revid: apa@tinyerp.com-20101007095127-1bjuobow1bt1sjcd
---
 bin/report/interface.py               | 15 ++++++---------
 bin/report/render/rml2pdf/trml2pdf.py | 14 ++++----------
 bin/report/report_sxw.py              |  6 +++++-
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/bin/report/interface.py b/bin/report/interface.py
index 28197c7872d..703256d8fcd 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -70,7 +70,7 @@ class report_rml(report_int):
     def __init__(self, name, table, tmpl, xsl):
         super(report_rml, self).__init__(name)
         self.table = table
-        self.pageCount=True
+        self.internal_header=False
         self.tmpl = tmpl
         self.xsl = xsl
         self.bin_datas = {}
@@ -111,6 +111,7 @@ class report_rml(report_int):
         return self.post_process_xml_data(cr, uid, xml, context)
 
     def post_process_xml_data(self, cr, uid, xml, context=None):
+
         if not context:
             context={}
         # find the position of the 3rd tag
@@ -137,6 +138,8 @@ class report_rml(report_int):
     # TODO: The translation doesn't work for "<tag t="1">textext<tag> tex</tag>text</tag>"
     #
     def create_rml(self, cr, xml, uid, context=None):
+        if self.tmpl=='' and not self.internal_header:
+            self.internal_header=True
         if not context:
             context={}
         pool = pooler.get_pool(cr.dbname)
@@ -176,13 +179,8 @@ class report_rml(report_int):
 
     def create_pdf(self, rml, localcontext = None, logo=None, title=None):
         if not localcontext:
-            localcontext={}
-            if self.tmpl=='' and not self.pageCount:
-                self.pageCount=True
-            else:
-                self.pageCount=False
-            localcontext.update({'header':self.pageCount})
-
+           localcontext={}
+        localcontext.update({'internal_header':self.internal_header})
         if logo:
             self.bin_datas['logo'] = logo
         else:
@@ -190,7 +188,6 @@ class report_rml(report_int):
                 del self.bin_datas['logo']
         obj = render.rml(rml, localcontext, self.bin_datas, tools.config['root_path'],title)
         obj.render()
-        self.pageCount=True
         return obj.get()
 
     def create_html(self, rml, localcontext = None, logo=None, title=None):
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index b88bbbb0050..23dad749dcc 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -820,9 +820,7 @@ class TinyDocTemplate(platypus.BaseDocTemplate):
 class _rml_template(object):
     def __init__(self, localcontext, out, node, doc, images={}, path='.', title=None):
         if not localcontext:
-            localcontext={'header':'internal'}
-        if not localcontext.get('header',True):
-            localcontext.update({'header':'internal'})
+            localcontext={'internal_header':True}
         self.localcontext = localcontext
         self.images= images
         self.path = path
@@ -871,16 +869,12 @@ class _rml_template(object):
             fis += r.render(node_story)
             # Reset Page Number with new story tag
             fis.append(PageReset())
-            if self.localcontext and self.localcontext.get('header',False) and \
-               (self.localcontext['header']=='internal' or self.localcontext['header']=='internal landscape'):
-                self.doc_tmpl.afterFlowable(fis)
             story_cnt += 1
-        if self.localcontext:
-            fis.append(PageCount())
-        if self.localcontext and self.localcontext.get('header',False) and \
-           (self.localcontext['header']=='internal' or self.localcontext['header']=='internal landscape'):
+        if self.localcontext and self.localcontext.get('internal_header',False):
+            self.doc_tmpl.afterFlowable(fis)
             self.doc_tmpl.build(fis,canvasmaker=NumberedCanvas)
         else:
+            fis.append(PageCount())
             self.doc_tmpl.build(fis)
 
 def parseNode(rml, localcontext = {},fout=None, images={}, path='.',title=None):
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index fdfcdd3b06a..ee23754bbfb 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -364,13 +364,17 @@ class report_sxw(report_rml, preprocess.report):
         self.parser = parser
         self.header = header
         self.store = store
+        self.internal_header=False
+        if header=='internal' or header=='internal landscape':
+            self.internal_header=True
 
     def getObjects(self, cr, uid, ids, context):
         table_obj = pooler.get_pool(cr.dbname).get(self.table)
         return table_obj.browse(cr, uid, ids, list_class=browse_record_list, context=context, fields_process=_fields_process)
 
     def create(self, cr, uid, ids, data, context=None):
-        context.update({'header':self.header})
+        if self.internal_header:
+            context.update({'internal_header':self.internal_header})
         pool = pooler.get_pool(cr.dbname)
         ir_obj = pool.get('ir.actions.report.xml')
         report_xml_ids = ir_obj.search(cr, uid,

From d480253a463f2b68ab3b6e0752073663dd1b71e7 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 15:41:27 +0530
Subject: [PATCH 162/244] improve code

bzr revid: apa@tinyerp.com-20101007101127-bpk7wfsxrz2q649q
---
 bin/report/render/rml2pdf/trml2pdf.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 23dad749dcc..c37aff7aab7 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -860,6 +860,8 @@ class _rml_template(object):
         self.doc_tmpl.addPageTemplates(self.page_templates)
 
     def render(self, node_stories):
+        if self.localcontext and not self.localcontext.get('internal_header',False):
+            del self.localcontext['internal_header']
         fis = []
         r = _rml_flowable(self.doc,self.localcontext, images=self.images, path=self.path, title=self.title)
         story_cnt = 0

From 4e8e0fd5bf3055841093c431b6f7e78b18d04673 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 7 Oct 2010 15:51:26 +0530
Subject: [PATCH 163/244] [MOD] hr_recuritment : small change in method

bzr revid: vir@tinyerp.com-20101007102126-17ylxz3fqaqnxmfc
---
 addons/hr_recruitment/hr_recruitment.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index a8f3af8b20b..fc12f744411 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -436,11 +436,10 @@ class hr_applicant(crm.crm_case, osv.osv):
         if applicant.job_id :
             emp_id = employee_obj.create(cr,uid,{'name':applicant.name,'job_id':applicant.job_id.id})
             job_data = job_obj.browse(cr,uid, applicant.job_id.id)
-            total_expected_emp = job_data['expected_employees']
             expected_emp = job_data['expected_employees'] - 1
-            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
-            if total_expected_emp == int(job_data.no_of_employee):
+            if expected_emp == 0:
                 job_obj.write(cr,uid, [applicant.job_id.id],{'state':'old'})
+            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
         return res
 
     def case_reset(self, cr, uid, ids, *args):

From 480ea8452ffbf96720b6543bf558ec9bd44d21e1 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Thu, 7 Oct 2010 16:36:40 +0530
Subject: [PATCH 164/244] [MOD/IMP] hr_* : hr_evaluation,hr_recruitment
 Usability improvement in access rights

bzr revid: amp@tinyerp.com-20101007110640-us0sp7ib1uaw6akm
---
 addons/hr_evaluation/hr_evaluation_view.xml     |  2 +-
 .../hr_evaluation/security/ir.model.access.csv  | 17 ++---------------
 .../hr_recruitment/security/ir.model.access.csv |  9 ++++-----
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 02f551a28b8..e4ccb11ce4e 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -64,7 +64,7 @@
         </record>
 
         <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
-        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_system"/>
+        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_hr_manager"/>
         <menuitem parent="menu_eval_hr_config" id="menu_open_view_hr_evaluation_plan_tree"
             action="open_view_hr_evaluation_plan_tree"/>
 
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 7c57d67d1cd..fba2a5f2202 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -1,21 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_evaluation_evaluation_user","hr_evaluation.evaluation.user","model_hr_evaluation_evaluation","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation.manager","model_hr_evaluation_evaluation","base.group_hr_manager",1,1,1,1
-"access_hr_evaluation_plan_user","hr_evaluation.plan.user","model_hr_evaluation_evaluation","base.group_hr_user",1,0,0,0
-"access_hr_evaluation_plan_manager","hr_evaluation.plan.manager","model_hr_evaluation_plan","base.group_hr_manager",1,1,1,1
-"access_hr_evaluation_plan_phase_user","hr_evaluation.plan.phase.user","model_hr_evaluation_plan_phase","base.group_hr_user",1,0,0,0
-"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase.manager","model_hr_evaluation_plan_phase","base.group_hr_manager",1,1,1,1
+"access_hr_evaluation_plan_user","hr_evaluation.plan.user","model_hr_evaluation_plan","base.group_hr_user",1,1,1,1
+"access_hr_evaluation_plan_phase_user","hr_evaluation.plan.phase.user","model_hr_evaluation_plan_phase","base.group_hr_user",1,1,1,1
 "access_hr_evaluation_interview_user","hr.evaluation.interview.user","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_interview_manager","hr.evaluation.interview.manager","model_hr_evaluation_interview","base.group_hr_manager",1,1,1,1
 "access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","base.group_hr_manager",1,1,1,1
-"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_plan","base.group_system",1,1,1,1
-"access_hr_evaluation_plan_phase_system","hr_evaluation.plan.phase.system","model_hr_evaluation_plan_phase","base.group_system",1,1,1,1
-"access_hr_evaluation_evaluation_system","hr_evaluation.evaluation.system","model_hr_evaluation_evaluation","base.group_system",1,0,0,0
-"access_hr_evaluation_interview_system","hr.evaluation.interview.system","model_hr_evaluation_interview","base.group_system",1,0,0,0
-"access_hr_evaluation_evaluation_employee","hr_evaluation.evaluation.employee","model_hr_evaluation_evaluation","base.group_user",1,0,0,0
-"access_hr_evaluation_interview_employee","hr.evaluation.interview.employee","model_hr_evaluation_interview","base.group_user",1,0,0,0
-"access_hr_evaluation_user","hr_evaluation.user","model_hr_evaluation_plan","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_employee","hr_evaluation.employee","model_hr_evaluation_plan","base.group_user",1,0,0,0
 "access_survey_type_hr_manager","survey.type","survey.model_survey_type","base.group_hr_manager",1,1,1,1
 "access_survey_hr_manager","survey.hr.manager","survey.model_survey","base.group_hr_manager",1,1,1,1
 "access_survey_history_manager","survey.history","survey.model_survey_history","base.group_hr_manager",1,1,1,1
@@ -28,7 +16,6 @@
 "access_survey_tbl_column_heading_hr_manager","survey.tbl.column.heading","survey.model_survey_tbl_column_heading","base.group_hr_manager",1,1,1,1
 "access_survey_response_answer_hr_manager","survey.response.answer","survey.model_survey_response_answer","base.group_hr_manager",1,1,1,1
 "access_survey_request_hr_manager","survey.request","survey.model_survey_request","base.group_hr_manager",1,1,1,1
-"access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0
 "access_survey_answer_hr_user","survey.answer.hr.user","survey.model_survey_answer","base.group_hr_user",1,1,1,0
 "access_survey_response_answer_hr_user","survey.response.answer.hr.user","survey.model_survey_response_answer","base.group_hr_user",1,1,1,0
 "access_survey_type_hr_user","survey.type.hr.user","survey.model_survey_type","base.group_hr_user",1,1,1,0
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 92dc912180d..5e343a40fa0 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -3,8 +3,7 @@
 "access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","base.group_hr_manager",1,1,1,1
 "access_hr_recruitment_stage_user","hr.recruitment.stage.user","model_hr_recruitment_stage","base.group_hr_user",1,1,1,1
 "access_hr_recruitment_degree","hr.recruitment.degree","model_hr_recruitment_degree","base.group_hr_user",1,1,1,1
-"access_hr_recruitment_stage_system","hr.recruitment.stage.system","model_hr_recruitment_stage","base.group_system",1,1,1,1
-"access_hr_applicant_manager","hr.applicant.manager","model_hr_applicant","base.group_hr_manager",1,1,1,1
-"access_hr_applicant_system","hr.applicant.system","model_hr_applicant","base.group_system",1,0,0,0
-"access_hr_recruitment_stage_manager","hr.recruitment.stage.manager","model_hr_recruitment_stage","base.group_hr_manager",1,1,1,1
-"access_hr_recruitment_degree_manager","hr.recruitment.degree.manager","model_hr_recruitment_degree","base.group_hr_manager",1,1,1,1
+"access_mailgate_message_user","mailgate.message.user","mail_gateway.model_mailgate_message","base.group_hr_user",1,1,1,1
+"access_res_partner_hr_user","res.partner.user","base.model_res_partner","base.group_hr_user",1,1,1,1
+"access_res_partner_address_hr_user","res.partner.address.user","base.model_res_partner_address","base.group_hr_user",1,1,1,1
+"access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0

From b960301eef703ccaa0e0cbf06532acdf52fdf8c3 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 7 Oct 2010 16:39:56 +0530
Subject: [PATCH 165/244] [MOD] hr_recuritment : small change in reset method

bzr revid: vir@tinyerp.com-20101007110956-7y0bbuwlt3uhpnok
---
 addons/hr_recruitment/hr_recruitment.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index fc12f744411..3dbcd946e87 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -450,8 +450,18 @@ class hr_applicant(crm.crm_case, osv.osv):
         @param ids: List of case Ids
         @param *args: Tuple Value for additional Params
         """
+        applicant = self.browse(cr, uid, ids)[0]
+        if applicant.job_id :
+            job_obj = self.pool.get('hr.job')
+            emp_obj = self.pool.get('hr.employee')
+            job_data = job_obj.browse(cr,uid, applicant.job_id.id)
+            expected_emp = job_data['expected_employees'] + 1
+            emp_id = emp_obj.search(cr,uid, [('job_id','=',applicant.job_id.id),('name','=',applicant.name)])
+            emp_obj.unlink(cr, uid, emp_id)
+            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
         res = super(hr_applicant, self).case_reset(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'date_open': False, 'date_closed':False})
+        
         return res
 
 

From 8761d340e385a0af80abacfc44b523e7cba24a31 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Thu, 7 Oct 2010 18:30:50 +0530
Subject: [PATCH 166/244] [MOD/IMP] hr_holidays : Usability Improvement in
 hr_holidays

bzr revid: amp@tinyerp.com-20101007130050-wvaqvtlqallypu3i
---
 addons/hr_holidays/hr_holidays.py       | 2 +-
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 025325a5ae1..356d697f2c1 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -141,7 +141,7 @@ class hr_holidays(osv.osv):
         return False
 
     _columns = {
-        'name': fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
+        'name': fields.char('Description', required=True, size=64),
         'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'), ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')], 'State', readonly=True, help='When the holiday request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Approval\'.\
             If the admin accepts it, the state is \'Approved\'. If it is refused, the state is \'Refused\'.'),
         'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9f8e5409e8d..6ee69af1bca 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -66,7 +66,7 @@
             <field name="arch" type="xml">
                 <form string="Leave Request">
                     <group col="8" colspan="4">
-                    <field name="name" />
+                    <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" groups="base.group_hr_manager"/>
                         <group attrs="{'invisible':[('holiday_type','=','employee')]}">
                         <field name="category_id"  attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>

From cfcbf1ab1ea30efe3a1929993064493587ebd419 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Thu, 7 Oct 2010 18:59:34 +0530
Subject: [PATCH 167/244] [MOD/IMP] hr_* : Usability Improvents in Record Rule
 in hr/groups

bzr revid: amp@tinyerp.com-20101007132934-3nzpqe2751iau4hg
---
 addons/hr_attendance/hr_attendance_demo.xml | 4 ++--
 addons/hr_evaluation/hr_evaluation_demo.xml | 4 ++--
 addons/hr_expense/hr_expense_demo.xml       | 4 ++--
 addons/hr_holidays/hr_holidays_demo.xml     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance_demo.xml b/addons/hr_attendance/hr_attendance_demo.xml
index 8f238fb61a5..d2967167ec8 100644
--- a/addons/hr_attendance/hr_attendance_demo.xml
+++ b/addons/hr_attendance/hr_attendance_demo.xml
@@ -125,13 +125,13 @@
             <field name="name">Employee Attendance</field>
             <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
             <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
         </record>
         <record id="property_rule_attendace_manager" model="ir.rule">
             <field name="name">Manager Attendance</field>
             <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
             <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_hr_user'),ref('base.group_hr_manager')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index 0a03ec0e0b6..f8513bf63ea 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -1616,13 +1616,13 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="name">Employee Evaluation</field>
             <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
             <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
         </record>
         <record id="property_rule_evaluation_manager" model="ir.rule">
             <field name="name">Manager Evaluation</field>
             <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
             <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_hr_user'),ref('base.group_hr_manager')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
         </record>
 		 </data>
 
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index c3fa9e90c67..cb9e28b5543 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -108,13 +108,13 @@
             <field name="name">Employee Expense</field>
             <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
             <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
         </record>
         <record id="property_rule_expense_manager" model="ir.rule">
             <field name="name">Manager Expense</field>
             <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
             <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_hr_user'),ref('base.group_hr_manager')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
         </record>
 	</data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index f513b8892c5..e59bd5a0353 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -52,13 +52,13 @@
         <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="[(6,0,[ref('base.group_user')])]"/>
+        <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
     </record>
     <record id="property_rule_holidays_manager" model="ir.rule">
         <field name="name">Manager Holidays</field>
         <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
         <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-        <field name="groups" eval="[(6,0,[ref('base.group_hr_user'),ref('base.group_hr_manager')])]"/>
+        <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
         </record>
 
   </data>

From 7f603c334ed810b66101781ae294ea4e1eea80dd Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 7 Oct 2010 19:17:46 +0530
Subject: [PATCH 168/244] [MOD] Improvemetns in reports

bzr revid: vir@tinyerp.com-20101007134746-38gevpiqxagm15sn
---
 addons/hr_evaluation/report/hr_evaluation_report_view.xml   | 5 ++++-
 addons/hr_expense/hr_expense_view.xml                       | 4 +++-
 addons/hr_recruitment/report/hr_recruitment_report_view.xml | 3 +--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 84ebf598e9d..59dade23d6f 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -18,6 +18,7 @@
                 <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="rating" invisible="1"/>
+                <field name="state" invisible="1"/>
                 <field name="nbr" sum="# of Requests"/>
                 <field name="progress_bar" widget="progressbar"/>
                 <field name="delay_date"/>
@@ -74,7 +75,9 @@
                     <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/>
-                    <filter string="Appreciation" icon="terp-rating-rated" context="{'group_by':'rating'}"/>
+                    <filter string="Appreciation" icon="terp-face-plain" context="{'group_by':'rating'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Creation Date"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 0763d76d1b4..e9a9c08669a 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -149,7 +149,9 @@
                       <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
                       </field>
-                      <field name="department_id" widget="selection" groups="base.group_extended"/>
+                      <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
+                   <filter icon="terp-personal+" context="{'invisible_department': False}" domain="[('department_id','=',context.get('department_id',False))]" help="My Department"/>
+               </field>
                 </group>
                 <newline />
                 <group expand="0" string="Group By...">
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 2e1476b9de6..d29ecabefb0 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -91,11 +91,10 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="job_id" />
+                    <!--field name="job_id"/-->
                     <field name="priority"/>
                     <field name="stage_id" widget="selection"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <newline/>
                     <field name="date" string="Creation Date"/>
                     <field name="date_closed"/>
                 </group>

From 0f0e88a3c86c5c29391ec2596f48fa5e210d4891 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Oct 2010 19:18:53 +0530
Subject: [PATCH 169/244] [MOD/IMP] hr_evaluation : Usability Improvements

bzr revid: dbr@tinyerp.com-20101007134853-979u6snp02182w04
---
 addons/hr_evaluation/hr_evaluation.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 041ec2d1fd8..960849bdfd4 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -258,6 +258,7 @@ class hr_evaluation(osv.osv):
     def button_done(self,cr, uid, ids, context=None):
         if context is None:
             context = {}
+        self.write(cr, uid, ids,{'progress': 1 * 100}, context=context)
         self.write(cr, uid, ids,{'state':'done', 'date_close': time.strftime('%Y-%m-%d')}, context=context)
         return True
 

From e38dcfb12241fed9bb7448873289dbbd9b5360c4 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 7 Oct 2010 20:22:40 +0530
Subject: [PATCH 170/244] [FIX] XSL Report : title of xsl reports should
 support accented characters

bzr revid: jvo@tinyerp.com-20101007145240-x9by6sv89jtco7j5
---
 bin/report/render/rml2pdf/utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/report/render/rml2pdf/utils.py b/bin/report/render/rml2pdf/utils.py
index 96df33c925f..0b2a898790d 100644
--- a/bin/report/render/rml2pdf/utils.py
+++ b/bin/report/render/rml2pdf/utils.py
@@ -42,6 +42,7 @@ from lxml import etree
 import copy
 import locale
 import traceback, sys
+import tools
 from tools.safe_eval import safe_eval as eval
 import logging
 
@@ -176,7 +177,7 @@ def attr_get(node, attrs, dict={}):
     for key in dict:
         if node.get(key):
             if dict[key]=='str':
-                res[key] = str(node.get(key))
+                res[key] = tools.ustr(node.get(key))
             elif dict[key]=='bool':
                 res[key] = bool_get(node.get(key))
             elif dict[key]=='int':

From 3b764ef32ca04e92fe574e4461bd33d538925442 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 8 Oct 2010 04:38:15 +0000
Subject: [PATCH 171/244] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101008043815-syw6e8kx0kyjfvht
---
 bin/addons/base/i18n/nl.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index 534a06b7f62..ab6a784be15 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-10-01 11:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-06 14:56+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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: 2010-10-02 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8142,7 +8142,7 @@ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
-msgstr ""
+msgstr "De code van de relatie functie moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:res.partner:0

From 68fd91458dacb3dd1c4944359aea43fd6f4bf615 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 8 Oct 2010 10:45:39 +0530
Subject: [PATCH 172/244] [MOD] small change in label

bzr revid: vir@tinyerp.com-20101008051539-mf3khodsfdcm5b1x
---
 addons/hr_holidays/wizard/hr_holidays_summary_department.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index 4409254c16e..5ea75cb7e30 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -30,7 +30,7 @@ class hr_holidays_summary_dept(osv.osv_memory):
     _columns = {
         'date_from': fields.date('From', required=True),
         'depts': fields.many2many('hr.department', 'summary_dept_rel', 'sum_id', 'dept_id', 'Department(s)'),
-        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holyday State', required=True)
+        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Leave Type', required=True)
     }
 
     _defaults = {

From 86a51c61e926c1d03d13f5a202f6b92914c3455b Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 8 Oct 2010 10:55:18 +0530
Subject: [PATCH 173/244] [MOD] small changes in leave report

bzr revid: vir@tinyerp.com-20101008052518-ip7ask30viaez2bx
---
 addons/hr_holidays/report/hr_holidays_report_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index ab8afeae30b..b2fa98a7720 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -54,7 +54,7 @@
 	                <separator orientation="vertical"/>
 	                <filter string="Future Leaves" icon="terp-gtk-media-pause" domain="[('state', 'in' ,('draft','confirm'))]"
 	                	help = "Draft and Confirmed leaves"/>
-	               	<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
+	               	<filter string="Validated" name="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
 	               		help = "Pending Leaves"/>
                   <filter icon="gtk-cancel" string="Cancelled" domain="[('state','=','cancel')]"/>
 					<separator orientation="vertical"/>
@@ -98,7 +98,7 @@
         <field name="res_model">hr.holidays.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_user_id": uid, 'search_default_month':1, 'search_default_department':1, 'group_by':[], 'group_by_no_leaf':1} </field>
+        <field name="context">{"search_default_user_id": uid, 'search_default_month':1, 'search_default_Employee':1,'search_default_department':1,"search_default_Validated":1, 'group_by':[], 'group_by_no_leaf':1} </field>
         <field name="search_view_id" ref="view_hr_holidays_report_search"/>
     </record>
 

From 996e8d70fb83f378070a4e6640dd009c32d07b52 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Fri, 8 Oct 2010 11:27:25 +0530
Subject: [PATCH 174/244] [MOD/IMP] hr_holidays : Usability Improvement in
 reports

bzr revid: amp@tinyerp.com-20101008055725-xwvpyigj05e1uhhj
---
 addons/hr_holidays/report/hr_holidays_report.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py
index 9a259f1fe15..5d2dc27c0de 100644
--- a/addons/hr_holidays/report/hr_holidays_report.py
+++ b/addons/hr_holidays/report/hr_holidays_report.py
@@ -64,9 +64,9 @@ class hr_holidays_report(osv.osv):
                      s.employee_id,
                      s.category_id,
                      s.user_id as user_id,
-                     to_char(s.create_date, 'YYYY') as year,
-                     to_char(s.create_date, 'MM') as month,
-                     to_char(s.create_date, 'YYYY-MM-DD') as day,
+                     to_char(s.date_from, 'YYYY') as year,
+                     to_char(s.date_from, 'MM') as month,
+                     to_char(s.date_from, 'YYYY-MM-DD') as day,
                      s.holiday_status_id,
                      s.department_id,
                      s.state,

From d270bee66ac71436061dcfff1ef779c25bed9b54 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 8 Oct 2010 12:34:38 +0530
Subject: [PATCH 175/244] [MOD/IMP] hr_timesheet_sheet : Usability Improvements
 in Timesheet Sheet Analysis Report

bzr revid: dbr@tinyerp.com-20101008070438-zc0g5fxb6kko2jmq
---
 .../security/hr_contract_security.xml         |  4 ----
 .../report/timesheet_report.py                | 19 ++++++++++---------
 .../report/timesheet_report_view.xml          | 10 +++++-----
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/addons/hr_contract/security/hr_contract_security.xml b/addons/hr_contract/security/hr_contract_security.xml
index b891099e447..39f923a895b 100644
--- a/addons/hr_contract/security/hr_contract_security.xml
+++ b/addons/hr_contract/security/hr_contract_security.xml
@@ -2,9 +2,5 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="base.group_hr_contract" model="res.groups">
-            <field name="name">Human Resources / Contract</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
index a8c0440a053..6688c747983 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -35,7 +35,7 @@ class timesheet_report(osv.osv):
         'name': fields.char('Description', size=64,readonly=True),
         'product_id' : fields.many2one('product.product', 'Product'),
         'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
-        'user_id': fields.many2one('res.users', 'User',readonly=True),
+        'employee_id': fields.many2one('hr.employee', 'Employee',readonly=True),
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
         'nbr': fields.integer('#Nbr',readonly=True),
@@ -60,8 +60,8 @@ class timesheet_report(osv.osv):
         tools.drop_view_if_exists(cr, 'timesheet_report')
         cr.execute("""
             create or replace view timesheet_report as (
-                    select
-                        min(aal.id) as id,
+                    select 
+			min(aal.id) as id,
                         htss.date_current,
                         htss.name,
                         htss.date_from,
@@ -91,14 +91,14 @@ class timesheet_report(osv.osv):
                             AND day.name = sheet.date_current) where sheet.id=htss.id) as total_attendance,
                         aal.to_invoice,
                         aal.general_account_id,
-                        htss.user_id,
+                        htss.employee_id as employee_id,
                         htss.company_id,
                         htss.department_id,
                         htss.state
-                    from account_analytic_line as aal
-                    left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id)
-                    left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id)
-                    group by
+		from hr_timesheet_sheet_sheet as htss
+		left join hr_analytic_timesheet as hat ON (hat.create_uid=htss.create_uid)
+		left join account_analytic_line as aal ON (hat.line_id=aal.id)
+		group by
                         to_char(htss.date_current,'YYYY'),
                         to_char(htss.date_current,'MM'),
                         to_char(htss.date_current, 'YYYY-MM-DD'),
@@ -116,7 +116,8 @@ class timesheet_report(osv.osv):
                         htss.state,
                         htss.id,
                         htss.department_id,
-                        htss.user_id
+                        htss.employee_id
+  
             )
         """)
 timesheet_report()
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index a015ff933d2..d7fa7681a6b 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -7,7 +7,7 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet" type="bar">
-                    <field name="user_id" />
+                    <field name="employee_id" />
                     <field name="quantity" operator = "+"/>
                     <field name="state" group = "True"/>
                 </graph>
@@ -21,7 +21,7 @@
                 <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('cancel')" string="Timesheet">
                     <field name="date_current" invisible="1"/>
                     <field name="name" invisible="1"/>
-                    <field name="user_id" invisible="1"/>
+                    <field name="employee_id" invisible="1"/>
                     <field name="date_from" invisible="1"/>
                     <field name="date_to" invisible="1"/>
                     <field name="state" invisible="1"/>
@@ -72,7 +72,7 @@
                                     domain="[('state','=','done')]"/>
                         <separator orientation="vertical"/>
                         <field name="account_id"/>
-                      <field name="user_id" />
+                      <field name="employee_id" />
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters..." groups="base.group_extended">
@@ -90,7 +90,7 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
-                        <filter string="User" name="User_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                        <filter string="Employee" name="Employee_id" icon="terp-personal" context="{'group_by':'employee_id'}"/>
                         <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
@@ -117,7 +117,7 @@
             <field name="res_model">timesheet.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_month':1,'search_default_Employee_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="search_view_id" ref="view_timesheet_report_search"/>
         </record>
         <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"

From bae78575c82879fe64eac8ed2cf1c37f77e1d68a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 8 Oct 2010 10:38:47 +0200
Subject: [PATCH 176/244] [IMP] form view for widgets

bzr revid: xmo@openerp.com-20101008083847-0jy9px2ey4wwok81
---
 bin/addons/base/res/res_widget_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml
index 7164c504993..7ddd5a06e8a 100644
--- a/bin/addons/base/res/res_widget_view.xml
+++ b/bin/addons/base/res/res_widget_view.xml
@@ -11,15 +11,15 @@
                  </search>
             </field>
         </record>
-        
+
         <record id="res_widget_form" model="ir.ui.view">
             <field name="name">res.widget.form</field>
             <field name="model">res.widget</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Widgets">
-                    <field name="title"/>
-                    <field name="content"/>
+                    <field name="title" colspan="4"/>
+                    <field name="content" colspan="4" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -41,7 +41,7 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_res_widget_search"/>
         </record>
-        
+
         <menuitem
             action="res_widget_act_window"
             id="menu_res_widget_act_window"

From 560ccd262a68ecbfd703d8fbb5959c0bdab411f4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 8 Oct 2010 10:39:28 +0200
Subject: [PATCH 177/244] [IMP] make fields required in widget res

bzr revid: xmo@openerp.com-20101008083928-30ivjz573xgxykhk
---
 bin/addons/base/res/res_widget.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index 978a092c5db..a152a6bb5fd 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -25,7 +25,7 @@ class res_widget(osv.osv):
     _name = "res.widget"
     _rec_name = "title"
     _columns = {
-                'title' : fields.char('Title', size=64),
-                'content': fields.text('Content')
-                }
-res_widget()
\ No newline at end of file
+        'title' : fields.char('Title', size=64, required=True),
+        'content': fields.text('Content', required=True)
+    }
+res_widget()

From eecda53df51fddf7cd40cac667f68a6a83f84392 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 8 Oct 2010 15:40:42 +0530
Subject: [PATCH 178/244] [MOD] improvements in access rights

bzr revid: vir@tinyerp.com-20101008101042-ak2z1vuzbmak7yt3
---
 addons/hr/security/ir.model.access.csv                 | 1 +
 addons/hr_attendance/security/ir.model.access.csv      | 1 +
 addons/hr_timesheet_sheet/security/ir.model.access.csv | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 4b2d72b017d..ab8eb568264 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,6 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,1,1,1
 "access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
+"access_hr_employee_system_user","hr.employee system user","model_hr_employee","base.group_user",1,0,0,0
 "access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
 "access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
 "access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index 4b686dcb1b2..919aea0d57f 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_action_reason_user","hr.action.reason.user","model_hr_action_reason","base.group_hr_user",1,1,1,1
 "access_hr_attendance_user","hr.attendance.user","model_hr_attendance","base.group_hr_user",1,1,1,1
+"access_hr_attendance_system_user","hr.attendance.system.user","model_hr_attendance","base.group_user",1,0,0,0
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 79bc9263ec5..c11a3ce7099 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -1,6 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_timesheet_sheet_sheet_user","hr_timesheet_sheet.sheet.user","model_hr_timesheet_sheet_sheet","base.group_hr_user",1,1,1,1
+"access_hr_timesheet_sheet_sheet_system_user","hr_timesheet_sheet.sheet.system.user","model_hr_timesheet_sheet_sheet","base.group_user",1,0,0,0
 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
 "access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_hr_user",1,1,1,1
+"access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
+"access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0

From f0c306b2b8294c25e4d1785d693f058553c77750 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 8 Oct 2010 18:29:00 +0530
Subject: [PATCH 179/244] [MOD/IMP] hr_timesheet : Usability Improvements in
 Timesheet Sheet yml Report

bzr revid: dbr@tinyerp.com-20101008125900-lpjetu39xmpbynpu
---
 addons/hr_timesheet/test/hr_timesheet_report.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_timesheet/test/hr_timesheet_report.yml b/addons/hr_timesheet/test/hr_timesheet_report.yml
index 2f19f75618f..b1cd445a35d 100644
--- a/addons/hr_timesheet/test/hr_timesheet_report.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_report.yml
@@ -5,7 +5,7 @@
     import netsvc, tools, os, time
     month = time.gmtime()[1]
     year = time.gmtime()[0]
-    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_id' : uid }}
+    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'employee_id' : ref('hr.employee1') }}
     (data, format) = netsvc.LocalService('report.hr.analytical.timesheet').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-user_report.'+format), 'wb+').write(data)
@@ -17,7 +17,7 @@
     import netsvc, tools, os, time
     month = time.gmtime()[1]
     year = time.gmtime()[0]
-    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_ids' : [uid] }}
+    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'employee_ids' : [ref('hr.employee1')] }}
     (data, format) = netsvc.LocalService('report.hr.analytical.timesheet_users').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-users_report.'+format), 'wb+').write(data)
\ No newline at end of file
+       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-users_report.'+format), 'wb+').write(data)

From 795e755b42a8786e5bbe5f318b05d9943cd98a4c Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Fri, 8 Oct 2010 18:50:28 +0530
Subject: [PATCH 180/244] [FIX] : base : import module as zip file

bzr revid: jas@tinyerp.com-20101008132028-qzrac0xv1nu7z4ow
---
 bin/addons/__init__.py           | 18 ++++++++++++++----
 bin/addons/base/module/module.py |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 08cc60c19bd..7db007b732f 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -270,7 +270,17 @@ def get_module_resource(module, *args):
     @return: absolute path to the resource
     """
     a = get_module_path(module)
-    return a and opj(a, *args) or False
+    if zipfile.is_zipfile( a +'.zip') :
+        zip = zipfile.ZipFile( a + ".zip")
+        files = ['/'.join(f.split('/')[1:]) for f in zip.namelist()]
+    else:
+        files = tools.osutil.listdir(a, True)
+    for ar in args:
+        if ar not in files:
+            return False
+    res = a and opj(a, *args) or False
+    return res
+
 
 
 def get_modules():
@@ -297,9 +307,10 @@ def load_information_from_description_file(module):
     """
     :param module: The name of the module (sale, purchase, ...)
     """
+
     for filename in ['__openerp__.py', '__terp__.py']:
         description_file = get_module_resource(module, filename)
-        if os.path.isfile(description_file):
+        if description_file :
             return eval(tools.file_open(description_file).read())
 
     #TODO: refactor the logger in this file to follow the logging guidelines
@@ -332,9 +343,8 @@ def upgrade_graph(graph, cr, module_list, force=None):
     for module in module_list:
         mod_path = get_module_path(module)
         terp_file = get_module_resource(module, '__openerp__.py')
-        if not terp_file or not os.path.isfile(terp_file):
+        if not terp_file:
             terp_file = get_module_resource(module, '__terp__.py')
-
         if not mod_path or not terp_file:
             logger.notifyChannel('init', netsvc.LOG_WARNING, 'module %s: not found, skipped' % (module))
             continue
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index b446f39f5b5..74cd018399c 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -247,7 +247,7 @@ class module(osv.osv):
                 else:
                     od = self.browse(cr, uid, ids2)[0]
                     mdemo = od.demo or mdemo
-            
+
             terp = self.get_module_info(module.name)
             try:
                 self._check_external_dependencies(terp)

From 2171202b324551e15050663ef61a2fddb4707357 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 8 Oct 2010 16:03:49 +0200
Subject: [PATCH 181/244] [IMP] translations: support generic "report"
 translation type + export from *.mako files + multiple types for
 _get_source() + lint cleanup

bzr revid: odo@openerp.com-20101008140349-9hclfqwjmndkrtn4
---
 bin/addons/base/ir/ir_translation.py | 18 +++++----
 bin/tools/translate.py               | 57 ++++++++++++++--------------
 2 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/bin/addons/base/ir/ir_translation.py b/bin/addons/base/ir/ir_translation.py
index 631e42eb39b..6f8a4affbe9 100644
--- a/bin/addons/base/ir/ir_translation.py
+++ b/bin/addons/base/ir/ir_translation.py
@@ -25,7 +25,8 @@ import tools
 TRANSLATION_TYPE = [
     ('field', 'Field'),
     ('model', 'Object'),
-    ('rml', 'RML'),
+    ('rml', 'RML  (deprecated - use Report)'), # Pending deprecation - to be replaced by report!
+    ('report', 'Report/Template'),
     ('selection', 'Selection'),
     ('view', 'View'),
     ('wizard_button', 'Wizard Button'),
@@ -131,14 +132,14 @@ class ir_translation(osv.osv):
         return len(ids)
 
     @tools.cache(skiparg=3)
-    def _get_source(self, cr, uid, name, tt, lang, source=None):
+    def _get_source(self, cr, uid, name, types, lang, source=None):
         """
         Returns the translation for the given combination of name, type, language
         and source. All values passed to this method should be unicode (not byte strings),
         especially ``source``.
 
         :param name: identification of the term to translate, such as field name
-        :param type: type of term to translate (see ``type`` field on ir.translation)
+        :param types: single string defining type of term to translate (see ``type`` field on ir.translation), or sequence of allowed types (strings)
         :param lang: language code of the desired translation
         :param source: optional source term to translate (should be unicode)
         :rtype: unicode
@@ -147,24 +148,25 @@ class ir_translation(osv.osv):
         """
         # FIXME: should assert that `source` is unicode and fix all callers to always pass unicode
         # so we can remove the string encoding/decoding.
-
         if not lang:
             return u''
+        if isinstance(types, basestring):
+            types = (types,)
         if source:
             cr.execute('select value ' \
                     'from ir_translation ' \
                     'where lang=%s ' \
-                        'and type=%s ' \
+                        'and type in %s ' \
                         'and name=%s ' \
                         'and src=%s',
-                    (lang or '', tt, tools.ustr(name), source))
+                    (lang or '', types, tools.ustr(name), source))
         else:
             cr.execute('select value ' \
                     'from ir_translation ' \
                     'where lang=%s ' \
-                        'and type=%s ' \
+                        'and type in %s ' \
                         'and name=%s',
-                    (lang or '', tt, tools.ustr(name)))
+                    (lang or '', types, tools.ustr(name)))
         res = cr.fetchone()
         trad = res and res[0] or u''
         if source and not trad:
diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 64f742924f3..b9ce95cdaaa 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -23,6 +23,7 @@ import codecs
 import csv
 import fnmatch
 import inspect
+import itertools
 import locale
 import os
 import re
@@ -34,8 +35,7 @@ import logging
 from datetime import datetime
 from lxml import etree
 
-import osv, tools, pooler
-import ir
+import tools, pooler
 import netsvc
 from tools.misc import UpdateableStr
 
@@ -472,7 +472,6 @@ def trans_generate(lang, modules, dbname=None):
 
     query = 'SELECT name, model, res_id, module'    \
             '  FROM ir_model_data'
-    query_param = None
     if 'all_installed' in modules:
         query += ' WHERE module IN ( SELECT name FROM ir_module_module WHERE state = \'installed\') '
     query_param = None
@@ -589,7 +588,7 @@ def trans_generate(lang, modules, dbname=None):
                         push_translation(module, 'model', name, 0, encode(obj_value[field_name]))
 
             if hasattr(field_def, 'selection') and isinstance(field_def.selection, (list, tuple)):
-                for key, val in field_def.selection:
+                for dummy, val in field_def.selection:
                     push_translation(module, 'selection', name, 0, encode(val))
 
         elif model=='ir.actions.report.xml':
@@ -598,19 +597,18 @@ def trans_generate(lang, modules, dbname=None):
             if obj.report_rml:
                 fname = obj.report_rml
                 parse_func = trans_parse_rml
-                report_type = "rml"
+                report_type = "report"
             elif obj.report_xsl:
                 fname = obj.report_xsl
                 parse_func = trans_parse_xsl
                 report_type = "xsl"
-            try:
-                xmlstr = tools.file_open(fname).read()
-                d = etree.XML(xmlstr)
-                for t in parse_func(d):
-                    push_translation(module, report_type, name, 0, t)
-            except IOError, etree.XMLSyntaxError:
-                if fname:
-                    logger.notifyChannel("i18n", netsvc.LOG_ERROR, "couldn't export translation for report %s %s %s" % (name, report_type, fname))
+            if fname and obj.report_type in ('pdf', 'xsl'):
+                try:
+                    d = etree.parse(tools.file_open(fname))
+                    for t in parse_func(d):
+                        push_translation(module, report_type, name, 0, t)
+                except (IOError, etree.XMLSyntaxError):
+                    logging.getLogger("i18n").exception("couldn't export translation for report %s %s %s", name, report_type, fname)
 
         for constraint in pool.get(model)._constraints:
             msg = constraint[1]
@@ -666,22 +664,25 @@ def trans_generate(lang, modules, dbname=None):
     else :
         path_list = [root_path,tools.config['addons_path']]
 
-    for path in path_list:
-        for root, dirs, files in tools.osutil.walksymlinks(path):
-            for fname in fnmatch.filter(files, '*.py'):
-                fabsolutepath = join(root, fname)
-                frelativepath = fabsolutepath[len(path):]
-                module = get_module_from_path(frelativepath)
-                is_mod_installed = module in installed_modules
-                if (('all' in modules) or (module in modules)) and is_mod_installed:
-                    code_string = tools.file_open(fabsolutepath, subdir='').read()
-                    iter = re.finditer('[^a-zA-Z0-9_]_\([\s]*["\'](.+?)["\'][\s]*\)',
-                        code_string, re.S)
+    def export_code_terms_from_file(fname, path, root, terms_type):
+        fabsolutepath = join(root, fname)
+        frelativepath = fabsolutepath[len(path):]
+        module = get_module_from_path(frelativepath)
+        is_mod_installed = module in installed_modules
+        if (('all' in modules) or (module in modules)) and is_mod_installed:
+            code_string = tools.file_open(fabsolutepath, subdir='').read()
+            iter = re.finditer('[^a-zA-Z0-9_]_\([\s]*["\'](.+?)["\'][\s]*\)', code_string, re.S)
+            if module in installed_modules:
+                frelativepath = str("addons" + frelativepath)
+            for i in iter:
+                push_translation(module, terms_type, frelativepath, 0, encode(i.group(1)))
 
-                    if module in installed_modules :
-                        frelativepath =str("addons"+frelativepath)
-                    for i in iter:
-                        push_translation(module, 'code', frelativepath, 0, encode(i.group(1)))
+    for path in path_list:
+        for root, dummy, files in tools.osutil.walksymlinks(path):
+            for fname in itertools.chain(fnmatch.filter(files, '*.py')):
+                export_code_terms_from_file(fname, path, root, 'code')
+            for fname in itertools.chain(fnmatch.filter(files, '*.mako')):
+                export_code_terms_from_file(fname, path, root, 'report')
 
 
     out = [["module","type","name","res_id","src","value"]] # header

From f92f272130c06d87cdde64bbe1d4c1f9f99cfb33 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 8 Oct 2010 16:23:01 +0200
Subject: [PATCH 182/244] [IMP] reports: support generic report_file field
 instead of report_xml ; add "file" attribute for <report> ;  pending better
 refactoring after v6.0

bzr revid: odo@openerp.com-20101008142301-0os4ajp8xb9kt3cy
---
 bin/addons/base/ir/ir.xml        |  4 ++--
 bin/addons/base/ir/ir_actions.py |  8 ++++++--
 bin/import_xml.rng               |  3 ++-
 bin/report/report_sxw.py         | 22 +++++++---------------
 bin/tools/convert.py             |  2 +-
 bin/tools/yaml_import.py         |  2 +-
 6 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 8d35e469bd8..5821e3cafdb 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -433,15 +433,14 @@
 
                         <field name="report_name" select="1"/>
                         <field name="report_type"/>
+                        <field name="report_file"/>
                     </group>
 
                     <notebook colspan="4">
                         <page string="Other Configuration">
                             <group col="2" colspan="2">
                                 <separator string="RML Report" colspan="2"/>
-                                <field name="report_rml"/>
                                 <field name="header"/>
-                                <field name="auto"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator string="XML Report" colspan="2"/>
@@ -456,6 +455,7 @@
                             <group col="2" colspan="2">
                                 <separator string="Miscellaneous" colspan="2"/>
                                 <field name="multi"/>
+                                <field name="auto"/>
                             </group>
                         </page>
                         <page string="Security">
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 297aebaf5dc..195241afb21 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -114,9 +114,13 @@ class report_xml(osv.osv):
 
         'report_xsl': fields.char('XSL path', size=256),
         'report_xml': fields.char('XML path', size=256, help=''),
-        'report_rml': fields.char('RML path', size=256, help="The .rml path of the file or NULL if the content is in report_rml_content"),
-        'report_sxw': fields.function(_report_sxw, method=True, type='char', string='SXW path'),
 
+        # Pending deprecation... to be replaced by report_file as this object will become the default report object (not so specific to RML anymore)
+        'report_rml': fields.char('Main report file path', size=256, help="The path to the main report file (depending on Report Type) or NULL if the content is in another data field"),
+        # temporary related field as report_rml is pending deprecation - this field will replace report_rml after v6.0
+        'report_file': fields.related('report_rml', type="char", size=256, required=False, readonly=False, string='Report file', help="The path to the main report file (depending on Report Type) or NULL if the content is in another field", store=True),
+
+        'report_sxw': fields.function(_report_sxw, method=True, type='char', string='SXW path'),
         'report_sxw_content_data': fields.binary('SXW content'),
         'report_rml_content_data': fields.binary('RML content'),
         'report_sxw_content': fields.function(_report_content, fnct_inv=_report_content_inv, method=True, type='binary', string='SXW content',),
diff --git a/bin/import_xml.rng b/bin/import_xml.rng
index 2ddc2336cc0..7b5a889a110 100644
--- a/bin/import_xml.rng
+++ b/bin/import_xml.rng
@@ -104,7 +104,8 @@
             <rng:optional><rng:attribute name="multi"/></rng:optional>
             <rng:optional><rng:attribute name="menu"/></rng:optional>
             <rng:optional><rng:attribute name="keyword"/></rng:optional>
-            <rng:optional><rng:attribute name="rml"/></rng:optional>
+            <rng:optional><rng:attribute name="rml"/></rng:optional><!-- pending deprecation after v6.0 -->
+            <rng:optional><rng:attribute name="file"/></rng:optional>
             <rng:optional><rng:attribute name="sxw"/></rng:optional>
             <rng:optional><rng:attribute name="xml"/></rng:optional>
             <rng:optional><rng:attribute name="xsl"/></rng:optional>
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 3cd448eac58..7707ef2fff0 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -19,24 +19,18 @@
 #
 ##############################################################################
 from lxml import etree
-import traceback, sys
 import StringIO
 import cStringIO
 import base64
-import copy
-import locale
 from datetime import datetime
 import os
 import re
 import time
 from interface import report_rml
 import preprocess
-import ir
-import netsvc
-import osv
+import logging
 import pooler
 import tools
-import warnings
 import zipfile
 import common
 from osv.fields import float as float_class, function as function_class
@@ -319,7 +313,7 @@ class rml_parse(object):
                 if not self._transl_regex.match(piece_list[pn]):
                     source_string = piece_list[pn].replace('\n', ' ').strip()
                     if len(source_string):
-                        translated_string = transl_obj._get_source(self.cr, self.uid, self.name, 'rml', lang, source_string)
+                        translated_string = transl_obj._get_source(self.cr, self.uid, self.name, ('report', 'rml'), lang, source_string)
                         if translated_string:
                             piece_list[pn] = piece_list[pn].replace(source_string, translated_string)
             text = ''.join(piece_list)
@@ -434,8 +428,8 @@ class report_sxw(report_rml, preprocess.report):
                 result = self.create_single_pdf(cr, uid, [obj.id], data, report_xml, context)
                 if not result:
                     return False
-                try:
-                    if aname:
+                if aname:
+                    try:
                         name = aname+'.'+result[1]
                         pool.get('ir.attachment').create(cr, uid, {
                             'name': aname,
@@ -445,11 +439,9 @@ class report_sxw(report_rml, preprocess.report):
                             'res_id': obj.id,
                             }, context=context
                         )
-                        cr.commit()
-                except Exception,e:
-                     import traceback, sys
-                     tb_s = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
-                     netsvc.Logger().notifyChannel('report', netsvc.LOG_ERROR,str(e))
+                    except Exception:
+                        #TODO: should probably raise a proper osv_except instead, shouldn't we? see LP bug #325632
+                        logging.getLogger('report').error('Could not create saved report attachment', exc_info=True)
                 results.append(result)
             if results:
                 if results[0][1]=='pdf':
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index a8749514958..ec3869f322f 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -300,7 +300,7 @@ form: module.record_id""" % (xml_id,)
         for dest,f in (('name','string'),('model','model'),('report_name','name')):
             res[dest] = rec.get(f,'').encode('utf8')
             assert res[dest], "Attribute %s of report is empty !" % (f,)
-        for field,dest in (('rml','report_rml'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
+        for field,dest in (('rml','report_rml'),('file','report_file'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
             if rec.get(field):
                 res[dest] = rec.get(field).encode('utf8')
         if rec.get('auto'):
diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 814779b3f36..7f271767a04 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -675,7 +675,7 @@ class YamlInterpreter(object):
         for dest, f in (('name','string'), ('model','model'), ('report_name','name')):
             values[dest] = getattr(node, f)
             assert values[dest], "Attribute %s of report is empty !" % (f,)
-        for field,dest in (('rml','report_rml'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
+        for field,dest in (('rml','report_rml'),('file','report_file'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
             if getattr(node, field):
                 values[dest] = getattr(node, field)
         if node.auto:

From 59c4544c97043763ace19e4db20ebc9760fd6505 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 8 Oct 2010 17:08:49 +0200
Subject: [PATCH 183/244] fix

bzr revid: fp@tinyerp.com-20101008150849-bxtph2mqcpxgs3b7
---
 bin/addons/base/res/res_log.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_log.py b/bin/addons/base/res/res_log.py
index 8ce446883b5..8165d05acac 100644
--- a/bin/addons/base/res/res_log.py
+++ b/bin/addons/base/res/res_log.py
@@ -22,19 +22,22 @@
 from osv import fields, osv
 import tools
 import time
+
 class res_log(osv.osv_memory):
     _name = 'res.log'
     _columns = {
         'name': fields.char('Message', size=128, help='The logging message.', required=True),
         'user_id': fields.many2one('res.users','User', required=True),
         'res_model': fields.char('Object', size=128),
+        'context': fields.char('Context', size=250),
         'res_id': fields.integer('Object ID'),
         'secondary': fields.boolean('Secondary Log', help='Do not display this log if it belongs to the same object the user is working on'),
         'create_date': fields.datetime('Created Date', readonly=True),
     }
     _defaults = {
         'user_id': lambda self,cr,uid,ctx: uid,
-        'create_date': time.strftime('%Y-%m-%d %H:%M:%S')
+        'create_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+        'context': lambda *args: "{}"
     }
     _order='create_date desc'
 

From 0cbf401d86b2ab0364d41036a66d5bee4abb87ab Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Fri, 8 Oct 2010 21:14:23 +0200
Subject: [PATCH 184/244] [FIX] base: Can translate the shortcut of a partner

bzr revid: stephane@openerp.com-20101008191423-i9re6cdmoc22vddb
---
 bin/addons/base/res/partner/partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 05630dea85b..3bef2042774 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -84,7 +84,7 @@ class res_partner_title(osv.osv):
     _name = 'res.partner.title'
     _columns = {
         'name': fields.char('Title', required=True, size=46, translate=True),
-        'shortcut': fields.char('Shortcut', required=True, size=16),
+        'shortcut': fields.char('Shortcut', required=True, size=16, translate=True),
         'domain': fields.selection([('partner','Partner'),('contact','Contact')], 'Domain', required=True, size=24)
     }
     _order = 'name'

From 02f8005ad476eed38eb50ead73eb4d26b2292787 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 9 Oct 2010 12:12:39 +0000
Subject: [PATCH 185/244] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101009121239-ksnhjucoz9ual2u8
---
 bin/addons/base/i18n/nl.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index ab6a784be15..2e2f548afde 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-10-06 14:56+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 06:06+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-10-08 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From 18c3f9511d2022c72fe73120c9410171b065e1ba Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Sun, 10 Oct 2010 21:09:42 +0200
Subject: [PATCH 186/244] useability

bzr revid: fp@fp-laptop-20101010190942-d5wo2tilixnzj7yx
---
 bin/addons/base/ir/ir_model.py               | 1 +
 bin/addons/base/res/partner/partner_view.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 5410cba10a6..247f020c7d6 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -239,6 +239,7 @@ class ir_model_access(osv.osv):
         grouparr  = group.split('.')
         if not grouparr:
             return False
+        print grouparr
 
         cr.execute("select 1 from res_groups_users_rel where uid=%s and gid IN (select res_id from ir_model_data where module=%s and name=%s)", (uid, grouparr[0], grouparr[1],))
         return bool(cr.fetchone())
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index fcf007deb0f..0837807e0b2 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -250,7 +250,7 @@
                     <group col="6" colspan="4">
                         <group colspan="5" col="6">
                             <field name="name" select="1"/>
-                            <field name="ref"/>
+                            <field name="ref" groups="base.group_extended"/>
                             <field domain="[('domain', '=', 'partner')]" name="title" size="0" groups="base.group_extended" widget="selection"/>
                             <field name="lang"/>
                         </group>

From 4c1a9e61399655f34652dea50ee46a5bd5b5e6e1 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Sun, 10 Oct 2010 21:33:54 +0200
Subject: [PATCH 187/244] fix

bzr revid: fp@fp-laptop-20101010193354-1azqu1646j4z6of7
---
 bin/addons/base/module/wizard/base_module_configuration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/module/wizard/base_module_configuration.py b/bin/addons/base/module/wizard/base_module_configuration.py
index 345ed9a9797..866b22905e0 100644
--- a/bin/addons/base/module/wizard/base_module_configuration.py
+++ b/bin/addons/base/module/wizard/base_module_configuration.py
@@ -27,7 +27,7 @@ class base_module_configuration(osv.osv_memory):
     _name = "base.module.configuration"
 
     def start(self, cr, uid, ids, context=None):
-        todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, ['|', ('state', '=', 'open'), '&', ('state', '=', 'skip'), ('restart', '=', 'onskip')])
+        todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, ['|', '|', ('restart','=','always'), ('state', '=', 'open'), '&', ('state', '=', 'skip'), ('restart', '=', 'onskip')])
         if not todo_ids:
             # When there is no wizard todo it will display message
             data_obj = self.pool.get('ir.model.data')

From ce3a5813b9a9e76a968715ccd782ea2b468565ee Mon Sep 17 00:00:00 2001
From: "AMP(Open ERP)" <>
Date: Mon, 11 Oct 2010 10:58:31 +0530
Subject: [PATCH 188/244] [ADD] Added a shortcut for Reconfigure and Customer

bzr revid: vir@tinyerp.com-20101011052831-srj5hjhctj5llqnh
---
 .../base/module/wizard/base_module_configuration_view.xml   | 6 ++++++
 bin/addons/base/res/partner/partner_view.xml                | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/module/wizard/base_module_configuration_view.xml b/bin/addons/base/module/wizard/base_module_configuration_view.xml
index e5ad8f720bd..2d0b31b7126 100644
--- a/bin/addons/base/module/wizard/base_module_configuration_view.xml
+++ b/bin/addons/base/module/wizard/base_module_configuration_view.xml
@@ -38,6 +38,12 @@
             <field name="key">action</field>
             <field name="model">ir.actions.todo</field>
         </record>
+        <record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc">
+            <field name="name">Reconfigure</field>
+            <field name="resource">ir.ui.menu</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="res_id" ref="menu_view_base_module_configuration"/>
+        </record>
 
     </data>
 </openerp>
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 0837807e0b2..e1eac247a08 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -586,7 +586,7 @@
             />
 
         <record id="ir_ui_view_sc_partner0" model="ir.ui.view_sc">
-            <field name="name">Address Book</field>
+            <field name="name">Customers</field>
             <field name="resource">ir.ui.menu</field>
             <field name="user_id" ref="base.user_root"/>
              <field name="res_id" ref="menu_partner_form"/>

From 1cb3e4e0992f91685e3e40ccc01c8621b557502b Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Mon, 11 Oct 2010 12:19:48 +0530
Subject: [PATCH 189/244] [REF] base: Refactored Code

bzr revid: ach@tinyerp.com-20101011064948-ust4ovsiy9tyjs85
---
 bin/addons/base/ir/ir_model.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 247f020c7d6..4e974abc9fa 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -239,8 +239,6 @@ class ir_model_access(osv.osv):
         grouparr  = group.split('.')
         if not grouparr:
             return False
-        print grouparr
-
         cr.execute("select 1 from res_groups_users_rel where uid=%s and gid IN (select res_id from ir_model_data where module=%s and name=%s)", (uid, grouparr[0], grouparr[1],))
         return bool(cr.fetchone())
 

From 890f23281a0ca4fb54d4cceea405ae7c7c6d10b1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 9 Oct 2010 18:01:30 +0200
Subject: [PATCH 190/244] [IMP] useability

bzr revid: fp@tinyerp.com-20101009160130-scig3mrbr64pj09d
---
 bin/addons/base/base_update.xml   | 2 +-
 bin/addons/base/res/bank_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index e89106bb8f3..a397b39cba2 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -322,7 +322,7 @@
                 </form>
                 <xpath expr="//label[@string='description']"
                      position="attributes">
-                <attribute name="string">OpenERP allows you to select between a simplified and extended interface. If you use OpenERP for the first time we strongly advise you to select the simplified interface. You can always switch later from the user preferences.</attribute>
+                <attribute name="string">If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences.</attribute>
               </xpath>
               <xpath expr='//separator[@string="title"]' position='attributes'>
                     <attribute name='string'>Configure Your Interface</attribute>
diff --git a/bin/addons/base/res/bank_view.xml b/bin/addons/base/res/bank_view.xml
index feb7088168e..c6e6b063456 100644
--- a/bin/addons/base/res/bank_view.xml
+++ b/bin/addons/base/res/bank_view.xml
@@ -45,7 +45,7 @@
         </record>
 
         <record id="action_res_bank_form" model="ir.actions.act_window">
-            <field name="name">Bank List</field>
+            <field name="name">Banks</field>
             <field name="res_model">res.bank</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>

From 3d6b88c87e888fd1219c75a0ead7397f1bf7bcd0 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 11 Oct 2010 12:27:03 +0530
Subject: [PATCH 191/244] [FIX] fixed regression on get_module_resource method
 to clean checking of file

bzr revid: hmo@tinyerp.com-20101011065703-96zngxucees6zwx1
---
 bin/addons/__init__.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 7db007b732f..8e75a7d1124 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -270,16 +270,17 @@ def get_module_resource(module, *args):
     @return: absolute path to the resource
     """
     a = get_module_path(module)
+    res = a and opj(a, *args) or False
     if zipfile.is_zipfile( a +'.zip') :
         zip = zipfile.ZipFile( a + ".zip")
-        files = ['/'.join(f.split('/')[1:]) for f in zip.namelist()]
+        files = [opj(a,'/'.join(f.split('/')[1:])) for f in zip.namelist()]
+        if res in files:
+            return res
     else:
-        files = tools.osutil.listdir(a, True)
-    for ar in args:
-        if ar not in files:
-            return False
-    res = a and opj(a, *args) or False
-    return res
+        if os.path.isfile(res):
+            return res
+    
+    return False
 
 
 

From f9eb2e0260ba98475860e4daef7d12814fd40b5e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Oct 2010 12:24:39 +0200
Subject: [PATCH 192/244] [FIX] addons: fixed cross-platform compatibility for
 get_module_resource()

bzr revid: odo@openerp.com-20101011102439-qgrsxquxdmasnty8
---
 bin/addons/__init__.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 8e75a7d1124..72e9fb2c6e2 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -273,13 +273,12 @@ def get_module_resource(module, *args):
     res = a and opj(a, *args) or False
     if zipfile.is_zipfile( a +'.zip') :
         zip = zipfile.ZipFile( a + ".zip")
-        files = [opj(a,'/'.join(f.split('/')[1:])) for f in zip.namelist()]
+        files = ['/'.join(f.split('/')[1:]) for f in zip.namelist()]
+        res = '/'.join(args)
         if res in files:
-            return res
-    else:
-        if os.path.isfile(res):
-            return res
-    
+            return opj(a, res)
+    elif os.path.isfile(res):
+        return res
     return False
 
 

From 9df06539a4e6b4f280ed1cd3096ac7e8c1302f08 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Mon, 11 Oct 2010 16:19:13 +0530
Subject: [PATCH 193/244] [MOD/IMP] : Usability Improvement

bzr revid: amp@tinyerp.com-20101011104913-7apvg28gokrjjdht
---
 addons/crm/crm_meeting_view.xml                      | 2 +-
 addons/report_designer/installer.py                  | 1 -
 addons/report_designer/report_designer_installer.xml | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index aa8b6cc4820..62d4e9cd59b 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -36,7 +36,7 @@
                     <field name="date" string="Start Date" required="1"
                         on_change="onchange_dates(date,duration,False,allday)" />
                     <field name="duration" widget="float_time"
-                        on_change="onchange_dates(date,duration,False,allday)" />
+                        on_change="onchange_dates(date,duration,False,allday)" readonly="1" />
                     <field name="date_deadline" string="End Date" required="1"
                         on_change="onchange_dates(date,False,date_deadline)" />
                     <field name="location" />
diff --git a/addons/report_designer/installer.py b/addons/report_designer/installer.py
index 1accab65c0b..f849392d328 100644
--- a/addons/report_designer/installer.py
+++ b/addons/report_designer/installer.py
@@ -31,7 +31,6 @@ class report_designer_installer(osv.osv_memory):
                                 "upload the report using the same wizard."),
         'base_report_creator':fields.boolean('Query Builder',help="Allows you to create any statistic "
                                 "reports  on several objects. It's a SQL query builder and browser for end users."),
-        'olap':fields.boolean('Business Intelligence Report',help="Helps you manage Online Analytical Process with the mdx query and provides Cube Designing and Cube Browsing"),
     }
 report_designer_installer()
 
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index b377331a208..2f838c0b74c 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -28,7 +28,6 @@
           <group colspan="8">
             <field name="base_report_designer"/>
             <field name="base_report_creator"/>
-            <field name="olap"/>
           </group>
         </data>
       </field>

From 3e44b15833aeff145186d03663a57039536ffaa6 Mon Sep 17 00:00:00 2001
From: husen <husen@husen-laptop>
Date: Mon, 11 Oct 2010 17:47:53 +0530
Subject: [PATCH 194/244] fix related field create problem

bzr revid: husen@husen-laptop-20101011121753-geotbl0iwqf3cqwe
---
 bin/tools/convert.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index ec3869f322f..6e534fe0400 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -300,7 +300,7 @@ form: module.record_id""" % (xml_id,)
         for dest,f in (('name','string'),('model','model'),('report_name','name')):
             res[dest] = rec.get(f,'').encode('utf8')
             assert res[dest], "Attribute %s of report is empty !" % (f,)
-        for field,dest in (('rml','report_rml'),('file','report_file'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
+        for field,dest in (('rml','report_rml'),('file','report_rml'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
             if rec.get(field):
                 res[dest] = rec.get(field).encode('utf8')
         if rec.get('auto'):

From efab55ee39c1b89f246d271ead15f4ee004bfcc1 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Mon, 11 Oct 2010 18:16:07 +0530
Subject: [PATCH 195/244] [MOD/IMP] : Usability Improvement

bzr revid: amp@tinyerp.com-20101011124607-9cb7byanld4uka1s
---
 addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml | 2 +-
 addons/product/product.py                                 | 1 +
 addons/product/product_view.xml                           | 6 ++----
 addons/project/project_view.xml                           | 6 +++---
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 4beda0999d0..a284523665c 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -112,7 +112,7 @@
 
         <!-- Menus -->
         <record id="action_hr_analytic_timesheet_open_tree" model="ir.actions.act_window">
-            <field name="name">Costs to Invoice</field>
+            <field name="name">Bill Tasks Works</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/product/product.py b/addons/product/product.py
index 09732a9bff3..922868684aa 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -308,6 +308,7 @@ class product_template(osv.osv):
         'uos_coeff' : lambda *a: 1.0,
         'mes_type' : lambda *a: 'fixed',
         'categ_id' : _default_category,
+        'type' : lambda *a: 'consu',
     }
 
     def _check_uom(self, cursor, user, ids):
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8f2e5efe649..b7c7f621818 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -9,10 +9,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
-                   <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
-		   <filter icon="terp-accessories-archiver" string="Consumable"
-                        domain="[('type','=', 'consumable')]"/>                   
-                   <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
+                   <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>                   
+                   <filter string="Consumable/Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
                    <separator orientation="vertical"/>
                    <filter string="To Sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5e5be5ee4b0..6b4796cc099 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -46,7 +46,7 @@
                             <separator colspan="4"/>
                             <group col="9" colspan="8">
                                 <field name="state" select="1" readonly="1"/>
-                                <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
+                                <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
                                 <button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
                                 <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
                                 <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
@@ -67,9 +67,9 @@
                                 </tree>
                             </field>
                         </page>
-                        <page groups="base.group_extended" string="Partner Info">
+                        <page groups="base.group_extended" string="Accounting">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Contact Address"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Invoice Address"/>
                             <field name="warn_customer"/>
                             <newline/>
                             <separator colspan="2" string="Mail Header"/>

From 7bc5710eef14b16fc425596b7a2b39a3152daaff Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Mon, 11 Oct 2010 18:31:41 +0530
Subject: [PATCH 196/244] [FIX] base : Deleting a Language deletes the
 respective translations

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

bzr revid: ach@tinyerp.com-20101011130141-wxzk35dx7sxoakaw
---
 bin/addons/base/res/res_lang.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_lang.py b/bin/addons/base/res/res_lang.py
index 13c4a33aa9c..1e158a175e6 100644
--- a/bin/addons/base/res/res_lang.py
+++ b/bin/addons/base/res/res_lang.py
@@ -23,7 +23,7 @@ from osv import fields, osv
 from locale import localeconv
 import tools
 from tools.safe_eval import safe_eval as eval
-
+from tools.translate import _
 class lang(osv.osv):
     _name = "res.lang"
     _description = "Languages"
@@ -76,6 +76,23 @@ class lang(osv.osv):
             self._lang_data_get.clear_cache(cr.dbname,lang_id= lang_id)
         return super(lang, self).write(cr, uid, ids, vals, context)
 
+    def unlink(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        languages = self.read(cr, uid, ids, ['code','active'], context=context)
+        for language in languages:
+            lang = context.get('lang')
+            if language['code']=='en_US':
+                raise osv.except_osv(_('User Error'), _("Base Language 'en_US' can not be deleted !"))
+            if lang and (language['code']==lang):
+                raise osv.except_osv(_('User Error'), _("You cannot delete the language which is User's Preferred Language !"))
+            if language['active']:
+                raise osv.except_osv(_('User Error'), _("You cannot delete the language which is Active !\nPlease de-activate the language first."))
+            trans_obj = self.pool.get('ir.translation')
+            trans_ids = trans_obj.search(cr, uid, [('lang','=',language['code'])], context=context)
+            trans_obj.unlink(cr, uid, trans_ids, context=context)
+        return super(lang, self).unlink(cr, uid, ids, context=context)
+
     def _group(self, cr, uid, ids, s, monetary=False, grouping=False, thousands_sep=''):
         grouping = eval(grouping)
         

From 61da7d8883a915bb7e8593d696a10e94852ced90 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Mon, 11 Oct 2010 18:50:43 +0530
Subject: [PATCH 197/244] [REM]:removed implementation of gallery view

bzr revid: nch@tinyerp.com-20101011132043-qlzlaujac4yv1zr7
---
 bin/addons/base/ir/ir_actions.py |  3 +--
 bin/addons/base/ir/ir_ui_view.py |  1 -
 bin/addons/base/rng/view.rng     | 17 -----------------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 195241afb21..1774b64fefa 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -282,8 +282,7 @@ class act_window_view(osv.osv):
             ('form', 'Form'),
             ('graph', 'Graph'),
             ('calendar', 'Calendar'),
-            ('gantt', 'Gantt'),
-            ('gallery', 'Gallery')), string='View Type', required=True),
+            ('gantt', 'Gantt')), string='View Type', required=True),
         'act_window_id': fields.many2one('ir.actions.act_window', 'Action', ondelete='cascade'),
         'multi': fields.boolean('On Multiple Doc.',
             help="If set to true, the action will not be displayed on the right toolbar of a form view."),
diff --git a/bin/addons/base/ir/ir_ui_view.py b/bin/addons/base/ir/ir_ui_view.py
index 810bfcf108a..4c90e85a35c 100644
--- a/bin/addons/base/ir/ir_ui_view.py
+++ b/bin/addons/base/ir/ir_ui_view.py
@@ -64,7 +64,6 @@ class view(osv.osv):
             ('calendar', 'Calendar'),
             ('diagram','Diagram'),
             ('gantt', 'Gantt'),
-            ('gallery', 'Gallery'),
             ('search','Search')), 'View Type', required=True),
         'arch': fields.text('View Architecture', required=True),
         'inherit_id': fields.many2one('ir.ui.view', 'Inherited View', ondelete='cascade'),
diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index c634ede8d5f..9c591723a9f 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -397,7 +397,6 @@
                     <rng:ref name="button"/>
                     <rng:ref name="group"/>
                     <rng:ref name="graph"/>
-		    <rng:ref name="gallery"/>
                     <rng:ref name="html"/>
                     <rng:element name="newline"><rng:empty/></rng:element>
                 </rng:choice>
@@ -441,7 +440,6 @@
             <rng:optional><rng:attribute name="required"/></rng:optional>
             <rng:optional><rng:attribute name="readonly"/></rng:optional>
             <rng:optional><rng:attribute name="view_mode"/></rng:optional>
-            <rng:optional><rng:attribute name="search_mode"/></rng:optional>
             <rng:optional><rng:attribute name="widget"/></rng:optional>
             <rng:optional><rng:attribute name="context"/></rng:optional>
             <rng:optional><rng:attribute name="states"/></rng:optional>
@@ -472,7 +470,6 @@
                     <rng:ref name="button"/>
                     <rng:ref name="group"/>
                     <rng:ref name="graph"/>
-		    <rng:ref name="gallery"/>
                     <rng:ref name="filter"/>
                     <rng:ref name="notebook"/>
                     <rng:ref name="html"/>
@@ -535,18 +532,6 @@
         </rng:element>
     </rng:define>
 
-    <rng:define name="gallery">
-        <rng:element name="gallery">
-            <rng:optional><rng:attribute name="string"/></rng:optional>
-            <rng:optional><rng:attribute name="width"/></rng:optional>
-            <rng:optional><rng:attribute name="height"/></rng:optional>
-            <rng:optional><rng:attribute name="col"/></rng:optional>
-            <rng:oneOrMore>
-                <rng:ref name="field"/>
-            </rng:oneOrMore>
-        </rng:element>
-    </rng:define>
-
     <rng:define name="button">
         <rng:element name="button">
             <rng:ref name="overload"/>
@@ -576,7 +561,6 @@
                     <rng:ref name="graph" />
                     <rng:ref name="calendar" />
                     <rng:ref name="gantt" />
-                    <rng:ref name="gallery" />
                     <rng:ref name="xpath" />
                     <rng:ref name="page" />
                     <rng:ref name="separator"/>
@@ -645,7 +629,6 @@
             <rng:ref name="calendar" />
             <rng:ref name="data" />
             <rng:ref name="gantt" />
-            <rng:ref name="gallery" />
             <rng:ref name="xpath" />
             <rng:ref name="page" />
             <rng:ref name="separator"/>

From c8bbcfdc57813e43230ff6ea513bd8e3926284ea Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 11 Oct 2010 18:55:25 +0530
Subject: [PATCH 198/244] [MOD/IMP] Account_* : Cancel Button Set on left side

bzr revid: dbr@tinyerp.com-20101011132525-hc2nmdmjaz6p7mju
---
 addons/account/account_invoice_view.xml              |  2 +-
 addons/account/account_view.xml                      | 10 +++++-----
 addons/account/wizard/account_invoice_state_view.xml |  2 +-
 addons/account_budget/account_budget_view.xml        |  2 +-
 addons/base_calendar/base_calendar_view.xml          | 12 ++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index e72bd584f9d..0825aad8831 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -209,8 +209,8 @@
                                 <field name="state"/>
                                 <field name="residual"/>
                                 <group col="6" colspan="4">
-                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
                                     <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 36ee5255523..f2beba72a12 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -471,8 +471,8 @@
                     <field name="balance_end_real"/>
                     <field name="balance_end" invisible="1"/>
                     <field name="state"/>
-                    <button type="object" string="Confirm" name="button_confirm_bank" states="draft" icon="terp-camera_test"/>
                     <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
+                    <button type="object" string="Confirm" name="button_confirm_bank" states="draft" icon="terp-camera_test"/>
                 </tree>
             </field>
         </record>
@@ -553,9 +553,9 @@
                     <group col="8" colspan="4">
                         <field name="state"/>
                         <field name="balance_end"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                         <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
                         <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -585,9 +585,9 @@
                     <group col="8" colspan="4">
                         <field name="state"/>
                         <field name="balance_end"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                         <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
                         <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -1470,9 +1470,9 @@
                     <group col="7" colspan="4">
                         <field name="state"/>
                         <field name="balance_end"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                         <button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
                         <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -2455,9 +2455,9 @@
                     <field name="balance_end_real"/>
                     <field name="balance_end"/>
                     <field name="state"/>
+                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
                     <button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
                     <button type="object" string="Confirm" name="button_confirm_bank" states="open" icon="terp-gtk-go-back-rtl"/>
-                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 6f6dca22e46..8e9c04b788d 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -33,8 +33,8 @@
             <form string="Cancel Selected Invoices">
                 <separator string="Cancel Selected Invoices" colspan="4"/>
                     <group colspan="4" col="6">
-                        <button icon="terp-dialog-close" special="cancel" string="Close"/>
                         <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
+                        <button icon="terp-dialog-close" special="cancel" string="Close"/>
                    </group>
             </form>
             </field>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index d6c4b82e960..a1aeb93252c 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -147,10 +147,10 @@
                             </field>
                             <field name="state" select="1"/>
                             <group col="4" colspan="2">
+                                <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-apply" />
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
                                 <button string="Done" name="done" states="validate" type="workflow"   icon="gtk-jump-to" />
-                                <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
                                 <button name="draft" states="cancel" string="Reset to Draft" type="workflow" icon="terp-stock_effects-object-colorize"/>
                             </group>
 
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index ba91c4b75dd..bc581955571 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -313,6 +313,11 @@
                         <separator colspan="4" string="" />
                            <group col="5" colspan="4">
                                <field name="state" select="2" />
+                               <button name="do_cancel"
+                                   string="Cancel"
+                                   states="tentative,confirmed"
+                                   type="object"
+                                   icon="gtk-cancel" />
                                <button name="do_tentative"
                                    states="confirmed,cancelled"
                                    string="Uncertain"
@@ -323,11 +328,6 @@
                                    states="tentative,cancelled"
                                    type="object"
                                    icon="gtk-apply" />
-                               <button name="do_cancel"
-                                   string="Cancel"
-                                   states="tentative,confirmed"
-                                   type="object"
-                                   icon="gtk-cancel" />
                            </group>
                         </page>
                         <page string="Invitation Detail">
@@ -475,7 +475,7 @@
                             <separator orientation="vertical" />
                             <filter string="Date" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'date'}" />
-                            
+
                         </group>
                 </search>
             </field>

From 4fa6f8317732d77fab7ec76a158ef8c1194f6539 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 11 Oct 2010 19:05:12 +0530
Subject: [PATCH 199/244] [MOD/IMP] CRM_* : Cancel Button Set on left side

bzr revid: dbr@tinyerp.com-20101011133512-itlt90clyzunqvot
---
 addons/crm/crm_meeting_view.xml                 |  6 +++---
 addons/crm/crm_phonecall_view.xml               |  8 ++++----
 addons/crm/res_partner_view.xml                 |  8 ++++----
 addons/crm_claim/crm_claim_view.xml             | 12 ++++++------
 addons/crm_fundraising/crm_fundraising_view.xml | 12 ++++++------
 addons/crm_helpdesk/crm_helpdesk_view.xml       | 12 ++++++------
 addons/crm_partner_assign/res_partner_view.xml  |  6 +++---
 7 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 62d4e9cd59b..d433e6a62ca 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -244,6 +244,9 @@
                 <field name="state" groups="base.group_extended"/>
                 <field name="user_id" invisible="1"/>
                 <field name="show_as" invisible="1" string="Show time as"/>
+                <button name="case_cancel" string="Cancel"
+                   states="draft,open" type="object"
+                   icon="gtk-cancel" />
                 <button name="case_reset" string="Reset to Unconfirmed"
                    states="open,done,cancel" type="object"
                    icon="gtk-convert" />
@@ -253,9 +256,6 @@
                 <button name="case_close" string="Done"
                             states="open" type="object"
                             icon="gtk-jump-to" />
-                <button name="case_cancel" string="Cancel"
-                   states="draft,open" type="object"
-                   icon="gtk-cancel" />
             </tree>
         </field>
     </record>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index afc6edd5295..5d322d17727 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -40,10 +40,10 @@
                     states="draft,open,pending" icon="gtk-redo"
                      name="action_make_meeting" type="object" />
                 <field name="state"/>
+                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                 <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                 <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause"/>
-                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
             </tree>
         </field>
     </record>
@@ -105,6 +105,9 @@
                 <separator colspan="4" />
                 <group col="8" colspan="4">
                     <field name="state" select="1" />
+                    <button name="case_cancel" string="Cancel"
+                        states="draft,open,pending" type="object"
+                        icon="gtk-cancel" />
                     <button name="case_open" string="Open"
                         states="draft,pending" type="object"
                         icon="gtk-go-forward" />
@@ -116,9 +119,6 @@
                     <button name="case_reset" string="Reset to Draft"
                         states="done,cancel" type="object"
                         icon="gtk-convert" />
-                    <button name="case_cancel" string="Cancel"
-                        states="draft,open,pending" type="object"
-                        icon="gtk-cancel" />
                 </group>
             </form>
         </field>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 6ca978ea153..75189fb70f5 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -26,6 +26,9 @@
                                  invisible="context.get('invisible_section', True)" />
                              <field name="user_id" />
                              <field name="state" />
+                             <button name="case_cancel" string="Cancel"
+                                 states="draft,open,pending" type="object"
+                                 icon="gtk-cancel" />
                              <button name="case_open" string="Open"
                                  states="draft,pending" type="object"
                                  icon="gtk-go-forward" />
@@ -39,9 +42,6 @@
                              <button name="case_escalate" string="Escalate"
                                  states="open,draft,pending" type="object"
                                  icon="gtk-go-up" />
-                             <button name="case_cancel" string="Cancel"
-                                 states="draft,open,pending" type="object"
-                                 icon="gtk-cancel" />
                          </tree>
                     </field>
                     <field name="meeting_ids" colspan="4" nolabel="1" >
@@ -59,10 +59,10 @@
                             <field name="categ_id"/>
                             <field name="user_id"/>
                             <field name="state"/>
+                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                             <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                             <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause"/>
-                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                         </tree>
                     </field>
                 </page>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6b5f21df920..a52c5d7e93f 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -53,6 +53,9 @@
                     <field name="categ_id" string="Type" select="1"/>
                     <field name="stage_id" invisible="1"/>
                     <field name="state"/>
+                    <button name="case_cancel" string="Cancel"
+                        states="draft,open,pending" type="object"
+                        icon="gtk-cancel" />
                     <button name="case_open" string="Open"
                         states="draft,pending" type="object"
                         icon="gtk-go-forward" />
@@ -62,9 +65,6 @@
                     <button name="case_close" string="Close"
                         states="open,draft,pending" type="object"
                         icon="gtk-close" />
-                    <button name="case_cancel" string="Cancel"
-                        states="draft,open,pending" type="object"
-                        icon="gtk-cancel" />
                     <button name="case_reset" string="Reset to Draft"
                         states="done,cancel" type="object" icon="gtk-convert" />
                 </tree>
@@ -130,6 +130,9 @@
                                 <separator colspan="4" string=""/>
                                 <group col="8" colspan="4">
                                     <field name="state" select="1"/>
+                                    <button name="case_cancel" string="Cancel"
+                                    states="draft,open,pending" type="object"
+                                    icon="gtk-cancel" />
                                     <button name="case_open" string="Open"
                                     states="draft,pending" type="object"
                                     icon="gtk-go-forward" />
@@ -139,9 +142,6 @@
                                     <button name="case_close" string="Done"
                                     states="open,draft,pending" type="object"
                                     icon="gtk-jump-to" />
-                                    <button name="case_cancel" string="Cancel"
-                                    states="draft,open,pending" type="object"
-                                    icon="gtk-cancel" />
                                     <button name="case_reset"
                                     string="Reset to Draft" states="done,cancel"
                                     type="object" icon="gtk-convert" />
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 6bcf019dabe..f38b46c0a5e 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -54,6 +54,9 @@
                     <field name="user_id" />
                     <field name="state" />
                     <field name="partner_id" invisible="1"/>
+                    <button name="case_cancel" string="Cancel"
+                        states="draft,open,pending" type="object"
+                        icon="gtk-cancel" />
                     <button name="case_open" string="Open"
                         states="draft,pending" type="object"
                         icon="gtk-go-forward" />
@@ -66,9 +69,6 @@
                     <button name="case_close" string="Done"
                         states="open,draft,pending" type="object"
                         icon="gtk-close" />
-                    <button name="case_cancel" string="Cancel"
-                        states="draft,open,pending" type="object"
-                        icon="gtk-cancel" />
                     <button name="case_reset" string="Reset to Draft"
                         states="done,cancel" type="object" icon="gtk-convert" />
                 </tree>
@@ -115,6 +115,9 @@
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
                                 <field name="state"/>
+                                <button name="case_cancel" string="Cancel"
+                                    states="draft,open,pending" type="object"
+                                    icon="gtk-cancel" />
                                 <button name="case_open" string="Open"
                                     states="draft,pending" type="object"
                                     icon="gtk-go-forward" />
@@ -128,9 +131,6 @@
                                 <button name="case_close" string="Done"
                                     states="open,draft,pending" type="object"
                                     icon="gtk-close" />
-                                <button name="case_cancel" string="Cancel"
-                                    states="draft,open,pending" type="object"
-                                    icon="gtk-cancel" />
                                 <button name="case_reset"
                                     string="Reset to Draft" states="done,cancel"
                                     type="object" icon="gtk-convert" />
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 0531092dd98..b792097534d 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -69,6 +69,9 @@
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
                                 <field name="state" select="1"/>
+                                <button name="case_cancel"
+                                    states="draft,open,pending" string="Cancel"
+                                    type="object" icon="gtk-cancel" />
                                 <button name="case_open"
                                     states="draft,pending" string="Open"
                                     type="object" icon="gtk-go-forward" />
@@ -82,9 +85,6 @@
                                 <button name="case_close"
                                     states="open,draft,pending" string="Close"
                                     type="object" icon="gtk-jump-to" />
-                                <button name="case_cancel"
-                                    states="draft,open,pending" string="Cancel"
-                                    type="object" icon="gtk-cancel" />
                                 <button name="case_reset"
                                     states="done,cancel"
                                     string="Reset to Draft" type="object"
@@ -187,6 +187,9 @@
                     <field name="section_id"/>
                     <field name="priority"/>
                     <field name="state"/>
+                    <button name="case_cancel" string="Cancel"
+                        states="draft,open,pending" type="object"
+                        icon="gtk-cancel" />
                     <button name="case_open" string="Open"
                         states="draft,pending" type="object"
                         icon="gtk-go-forward" />
@@ -200,9 +203,6 @@
                     <button name="case_close" string="Done"
                         states="open,draft,pending" type="object"
                         icon="gtk-close" />
-                    <button name="case_cancel" string="Cancel"
-                        states="draft,open,pending" type="object"
-                        icon="gtk-cancel" />
                     <button name="case_reset" string="Reset to Draft"
                         states="done,cancel" type="object" icon="gtk-convert" />
                 </tree>
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index ab14e7ca7b0..c340483f024 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -100,6 +100,9 @@
                                  invisible="context.get('invisible_section', True)" />
                              <field name="user_id" />
                              <field name="state" />
+                             <button name="case_cancel" string="Cancel"
+                                 states="draft,open,pending" type="object"
+                                 icon="gtk-cancel" />
                              <button name="case_open" string="Open"
                                  states="draft,pending" type="object"
                                  icon="gtk-go-forward" />
@@ -113,9 +116,6 @@
                              <button name="case_escalate" string="Escalate"
                                  states="open,draft,pending" type="object"
                                  icon="gtk-go-up" />
-                             <button name="case_cancel" string="Cancel"
-                                 states="draft,open,pending" type="object"
-                                 icon="gtk-cancel" />
                          </tree>
                     </field>
                 </page>

From eec37bdb7786b497ba7f7af9f35e91fabf80bc51 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Mon, 11 Oct 2010 20:15:40 +0530
Subject: [PATCH 200/244] [FIX] base : Partner's Spam email wizard fixed

bzr revid: ach@tinyerp.com-20101011144540-fa5t23ys1c05403l
---
 bin/addons/base/res/partner/wizard/partner_wizard_spam.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/partner/wizard/partner_wizard_spam.py b/bin/addons/base/res/partner/wizard/partner_wizard_spam.py
index 8f85833d650..f349825d588 100644
--- a/bin/addons/base/res/partner/wizard/partner_wizard_spam.py
+++ b/bin/addons/base/res/partner/wizard/partner_wizard_spam.py
@@ -47,7 +47,7 @@ class partner_wizard_spam(osv.osv_memory):
 
         nbr = 0
         partner_pool = self.pool.get('res.partner')
-        data = self.browse(cr, uid, ids, context=context)
+        data = self.browse(cr, uid, ids[0], context=context)
         event_pool = self.pool.get('res.partner.event')
         active_ids = context and context.get('active_ids', [])
         partners = partner_pool.browse(cr, uid, active_ids, context)
@@ -61,7 +61,7 @@ class partner_wizard_spam(osv.osv_memory):
                     tools.email_send(data.email_from, [to], data.subject, data.text,subtype='html')
                     nbr += 1
             event_pool.create(cr, uid,
-                    {'name': 'Email sent through mass mailing',
+                    {'name': 'Email(s) sent through mass mailing',
                      'partner_id': partner.id,
                      'description': data.text })
     #TODO: log number of message sent

From 494f8f778da8594781f9b736f9a6a16bbeb52084 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Mon, 11 Oct 2010 20:16:55 +0530
Subject: [PATCH 201/244] [FIX] base : Removed Translation References of
 ir.rule.group

bzr revid: ach@tinyerp.com-20101011144655-e6oqb3xb6grtutid
---
 bin/addons/base/i18n/am.po    | 44 ------------------------------
 bin/addons/base/i18n/ar.po    | 44 ------------------------------
 bin/addons/base/i18n/base.pot | 44 ------------------------------
 bin/addons/base/i18n/bg.po    | 48 ---------------------------------
 bin/addons/base/i18n/bs.po    | 44 ------------------------------
 bin/addons/base/i18n/ca.po    | 46 -------------------------------
 bin/addons/base/i18n/cs.po    | 44 ------------------------------
 bin/addons/base/i18n/da.po    | 44 ------------------------------
 bin/addons/base/i18n/de.po    | 47 --------------------------------
 bin/addons/base/i18n/el.po    | 46 -------------------------------
 bin/addons/base/i18n/en_GB.po | 44 ------------------------------
 bin/addons/base/i18n/es.po    | 45 -------------------------------
 bin/addons/base/i18n/es_AR.po | 45 -------------------------------
 bin/addons/base/i18n/es_EC.po | 45 -------------------------------
 bin/addons/base/i18n/et.po    | 44 ------------------------------
 bin/addons/base/i18n/eu.po    | 44 ------------------------------
 bin/addons/base/i18n/fa.po    | 47 --------------------------------
 bin/addons/base/i18n/fi.po    | 45 -------------------------------
 bin/addons/base/i18n/fr.po    | 46 -------------------------------
 bin/addons/base/i18n/gl.po    | 44 ------------------------------
 bin/addons/base/i18n/he.po    | 44 ------------------------------
 bin/addons/base/i18n/hr.po    | 44 ------------------------------
 bin/addons/base/i18n/hu.po    | 44 ------------------------------
 bin/addons/base/i18n/id.po    | 44 ------------------------------
 bin/addons/base/i18n/is.po    | 44 ------------------------------
 bin/addons/base/i18n/it.po    | 50 ----------------------------------
 bin/addons/base/i18n/ja.po    | 44 ------------------------------
 bin/addons/base/i18n/ko.po    | 44 ------------------------------
 bin/addons/base/i18n/lt.po    | 44 ------------------------------
 bin/addons/base/i18n/lt_LT.po | 44 ------------------------------
 bin/addons/base/i18n/lv.po    | 46 -------------------------------
 bin/addons/base/i18n/mn.po    | 44 ------------------------------
 bin/addons/base/i18n/nb.po    | 44 ------------------------------
 bin/addons/base/i18n/nl.po    | 47 --------------------------------
 bin/addons/base/i18n/nl_BE.po | 46 -------------------------------
 bin/addons/base/i18n/nl_NL.po | 46 -------------------------------
 bin/addons/base/i18n/pl.po    | 46 -------------------------------
 bin/addons/base/i18n/pt.po    | 45 -------------------------------
 bin/addons/base/i18n/pt_BR.po | 46 -------------------------------
 bin/addons/base/i18n/ro.po    | 44 ------------------------------
 bin/addons/base/i18n/ru.po    | 51 -----------------------------------
 bin/addons/base/i18n/sk.po    | 44 ------------------------------
 bin/addons/base/i18n/sl.po    | 44 ------------------------------
 bin/addons/base/i18n/sq.po    | 44 ------------------------------
 bin/addons/base/i18n/sr.po    | 46 -------------------------------
 bin/addons/base/i18n/sv.po    | 44 ------------------------------
 bin/addons/base/i18n/th.po    | 44 ------------------------------
 bin/addons/base/i18n/tlh.po   | 44 ------------------------------
 bin/addons/base/i18n/tr.po    | 46 -------------------------------
 bin/addons/base/i18n/uk.po    | 44 ------------------------------
 bin/addons/base/i18n/uk_UA.po | 44 ------------------------------
 bin/addons/base/i18n/vi.po    | 44 ------------------------------
 bin/addons/base/i18n/zh_CN.po | 44 ------------------------------
 bin/addons/base/i18n/zh_TW.po | 44 ------------------------------
 54 files changed, 2427 deletions(-)

diff --git a/bin/addons/base/i18n/am.po b/bin/addons/base/i18n/am.po
index 718ec294ec0..9ab01f41afd 100644
--- a/bin/addons/base/i18n/am.po
+++ b/bin/addons/base/i18n/am.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/ar.po b/bin/addons/base/i18n/ar.po
index de0a35e7dfe..8080be966a3 100644
--- a/bin/addons/base/i18n/ar.po
+++ b/bin/addons/base/i18n/ar.po
@@ -248,11 +248,6 @@ msgstr "%y - السنة بدون القرن (من 00 إلى 99)"
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -795,11 +790,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1326,7 +1316,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1427,11 +1416,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2141,11 +2125,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2756,11 +2735,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3080,7 +3054,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3740,11 +3713,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4072,11 +4040,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4693,11 +4656,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4944,7 +4902,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6057,7 +6014,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/base.pot b/bin/addons/base/i18n/base.pot
index f3b7e08da87..dfe019bdda2 100644
--- a/bin/addons/base/i18n/base.pot
+++ b/bin/addons/base/i18n/base.pot
@@ -242,11 +242,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -781,11 +776,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1295,7 +1285,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1390,11 +1379,6 @@ msgstr ""
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2098,11 +2082,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2696,11 +2675,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3016,7 +2990,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3669,11 +3642,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4001,11 +3969,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4613,11 +4576,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4862,7 +4820,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -5962,7 +5919,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index 325288006a4..141f3e3b521 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -256,11 +256,6 @@ msgstr "%y - Година без век, като десетично число
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Това правило е удовлетворено ако поне един тест е истина"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -814,11 +809,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Уеб-страница"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Тестове"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1365,7 +1355,6 @@ msgstr "Брой обновени модули"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1473,13 +1462,6 @@ msgstr ""
 "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
 "символи!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Направете правилото глобално, в противен случай то трябва да се зададе към "
-"определена група."
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2195,11 +2177,6 @@ msgstr "Роли"
 msgid "Countries"
 msgstr "Държави"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Правила на записа"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2832,11 +2809,6 @@ msgstr "Удовлетвореност"
 msgid "Benin"
 msgstr "Бенин"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Правилото е удовлетворено ако всички тестове за истина (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3162,7 +3134,6 @@ msgstr "Казахстан"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3834,11 +3805,6 @@ msgstr "Наследен изглед"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4168,13 +4134,6 @@ msgstr "А4"
 msgid "Search View Ref."
 msgstr "\"Изглед\" търсене в справки"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Няколко правила към един и същ обект са обединени с помощта на оператор OR "
-"(или)"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4803,11 +4762,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Реюнион (Франция)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Общи"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5056,7 +5010,6 @@ msgstr "Доставчик на компоненти"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6187,7 +6140,6 @@ msgstr "Възвращаемо"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/bs.po b/bin/addons/base/i18n/bs.po
index 5eace0482b4..b6658bb0459 100644
--- a/bin/addons/base/i18n/bs.po
+++ b/bin/addons/base/i18n/bs.po
@@ -257,11 +257,6 @@ msgstr "%y - Godina bez stoljeća kao decimalni broj [00,99]"
 msgid "STOCK_GOTO_FIRST"
 msgstr "SKLADIŠTE_IDI_NA_PRVI"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Pravilo je zadovoljeno ako je makar jedan test tačan"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -811,11 +806,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1342,7 +1332,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1445,11 +1434,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2159,11 +2143,6 @@ msgstr "Uloge"
 msgid "Countries"
 msgstr "Zemlje"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2774,11 +2753,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3098,7 +3072,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3758,11 +3731,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4090,11 +4058,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4715,11 +4678,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4966,7 +4924,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6080,7 +6037,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po
index 68f51968a1a..5a48c0fdacc 100644
--- a/bin/addons/base/i18n/ca.po
+++ b/bin/addons/base/i18n/ca.po
@@ -258,11 +258,6 @@ msgstr "%y - Any sense centúria com un número decimal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "La regla és satisfeta si almenys un test és Cert"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -816,11 +811,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Lloc web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Proves"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1365,7 +1355,6 @@ msgstr "Número de mòduls actualitzats"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1473,11 +1462,6 @@ msgstr ""
 "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
 "especial!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Feu la regla global, sinó necessitarà ser inclosa en un grup"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2193,11 +2177,6 @@ msgstr "Rols"
 msgid "Countries"
 msgstr "Països"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Regles de registre"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2830,11 +2809,6 @@ msgstr "Grau de satisfacció"
 msgid "Benin"
 msgstr "Benín"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "La regla es satisfà si tots els tests són Verdader (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3159,7 +3133,6 @@ msgstr "Kazakhstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3830,11 +3803,6 @@ msgstr "Vista heretada"
 msgid "ir.translation"
 msgstr "ir.traduccio"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.regla.grup"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4162,13 +4130,6 @@ msgstr "A4"
 msgid "Search View Ref."
 msgstr "Ref. vista cerca"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Sobre un mateix objecte, les regles múltiples s'associen utilitzan "
-"l'operador OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4796,11 +4757,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunió (Francesa)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5049,7 +5005,6 @@ msgstr "Proveïdor de components"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6181,7 +6136,6 @@ msgstr "Devolució"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/cs.po b/bin/addons/base/i18n/cs.po
index aa4ad43cbc3..4d9e7bd26e8 100644
--- a/bin/addons/base/i18n/cs.po
+++ b/bin/addons/base/i18n/cs.po
@@ -248,11 +248,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -795,11 +790,6 @@ msgstr ""
 msgid "Website"
 msgstr "Webová stránka"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testy"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1326,7 +1316,6 @@ msgstr "Počet aktualizovaných modulů"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 msgstr ""
 "Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr "Funkce"
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2759,11 +2738,6 @@ msgstr "Názor(State of mind)"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3083,7 +3057,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3743,11 +3716,6 @@ msgstr "Inherited View(Inherited View)"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4075,11 +4043,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4696,11 +4659,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4947,7 +4905,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6060,7 +6017,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/da.po b/bin/addons/base/i18n/da.po
index 614b8a8f285..402776a0302 100644
--- a/bin/addons/base/i18n/da.po
+++ b/bin/addons/base/i18n/da.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr "Hjemmeside"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Test"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po
index 968b8392abe..86775b8ffa3 100644
--- a/bin/addons/base/i18n/de.po
+++ b/bin/addons/base/i18n/de.po
@@ -257,11 +257,6 @@ msgstr "%y - Jahr ohne Jahrtausend [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Die Regel ist erfüllt wenn mindestens ein Test korrekt ist."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -814,11 +809,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Website"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Tests"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1367,7 +1357,6 @@ msgstr "Anzahl Module mit Updates"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1478,13 +1467,6 @@ msgstr ""
 "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
 "beinhalten"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Mache die Regel global gültig, ansonsten muss diese auf Gruppeneben "
-"definiert werden."
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2200,11 +2182,6 @@ msgstr "Rollen"
 msgid "Countries"
 msgstr "Länder"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Aufzeichnung Regel"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2836,11 +2813,6 @@ msgstr "Kundenzufriedenheit"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Die Regel ist für mich o.K. falls alle Tests erfolgreich verlaufen."
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3162,7 +3134,6 @@ msgstr "Kasachstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3834,11 +3805,6 @@ msgstr "Abgeleitete Ansicht"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4166,12 +4132,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "Suche Ansicht Referenz"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Mehrere Regeln für dasselbe Objekt werden mit dem Operator OR verbunden"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4802,11 +4762,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (franz.)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5055,7 +5010,6 @@ msgstr "Komponenten Lieferant"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6186,7 +6140,6 @@ msgstr "Rückgabe"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/el.po b/bin/addons/base/i18n/el.po
index 5e1718b2d48..dbaa66d3f52 100644
--- a/bin/addons/base/i18n/el.po
+++ b/bin/addons/base/i18n/el.po
@@ -261,11 +261,6 @@ msgstr "%y - Χρονολογία χωρίς τον αιώνα, σε δεκαδ
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Ο κανόνας πληροίται αν τουλάχιστον ένα τεστ είναι Ορθό"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -819,11 +814,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Ιστοσελίδα"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Tests"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1365,7 +1355,6 @@ msgstr "Αριθμός Αρθρωμάτων που ενημερώθηκαν"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1472,11 +1461,6 @@ msgid ""
 msgstr ""
 "Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Κάντε τον κανόνα γενικό, αλλιώς πρέπει να μπει σε ένα μια ομάδα"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2194,11 +2178,6 @@ msgstr "Ρόλοι"
 msgid "Countries"
 msgstr "Χώρες"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Καταχώρηση κανόνων"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2835,11 +2814,6 @@ msgstr "Προδιάθεση"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Ο κανόνας πληροίται αν τουλάχιστον ένα τεστ είναι Ορθό (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3164,7 +3138,6 @@ msgstr "Kazakhstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3835,11 +3808,6 @@ msgstr "Παράγωγος Προβολή"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4169,13 +4137,6 @@ msgstr "Α4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Πολλαπλοί κανόνες στα ίδια αντικείμενα συνδέονται μέσω της λογικής "
-"συνάρτησης 'Ή'"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4802,11 +4763,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (French)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Παγκόσμια"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5055,7 +5011,6 @@ msgstr "Προμηθευτής Μερών"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6188,7 +6143,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/en_GB.po b/bin/addons/base/i18n/en_GB.po
index 098e3d1129a..2c28b7d1dd4 100644
--- a/bin/addons/base/i18n/en_GB.po
+++ b/bin/addons/base/i18n/en_GB.po
@@ -259,11 +259,6 @@ msgstr "%y - Year without century as a decimal number [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "The rule is satisfied if at least one test is True"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -814,11 +809,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Website"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Tests"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1362,7 +1352,6 @@ msgstr "Number of modules updated"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1469,11 +1458,6 @@ msgid ""
 msgstr ""
 "The Object name must start with x_ and not contain any special character !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Make the rule global, otherwise it needs to be put on a group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2189,11 +2173,6 @@ msgstr "Roles"
 msgid "Countries"
 msgstr "Countries"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Record rules"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2825,11 +2804,6 @@ msgstr "State of Mind"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "The rule is satisfied if all test are True (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3153,7 +3127,6 @@ msgstr "Kazakhstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3822,11 +3795,6 @@ msgstr "Inherited View"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4155,11 +4123,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "Search View Ref."
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Multiple rules on same objects are joined using operator OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4785,11 +4748,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (French)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5038,7 +4996,6 @@ msgstr "Components Supplier"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6167,7 +6124,6 @@ msgstr "Returning"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po
index be23757ec05..53727c6eec7 100644
--- a/bin/addons/base/i18n/es.po
+++ b/bin/addons/base/i18n/es.po
@@ -258,11 +258,6 @@ msgstr "%y - Año sin siglo como un número decimal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "La regla se satisface si por lo menos un test es Verdadero (OR)"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -818,11 +813,6 @@ msgstr "ir.modelo.config"
 msgid "Website"
 msgstr "Sitio web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Pruebas"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1368,7 +1358,6 @@ msgstr "Número de módulos actualizados"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1476,11 +1465,6 @@ msgstr ""
 "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
 "especial!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Haga la regla global, sino necesitará ser incluida en un grupo"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2196,11 +2180,6 @@ msgstr "Roles"
 msgid "Countries"
 msgstr "Países"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Reglas de registro"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2833,11 +2812,6 @@ msgstr "Grado de satisfacción"
 msgid "Benin"
 msgstr "Benín"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "La regla se satisface si todos los tests son Verdadero (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3163,7 +3137,6 @@ msgstr "Kazajstán"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3835,11 +3808,6 @@ msgstr "Vista heredada"
 msgid "ir.translation"
 msgstr "ir.traduccion"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.regla.grupo"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4167,12 +4135,6 @@ msgstr "A4"
 msgid "Search View Ref."
 msgstr "Ref. vista búsqueda"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Las reglas múltiples sobre un mismo objeto se asocian usando el operador OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4800,11 +4762,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunión (Francesa)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5053,7 +5010,6 @@ msgstr "Proveedor de componentes"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6185,7 +6141,6 @@ msgstr "Devolución"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/es_AR.po b/bin/addons/base/i18n/es_AR.po
index 6088fcba91f..8e2cfe27929 100644
--- a/bin/addons/base/i18n/es_AR.po
+++ b/bin/addons/base/i18n/es_AR.po
@@ -247,11 +247,6 @@ msgstr "%y - Año sin siglo como un número decimal [00,99]."
 msgid "Validated"
 msgstr "Validado"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "La regla se satisface si por lo menos un test es Verdadero"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -819,11 +814,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Sitio web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Pruebas"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1366,7 +1356,6 @@ msgstr "El método set_memory no está implementado !"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1469,11 +1458,6 @@ msgstr ""
 "El nombre del objeto debe empezar con x_ y no contener ningún carácter "
 "especial !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2181,11 +2165,6 @@ msgstr "Roles"
 msgid "Countries"
 msgstr "Países"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Reglas de registro"
-
 #. module: base
 #: view:res.lang:0
 msgid "12. %w              ==> 5 ( Friday is the 6th day)"
@@ -2813,11 +2792,6 @@ msgstr "Establecer a NULL"
 msgid "Benin"
 msgstr "Benín"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "La regla se satisface si todos los tests son Verdaderas (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3129,7 +3103,6 @@ msgstr "Kazajstán"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3828,11 +3801,6 @@ msgstr "ir.translation"
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4121,12 +4089,6 @@ msgstr "Cabecera interna RML"
 msgid "a4"
 msgstr "A4"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Las reglas múltiples sobre un mismo objeto se asocian usando el operador OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4795,11 +4757,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunión (Francesa)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5033,7 +4990,6 @@ msgstr "Proveedor de componentes"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6159,7 +6115,6 @@ msgstr "Padre"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/es_EC.po b/bin/addons/base/i18n/es_EC.po
index 88d23a33bfa..ef7691650d5 100644
--- a/bin/addons/base/i18n/es_EC.po
+++ b/bin/addons/base/i18n/es_EC.po
@@ -257,11 +257,6 @@ msgstr "%y - Año sin siglo como un número decimal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "La regla se satisface si por lo menos un test es Verdadero (OR)"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -817,11 +812,6 @@ msgstr "ir.modelo.config"
 msgid "Website"
 msgstr "Sitio web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Pruebas"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1367,7 +1357,6 @@ msgstr "Número de módulos actualizados"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1475,11 +1464,6 @@ msgstr ""
 "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
 "especial!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Haga la regla global, sino necesitará ser incluida en un grupo"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2195,11 +2179,6 @@ msgstr "Roles"
 msgid "Countries"
 msgstr "Países"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Reglas de registro"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2832,11 +2811,6 @@ msgstr "Grado de satisfacción"
 msgid "Benin"
 msgstr "Benín"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "La regla se satisface si todos los tests son Verdadero (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3161,7 +3135,6 @@ msgstr "Kazajstán"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3833,11 +3806,6 @@ msgstr "Vista heredada"
 msgid "ir.translation"
 msgstr "ir.traduccion"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.regla.grupo"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4165,12 +4133,6 @@ msgstr "A4"
 msgid "Search View Ref."
 msgstr "Ref. vista búsqueda"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Las reglas múltiples sobre un mismo objeto se asocian usando el operador OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4798,11 +4760,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunión (Francesa)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5051,7 +5008,6 @@ msgstr "Proveedor de componentes"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6183,7 +6139,6 @@ msgstr "Devolución"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index 2d639fd8d86..ffd58080bf3 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.po
@@ -255,11 +255,6 @@ msgstr "%y - Aasta ilma sajandita kümnendarvuna [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "See reegel on rahuldatud kui vähemalt üks test on tõene"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -810,11 +805,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Veebileht"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testid"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1351,7 +1341,6 @@ msgstr "Uuendatud moodulite arv"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1458,11 +1447,6 @@ msgid ""
 msgstr ""
 "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Tee see reegel globaalseks, Teisel juhul peab ta panema gruppi"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2178,11 +2162,6 @@ msgstr "Rollid"
 msgid "Countries"
 msgstr "Riigid"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Kirje reeglid"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2813,11 +2792,6 @@ msgstr "Meeleolu"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Reegel on rahuldatud, kui kõik testid on Tõesed (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3140,7 +3114,6 @@ msgstr "Kasahstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3807,11 +3780,6 @@ msgstr "Päritud vaade"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4139,11 +4107,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Mitmikreeglid samadel objektidel ühendatakse operaatoriga O"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4770,11 +4733,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (Prantsuse)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Globaalne"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5023,7 +4981,6 @@ msgstr "Komponentidega varustaja"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6149,7 +6106,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/eu.po b/bin/addons/base/i18n/eu.po
index a5bf4a24011..f1b900b3804 100644
--- a/bin/addons/base/i18n/eu.po
+++ b/bin/addons/base/i18n/eu.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/fa.po b/bin/addons/base/i18n/fa.po
index 0aa5c25bfbb..299bd9393ab 100644
--- a/bin/addons/base/i18n/fa.po
+++ b/bin/addons/base/i18n/fa.po
@@ -256,11 +256,6 @@ msgstr "%y - سال بدون دو شماره نخست به شکل یک شمار
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "در صورتی که یک تست درست باشد قاعده رعایت شده است"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -815,11 +810,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "تارنما"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "آزمایش‌ها"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1362,7 +1352,6 @@ msgstr "تعداد پیمانه‌های بروزرسانده"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1468,13 +1457,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr "نام شی باید با 'x_' آغاز شود و دارای هیچ نویسه ویژه‌ای نباشد!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"قاعده را فراگیر می‌کند، در غیر این صورت لازم است آن را به یک گروه یا کاربر "
-"بدهید"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2191,11 +2173,6 @@ msgstr "نقش‌ها"
 msgid "Countries"
 msgstr "کشورها"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "قواعد رکورد"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2829,11 +2806,6 @@ msgstr "وضعیت فکری"
 msgid "Benin"
 msgstr "بنین"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "در صورتی که تمامی تست‌ها درست باشند قاعده رعایت شده است. (و منطقی)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3156,7 +3128,6 @@ msgstr "قزاقستان"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3825,11 +3796,6 @@ msgstr "نمای موروثی"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4157,12 +4123,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "مرجع نمای جستجو"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"چندین قاعده روی اشیای همسان بوسیله گرداننده یای منطقی به هم پیوسته شدند"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4789,11 +4749,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "گویان فرانسه"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "فراگیر"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5042,7 +4997,6 @@ msgstr "تامین‌کننده اجزا"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6172,7 +6126,6 @@ msgstr "بازگشتی"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index 4e1a3189281..d9d6c9d941b 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.po
@@ -257,11 +257,6 @@ msgstr "%y - Vuosiluku ilman vuosisatoja desimaalilukuna [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Sääntö toteutuu jos vähintään yksi testeistä on \"tosi\""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -815,11 +810,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Web-sivusto"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testit"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1356,7 +1346,6 @@ msgstr "Päivitettyjen moduulien määrä"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1461,11 +1450,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Tee säännöstä yleinen, muuten se pitää laittaa ryhmään"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2181,11 +2165,6 @@ msgstr "Työtehtävät"
 msgid "Countries"
 msgstr "Maat"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Tietuesäännöt"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2819,11 +2798,6 @@ msgstr "Mielentila"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Sääntö täyttyy jos kaikki testit ovat tosia"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3148,7 +3122,6 @@ msgstr "Kazakstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3818,11 +3791,6 @@ msgstr "Peritty näkymä"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4150,12 +4118,6 @@ msgstr "A4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Monta sääntöä samalle objektille liitetään käyttämällä operaattoria TAI"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4783,11 +4745,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Réunion (Ranska)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Yleinen"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5036,7 +4993,6 @@ msgstr "Komponenttien toimittajat"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6167,7 +6123,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index d3bbc43f35c..3a6eeab5c6d 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -259,11 +259,6 @@ msgstr "%y - Année dans le siècle comme un nombre décimal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "La règle est satisfaite si au moins un test est Vrai"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -818,11 +813,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Site Web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Tests"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1368,7 +1358,6 @@ msgstr "Nombre de modules mis à jour"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1476,13 +1465,6 @@ msgstr ""
 "Le nom de l'objet doit commencer par x_ et ne doit pas contenir de "
 "caractères spéciaux !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Faire une règle globale, sinon il sera nécessaire de mettre un groupe ou "
-"utilisateur"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2199,11 +2181,6 @@ msgstr "Rôles"
 msgid "Countries"
 msgstr "Pays"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Enregistrer la règle"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2838,11 +2815,6 @@ msgstr "État d'esprit"
 msgid "Benin"
 msgstr "Bénin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "La règle est satisfaite si tous les tests sont Vrai (ET)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3167,7 +3139,6 @@ msgstr "Kazakhstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3841,11 +3812,6 @@ msgstr "Vue héritée"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4173,11 +4139,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "Vue de recherche"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Un \"ou\" est fait entre toutes les règles concernant le même objet."
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4806,11 +4767,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Réunion (Française)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5059,7 +5015,6 @@ msgstr "Fournisseurs de composants"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6192,7 +6147,6 @@ msgstr "Retour"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/gl.po b/bin/addons/base/i18n/gl.po
index 5d303846db7..5f0b6e3b32a 100644
--- a/bin/addons/base/i18n/gl.po
+++ b/bin/addons/base/i18n/gl.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po
index 40e0f35f606..cbe4e9067e7 100644
--- a/bin/addons/base/i18n/he.po
+++ b/bin/addons/base/i18n/he.po
@@ -256,11 +256,6 @@ msgstr "%y -שנה במבנה שתי ספרות [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "מספיקה בדיקה אחת נכונה וההוראה היא חוקית"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -811,11 +806,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "אתר"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "בדיקות"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1348,7 +1338,6 @@ msgstr "מספר מודולים עודכנו."
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1451,11 +1440,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr "שם האובייקט חייב להתחיל עם X_ולא להכיל תוים מיוחדים!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2169,11 +2153,6 @@ msgstr "תפקיד"
 msgid "Countries"
 msgstr "מדינות"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "חוקי רישום"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2797,11 +2776,6 @@ msgstr "מַצַּב רוּחַ"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "ההוראה מיושמת אם כל הבדיקות הם TRUE (וגם)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3121,7 +3095,6 @@ msgstr "Kazakhstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3785,11 +3758,6 @@ msgstr "מבט יורש"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4117,11 +4085,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "חוקים מרובים על אותו אובייקט מצורפים ע\"י שימוש במפעיל OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4746,11 +4709,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (French)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "גלובלי"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4997,7 +4955,6 @@ msgstr "רכיבי ספק"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6116,7 +6073,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 679d8a9bf38..09aa6e981a6 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -258,11 +258,6 @@ msgstr "%y - Godina bez stoljeća kao decimalni broj [00,99]"
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Pravilo je zadovoljeno ako je barem jedan test točan"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -814,11 +809,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Web stranice"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testovi"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1354,7 +1344,6 @@ msgstr "Broj nadograđenih modula"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1460,11 +1449,6 @@ msgid ""
 msgstr ""
 "Naziv objekta mora početi s x_ i ne smije sadržavati posebne znakove !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Napravite globalno pravilo, inače je potrebno staviti ga u grupu"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2174,11 +2158,6 @@ msgstr "Uloge"
 msgid "Countries"
 msgstr "Države"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Pravila zapisa"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2801,11 +2780,6 @@ msgstr "Stanje svijesti"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3126,7 +3100,6 @@ msgstr "Kazahstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3786,11 +3759,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4118,11 +4086,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4739,11 +4702,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4990,7 +4948,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6103,7 +6060,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/hu.po b/bin/addons/base/i18n/hu.po
index 4a1e1c08a53..4c9a39667d1 100644
--- a/bin/addons/base/i18n/hu.po
+++ b/bin/addons/base/i18n/hu.po
@@ -248,11 +248,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -795,11 +790,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1326,7 +1316,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1427,11 +1416,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2141,11 +2125,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2756,11 +2735,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3080,7 +3054,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3740,11 +3713,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4072,11 +4040,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4693,11 +4656,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4944,7 +4902,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6057,7 +6014,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/id.po b/bin/addons/base/i18n/id.po
index 27beb420c03..e99a5b9191d 100644
--- a/bin/addons/base/i18n/id.po
+++ b/bin/addons/base/i18n/id.po
@@ -258,11 +258,6 @@ msgstr "%y - Tahun tanpa abad sebagai angka desimal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Aturan ini memuaskan jika setidaknya satu test Benar"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -807,11 +802,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1338,7 +1328,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1439,11 +1428,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2153,11 +2137,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2768,11 +2747,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3092,7 +3066,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3752,11 +3725,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4084,11 +4052,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4705,11 +4668,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4956,7 +4914,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6069,7 +6026,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/is.po b/bin/addons/base/i18n/is.po
index c1ee9927d16..eddb8f9faba 100644
--- a/bin/addons/base/i18n/is.po
+++ b/bin/addons/base/i18n/is.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index a43aa4a42de..c7ee91a97a2 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -258,12 +258,6 @@ msgstr "%y - Anno senza secolo come numero decimale [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-"La regola viene soddisfatta se almeno un test restituisce il valore True"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -819,11 +813,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Sito Web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Test"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1369,7 +1358,6 @@ msgstr "Numero di moduli aggiornati"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1477,12 +1465,6 @@ msgstr ""
 "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
 "speciali!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Rende la regola globale, altrimenti deve essere inserita in un gruppo"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2196,11 +2178,6 @@ msgstr "Ruoli"
 msgid "Countries"
 msgstr "Nazioni"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Registra Regole"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2834,13 +2811,6 @@ msgstr "Impressione"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-"La regola viene soddisfatta se tutti i test testituiscono il valore True "
-"(AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3166,7 +3136,6 @@ msgstr "Kazakistan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3839,11 +3808,6 @@ msgstr "Vista Collegata"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4171,13 +4135,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "Rif. Vista Ricerca"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Regole multiple sugli stessi oggetti possonon essere combinate utilizzando "
-"l'operatore OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4806,11 +4763,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "La Réunion"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Globale"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5058,7 +5010,6 @@ msgstr "Fornitori"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6188,7 +6139,6 @@ msgstr "Sto ritornando"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 9854b3d9c55..4a703076d64 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "このルールは、少なくとも一つのテストが通ることで満たされます。"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr "ウェブサイト"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "テスト"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1329,7 +1319,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1430,11 +1419,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2144,11 +2128,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2759,11 +2738,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3083,7 +3057,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3743,11 +3716,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4075,11 +4043,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4696,11 +4659,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4947,7 +4905,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6060,7 +6017,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/ko.po b/bin/addons/base/i18n/ko.po
index e8d4f6df07e..c3e8b6caa41 100644
--- a/bin/addons/base/i18n/ko.po
+++ b/bin/addons/base/i18n/ko.po
@@ -254,11 +254,6 @@ msgstr "%y - 백자리 단위를 뺀 년도 표시 [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "이 규칙은 적어도 하나의 테스트가 참일 때 적용됩니다."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -804,11 +799,6 @@ msgstr ""
 msgid "Website"
 msgstr "웹 사이트"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "테스트"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1338,7 +1328,6 @@ msgstr "갱신된 모듈들의 수"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1441,11 +1430,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자가 포함되면 안됩니다."
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2155,11 +2139,6 @@ msgstr "역할"
 msgid "Countries"
 msgstr "국가들"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "기록 규칙"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2782,11 +2761,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "이 규칙은 모든 테스트 결과가 참 (AND)일 때 적용됩니다."
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3106,7 +3080,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3766,11 +3739,6 @@ msgstr "상속된 뷰"
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4098,11 +4066,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "동일 오브젝트에 대한 여러 규칙들은 OR 오퍼레이터로 연결됩니다."
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4724,11 +4687,6 @@ msgstr "재고_미디어_레코드"
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "글로벌"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4975,7 +4933,6 @@ msgstr "컴포넌트 공급자"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6090,7 +6047,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/lt.po b/bin/addons/base/i18n/lt.po
index 5cb44432d4e..f0031333b10 100644
--- a/bin/addons/base/i18n/lt.po
+++ b/bin/addons/base/i18n/lt.po
@@ -248,11 +248,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -795,11 +790,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1326,7 +1316,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1427,11 +1416,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2141,11 +2125,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2756,11 +2735,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3080,7 +3054,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3740,11 +3713,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4072,11 +4040,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4693,11 +4656,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4944,7 +4902,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6057,7 +6014,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/lt_LT.po b/bin/addons/base/i18n/lt_LT.po
index 3dcb62f81fc..62eee0ce8ab 100644
--- a/bin/addons/base/i18n/lt_LT.po
+++ b/bin/addons/base/i18n/lt_LT.po
@@ -238,11 +238,6 @@ msgstr ""
 msgid "Validated"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -779,11 +774,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1302,7 +1292,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1392,11 +1381,6 @@ msgstr ""
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2091,11 +2075,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid "12. %w              ==> 5 ( Friday is the 6th day)"
@@ -2690,11 +2669,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -2996,7 +2970,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3678,11 +3651,6 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -3968,11 +3936,6 @@ msgstr ""
 msgid "a4"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4627,11 +4590,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4861,7 +4819,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -5966,7 +5923,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po
index b731641cfa7..1e52e93b971 100644
--- a/bin/addons/base/i18n/lv.po
+++ b/bin/addons/base/i18n/lv.po
@@ -258,11 +258,6 @@ msgstr "%y - Gads, neskaitot gadsimtu, kā decimālskaitlis [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Filtrs ir derīgs, ja vismaz viens notikums izpildās (True)."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -816,11 +811,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Tīkla vietne"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Pārbaudes"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1356,7 +1346,6 @@ msgstr "Jaunināto moduļu skaits"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1463,11 +1452,6 @@ msgid ""
 msgstr ""
 "Objekta nosaukumam jāsākas ar x_ un tas nedrīkst saturēt speciālos simbolus!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2186,11 +2170,6 @@ msgstr "Tiesības"
 msgid "Countries"
 msgstr "Valstis"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Ierakstu noteikumi"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2824,11 +2803,6 @@ msgstr "Apmierinātība"
 msgid "Benin"
 msgstr "Benina"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Noteikums ir pieņemts, ja visas pārbaudes atgriež True (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3154,7 +3128,6 @@ msgstr "Kazahstāna"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3818,11 +3791,6 @@ msgstr "Mantotais Skatījums"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4150,13 +4118,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Multi izpildes noteikumi vieniem un tiem pašiem objektiem, tiek apvienoti ar "
-"operatoru OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4784,11 +4745,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reinjona"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Vispārēji"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5037,7 +4993,6 @@ msgstr "Komponentu Piegādātājs"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6161,7 +6116,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po
index 247e7f202fe..ab4af442ebf 100644
--- a/bin/addons/base/i18n/mn.po
+++ b/bin/addons/base/i18n/mn.po
@@ -257,11 +257,6 @@ msgstr "%y - Мянгатын оронгүй жилийн тоон дугаар
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Дор хаяж нэг тест давбал дүрэмд нийцнэ"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -813,11 +808,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Вэбсайт"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Тестүүд"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1359,7 +1349,6 @@ msgstr "Шинэчлэгдсэн модулийн тоо"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1467,11 +1456,6 @@ msgstr ""
 "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
 "болохгүй!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Дүрмийг глобаль болгох эсвэл группэд байрлуулах хэрэгтэй"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2184,11 +2168,6 @@ msgstr "Дүрүүд"
 msgid "Countries"
 msgstr "Улс гүрнүүд"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2817,11 +2796,6 @@ msgstr "Нөхцөл байдал"
 msgid "Benin"
 msgstr "Бенин"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Бүх шалгалтыг давбал дүрэм хангагдана"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3142,7 +3116,6 @@ msgstr "Казакстан"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3811,11 +3784,6 @@ msgstr "Өргөтгөсөн дэлгэц"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4143,11 +4111,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "Хайлтын дэлгэц."
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Нэг объект дээр олон дүрмүүд OR үйлдлээр холбогдсон байна"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4770,11 +4733,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Глобал"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5023,7 +4981,6 @@ msgstr "Эд анги нийлүүлэгч"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6144,7 +6101,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/nb.po b/bin/addons/base/i18n/nb.po
index eef57ddd6b6..7789d3d6ed0 100644
--- a/bin/addons/base/i18n/nb.po
+++ b/bin/addons/base/i18n/nb.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index 2e2f548afde..0d1215a54cf 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -259,11 +259,6 @@ msgstr "%y - Jaar zonder eeuw als decimaal getal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Aan deze regel is voldaan als er tenminste één test 'waar' is."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -819,11 +814,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Website"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testen"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1368,7 +1358,6 @@ msgstr "Aantal bijgewerkte modules"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1475,12 +1464,6 @@ msgid ""
 msgstr ""
 "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Maak de regel globaal, anders dient deze in een groep te worden geplaatst"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2196,11 +2179,6 @@ msgstr "Rollen"
 msgid "Countries"
 msgstr "Landen"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Recordregels"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2834,11 +2812,6 @@ msgstr "Loyaliteit"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "De regel is voldaan als alle testen Waar (AND) zijn."
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3163,7 +3136,6 @@ msgstr "Kazachstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3836,11 +3808,6 @@ msgstr "Afgeleide weergave"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4169,13 +4136,6 @@ msgstr "A4"
 msgid "Search View Ref."
 msgstr "Zoek weergave ref."
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Meerdere regels voor dezelfde objecten worden samengevoegd met behulp van de "
-"operator OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4804,11 +4764,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (Frans)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Algemeen"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5057,7 +5012,6 @@ msgstr "Componenten leverancier"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6186,7 +6140,6 @@ msgstr "Terugkerend"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/nl_BE.po b/bin/addons/base/i18n/nl_BE.po
index 907f58743dd..01fe20fcf9f 100644
--- a/bin/addons/base/i18n/nl_BE.po
+++ b/bin/addons/base/i18n/nl_BE.po
@@ -251,11 +251,6 @@ msgstr "%y - Jaartal zonder eeuw als decimaal getal [00,99]."
 msgid "Validated"
 msgstr "Gevalideerd"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Deze regel is goed als er tenminste 1 test 'waar' is."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -821,11 +816,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Website"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Tests"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1358,7 +1348,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1457,11 +1446,6 @@ msgid ""
 msgstr ""
 "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2166,11 +2150,6 @@ msgstr "Rollen"
 msgid "Countries"
 msgstr "Landen"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid "12. %w              ==> 5 ( Friday is the 6th day)"
@@ -2791,11 +2770,6 @@ msgstr "Set NULL"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3102,7 +3076,6 @@ msgstr "Kazachstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3797,11 +3770,6 @@ msgstr "ir.translation"
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4087,13 +4055,6 @@ msgstr ""
 msgid "a4"
 msgstr "a4"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Meerdere regels voor dezelfde objecten worden samengevoegd met behulp van de "
-"operator OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4767,11 +4728,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (Frans)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5002,7 +4958,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6122,7 +6077,6 @@ msgstr "Bovenliggende"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/nl_NL.po b/bin/addons/base/i18n/nl_NL.po
index 018056b0afa..bde7d7d8e89 100644
--- a/bin/addons/base/i18n/nl_NL.po
+++ b/bin/addons/base/i18n/nl_NL.po
@@ -253,11 +253,6 @@ msgstr "%y - Jaar zonder eeuw als decimaal nummer [00,99]."
 msgid "Validated"
 msgstr "Gevalideerd"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Deze regel is goed als er tenminste 1 test 'waar' is."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -829,11 +824,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Website"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Tests"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1374,7 +1364,6 @@ msgstr "Niet geïmplenteerde set_memory methode !"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1476,11 +1465,6 @@ msgid ""
 msgstr ""
 "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2187,11 +2171,6 @@ msgstr "Rollen"
 msgid "Countries"
 msgstr "Landen"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Bericht regels"
-
 #. module: base
 #: view:res.lang:0
 msgid "12. %w              ==> 5 ( Friday is the 6th day)"
@@ -2828,11 +2807,6 @@ msgstr "Set NULL"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "De regel is OK als alle testen True (AND) zijn."
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3143,7 +3117,6 @@ msgstr "Kazachstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3841,11 +3814,6 @@ msgstr "ir.translation"
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4132,13 +4100,6 @@ msgstr "RML Interne Koptekst"
 msgid "a4"
 msgstr "a4"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Meerdere regels voor dezelfde objecten worden samengevoegd met behulp van de "
-"operator OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4814,11 +4775,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (Frans)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Algemeen"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5052,7 +5008,6 @@ msgstr "Componenten leverancier"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6182,7 +6137,6 @@ msgstr "Bovenliggende"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index eca6c8a4393..43d72938fea 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@ -257,11 +257,6 @@ msgstr "%y - Rok dwucyfrowo jako liczba dziesiętna [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Reguła jest spełniona, jeśli co najmniej jeden test jest pozytywny"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -814,11 +809,6 @@ msgstr ""
 msgid "Website"
 msgstr "Strona WWW"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testy"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1364,7 +1354,6 @@ msgstr "Liczba zaktualizowanych modułów"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1472,13 +1461,6 @@ msgstr ""
 "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
 "specjalnych !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Zdefiniuj regułę jak globalną, w przeciwnym przypadku musi ona być wstawiona "
-"do grupy"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2194,11 +2176,6 @@ msgstr "Role"
 msgid "Countries"
 msgstr "Kraje"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Reguły rekordów"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2831,11 +2808,6 @@ msgstr "Stan emocji"
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Reguła będzie spełniona, jeśli wszystkie testy będą pozytywne (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3157,7 +3129,6 @@ msgstr "Kazachstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3827,11 +3798,6 @@ msgstr "Widok dziedziczony"
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4159,11 +4125,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Reguły dla tego samego obiektu są łączone operatorem LUB (OR)"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4791,11 +4752,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Globalna"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5043,7 +4999,6 @@ msgstr "Dostawca komponentów"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6174,7 +6129,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po
index f2d03d46696..62322413fd2 100644
--- a/bin/addons/base/i18n/pt.po
+++ b/bin/addons/base/i18n/pt.po
@@ -258,11 +258,6 @@ msgstr "%y - Ano sem o século como um numero decimal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "A regra é valida se pelo menos um teste for verdadeiro"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -815,11 +810,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Página Web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testes"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1364,7 +1354,6 @@ msgstr "Numero de módulos actualizados"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1471,12 +1460,6 @@ msgid ""
 msgstr ""
 "O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Estabeleça a regra como global, de outro modo terá de ser colocada num grupo"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2192,11 +2175,6 @@ msgstr "Perfis"
 msgid "Countries"
 msgstr "Países"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Regras de gravação"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2827,11 +2805,6 @@ msgstr "Estado da mente"
 msgid "Benin"
 msgstr "Benim"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "A regra é satisfeita se todos os testes forem verdadeiras (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3155,7 +3128,6 @@ msgstr "Cazaquistão"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3824,11 +3796,6 @@ msgstr "Vista herdada"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4156,11 +4123,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "Ref. da vista de pesquisa"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Multiplas funções no mesmo objecto são ligadas usando o operador OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4787,11 +4749,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunião (França)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5040,7 +4997,6 @@ msgstr "Fornecedor de componentes"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6172,7 +6128,6 @@ msgstr "A retornar"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index 01a30d302a4..707fcef723f 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -258,11 +258,6 @@ msgstr "%y - Ano com 2 decimais [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "A regra será satisfeita se pelo menos um teste for verdadeiro"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -816,11 +811,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Página da Web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testes"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1364,7 +1354,6 @@ msgstr "Número de módulos atualizados"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1472,13 +1461,6 @@ msgstr ""
 "O nome do Objeto deve começar com x_ e não deve conter nenhum caracter "
 "especial!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Marque a regra como global - caso contrário, esta deve ser colocada em um "
-"grupo"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2194,11 +2176,6 @@ msgstr "Papéis"
 msgid "Countries"
 msgstr "Países"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Registro de Regras"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2830,11 +2807,6 @@ msgstr "Estado emocional"
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "A regra será satisfeita se todos os testes forem verdadeiros (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3159,7 +3131,6 @@ msgstr "Cazaquistão"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3829,11 +3800,6 @@ msgstr "View herdada"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4161,11 +4127,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Multiplas regras em um mesmo objeto são unidas usando o operador OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4793,11 +4754,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunião"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5046,7 +5002,6 @@ msgstr "Fornecedor de componentes"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6174,7 +6129,6 @@ msgstr "Retornando"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po
index 39f4f21635c..47bcccbfef2 100644
--- a/bin/addons/base/i18n/ro.po
+++ b/bin/addons/base/i18n/ro.po
@@ -259,11 +259,6 @@ msgstr "%y - An fara secol ca numar zecimal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Regula este satisfacuta daca cel putin un test este Adevarat"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -815,11 +810,6 @@ msgstr ""
 msgid "Website"
 msgstr "Website"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Teste"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1346,7 +1336,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1447,11 +1436,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2161,11 +2145,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2776,11 +2755,6 @@ msgstr "Stare spirit"
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3100,7 +3074,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3760,11 +3733,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4092,11 +4060,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4713,11 +4676,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4964,7 +4922,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6079,7 +6036,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index 145d2f828f8..9710e4e5c80 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.po
@@ -257,11 +257,6 @@ msgstr "%y - Год без указания века как десятичное
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Удовлетворяет правилу, если результат хотя бы одной из проверок True"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -818,11 +813,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Сайт"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Тесты"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1367,7 +1357,6 @@ msgstr "Количество обновленных модулей"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1475,11 +1464,6 @@ msgstr ""
 "Название объекта должно начинаться с x_  и не должно содержать специальных "
 "символов !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Задайте правило глобально или для определенной группы"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2195,11 +2179,6 @@ msgstr "Роли"
 msgid "Countries"
 msgstr "Страны"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Правила записи"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2833,11 +2812,6 @@ msgstr "Мнение"
 msgid "Benin"
 msgstr "Бенин"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Удовлетворяет правилу, если все условия 'True' (Логическое И)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3162,7 +3136,6 @@ msgstr "Казахстан"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3827,16 +3800,6 @@ msgstr ""
 msgid "Inherited View"
 msgstr "Унаследованный вид"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
-
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4164,13 +4127,6 @@ msgstr "A4"
 msgid "Search View Ref."
 msgstr "Поиск ссылки на обзор"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Монжественные правила для того же объекта объединены с использованием "
-"оператора ИЛИ"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4797,11 +4753,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Реюньон (заморский регион Франции)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Глобальный"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5050,7 +5001,6 @@ msgstr "Поставщик компонентов"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6176,7 +6126,6 @@ msgstr "Возвращаемое"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/sk.po b/bin/addons/base/i18n/sk.po
index 5654b60553b..4d541d2efb4 100644
--- a/bin/addons/base/i18n/sk.po
+++ b/bin/addons/base/i18n/sk.po
@@ -259,11 +259,6 @@ msgstr "%y - Rok bez storočia ako desatinné číslo [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Pravidlo je splnené ak platí aspoň jedna z podmienok."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -813,11 +808,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Webová stránka"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testy"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1361,7 +1351,6 @@ msgstr "Počet aktualizovaných modulov"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1468,11 +1457,6 @@ msgid ""
 msgstr ""
 "Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Spraviť pravidlo globálnym, inak je ho nutné pridať do skupiny"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2185,11 +2169,6 @@ msgstr "Role"
 msgid "Countries"
 msgstr "Krajiny"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2805,11 +2784,6 @@ msgstr "Stav mysle"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Podmienka je splená ak platia všetky podmienky (AND)."
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3129,7 +3103,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3789,11 +3762,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4121,11 +4089,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4742,11 +4705,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4993,7 +4951,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6106,7 +6063,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/sl.po b/bin/addons/base/i18n/sl.po
index fe867b0ae1f..8e4946642a1 100644
--- a/bin/addons/base/i18n/sl.po
+++ b/bin/addons/base/i18n/sl.po
@@ -250,11 +250,6 @@ msgstr "%y - Leto brez stoletij predstavljeno kot decimalno število [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Pravilo je izpolnjeno, če je vsaj en test resničen"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -801,11 +796,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Spletno mesto"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Kriteriji"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1334,7 +1324,6 @@ msgstr "Število osveženih modulov"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1437,11 +1426,6 @@ msgid ""
 msgstr ""
 "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2151,11 +2135,6 @@ msgstr "Vloge"
 msgid "Countries"
 msgstr "Države"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Posnemi pravila"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2776,11 +2755,6 @@ msgstr "Razpoloženje partnerja"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Pravilo je izpolnjeno, če so vsi testi resnični (IN)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3101,7 +3075,6 @@ msgstr "Kazahstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3761,11 +3734,6 @@ msgstr "Podedovan pogled"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4093,11 +4061,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Več pravil na istih objektih jih združenih z uporabo operatorja ALI"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4718,11 +4681,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Globalno"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4971,7 +4929,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6091,7 +6048,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/sq.po b/bin/addons/base/i18n/sq.po
index 98911a06d0b..a9a3d60a2bb 100644
--- a/bin/addons/base/i18n/sq.po
+++ b/bin/addons/base/i18n/sq.po
@@ -254,11 +254,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -801,11 +796,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1332,7 +1322,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1433,11 +1422,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2147,11 +2131,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2762,11 +2741,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3086,7 +3060,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3746,11 +3719,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4078,11 +4046,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4699,11 +4662,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4950,7 +4908,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6063,7 +6020,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/sr.po b/bin/addons/base/i18n/sr.po
index 3d0dc60859e..8c7af14853b 100644
--- a/bin/addons/base/i18n/sr.po
+++ b/bin/addons/base/i18n/sr.po
@@ -258,11 +258,6 @@ msgstr "%y - Godina bez veka kao decimalni broj [00,99]"
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Pravilo je zadovoljeno ako je bar jedan test tačan"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -816,11 +811,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Web stranica"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testovi"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1358,7 +1348,6 @@ msgstr "Broj ažuriranih modula"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1465,11 +1454,6 @@ msgid ""
 msgstr ""
 "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne znake!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2185,11 +2169,6 @@ msgstr "Uloge"
 msgid "Countries"
 msgstr "Zemlje"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Pravila zapisa"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2822,11 +2801,6 @@ msgstr "Stanje uma"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Pravilo je zadovoljeno ako su svi testovi istina (logičko I (AND))"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3150,7 +3124,6 @@ msgstr "Kazahstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3815,11 +3788,6 @@ msgstr "Nasleđeni pregled"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4147,13 +4115,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Više pravila nad istim objektom se priključuju korišćenjem operatora "
-"logičkog ILI (OR)"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4781,11 +4742,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (Franciska)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Globalno"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5032,7 +4988,6 @@ msgstr "Dobavljač komponenti"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6158,7 +6113,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 657c35a352f..74cce03ce4c 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -259,11 +259,6 @@ msgstr "%y - År utan århundrade i två siffror [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Regeln är uppfyllt om minst ett test är sant"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -806,11 +801,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Webbplats"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1337,7 +1327,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1439,11 +1428,6 @@ msgid ""
 msgstr ""
 "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2153,11 +2137,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2770,11 +2749,6 @@ msgstr ""
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3094,7 +3068,6 @@ msgstr "Kazakhstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3754,11 +3727,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4086,11 +4054,6 @@ msgstr "A4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4709,11 +4672,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4960,7 +4918,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6075,7 +6032,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/th.po b/bin/addons/base/i18n/th.po
index a8c0a3ca261..b219145c312 100644
--- a/bin/addons/base/i18n/th.po
+++ b/bin/addons/base/i18n/th.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/tlh.po b/bin/addons/base/i18n/tlh.po
index 816c8a463c0..5eec1a0270e 100644
--- a/bin/addons/base/i18n/tlh.po
+++ b/bin/addons/base/i18n/tlh.po
@@ -248,11 +248,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -795,11 +790,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1326,7 +1316,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1427,11 +1416,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2141,11 +2125,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2756,11 +2735,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3080,7 +3054,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3740,11 +3713,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4072,11 +4040,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4693,11 +4656,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4944,7 +4902,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6057,7 +6014,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index 8feffb44a99..42cbcbccc82 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.po
@@ -257,11 +257,6 @@ msgstr "%y - Yıl, yüzyıl olmadan onluk sistemde [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Testlerden en az biri Doğru ise kural sağlanır."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -815,11 +810,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Web sitesi"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Sınamalar"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1362,7 +1352,6 @@ msgstr "Bir kaç modül güncllendi"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1467,11 +1456,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr "Nesne adı x_ ile başlamalı ve özel karakterler içermemelidir!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Kuralı genel geçer yapın yoksa bir gruba eklenmesi gerekir."
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2187,11 +2171,6 @@ msgstr "Roller"
 msgid "Countries"
 msgstr "Ülkeler"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Kayıt kuralları"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2822,11 +2801,6 @@ msgstr "Ruh Hali"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Bu kural bütün sınamalar doğru (True) sonuçlanırsa sağlanır (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3149,7 +3123,6 @@ msgstr "Kazakistan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3818,11 +3791,6 @@ msgstr "Devralınan Görünüm"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4150,13 +4118,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "Arama Görüntüsü Referansı"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Aynı nesne üzerindeki birden fazla kural OR operatörü kullanılarak "
-"birleştirilir"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4782,11 +4743,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (Fransız)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Evrensel"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5034,7 +4990,6 @@ msgstr "Parça Tedarikçisi"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6164,7 +6119,6 @@ msgstr "Ger Dönen"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 08556556f93..f01a5de45e3 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -256,11 +256,6 @@ msgstr "%y - Рік без століття цифрами [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Правило задовольняється, якщо принаймні один тест є 'істина'"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -813,11 +808,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Веб-сайт"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Тести"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1359,7 +1349,6 @@ msgstr "Кількість обновлених модулів"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1462,11 +1451,6 @@ msgid ""
 msgstr ""
 "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Зробіть правило загальним чи призначте його групі"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2178,11 +2162,6 @@ msgstr "Ролі"
 msgid "Countries"
 msgstr "Країни"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Правила запису"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2808,11 +2787,6 @@ msgstr "Настрій"
 msgid "Benin"
 msgstr "Бенін"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Правило задовольняється, якщо всі тести є True (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3136,7 +3110,6 @@ msgstr "Казахстан"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3798,11 +3771,6 @@ msgstr "Успадкований вид"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4130,11 +4098,6 @@ msgstr "А4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Декілька правил для однакових об'єктів об'єднуються оператором OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4755,11 +4718,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Глобальне"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5008,7 +4966,6 @@ msgstr "Постачальник Компонентів"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6124,7 +6081,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/uk_UA.po b/bin/addons/base/i18n/uk_UA.po
index f7a2900ec5e..8e50c76578f 100644
--- a/bin/addons/base/i18n/uk_UA.po
+++ b/bin/addons/base/i18n/uk_UA.po
@@ -242,11 +242,6 @@ msgstr ""
 msgid "Validated"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Правило задовольняється, якщо принаймні один тест є 'істина'"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Веб-сайт"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Тести"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1319,7 +1309,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1409,11 +1398,6 @@ msgstr "Мадагаскар"
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2108,11 +2092,6 @@ msgstr "Ролі"
 msgid "Countries"
 msgstr "Країни"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Правила запису"
-
 #. module: base
 #: view:res.lang:0
 msgid "12. %w              ==> 5 ( Friday is the 6th day)"
@@ -2708,11 +2687,6 @@ msgstr "Set NULL"
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Правило задовольняється, якщо всі тести є True (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3014,7 +2988,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3696,11 +3669,6 @@ msgstr "ir.translation"
 msgid "Luxembourg"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -3986,11 +3954,6 @@ msgstr "Внутрішній заголовок RML"
 msgid "a4"
 msgstr "А4"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Декілька правил для однакових об'єктів об'єднуються оператором OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4645,11 +4608,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Глобальне"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4878,7 +4836,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -5979,7 +5936,6 @@ msgstr "Батьківська"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/vi.po b/bin/addons/base/i18n/vi.po
index 43e1bc0ac30..f3ba083adf5 100644
--- a/bin/addons/base/i18n/vi.po
+++ b/bin/addons/base/i18n/vi.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 8c2d99e0864..3d423859e77 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -251,11 +251,6 @@ msgstr "%y - 不包含世纪的十进制年份数 [00,99]。"
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "只要一个条件判断为真，该规则即满足"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -800,11 +795,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "网站"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "测试"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1334,7 +1324,6 @@ msgstr "已更新的模块数"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1436,11 +1425,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "让规则的作用范围为全局，否则需要将其指定给用户组"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2150,11 +2134,6 @@ msgstr "角色"
 msgid "Countries"
 msgstr "国家"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "记录规则"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2769,11 +2748,6 @@ msgstr "满意度"
 msgid "Benin"
 msgstr "贝宁"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "如果所有测试都为真的话该规则将满足条件（“与”运算）"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3093,7 +3067,6 @@ msgstr "哈萨克斯坦"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3757,11 +3730,6 @@ msgstr "继承视图"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4089,11 +4057,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "搜索视图引用"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "同一对象上的多条规则使用“或”（OR）操作符连接。"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4712,11 +4675,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "法属留尼旺岛"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "全局"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4963,7 +4921,6 @@ msgstr "零件供应商"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6080,7 +6037,6 @@ msgstr "所属公司"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/zh_TW.po b/bin/addons/base/i18n/zh_TW.po
index 69dd7e92bcc..a8d5912499e 100644
--- a/bin/addons/base/i18n/zh_TW.po
+++ b/bin/addons/base/i18n/zh_TW.po
@@ -253,11 +253,6 @@ msgstr "%y - 不包含世紀的十進制年份數 [00,99]。"
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "只要一個條件判斷為真，該規則即滿足"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -802,11 +797,6 @@ msgstr ""
 msgid "Website"
 msgstr "網站"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1334,7 +1324,6 @@ msgstr "已更新的模組數"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1436,11 +1425,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr "對象名稱必須以「x_」開頭且不能包含任何特殊字符！"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "請設定全域規則,否則將會成為單一群組規則"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2150,11 +2134,6 @@ msgstr "角色"
 msgid "Countries"
 msgstr "國家"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "記錄規則"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2771,11 +2750,6 @@ msgstr "助记状态"
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "如果所有測試都為真的話該規則將滿足條件（「與」運算）"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3095,7 +3069,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3755,11 +3728,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4087,11 +4055,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4708,11 +4671,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4959,7 +4917,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6072,7 +6029,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0

From b0190b51685cbd4328f49386bfa007857cc23ee9 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Mon, 11 Oct 2010 20:26:47 +0530
Subject: [PATCH 202/244] [FIX] base : Translations added for res_lang

bzr revid: ach@tinyerp.com-20101011145647-suao8tirobfkiozd
---
 bin/addons/base/i18n/am.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/ar.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/base.pot | 23 +++++++++++++++++++++++
 bin/addons/base/i18n/bg.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/bs.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/ca.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/cs.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/da.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/de.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/el.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/en_GB.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/es.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/es_AR.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/es_EC.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/et.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/eu.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/fa.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/fi.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/fr.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/gl.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/he.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/hr.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/hu.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/id.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/is.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/it.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/ja.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/ko.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/lt.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/lt_LT.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/lv.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/mn.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/nb.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/nl.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/nl_BE.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/nl_NL.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/pl.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/pt.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/pt_BR.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/ro.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/ru.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/sk.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/sl.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/sq.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/sr.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/sv.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/th.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/tlh.po   | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/tr.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/uk.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/uk_UA.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/vi.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/zh_CN.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/zh_TW.po | 24 ++++++++++++++++++++++++
 54 files changed, 1295 insertions(+)

diff --git a/bin/addons/base/i18n/am.po b/bin/addons/base/i18n/am.po
index 9ab01f41afd..dc910dc47d4 100644
--- a/bin/addons/base/i18n/am.po
+++ b/bin/addons/base/i18n/am.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/ar.po b/bin/addons/base/i18n/ar.po
index 8080be966a3..fd857b54e67 100644
--- a/bin/addons/base/i18n/ar.po
+++ b/bin/addons/base/i18n/ar.po
@@ -7992,3 +7992,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/base.pot b/bin/addons/base/i18n/base.pot
index dfe019bdda2..d279fc3e271 100644
--- a/bin/addons/base/i18n/base.pot
+++ b/bin/addons/base/i18n/base.pot
@@ -7860,3 +7860,26 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index 141f3e3b521..b1b2096348b 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -8155,6 +8155,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Others Partners"
 #~ msgstr "Други партньори"
 
diff --git a/bin/addons/base/i18n/bs.po b/bin/addons/base/i18n/bs.po
index b6658bb0459..22bda14c6e2 100644
--- a/bin/addons/base/i18n/bs.po
+++ b/bin/addons/base/i18n/bs.po
@@ -8015,3 +8015,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po
index 5a48c0fdacc..b33243184f4 100644
--- a/bin/addons/base/i18n/ca.po
+++ b/bin/addons/base/i18n/ca.po
@@ -8151,6 +8151,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached ID"
 #~ msgstr "ID fitxer adjunt"
 
diff --git a/bin/addons/base/i18n/cs.po b/bin/addons/base/i18n/cs.po
index 4d9e7bd26e8..72ca59fd5dc 100644
--- a/bin/addons/base/i18n/cs.po
+++ b/bin/addons/base/i18n/cs.po
@@ -7996,5 +7996,29 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Main Company"
 #~ msgstr "Hlavní společnost"
diff --git a/bin/addons/base/i18n/da.po b/bin/addons/base/i18n/da.po
index 402776a0302..6902704935d 100644
--- a/bin/addons/base/i18n/da.po
+++ b/bin/addons/base/i18n/da.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po
index 86775b8ffa3..7125ce3adae 100644
--- a/bin/addons/base/i18n/de.po
+++ b/bin/addons/base/i18n/de.po
@@ -8157,6 +8157,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached ID"
 #~ msgstr "Sie können dieses Dokument nicht lesen ! (%s)"
 
diff --git a/bin/addons/base/i18n/el.po b/bin/addons/base/i18n/el.po
index dbaa66d3f52..0b4ab975a2f 100644
--- a/bin/addons/base/i18n/el.po
+++ b/bin/addons/base/i18n/el.po
@@ -8159,6 +8159,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "The unlink method is not implemented on this object !"
 #~ msgstr "Η μέθοδος αποσύνδεσης δεν έχει αναπτυχθεί σε αυτό το αντικείμενο!"
diff --git a/bin/addons/base/i18n/en_GB.po b/bin/addons/base/i18n/en_GB.po
index 2c28b7d1dd4..213c82427a4 100644
--- a/bin/addons/base/i18n/en_GB.po
+++ b/bin/addons/base/i18n/en_GB.po
@@ -8134,3 +8134,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po
index 53727c6eec7..5d9dcbac646 100644
--- a/bin/addons/base/i18n/es.po
+++ b/bin/addons/base/i18n/es.po
@@ -8158,6 +8158,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached ID"
 #~ msgstr "ID archivo adjunto"
 
diff --git a/bin/addons/base/i18n/es_AR.po b/bin/addons/base/i18n/es_AR.po
index 8e2cfe27929..07f8596dc29 100644
--- a/bin/addons/base/i18n/es_AR.po
+++ b/bin/addons/base/i18n/es_AR.po
@@ -8115,6 +8115,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid ""
 #~ "Some installed modules depends on the module you plan to desinstall :\n"
diff --git a/bin/addons/base/i18n/es_EC.po b/bin/addons/base/i18n/es_EC.po
index ef7691650d5..bb83aeb18f6 100644
--- a/bin/addons/base/i18n/es_EC.po
+++ b/bin/addons/base/i18n/es_EC.po
@@ -8162,3 +8162,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr "Error de Integridad"
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index ffd58080bf3..0b97344fc9f 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.po
@@ -8114,6 +8114,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached ID"
 #~ msgstr "Manustatud ID"
 
diff --git a/bin/addons/base/i18n/eu.po b/bin/addons/base/i18n/eu.po
index f1b900b3804..caafabcff62 100644
--- a/bin/addons/base/i18n/eu.po
+++ b/bin/addons/base/i18n/eu.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/fa.po b/bin/addons/base/i18n/fa.po
index 299bd9393ab..6de36341b09 100644
--- a/bin/addons/base/i18n/fa.po
+++ b/bin/addons/base/i18n/fa.po
@@ -8136,6 +8136,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached ID"
 #~ msgstr "شناسه پیوست"
 
diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index d9d6c9d941b..b939177cb59 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.po
@@ -8140,6 +8140,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached Model"
 #~ msgstr "Liitetty malli"
 
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 3a6eeab5c6d..0471bd12dff 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -8168,6 +8168,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Others Partners"
 #~ msgstr "Autres partenaires"
 
diff --git a/bin/addons/base/i18n/gl.po b/bin/addons/base/i18n/gl.po
index 5f0b6e3b32a..63971b2bae2 100644
--- a/bin/addons/base/i18n/gl.po
+++ b/bin/addons/base/i18n/gl.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po
index cbe4e9067e7..2b18b4be7c8 100644
--- a/bin/addons/base/i18n/he.po
+++ b/bin/addons/base/i18n/he.po
@@ -8076,6 +8076,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "The unlink method is not implemented on this object !"
 #~ msgstr "השיטה הלא מקושרת לא הוטמעה באובייקט!"
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 09aa6e981a6..c5200db8b0c 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -8039,6 +8039,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "Recursivity Detected."
 #~ msgstr "Otkrivena je rekurzivnost"
diff --git a/bin/addons/base/i18n/hu.po b/bin/addons/base/i18n/hu.po
index 4c9a39667d1..1bf33c12905 100644
--- a/bin/addons/base/i18n/hu.po
+++ b/bin/addons/base/i18n/hu.po
@@ -7993,5 +7993,29 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Main Company"
 #~ msgstr "Anyagcég"
diff --git a/bin/addons/base/i18n/id.po b/bin/addons/base/i18n/id.po
index e99a5b9191d..d1ae581da0f 100644
--- a/bin/addons/base/i18n/id.po
+++ b/bin/addons/base/i18n/id.po
@@ -8004,3 +8004,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/is.po b/bin/addons/base/i18n/is.po
index eddb8f9faba..a26de9e9d24 100644
--- a/bin/addons/base/i18n/is.po
+++ b/bin/addons/base/i18n/is.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index c7ee91a97a2..723842010b0 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -8166,6 +8166,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr "Errore di integrità"
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached ID"
 #~ msgstr "ID Allegato"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 4a703076d64..c0ff2af0662 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -7995,3 +7995,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/ko.po b/bin/addons/base/i18n/ko.po
index c3e8b6caa41..d23167e32c0 100644
--- a/bin/addons/base/i18n/ko.po
+++ b/bin/addons/base/i18n/ko.po
@@ -8035,6 +8035,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "The unlink method is not implemented on this object !"
 #~ msgstr "링크해제 방법은 이 오브젝트에 적용되지 않습니다."
diff --git a/bin/addons/base/i18n/lt.po b/bin/addons/base/i18n/lt.po
index f0031333b10..62683dae0ba 100644
--- a/bin/addons/base/i18n/lt.po
+++ b/bin/addons/base/i18n/lt.po
@@ -7992,3 +7992,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/lt_LT.po b/bin/addons/base/i18n/lt_LT.po
index 62eee0ce8ab..6a90402e113 100644
--- a/bin/addons/base/i18n/lt_LT.po
+++ b/bin/addons/base/i18n/lt_LT.po
@@ -7849,3 +7849,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po
index 1e52e93b971..404d7096f1c 100644
--- a/bin/addons/base/i18n/lv.po
+++ b/bin/addons/base/i18n/lv.po
@@ -8128,6 +8128,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "The unlink method is not implemented on this object !"
 #~ msgstr "Objektam nav ieviesta atsaistes funkcija!"
diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po
index ab4af442ebf..4b50a04b63d 100644
--- a/bin/addons/base/i18n/mn.po
+++ b/bin/addons/base/i18n/mn.po
@@ -8092,6 +8092,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "You can not have two users with the same login !"
 #~ msgstr "Ижил нэвтрэх кодтой хоёр хэрэглэгч байж болохгүй!"
diff --git a/bin/addons/base/i18n/nb.po b/bin/addons/base/i18n/nb.po
index 7789d3d6ed0..722fd43ae3a 100644
--- a/bin/addons/base/i18n/nb.po
+++ b/bin/addons/base/i18n/nb.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index 0d1215a54cf..6be0a162fc6 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -8165,6 +8165,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr "Integriteit Fout"
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Main Company"
 #~ msgstr "Moederorganisatie"
 
diff --git a/bin/addons/base/i18n/nl_BE.po b/bin/addons/base/i18n/nl_BE.po
index 01fe20fcf9f..607e803bbc4 100644
--- a/bin/addons/base/i18n/nl_BE.po
+++ b/bin/addons/base/i18n/nl_BE.po
@@ -8057,6 +8057,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Make the rule global, otherwise it needs to be put on a group or user"
 #~ msgstr ""
 #~ "Maak dit een globale regel, anders moet de regel aan een groep of gebruiker "
diff --git a/bin/addons/base/i18n/nl_NL.po b/bin/addons/base/i18n/nl_NL.po
index bde7d7d8e89..2be89d2adb3 100644
--- a/bin/addons/base/i18n/nl_NL.po
+++ b/bin/addons/base/i18n/nl_NL.po
@@ -8138,6 +8138,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Make the rule global, otherwise it needs to be put on a group or user"
 #~ msgstr ""
 #~ "Maak dit een globale regel, anders moet de regel aan een groep of gebruiker "
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index 43d72938fea..534179e69a4 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@ -8147,6 +8147,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "Product quantity"
 #~ msgstr "Ilość produktu"
diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po
index 62322413fd2..f85e164b29f 100644
--- a/bin/addons/base/i18n/pt.po
+++ b/bin/addons/base/i18n/pt.po
@@ -8142,6 +8142,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached ID"
 #~ msgstr "Id ligado"
 
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index 707fcef723f..0a2023ded93 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -8144,6 +8144,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached Model"
 #~ msgstr "Modelo anexado"
 
diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po
index 47bcccbfef2..39e081f347e 100644
--- a/bin/addons/base/i18n/ro.po
+++ b/bin/addons/base/i18n/ro.po
@@ -8015,6 +8015,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Main Company"
 #~ msgstr "Compania mama"
 
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index 9710e4e5c80..766d4c8bce6 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.po
@@ -8121,6 +8121,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Others Partners"
 #~ msgstr "Прочие партнеры"
 
diff --git a/bin/addons/base/i18n/sk.po b/bin/addons/base/i18n/sk.po
index 4d541d2efb4..f348b8e3f63 100644
--- a/bin/addons/base/i18n/sk.po
+++ b/bin/addons/base/i18n/sk.po
@@ -8042,6 +8042,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "The read method is not implemented on this object !"
 #~ msgstr "Metóda nie je implementovaná na tento objekt!"
diff --git a/bin/addons/base/i18n/sl.po b/bin/addons/base/i18n/sl.po
index 8e4946642a1..4aaa81cd3dc 100644
--- a/bin/addons/base/i18n/sl.po
+++ b/bin/addons/base/i18n/sl.po
@@ -8034,6 +8034,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Others Partners"
 #~ msgstr "Ostali partnerji"
 
diff --git a/bin/addons/base/i18n/sq.po b/bin/addons/base/i18n/sq.po
index a9a3d60a2bb..c177b83a443 100644
--- a/bin/addons/base/i18n/sq.po
+++ b/bin/addons/base/i18n/sq.po
@@ -7998,3 +7998,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/sr.po b/bin/addons/base/i18n/sr.po
index 8c7af14853b..6b741b11629 100644
--- a/bin/addons/base/i18n/sr.po
+++ b/bin/addons/base/i18n/sr.po
@@ -8123,6 +8123,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "The unlink method is not implemented on this object !"
 #~ msgstr "Metoda za prekid veze nije implementirana u ovaj objekat !"
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 74cce03ce4c..d778e62a3ae 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -8014,3 +8014,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/th.po b/bin/addons/base/i18n/th.po
index b219145c312..9d49e96a260 100644
--- a/bin/addons/base/i18n/th.po
+++ b/bin/addons/base/i18n/th.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/tlh.po b/bin/addons/base/i18n/tlh.po
index 5eec1a0270e..4b1e0544a1e 100644
--- a/bin/addons/base/i18n/tlh.po
+++ b/bin/addons/base/i18n/tlh.po
@@ -7992,3 +7992,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index 42cbcbccc82..35fdcc33b43 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.po
@@ -8130,6 +8130,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid ""
 #~ "The sum of the data (2nd field) is null.\n"
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index f01a5de45e3..e0c660f9291 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -8077,6 +8077,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "The unlink method is not implemented on this object !"
 #~ msgstr "Метод unlink не реалізований у цьому об'єкті!"
diff --git a/bin/addons/base/i18n/uk_UA.po b/bin/addons/base/i18n/uk_UA.po
index 8e50c76578f..45b170df689 100644
--- a/bin/addons/base/i18n/uk_UA.po
+++ b/bin/addons/base/i18n/uk_UA.po
@@ -7862,3 +7862,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/vi.po b/bin/addons/base/i18n/vi.po
index f3ba083adf5..c7cc46edca9 100644
--- a/bin/addons/base/i18n/vi.po
+++ b/bin/addons/base/i18n/vi.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 3d423859e77..9f43500c238 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -8022,6 +8022,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Main Company"
 #~ msgstr "母公司"
 
diff --git a/bin/addons/base/i18n/zh_TW.po b/bin/addons/base/i18n/zh_TW.po
index a8d5912499e..cc4e92b4da0 100644
--- a/bin/addons/base/i18n/zh_TW.po
+++ b/bin/addons/base/i18n/zh_TW.po
@@ -8008,5 +8008,29 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Main Company"
 #~ msgstr "主要公司"

From 86c87e1a376447bf02acd628ee099acc738d0d2f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Oct 2010 17:43:14 +0200
Subject: [PATCH 203/244] [ADD] osv.perm_read: added XML ID (xmlid) to returned
 values - naming indicates this is not a m2o.

bzr revid: odo@openerp.com-20101011154314-sxdfqmeoxo5f91er
---
 bin/osv/orm.py | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index c4195dc00fa..bc2d1b03d86 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2159,7 +2159,8 @@ class orm_memory(orm_template):
                 'create_date': create_date,
                 'write_uid': False,
                 'write_date': False,
-                'id': id
+                'id': id,
+                'xmlid' : False,
             })
         return result
 
@@ -3168,12 +3169,8 @@ class orm(orm_template):
 
     def perm_read(self, cr, user, ids, context=None, details=True):
         """
-        Read the permission for record of the given ids
+        Returns some metadata about the given records.
 
-        :param cr: database cursor
-        :param user: current user id
-        :param ids: id or list of ids
-        :param context: context arguments, like lang, time zone
         :param details: if True, \*_uid fields are replaced with the name of the user
         :return: list of ownership dictionaries for each requested record
         :rtype: list of dictionaries with the following keys:
@@ -3183,7 +3180,7 @@ class orm(orm_template):
                     * create_date: date when the record was created
                     * write_uid: last user who changed the record
                     * write_date: date of the last change to the record
-
+                    * xmlid: XML ID to use to refer to this record (if there is one), in format ``module.name``
         """
         if not context:
             context = {}
@@ -3193,18 +3190,25 @@ class orm(orm_template):
         uniq = isinstance(ids, (int, long))
         if uniq:
             ids = [ids]
-        fields = 'id'
+        fields = ['id']
         if self._log_access:
-            fields += ', create_uid, create_date, write_uid, write_date'
-        query = 'SELECT %s FROM "%s" WHERE id IN %%s' % (fields, self._table)
-        cr.execute(query, (tuple(ids),))
+            fields += ['create_uid', 'create_date', 'write_uid', 'write_date']
+        quoted_table = '"%s"' % self._table
+        fields_str = ",".join('%s.%s'%(quoted_table, field) for field in fields)
+        query = '''SELECT %s, __imd.module, __imd.name
+                   FROM %s LEFT JOIN ir_model_data __imd
+                       ON (__imd.model = %%s and __imd.res_id = %s.id)
+                   WHERE %s.id IN %%s''' % (fields_str, quoted_table, quoted_table, quoted_table)
+        cr.execute(query, (self._name, tuple(ids)))
         res = cr.dictfetchall()
         for r in res:
             for key in r:
                 r[key] = r[key] or False
-                if key in ('write_uid', 'create_uid', 'uid') and details:
+                if details and key in ('write_uid', 'create_uid'):
                     if r[key]:
                         r[key] = self.pool.get('res.users').name_get(cr, user, [r[key]])[0]
+            r['xmlid'] = ("%(module)s.%(name)s" % r) if r['name'] else False
+            del r['name'], r['module']
         if uniq:
             return res[ids[0]]
         return res

From 32b9ac6ddda2e334867b75b3833a76b16b738031 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 12 Oct 2010 04:51:03 +0000
Subject: [PATCH 204/244] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101012045103-4ym19xvsbzg84btl
---
 bin/addons/base/i18n/de.po | 56 ++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po
index 7125ce3adae..593919a31b3 100644
--- a/bin/addons/base/i18n/de.po
+++ b/bin/addons/base/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-09 17:58+0000\n"
-"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
+"PO-Revision-Date: 2010-10-11 17:20+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <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: 2010-09-29 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8062,75 +8062,76 @@ msgstr "2 Benuzter können nicht den gleichen Login Code haben!"
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
-msgstr ""
+msgstr "Die Feldlänge kann niemals kleiner als 1 sein!"
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
-msgstr ""
+msgstr "Die Verknüpfung existiert bereits für dieses Menü!"
 
 #. module: base
 #: sql_constraint:ir.model.data:0
 msgid ""
 "You cannot have multiple records with the same id for the same module !"
 msgstr ""
+"Mehrere Datensätze dürfen nicht die selbe ID für dasselbe Modul besitzen!"
 
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
-msgstr ""
+msgstr "Ihr Wartungsvertrag wurde bereits in Ihrem System registriert!"
 
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
-msgstr ""
+msgstr "Der Name des Moduls muss eindeutig sein!"
 
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
-msgstr ""
+msgstr "Die Zertifikats-ID muss eindeutig sein!"
 
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
-msgstr ""
+msgstr "Der Code der Partnerfunktion muss eindeutig sein."
 
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
-msgstr ""
+msgstr "Der Name des Partners muss eindeutig sein!"
 
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "Der Name des Landes muss eindeutig sein!"
 
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "Der Code des Landes muss eindeutig sein!"
 
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
-msgstr ""
+msgstr "Der Name der Sprache muss eindeutig sein!"
 
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
-msgstr ""
+msgstr "Der Code  der Sprache muss eindeutig sein!"
 
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
-msgstr ""
+msgstr "Der Name der Gruppe muss eindeutig sein!"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "Abhängigkeitsfehler"
 
 #. module: base
 #: code:addons/osv/osv.py:0
@@ -8141,6 +8142,12 @@ msgid ""
 "reference it\n"
 "- creation/update: a mandatory field is not correctly set"
 msgstr ""
+"Die Aktion kann nicht fertiggestellt werden, wahrscheinlich aufgrund einer "
+"der folgenden Fehler:\n"
+"- Löschen: Sie versuchen einen Datensatz zu löschen, auf den noch andere "
+"Datensätze referenzieren\n"
+"- Neu/Aktualisierung: Ein Pflicht-Feld wurde nicht oder nicht richtig "
+"ausgefüllt"
 
 #. module: base
 #: code:addons/osv/osv.py:0
@@ -8150,36 +8157,45 @@ msgid ""
 "\n"
 "[object with reference: %s - %s]"
 msgstr ""
+"\n"
+"\n"
+"[Objekt mit Referenz: %s - %s]"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Integrity Error"
-msgstr ""
+msgstr "Datenintegritäts Fehler"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
 msgid "User Error"
-msgstr ""
+msgstr "Benutzerfehler"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
 msgid "Base Language 'en_US' can not be deleted !"
-msgstr ""
+msgstr "Basis Sprache 'en_US' kann nicht gelöscht werden !"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
+"Eine Sprache, die in einer Benutzereinstellung definiert ist, kann nicht "
+"gelöscht werden."
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
+"Eine aktive Sprache kann nicht gelöscht werden !\n"
+"Bitte diese vorher deaktivieren."
 
 #~ msgid "Attached ID"
 #~ msgstr "Sie können dieses Dokument nicht lesen ! (%s)"

From 3678e09a807ddb606309a00196fa856e69321362 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 12 Oct 2010 10:49:30 +0530
Subject: [PATCH 205/244] [MOD/IMP] hr_* : Cancel Button Set on left side

bzr revid: dbr@tinyerp.com-20101012051930-h37amb58eps2bzf0
---
 addons/hr_holidays/hr_holidays_view.xml | 12 ++++++------
 addons/hr_payroll/hr_payroll_view.xml   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 124e424f620..b1225f04609 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -90,8 +90,8 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2">
-                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
                                 <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
+                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                                 <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
@@ -133,11 +133,11 @@
                         <newline/>
                         <field name="state" colspan="2"/>
                         <group colspan="2">
+                            <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                             <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                             <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                             <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
-                            <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                             <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                         </group>
                     </page>
@@ -161,11 +161,11 @@
                     <field name="user_id" invisible="1"/>
                     <!--field name="type"/-->
                     <field name="state"/>
+                    <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                     <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                     <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
-                    <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                     <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                 </tree>
             </field>
@@ -191,10 +191,10 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2">
+                                <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
                                 <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no"/>
-                                <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel"/>
                                 <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
@@ -221,10 +221,10 @@
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="state"/>
+                    <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                     <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                     <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
-                    <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                     <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                 </tree>
             </field>
@@ -248,10 +248,10 @@
                     <field name="user_id" invisible="1"/>
                     <!--field name="type"/-->
                     <field name="state"/>
+                    <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                     <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                     <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
-                    <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                     <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                 </tree>
             </field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 0b06790407d..9d99be20b8a 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -985,11 +985,11 @@
                     </notebook>
                     <group col="8" colspan="4">
                         <field name="state"/>
+                        <button string="Cancel" name="cancel_sheet" icon="gtk-cancel" states="draft,hr_check,accont_check,confirm" type="object"/>
                         <button string="Compute" name="compute_sheet" states="new" icon="terp-document-new" type="object"/>
                         <button string="Verify Sheet" icon="gtk-ok" name="verify_sheet" states="draft" type="object"/>
                         <button string="Complete HR Checking"  icon="gtk-apply" name="final_verify_sheet" type="object" states="hr_check"/>
                         <button string="Pay Salary" icon="gtk-apply"  name="process_sheet" states="confirm" type="object" />
-                        <button string="Cancel" name="cancel_sheet" icon="gtk-cancel" states="draft,hr_check,accont_check,confirm" type="object"/>
                         <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" />
                     </group>
                 </form>

From 69147e278f1a4f14963cebf5332787c9463e713c Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 12 Oct 2010 10:57:02 +0530
Subject: [PATCH 206/244] [FIX] base : Translations Corrected

bzr revid: ach@tinyerp.com-20101012052702-qrka8uld1apdpwg0
---
 bin/addons/base/i18n/am.po     |  9 ++-------
 bin/addons/base/i18n/ar.po     |  9 ++-------
 bin/addons/base/i18n/base.pot  |  2 +-
 bin/addons/base/i18n/bg.po     | 19 ++++---------------
 bin/addons/base/i18n/bs.po     |  9 ++-------
 bin/addons/base/i18n/ca.po     | 19 ++++---------------
 bin/addons/base/i18n/cs.po     |  9 ++-------
 bin/addons/base/i18n/da.po     |  9 ++-------
 bin/addons/base/i18n/de.po     | 32 ++++++--------------------------
 bin/addons/base/i18n/el.po     | 19 ++++---------------
 bin/addons/base/i18n/en_GB.po  | 18 ++++--------------
 bin/addons/base/i18n/es.po     | 19 ++++---------------
 bin/addons/base/i18n/es_AR.po  | 14 +++-----------
 bin/addons/base/i18n/es_EC.po  | 19 ++++---------------
 bin/addons/base/i18n/et.po     | 14 +++-----------
 bin/addons/base/i18n/eu.po     |  9 ++-------
 bin/addons/base/i18n/fa.po     | 19 ++++---------------
 bin/addons/base/i18n/fi.po     | 33 ++++++---------------------------
 bin/addons/base/i18n/fr.po     | 14 +++-----------
 bin/addons/base/i18n/gl.po     |  9 ++-------
 bin/addons/base/i18n/he.po     | 13 +++----------
 bin/addons/base/i18n/hr.po     | 14 +++-----------
 bin/addons/base/i18n/hu.po     |  9 ++-------
 bin/addons/base/i18n/id.po     |  9 ++-------
 bin/addons/base/i18n/is.po     |  9 ++-------
 bin/addons/base/i18n/it.po     | 19 ++++---------------
 bin/addons/base/i18n/ja.po     |  9 ++-------
 bin/addons/base/i18n/ko.po     | 13 +++----------
 bin/addons/base/i18n/lt.po     |  9 ++-------
 bin/addons/base/i18n/lt_LT.po  |  5 ++---
 bin/addons/base/i18n/lv.po     | 25 +++++--------------------
 bin/addons/base/i18n/mn.po     | 18 ++++--------------
 bin/addons/base/i18n/nb.po     |  9 ++-------
 bin/addons/base/i18n/nl.po     | 19 ++++---------------
 bin/addons/base/i18n/nl_BE.po  |  9 ++-------
 bin/addons/base/i18n/nl_NL.po  | 14 +++-----------
 bin/addons/base/i18n/pl.po     | 19 ++++---------------
 bin/addons/base/i18n/pt.po     | 18 ++++--------------
 bin/addons/base/i18n/pt_BR.po  | 19 ++++---------------
 bin/addons/base/i18n/ro.po     |  9 ++-------
 bin/addons/base/i18n/ru.po     | 19 ++++---------------
 bin/addons/base/i18n/sk.po     | 14 +++-----------
 bin/addons/base/i18n/sl.po     |  9 ++-------
 bin/addons/base/i18n/sq.po     |  9 ++-------
 bin/addons/base/i18n/sr.po     | 14 +++-----------
 bin/addons/base/i18n/sv.po     |  9 ++-------
 bin/addons/base/i18n/th.po     |  9 ++-------
 bin/addons/base/i18n/tlh.po    |  9 ++-------
 bin/addons/base/i18n/tr.po     | 18 ++++--------------
 bin/addons/base/i18n/uk.po     |  9 ++-------
 bin/addons/base/i18n/uk_UA.po  |  5 ++---
 bin/addons/base/i18n/vi.po     |  9 ++-------
 bin/addons/base/i18n/zh_CN.po  | 16 ++++------------
 bin/addons/base/i18n/zh_TW.po  | 12 +++---------
 bin/addons/base/ir/ir_model.py |  2 +-
 55 files changed, 161 insertions(+), 574 deletions(-)

diff --git a/bin/addons/base/i18n/am.po b/bin/addons/base/i18n/am.po
index dc910dc47d4..2c1cb0945d4 100644
--- a/bin/addons/base/i18n/am.po
+++ b/bin/addons/base/i18n/am.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ar.po b/bin/addons/base/i18n/ar.po
index fd857b54e67..7949bf77f5e 100644
--- a/bin/addons/base/i18n/ar.po
+++ b/bin/addons/base/i18n/ar.po
@@ -1364,10 +1364,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3168,9 +3165,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/base.pot b/bin/addons/base/i18n/base.pot
index d279fc3e271..a29409e69b2 100644
--- a/bin/addons/base/i18n/base.pot
+++ b/bin/addons/base/i18n/base.pot
@@ -3103,7 +3103,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "\"%s\" contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index b1b2096348b..f81214368cc 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -1405,14 +1405,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Въведете поле/израз, който връща списък. Например, изберете поръчка за "
-"продажба в обект и ще може да имате цикъл върху редовете от поръчка за "
-"продажба. Израз = 'object.order_line'."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Въведете поле/израз, който връща списък. Например, изберете поръчка за продажба в обект и ще може да имате цикъл върху редовете от поръчка за продажба. Израз = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3250,13 +3244,8 @@ msgstr "Групиране по"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" съдържа твърде много точки. XML-идентификаторите не трябва да "
-"съдържат точки! Те се използват за свързване към данни от други модули, "
-"например в module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' съдържа твърде много точки. XML-идентификаторите не трябва да съдържат точки! Те се използват за свързване към данни от други модули, например в module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/bs.po b/bin/addons/base/i18n/bs.po
index 22bda14c6e2..72df0ea0c8d 100644
--- a/bin/addons/base/i18n/bs.po
+++ b/bin/addons/base/i18n/bs.po
@@ -1382,10 +1382,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3186,9 +3183,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po
index b33243184f4..b0963e20e96 100644
--- a/bin/addons/base/i18n/ca.po
+++ b/bin/addons/base/i18n/ca.po
@@ -1405,14 +1405,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Introduïu el camp/expressió que tornarà la llista. Per ex. si seleccioneu "
-"la comanda de venda en Objecte podrà realitzar un bucle sobre les línies del "
-"comanda de venda. Expressió = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Introduïu el camp/expressió que tornarà la llista. Per ex. si seleccioneu la comanda de venda en Objecte podrà realitzar un bucle sobre les línies del comanda de venda. Expressió = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3249,13 +3243,8 @@ msgstr "Agrupa per"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"% s\" conté massa punts. ¡Els ids l'XML no haurien de contenir punts! Els "
-"punts es fan servir per referir-se a dades d'altres mòduls, per exemple "
-"mòdul.referència_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' conté massa punts. ¡Els ids l'XML no haurien de contenir punts! Els punts es fan servir per referir-se a dades d'altres mòduls, per exemple mòdul.referència_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/cs.po b/bin/addons/base/i18n/cs.po
index 72ca59fd5dc..3b9e2719025 100644
--- a/bin/addons/base/i18n/cs.po
+++ b/bin/addons/base/i18n/cs.po
@@ -1364,10 +1364,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3171,9 +3168,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/da.po b/bin/addons/base/i18n/da.po
index 6902704935d..590d4b7d804 100644
--- a/bin/addons/base/i18n/da.po
+++ b/bin/addons/base/i18n/da.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po
index 593919a31b3..b6e59ea5a83 100644
--- a/bin/addons/base/i18n/de.po
+++ b/bin/addons/base/i18n/de.po
@@ -1409,15 +1409,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Eingabe des Feldes/Ausdruckes, das die Liste erzeugt. \r\n"
-"zB Auswahl von \"sale order\" in Objekt und alle Averkaufsauftragszeilen "
-"werden ausgewählt.\r\n"
-"Ausdruck = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Eingabe des Feldes/Ausdruckes, das die Liste erzeugt. zB Auswahl von sale order in Objekt und alle Averkaufsauftragszeilen werden ausgewählt.Ausdruck = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3250,13 +3243,8 @@ msgstr "Gruppiere nach"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" beinhaltet zu viele Punkte. XML IDs sollen keine Punkte enthalten. "
-"Punkte werdfen verwendet um andere Module zu ferferenzieren wie zB. "
-"module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' beinhaltet zu viele Punkte. XML IDs sollen keine Punkte enthalten. Punkte werdfen verwendet um andere Module zu ferferenzieren wie zB. module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4418,16 +4406,8 @@ msgstr "Objekt"
 
 #. module: base
 #: help:ir.actions.report.xml,attachment:0
-msgid ""
-"This is the filename of the attachment used to store the printing result. "
-"Keep empty to not save the printed reports. You can use a python expression "
-"with the object and time variables."
-msgstr ""
-"Das ist der Dateiname des Anhanges unter dem Ausdrucke gespeichert "
-"werden.\r\n"
-"Leer lassen, wenn Ausdrucke nicht gespeichert wreden sollen.\r\n"
-"Die Verwendung von Python Ausdrücken sowie Objekt und Zeitvariablen ist "
-"möglich."
+msgid "This is the filename of the attachment used to store the printing result. Keep empty to not save the printed reports. You can use a python expression with the object and time variables."
+msgstr "Das ist der Dateiname des Anhanges unter dem Ausdrucke gespeichert werden. Leer lassen, wenn Ausdrucke nicht gespeichert wreden sollen. Die Verwendung von Python Ausdrücken sowie Objekt und Zeitvariablen ist möglich."
 
 #. module: base
 #: model:res.country,name:base.ng
diff --git a/bin/addons/base/i18n/el.po b/bin/addons/base/i18n/el.po
index 0b4ab975a2f..cd8089d36d0 100644
--- a/bin/addons/base/i18n/el.po
+++ b/bin/addons/base/i18n/el.po
@@ -1405,14 +1405,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3254,13 +3248,8 @@ msgstr "Ομαδοποίηση Ανά"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" περιέχει πολλές τελείες. Οι XML ταυτότητες (ids) δεν πρέπει να "
-"περιέχουν τελείες! Οι τελείες χρησιμοποιούνται σε αναφορές σε άλλες ενότητες "
-"όπως στο module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' περιέχει πολλές τελείες. Οι XML ταυτότητες (ids) δεν πρέπει να περιέχουν τελείες! Οι τελείες χρησιμοποιούνται σε αναφορές σε άλλες ενότητες όπως στο module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/en_GB.po b/bin/addons/base/i18n/en_GB.po
index 213c82427a4..68d70c6c092 100644
--- a/bin/addons/base/i18n/en_GB.po
+++ b/bin/addons/base/i18n/en_GB.po
@@ -1402,14 +1402,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3243,12 +3237,8 @@ msgstr "Group By"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po
index 5d9dcbac646..6e5c5d3ca68 100644
--- a/bin/addons/base/i18n/es.po
+++ b/bin/addons/base/i18n/es.po
@@ -1408,14 +1408,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Introduzca el campo/expresión que devolverá la lista. Por ej. si seleccione "
-"el pedido de venta en Objeto podrá realizar un bucle sobre las líneas del "
-"pedido de venta. Expresión = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Introduzca el campo/expresión que devolverá la lista. Por ej. si seleccione el pedido de venta en Objeto podrá realizar un bucle sobre las líneas del pedido de venta. Expresión = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3253,13 +3247,8 @@ msgstr "Agrupar por"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" contiene demasiados puntos. ¡Los ids del XML no deberían contener "
-"puntos! Los puntos se usan para referirse a datos de otros módulos, por "
-"ejemplo módulo.referencia_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' contiene demasiados puntos. ¡Los ids del XML no deberían contener puntos! Los puntos se usan para referirse a datos de otros módulos, por ejemplo módulo.referencia_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/es_AR.po b/bin/addons/base/i18n/es_AR.po
index 07f8596dc29..f22db5e97a5 100644
--- a/bin/addons/base/i18n/es_AR.po
+++ b/bin/addons/base/i18n/es_AR.po
@@ -1401,14 +1401,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Introduzca el campo/expresión que devolverá la lista. Por ej. si seleccione "
-"el pedido de venta en Objeto podrá realizar un bucle sobre las líneas del "
-"pedido de venta. Expresión = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Introduzca el campo/expresión que devolverá la lista. Por ej. si seleccione el pedido de venta en Objeto podrá realizar un bucle sobre las líneas del pedido de venta. Expresión = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3225,9 +3219,7 @@ msgstr "Agrupar por"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/es_EC.po b/bin/addons/base/i18n/es_EC.po
index bb83aeb18f6..edd17754b3a 100644
--- a/bin/addons/base/i18n/es_EC.po
+++ b/bin/addons/base/i18n/es_EC.po
@@ -1407,14 +1407,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Introduzca el campo/expresión que devolverá la lista. Por ej. si seleccione "
-"el pedido de venta en Objeto podrá realizar un bucle sobre las líneas del "
-"pedido de venta. Expresión = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Introduzca el campo/expresión que devolverá la lista. Por ej. si seleccione el pedido de venta en Objeto podrá realizar un bucle sobre las líneas del pedido de venta. Expresión = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3251,13 +3245,8 @@ msgstr "Agrupar por"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" contiene demasiados puntos. ¡Los ids del XML no deberían contener "
-"puntos! Los puntos se usan para referirse a datos de otros módulos, por "
-"ejemplo módulo.referencia_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' contiene demasiados puntos. ¡Los ids del XML no deberían contener puntos! Los puntos se usan para referirse a datos de otros módulos, por ejemplo módulo.referencia_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index 0b97344fc9f..46bbbbbaa59 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.po
@@ -1391,14 +1391,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Sisesta väli/avaldis, mis tagastab nimekirja. Nt vali müügikorraldus "
-"objektis ja sul saab olla kordus müügikorralduse real. Avaldis = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Sisesta väli/avaldis, mis tagastab nimekirja. Nt vali müügikorraldus objektis ja sul saab olla kordus müügikorralduse real. Avaldis = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3230,9 +3224,7 @@ msgstr "Rühmitamine"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/eu.po b/bin/addons/base/i18n/eu.po
index caafabcff62..18076ad3f73 100644
--- a/bin/addons/base/i18n/eu.po
+++ b/bin/addons/base/i18n/eu.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/fa.po b/bin/addons/base/i18n/fa.po
index 6de36341b09..cc76d6182e3 100644
--- a/bin/addons/base/i18n/fa.po
+++ b/bin/addons/base/i18n/fa.po
@@ -1402,14 +1402,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"فیلد/عبارتی که فهرست را باز خواهد گرداند وارد کنید. برای نمونه برگزیدن سفارش "
-"فروش در شی، بنابراین شما می‌توانید در ردیف‌های سفارشات فروش حلقه داشته "
-"باشید. عبارت = 'object.order_line'."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "فیلد/عبارتی که فهرست را باز خواهد گرداند وارد کنید. برای نمونه برگزیدن سفارش فروش در شی، بنابراین شما می‌توانید در ردیف‌های سفارشات فروش حلقه داشته باشید. عبارت = 'object.order_line'."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3244,13 +3238,8 @@ msgstr "گروه‌بندی برمبنای"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" دارای تیک نقطه بیش از حد است. شناسه‌های XML نباید دارای نقطه باشنتد! "
-"آنها برای ارجاع به داده‌های پیمانه‌های دیگر آنگونه که در module.reference_id "
-"آمده، هستند."
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' دارای تیک نقطه بیش از حد است. شناسه‌های XML نباید دارای نقطه باشنتد!آنها برای ارجاع به داده‌های پیمانه‌های دیگر آنگونه که در module.reference_id آمده، هستند."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index b939177cb59..165b6a929a6 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.po
@@ -1395,14 +1395,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Syötä kenttä tai lauseke joka palauttaa listan. Esim. valitse myyntitilaus "
-"objektista ja voit luoda silmukan myyntitilauksen rivistä. Lauseke = "
-"\"object.order_line\"."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Syötä kenttä tai lauseke joka palauttaa listan. Esim. valitse myyntitilaus objektista ja voit luoda silmukan myyntitilauksen rivistä. Lauseke = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3238,13 +3232,8 @@ msgstr "Ryhmittele"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" sisältää liikaa pisteitä. XML ids eivät saa sisältää pisteitä ! Näitä "
-"käytetään viittaamaan toisten moodulien tietoihin kuten module.reference_id "
-"kerrotaan"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' sisältää liikaa pisteitä. XML ids eivät saa sisältää pisteitä ! Näitä käytetään viittaamaan toisten moodulien tietoihin kuten module.reference_id kerrotaan"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7750,18 +7739,8 @@ msgstr "Logo - Käytä kokoa noin 450x150 pikseliä."
 
 #. module: base
 #: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-"Erottimen formaatin tulisi olla muotoa [,n] jossa n > 0 ja -1 lopettaa "
-"erottelun.\r\n"
-"Esimerkiksi luku 106500 (tuhaterottimena on käytetty pilkkua):\r\n"
-"[3,2,-1] esittää sen muodossa 1,06,500;\r\n"
-"[1,2,-1] esittää sen muodossa 106,50,0;\r\n"
-"[3] esittää sen muodossa 106,500."
+msgid "The Separator Format should be like [,n] where 0 < n :starting from Unit digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be 1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as 106,500. Provided ',' as the thousand separator in each case."
+msgstr "Erottimen formaatin tulisi olla muotoa [,n] jossa n > 0 ja -1 lopettaa erottelun. Esimerkiksi luku 106500 (tuhaterottimena on käytetty pilkkua):[3,2,-1] esittää sen muodossa 1,06,500;[1,2,-1] esittää sen muodossa 106,50,0;[3] esittää sen muodossa 106,500."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form_new
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 0471bd12dff..cbc62e30b72 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -1408,14 +1408,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Entrez le champ/expression qui retournera la liste. Exemple: sélectionnez la "
-"commande client dans l'objet, et vous pourrez boucler sur les lignes de "
-"commandes client. Expression = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Entrez le champ/expression qui retournera la liste. Exemple: sélectionnez la commande client dans l'objet, et vous pourrez boucler sur les lignes de commandes client. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3255,9 +3249,7 @@ msgstr "Grouper par"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 "\"%s\" contient trop de points. Les ids XML ne devraient pas contenir de "
 "points! Les points sont utilisés pour faire référence à des données d'autres "
diff --git a/bin/addons/base/i18n/gl.po b/bin/addons/base/i18n/gl.po
index 63971b2bae2..109008d3c71 100644
--- a/bin/addons/base/i18n/gl.po
+++ b/bin/addons/base/i18n/gl.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po
index 2b18b4be7c8..e172c6283f3 100644
--- a/bin/addons/base/i18n/he.po
+++ b/bin/addons/base/i18n/he.po
@@ -1386,13 +1386,8 @@ msgstr "אשף זה יזהה הגדרות חדשות בישום כך שתוכל
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"הקש את השדה/ביטוי אשר ישיב את הרשימה. לדוגמא בחר את הזמנת מכירה באובייקט, "
-"ותוכל לקבל לולאה בשורת הזמנת מכירה. לדוגמא = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "הקש את השדה/ביטוי אשר ישיב את הרשימה. לדוגמא בחר את הזמנת מכירה באובייקט, ותוכל לקבל לולאה בשורת הזמנת מכירה. לדוגמא = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3211,9 +3206,7 @@ msgstr "קבץ לפי"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index c5200db8b0c..39dd99a30dd 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -1393,14 +1393,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Unesite polje/izraz koji će kreirati listu. Npr. odaberite narudžbenicu kao "
-"objekt, tako da možete koristiti petlju nad stavkama narudžbe. Izraz = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Unesite polje/izraz koji će kreirati listu. Npr. odaberite narudžbenicu kao objekt, tako da možete koristiti petlju nad stavkama narudžbe. Izraz = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3214,9 +3208,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/hu.po b/bin/addons/base/i18n/hu.po
index 1bf33c12905..c6827ed551b 100644
--- a/bin/addons/base/i18n/hu.po
+++ b/bin/addons/base/i18n/hu.po
@@ -1364,10 +1364,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3168,9 +3165,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/id.po b/bin/addons/base/i18n/id.po
index d1ae581da0f..fd1d550a731 100644
--- a/bin/addons/base/i18n/id.po
+++ b/bin/addons/base/i18n/id.po
@@ -1376,10 +1376,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3180,9 +3177,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/is.po b/bin/addons/base/i18n/is.po
index a26de9e9d24..d9c2ff923a5 100644
--- a/bin/addons/base/i18n/is.po
+++ b/bin/addons/base/i18n/is.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index 723842010b0..473adcfb865 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -1408,14 +1408,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Inserire il campo/espressione che ritornerà la lista. Per esempio, "
-"selezionare l'ordine di vendita fra gli oggetti, è possibile evere un loop "
-"nelle righe dellìordine di vendita. Expression = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Inserire il campo/espressione che ritornerà la lista. Per esempio, selezionare l'ordine di vendita fra gli oggetti, è possibile evere un loop nelle righe dellìordine di vendita. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3252,13 +3246,8 @@ msgstr "Raggruppa per"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" contiene troppi punti. Gli IDS XML non devono contenere punti! Questi "
-"sono usati per riferisti ad altri modelli di dato, come in: "
-"module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' contiene troppi punti. Gli IDS XML non devono contenere punti! Questi sono usati per riferisti ad altri modelli di dato, come in: module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index c0ff2af0662..6be669380ff 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -1367,10 +1367,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3171,9 +3168,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ko.po b/bin/addons/base/i18n/ko.po
index d23167e32c0..aafabe7154b 100644
--- a/bin/addons/base/i18n/ko.po
+++ b/bin/addons/base/i18n/ko.po
@@ -1376,13 +1376,8 @@ msgstr "이 위저드는 어플리케이션의 새로운 용어들을 탐지하
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"리스트를 돌려 줄 필드/표현식을 입력하십시오. 가령, 오브젝트에서 판매 주문을 선택하면, 판매 주문 라인 상의 루프를 얻을 수 있습니다 "
-"표현식 = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "리스트를 돌려 줄 필드/표현식을 입력하십시오. 가령, 오브젝트에서 판매 주문을 선택하면, 판매 주문 라인 상의 루프를 얻을 수 있습니다 표현식 = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3194,9 +3189,7 @@ msgstr "그룹 방식"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/lt.po b/bin/addons/base/i18n/lt.po
index 62683dae0ba..80733609733 100644
--- a/bin/addons/base/i18n/lt.po
+++ b/bin/addons/base/i18n/lt.po
@@ -1364,10 +1364,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3168,9 +3165,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/lt_LT.po b/bin/addons/base/i18n/lt_LT.po
index 6a90402e113..7aee4518a19 100644
--- a/bin/addons/base/i18n/lt_LT.po
+++ b/bin/addons/base/i18n/lt_LT.po
@@ -3033,8 +3033,7 @@ msgstr ""
 #. module: base
 #: code:addons/osv/orm.py:0
 #, python-format
-msgid "You try to write on an record that doesn\'t exist ' \\n"
-"                                        '(Document type: %s)."
+msgid "You try to write on an record that doesn't exist\n(Document type: %s)."
 msgstr ""
 
 #. module: base
@@ -3087,7 +3086,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "\"%s\" contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po
index 404d7096f1c..c5aca228c86 100644
--- a/bin/addons/base/i18n/lv.po
+++ b/bin/addons/base/i18n/lv.po
@@ -785,15 +785,8 @@ msgstr ">="
 
 #. module: base
 #: view:res.lang:0
-msgid ""
-"%W - Week number of the year (Monday as the first day of the week) as a "
-"decimal number [00,53]. All days in a new year preceding the first Monday "
-"are considered to be in week 0."
-msgstr ""
-"%W - gada nedēļas numurs kā decimāls skaitlis (pirmdiena kā pirmā nedēļas "
-"diena).\r\n"
-"Visas jauna gada dienas, kas iekrīt pirms pirmās pirmdienas tiek ieskaitītas "
-"0 nedēļā."
+msgid "%%W - Week number of the year (Monday as the first day of the week) as a decimal number [00,53]. All days in a new year preceding the first Monday are considered to be in week 0."
+msgstr "%%W - gada nedēļas numurs kā decimāls skaitlis (pirmdiena kā pirmā nedēļas diena).Visas jauna gada dienas, kas iekrīt pirms pirmās pirmdienas tiek ieskaitītas 0 nedēļā."
 
 #. module: base
 #: field:res.partner.event,planned_cost:0
@@ -1396,14 +1389,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Ievadiet lauku/izteiksmi, kas atspoguļos sarakstu. Piem., izvēloties tirdzn. "
-"pasūtījumu noteiktā objektā, var iegūt \"cilpu\" tirdzniecības saraksta "
-"rindai. Izteiksme = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Ievadiet lauku/izteiksmi, kas atspoguļos sarakstu. Piem., izvēloties tirdzn. pasūtījumu noteiktā objektā, var iegūt \"cilpu\" tirdzniecības saraksta rindai. Izteiksme = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3244,9 +3231,7 @@ msgstr "Grupēt pēc"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po
index 4b50a04b63d..93b90ef3e82 100644
--- a/bin/addons/base/i18n/mn.po
+++ b/bin/addons/base/i18n/mn.po
@@ -1399,14 +1399,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Жагсаалт гаргах талбар эсвэл илэрхийлэл бичнэ. Жнь. Object дээр борлуулалтын "
-"захиалгыг сонговол борлуулалтын захиалгын мөрүүдээр гүйх боломжтой болно. "
-"Expression = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Жагсаалт гаргах талбар эсвэл илэрхийлэл бичнэ. Жнь. Object дээр борлуулалтын захиалгыг сонговол борлуулалтын захиалгын мөрүүдээр гүйх боломжтой болно. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3232,12 +3226,8 @@ msgstr "Бүлэглэх"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" нь хэт олон цэг агуулж байна. XML id цэг агуулах ёсгүй ! Бусад "
-"модульд байгаа өгөгдлийг module.reference_id байдлаар заахад цэгийг хэрэглэнэ"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' нь хэт олон цэг агуулж байна. XML id цэг агуулах ёсгүй ! Бусад модульд байгаа өгөгдлийг module.reference_id байдлаар заахад цэгийг хэрэглэнэ"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/nb.po b/bin/addons/base/i18n/nb.po
index 722fd43ae3a..06e432cc71d 100644
--- a/bin/addons/base/i18n/nb.po
+++ b/bin/addons/base/i18n/nb.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index 6be0a162fc6..d364e1b388d 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -1408,14 +1408,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Voer het veld/expressie in die de lijst teruggeeft. Bijv. kies verkooporder "
-"in object, en u kunt een lus hebben op verkoopopdrachtregel. Expressie = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Voer het veld/expressie in die de lijst teruggeeft. Bijv. kies verkooporder in object, en u kunt een lus hebben op verkoopopdrachtregel. Expressie = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3252,13 +3246,8 @@ msgstr "Groeperen op"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" bevat teveel punten. XML-ids behoren geen punten te bevatten ! Punten "
-"worden gebruikt om te verwijzen naar gegevens in andere modules, zoals in "
-"module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' bevat teveel punten. XML-ids behoren geen punten te bevatten ! Punten worden gebruikt om te verwijzen naar gegevens in andere modules, zoals in module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/nl_BE.po b/bin/addons/base/i18n/nl_BE.po
index 607e803bbc4..6038df85cef 100644
--- a/bin/addons/base/i18n/nl_BE.po
+++ b/bin/addons/base/i18n/nl_BE.po
@@ -1393,10 +1393,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3196,9 +3193,7 @@ msgstr "Groeperen op"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/nl_NL.po b/bin/addons/base/i18n/nl_NL.po
index 2be89d2adb3..704c25a9d46 100644
--- a/bin/addons/base/i18n/nl_NL.po
+++ b/bin/addons/base/i18n/nl_NL.po
@@ -1409,14 +1409,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Voer het veld/expressie in die de lijst retourneerd. Bijv. Kies verkooporder "
-"in Object, en u kunt een loop hebben op verkooporder regel. Expressie = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Voer het veld/expressie in die de lijst retourneerd. Bijv. Kies verkooporder in Object, en u kunt een loop hebben op verkooporder regel. Expressie = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3239,9 +3233,7 @@ msgstr "Groeperen op"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index 534179e69a4..2f772243af9 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@ -1404,14 +1404,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Wprowadź pole/wyrażenie, które zwróci listę. Tzn. wybierz zamówienie "
-"sprzedaży w obiekcie, a będziesz mógł uzyskać pętlę na pozycjach zamówienia "
-"sprzedaży. Wyrażenie = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Wprowadź pole/wyrażenie, które zwróci listę. Tzn. wybierz zamówienie sprzedaży w obiekcie, a będziesz mógł uzyskać pętlę na pozycjach zamówienia sprzedaży. Wyrażenie = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3245,13 +3239,8 @@ msgstr "Pogrupuj wg"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" zawiera zbyt dużo kropek. XML ids nie powinno zawierać kropek ! "
-"Kropki są stosowane di budowania odnośników do innych modułów jak "
-"module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' zawiera zbyt dużo kropek. XML ids nie powinno zawierać kropek ! Kropki są stosowane di budowania odnośników do innych modułów jak module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po
index f85e164b29f..0886f8cacdc 100644
--- a/bin/addons/base/i18n/pt.po
+++ b/bin/addons/base/i18n/pt.po
@@ -1404,14 +1404,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Preencha o campo/expressão que irá devolver a lista. Ex: Seleccione a ordem "
-"da venda no Objecto e terá acesso às linhas da ordem de venda. Expressão = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Preencha o campo/expressão que irá devolver a lista. Ex: Seleccione a ordem da venda no Objecto e terá acesso às linhas da ordem de venda. Expressão = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3244,12 +3238,8 @@ msgstr "Agrupar por"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" contem demasiados pontos. Ids XML não devem conter pontos! Pontos são "
-"usados para referir dados de outros módulos, como em module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' contem demasiados pontos. Ids XML não devem conter pontos! Pontos são usados para referir dados de outros módulos, como em module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index 0a2023ded93..ffd25625bfb 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -1404,14 +1404,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Entre com campo / expressão que devolverá a lista. Por exemplo. Selecione o "
-"pedido de vendas no objeto, e voce terá as linhas dos itens. Expressão = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Entre com campo / expressão que devolverá a lista. Por exemplo. Selecione o pedido de vendas no objeto, e voce terá as linhas dos itens. Expressão = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3248,13 +3242,8 @@ msgstr "Agrupar Por"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" contem muitos pontos. Identificações XML não devem conter ponto "
-"final! Estes devem ser utilizados para referência a dados de outros módulos "
-"como em: module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' contem muitos pontos. Identificações XML não devem conter ponto final! Estes devem ser utilizados para referência a dados de outros módulos como em: module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po
index 39e081f347e..830eb654b1d 100644
--- a/bin/addons/base/i18n/ro.po
+++ b/bin/addons/base/i18n/ro.po
@@ -1384,10 +1384,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3188,9 +3185,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index 766d4c8bce6..3a10ca26aaa 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.po
@@ -698,10 +698,7 @@ msgstr "STOCK_FILE"
 #. module: base
 #: model:res.country,name:base.gu
 msgid "Guam (USA)"
-msgstr ""
-"Территория Гуам (США)\r\n"
-"С 1 июня 2009 года взамен территории Гуам появится Марианский архипелаг, "
-"территория США."
+msgstr "Территория Гуам (США)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_grid
@@ -1407,14 +1404,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Введите поле/выражение, которое возвращает список. Например, выберите счёт в "
-"Object, и Вы сможете получить все позиции в счёте на оплату. Выражение = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Введите поле/выражение, которое возвращает список. Например, выберите счёт в Object, и Вы сможете получить все позиции в счёте на оплату. Выражение = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3252,9 +3243,7 @@ msgstr "Группировать по"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 "\"%s\" содержит слишком много точек. XML идентификаторы не должны содержать "
 "точки! Они используются для ссылки на данные в других модулях, например, "
diff --git a/bin/addons/base/i18n/sk.po b/bin/addons/base/i18n/sk.po
index f348b8e3f63..112480d8c72 100644
--- a/bin/addons/base/i18n/sk.po
+++ b/bin/addons/base/i18n/sk.po
@@ -1401,14 +1401,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Zadajte pole / výraz, ktorý vráti zoznam. Napr.: vyberte objednávku v "
-"objekte a môžete si vytvoriť slučku na riadky objednávky. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Zadajte pole / výraz, ktorý vráti zoznam. Napr.: vyberte objednávku v objekte a môžete si vytvoriť slučku na riadky objednávky. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3217,9 +3211,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sl.po b/bin/addons/base/i18n/sl.po
index 4aaa81cd3dc..afabce32ddd 100644
--- a/bin/addons/base/i18n/sl.po
+++ b/bin/addons/base/i18n/sl.po
@@ -1373,10 +1373,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3189,9 +3186,7 @@ msgstr "Združi po"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sq.po b/bin/addons/base/i18n/sq.po
index c177b83a443..7b5c9cc61aa 100644
--- a/bin/addons/base/i18n/sq.po
+++ b/bin/addons/base/i18n/sq.po
@@ -1370,10 +1370,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3174,9 +3171,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sr.po b/bin/addons/base/i18n/sr.po
index 6b741b11629..41d758b3bde 100644
--- a/bin/addons/base/i18n/sr.po
+++ b/bin/addons/base/i18n/sr.po
@@ -1398,14 +1398,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Unesite polje/izraz koji će da vrati listu. Npr. odaberite nalog za prodaju "
-"u objektu, pa možete da imate petlju na redovima naloga za prodaju. Izraz = "
-"'object.order_line'"
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Unesite polje/izraz koji će da vrati listu. Npr. odaberite nalog za prodaju u objektu, pa možete da imate petlju na redovima naloga za prodaju. Izraz = 'object.order_line'"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3240,9 +3234,7 @@ msgstr "Grupiši po"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index d778e62a3ae..ccef6132d96 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -1375,10 +1375,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3182,9 +3179,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/th.po b/bin/addons/base/i18n/th.po
index 9d49e96a260..10450913054 100644
--- a/bin/addons/base/i18n/th.po
+++ b/bin/addons/base/i18n/th.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/tlh.po b/bin/addons/base/i18n/tlh.po
index 4b1e0544a1e..a9179aa7262 100644
--- a/bin/addons/base/i18n/tlh.po
+++ b/bin/addons/base/i18n/tlh.po
@@ -1364,10 +1364,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3168,9 +3165,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index 35fdcc33b43..3bd4bcc0d76 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.po
@@ -1402,13 +1402,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Bu listeyi gönderecek alan/ifade. Örneğin, Object'de satış emrini seçin,  ve "
-"satış emri satırında döngü yapabilirsiniz. Expression = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Bu listeyi gönderecek alan/ifade. Örneğin, Object'de satış emrini seçin,  ve satış emri satırında döngü yapabilirsiniz. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3239,13 +3234,8 @@ msgstr "Gruplama Anahtarı"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" çok fazla nokta içermektedir. XML belirteçlerinde nokta bulunmaz ! "
-"Nokta diğer modüllerin verilerine atıfta bulunmak için kullanılır. Örneğin, "
-"module.reference_id ."
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' çok fazla nokta içermektedir. XML belirteçlerinde nokta bulunmaz ! Nokta diğer modüllerin verilerine atıfta bulunmak için kullanılır. Örneğin, module.reference_id ."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index e0c660f9291..f19050aa194 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -1398,10 +1398,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3226,9 +3223,7 @@ msgstr "Групувати За"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk_UA.po b/bin/addons/base/i18n/uk_UA.po
index 45b170df689..c1923fd44a9 100644
--- a/bin/addons/base/i18n/uk_UA.po
+++ b/bin/addons/base/i18n/uk_UA.po
@@ -3051,8 +3051,7 @@ msgstr ""
 #. module: base
 #: code:addons/osv/orm.py:0
 #, python-format
-msgid "You try to write on an record that doesn\'t exist ' \\n"
-"                                        '(Document type: %s)."
+msgid "You try to write on an record that doesn't exist.\n(Document type: %s)."
 msgstr ""
 
 #. module: base
@@ -3105,7 +3104,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "\"%s\" contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/vi.po b/bin/addons/base/i18n/vi.po
index c7cc46edca9..19998e865db 100644
--- a/bin/addons/base/i18n/vi.po
+++ b/bin/addons/base/i18n/vi.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 9f43500c238..6a9e40ba413 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -1372,12 +1372,8 @@ msgstr "本向导将自动检测应用程序中的新术语以便您手工更新
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"输入返回列表的字段／表达式。比如当选择的对象是销售订单，那么您可以在销售订单明细中使用循环，表达式：`object.order_line`。"
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "输入返回列表的字段／表达式。比如当选择的对象是销售订单，那么您可以在销售订单明细中使用循环，表达式：`object.order_line`。"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3181,12 +3177,8 @@ msgstr "分组方式"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"“%s“包含太多点。XML 标识符不应该包括点！\r\n"
-"其作用是引用到其他模块数据，如module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s'包含太多点。XML 标识符不应该包括点！其作用是引用到其他模块数据，如module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/zh_TW.po b/bin/addons/base/i18n/zh_TW.po
index cc4e92b4da0..da90f77a409 100644
--- a/bin/addons/base/i18n/zh_TW.po
+++ b/bin/addons/base/i18n/zh_TW.po
@@ -1372,12 +1372,8 @@ msgstr "本項倒將自動偵測程式中的新的詞彙，您可在稍後手動
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"輸入返回列表的欄位／表達式。比如當選擇的對象是銷售訂單，那麼您可以在銷售訂單明細中使用循環，表達式：`object.order_line`。"
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "輸入返回列表的欄位／表達式。比如當選擇的對象是銷售訂單，那麼您可以在銷售訂單明細中使用循環，表達式：`object.order_line`。"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3183,9 +3179,7 @@ msgstr "分組方式"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 4e974abc9fa..6f6668af7fa 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -432,7 +432,7 @@ class ir_model_data(osv.osv):
         if not context:
             context = {}
         if xml_id and ('.' in xml_id):
-            assert len(xml_id.split('.'))==2, _('"%s" contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id') % (xml_id)
+            assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
             warning = False
             module, xml_id = xml_id.split('.')
         if (not xml_id) and (not self.doinit):

From 4be1e3bd9c72143bbde534280fc7cd5416d6c471 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 12 Oct 2010 11:05:13 +0530
Subject: [PATCH 207/244] [MOD/IMP] procurement/project_* : Cancel Button Set
 on left side

bzr revid: dbr@tinyerp.com-20101012053513-bkml0c84s2wplcco
---
 addons/procurement/procurement_view.xml             | 2 +-
 addons/project/project_view.xml                     | 8 ++++----
 addons/project_issue/project_issue_view.xml         | 6 +++---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 addons/project_planning/project_planning_view.xml   | 7 +++----
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 03a4c5aad82..3c9bff9be9c 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -72,9 +72,9 @@
                         <field colspan="4" name="message" readonly="1"/>
                         <field name="state" readonly="1"/>
                         <group col="7" colspan="2">
+                            <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
                             <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
                             <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
-                            <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
                             <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
                         </group>
                     </page>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6b4796cc099..91564583729 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -46,11 +46,11 @@
                             <separator colspan="4"/>
                             <group col="9" colspan="8">
                                 <field name="state" select="1" readonly="1"/>
+                                <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
                                 <button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
                                 <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
                                 <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
-                                <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
                                 <button
                                     string="New Project Based on Template"
@@ -242,13 +242,13 @@
                             <newline/>
                             <group col="11" colspan="4">
                                 <field name="state" select="1"/>
+                                <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                                 <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
                                 <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
                                 <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                                 <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                 <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
                                 <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
-                                <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page groups="base.group_extended" string="Delegations">
@@ -323,10 +323,10 @@
                     <field name="date_end" invisible="1"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
-                    <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                    <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>                    
+					<button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
                     <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
-                    <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index a5032047c2a..4623f968c05 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -84,10 +84,10 @@
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
                             <field name="state" />
+                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                             <button name="case_close" string="Close" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
                             <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
                             <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                             </group>
@@ -191,9 +191,9 @@
                     <field name="assigned_to"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="state"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" help="To Do"/>
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
                     <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
@@ -290,9 +290,9 @@
                     <field name="version_id"/>
                     <field name="user_id"/>
                     <field name="state"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
                     <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index fa645af4127..f2e4c6efd68 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -146,11 +146,11 @@
                             <separator string="" colspan="4"/>
                             <group col="12" colspan="4">
                                 <field name="state" select="1"/>
+                                <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                                 <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
                                 <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
                                 <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
-                                <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Task Detail">
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index ff354c69ccd..8e14631fb2c 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -104,14 +104,13 @@
                                                     <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
                                                     <group col="11" colspan="4">
                                                         <field name="state" select="1"/>
+                                                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                                                         <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
                                                         <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
                                                         <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
                                                         <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                                         <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
                                                         <button name="%(project.action_project_task_close)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
-                                                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
-
                                                     </group>
                                                  </page>
                                                 <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
@@ -139,12 +138,12 @@
                     <group col="6" colspan="4">
                         <field name="state" select="1"
                             readonly="1" />
+                        <button name="action_cancel" states="draft,open"
+                            string="Cancel" type="object" icon="gtk-cancel" />
                         <button name="action_open" states="draft"
                             string="Open" type="object" icon="gtk-yes" />
                         <button name="action_done" states="open"
                             string="Done" type="object" icon="gtk-jump-to" />
-                        <button name="action_cancel" states="draft,open"
-                            string="Cancel" type="object" icon="gtk-cancel" />
                         <button name="action_draft" states="done,cancel"
                             string="Reset to Draft" type="object" icon="gtk-convert" />
                     </group>

From e97a67e45cc768ed74c13ac9da9eeba8d843e956 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 12 Oct 2010 11:21:58 +0530
Subject: [PATCH 208/244] [MOD/IMP] product/stock/survey : Cancel Button Set on
 left side

bzr revid: dbr@tinyerp.com-20101012055158-3j94wwwe8d75fe3h
---
 .../purchase_requisition_view.xml                    |  4 ++--
 addons/stock/stock_view.xml                          | 12 ++++++------
 addons/survey/survey_view.xml                        |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index de25b07ff9d..d209ef6b3fd 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -61,10 +61,10 @@
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
                         <field name="state" select="1" readonly ="1"/>
+                        <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
                         <button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
                         <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
                         <button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
-                        <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
                     </group>
                     </page>
                     <page string="Quotations">
@@ -78,9 +78,9 @@
                                 <field name="minimum_planned_date"/>
                                 <field name="origin"/>
                                 <field name="state"/>
+                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>								
 								<button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/>
                                 <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-ok"/>
-                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>
                             </tree>
                          </field>
                         <separator colspan="4" string=""/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index fa81b7534c3..649031a4572 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -134,9 +134,9 @@
                     </notebook>
                     <field name="state"/>
                     <group col="4" colspan="2">
+                        <button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
                         <button name="action_done" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
                         <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                        <button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
                     </group>
 
                 </form>
@@ -734,10 +734,10 @@
                                     <label string="" colspan="4"/>
                                     <field name="state"/>
                                     <group col="4" colspan="2">
+                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -812,8 +812,8 @@
                     <field name="min_date"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="assigned" type="action" icon="gtk-go-forward" string="Approve Delivery"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
+                    <button name="%(action_partial_picking)d" states="assigned" type="action" icon="gtk-go-forward" string="Approve Delivery"/>
                 </tree>
             </field>
         </record>
@@ -923,10 +923,10 @@
                                     <label string="" colspan="4"/>
                                     <field name="state"/>
                                     <group col="4" colspan="2">
+                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -1142,10 +1142,10 @@
                                     <label string="" colspan="4"/>
                                     <field name="state"/>
                                     <group col="4" colspan="2">
+                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -1357,10 +1357,10 @@
                                     <label string="" colspan="4"/>
                                     <field name="state"/>
                                     <group col="4" colspan="2">
+                                        <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 576ef37885e..44bcb4475b5 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -183,6 +183,8 @@
                             </field>
                             <group col="9" colspan="4">
                                 <field name="state"/>
+                                <button name="survey_cancel"
+                                    string="Cancel" states="open" type="object" icon="gtk-cancel"/>
                                 <button name="survey_draft"
                                     string="Set to draft" states="cancel,close" type="object"
                                     icon="gtk-new"/>
@@ -190,8 +192,6 @@
                                     states="draft" type="object" icon="gtk-go-forward"/>
                                 <button name="survey_close"
                                     string="Close" states="open" type="object" icon="gtk-close"/>
-                                <button name="survey_cancel"
-                                    string="Cancel" states="open" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Other">

From bce8ba79aee4719774d766efaa798f266f7c2cbe Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 12 Oct 2010 11:41:15 +0530
Subject: [PATCH 209/244] [REF] base : Corrections

bzr revid: ach@tinyerp.com-20101012061115-mlr5laakmficmoal
---
 bin/addons/base/i18n/zh_CN.po  | 6 +-----
 bin/addons/base/ir/ir_model.py | 4 ----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 6a9e40ba413..038d1fb7c8a 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -8018,7 +8018,7 @@ msgstr ""
 #: code:addons/base/res/res_lang.py:0
 #, python-format
 msgid "User Error"
-msgstr ""
+msgstr "用户错误"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
@@ -9096,10 +9096,6 @@ msgstr ""
 #~ "defined !"
 #~ msgstr "该供应商的 付款方式未定义（计算）付款方式明细！"
 
-#, python-format
-#~ msgid "User Error"
-#~ msgstr "用户错误"
-
 #, python-format
 #~ msgid "not implemented"
 #~ msgstr "尚未实现"
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 6f6668af7fa..b87e8bc9801 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -235,7 +235,6 @@ class ir_model_access(osv.osv):
     }
 
     def check_groups(self, cr, uid, group):
-        res = False
         grouparr  = group.split('.')
         if not grouparr:
             return False
@@ -427,13 +426,11 @@ class ir_model_data(osv.osv):
         return id
 
     def _update(self,cr, uid, model, module, values, xml_id=False, store=True, noupdate=False, mode='init', res_id=False, context=None):
-        warning = True
         model_obj = self.pool.get(model)
         if not context:
             context = {}
         if xml_id and ('.' in xml_id):
             assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
-            warning = False
             module, xml_id = xml_id.split('.')
         if (not xml_id) and (not self.doinit):
             return False
@@ -520,7 +517,6 @@ class ir_model_data(osv.osv):
         return True
 
     def ir_set(self, cr, uid, key, key2, name, models, value, replace=True, isobject=False, meta=None, xml_id=False):
-        obj = self.pool.get('ir.values')
         if type(models[0])==type([]) or type(models[0])==type(()):
             model,res_id = models[0]
         else:

From 11d492dc4ff805bf1762cd610fc153949ab06002 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 12 Oct 2010 12:05:53 +0530
Subject: [PATCH 210/244] [MOD/IMP]: Cancel Button Set on left side

bzr revid: dbr@tinyerp.com-20101012063553-uk5qj6ubu6ddd090
---
 addons/account/account_view.xml                       | 4 ++--
 addons/account_voucher/account_voucher_view.xml       | 2 +-
 addons/marketing_campaign/marketing_campaign_view.xml | 6 +++---
 addons/mrp/mrp_view.xml                               | 2 +-
 addons/mrp_operations/mrp_operations_view.xml         | 6 +++---
 addons/project_scrum/project_scrum_view.xml           | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 17c5ebbc393..a5b77baa3fd 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1334,8 +1334,8 @@
                             <field name="narration" colspan="4" nolabel="1" height="50"/>
                             <group col="4" colspan="4">
                                 <field name="state" select="1"/>
-                                <button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
                                 <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
+                                <button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
                             </group>
                         </page>
                     </notebook>
@@ -2570,9 +2570,9 @@
                     </group>
                     <group col="8" colspan="4">
                         <field name="state" colspan="4"/>
+                        <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
                         <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-dialog-close" type="object"/>
                         <button name="button_open" states="draft" string="Open CashBox" icon="terp-document-new" type="object"/>
-                        <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 1ad3edd0760..79509542015 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -77,9 +77,9 @@
                     <group col="10" colspan="4">
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
+                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
                         <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
-                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 614055dddcd..b23826969a8 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -36,10 +36,10 @@
                 <separator string="" colspan="4" />
                 <group col="10" colspan="4">
                     <field name="state" readonly="1" />
+                    <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
                     <button name="state_running_set" string="Run" states="draft,done,cancelled" icon="gtk-apply"/>
                     <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
                     <button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
-                    <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
                 </group>
               </form>
         </field>
@@ -161,9 +161,9 @@
                 <separator string="" colspan="4"/>
                 <group col="6" colspan="4">
                     <field name="state" readonly="1"/>
+                    <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
                     <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
                     <button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
-                    <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
                     <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
                 </group>
             </form>
@@ -382,9 +382,9 @@
                 <separator string="" colspan="4"/>
                 <group colspan="4" col="11">
                     <field name="state" readonly="True"/>
+                    <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
                     <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
                     <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
-                    <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
                 </group>
             </form>
         </field>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7addfbc3194..efe7900f56b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -627,12 +627,12 @@
                             <separator colspan="4"/>
                             <group col="9" colspan="4">
                                 <field name="state"/>
+                                <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
                                 <button name="action_compute" states="draft" string="Compute Data" type="object" icon="terp-stock_format-scientific"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
                                 <button name="button_produce" states="ready" string="Start Production" icon="terp-gtk-jump-to-ltr"/>
                                 <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
                                 <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
-                                <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
                                 <button name="button_recreate" states="picking_except" string="Recreate Picking" icon="terp-document-new"/>
                             </group>
                         </page>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 9a93b67a36f..62298f4aa5f 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -14,10 +14,10 @@
 	       <xpath expr="/form/notebook/page/field[@name='workcenter_lines']/form/field[@name='hour']" position="after">
 	           <group colspan="8" col="8">
                    <field name="state"/>
+	               <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
                    <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
 	               <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
 	               <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
-	               <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
 	               <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
 	               <button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close" help="Finish Order"/>
                </group>
@@ -32,10 +32,10 @@
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
            <xpath expr="/form/notebook/page/field[@name='workcenter_lines']/tree/field[@name='hour']" position="after">
+                <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
                 <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
                 <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
                 <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
-                <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
                 <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
                 <button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close"/>
                 <field name="state"/>
@@ -114,10 +114,10 @@
                     <separator string="" colspan="4"/>
                     <group colspan="8" col="8">
                         <field name="state"/>
+                        <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
                         <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
                         <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
                         <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
-                        <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
                         <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
                         <button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close"/>
                     </group>
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 843b35646e4..7ae07d9eea8 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -113,12 +113,12 @@
                     </notebook>
                     <group col="8" colspan="4">
                         <field name="state" select="1" readonly="1"/>
+                        <button type="object" string="Cancel" name="button_cancel" states="open,pending" icon="gtk-stop"/>
                         <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                         <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
                         <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
                         <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
                         <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
-                        <button type="object" string="Cancel" name="button_cancel" states="open,pending" icon="gtk-stop"/>
                     </group>
                 </form>
             </field>

From ae1653e63ccc04702058bdaf9c0ebe681e1eb108 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 12 Oct 2010 09:08:57 +0200
Subject: [PATCH 211/244] [fix] multi-company visibility

bzr revid: fp@tinyerp.com-20101012070857-9ix6fu732ml1o3rt
---
 bin/addons/base/res/res_security.xml | 4 ++--
 bin/addons/base/res/res_user.py      | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bin/addons/base/res/res_security.xml b/bin/addons/base/res/res_security.xml
index f2ff90a804a..ea7b541b9a1 100644
--- a/bin/addons/base/res/res_security.xml
+++ b/bin/addons/base/res/res_security.xml
@@ -17,7 +17,7 @@
         <field name="name">company rule</field>
         <field model="ir.model" name="model_id" ref="model_res_company"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('user_ids','=',user.id),('parent_id','=',user.company_id.id)]</field>
+        <field name="domain_force">['|', ('child_ids', 'child_of', [company_id]), ('parent_id', 'child_of', [company_id])]</field>
     </record>
 
     <!-- Record Rule For User -->
@@ -25,7 +25,7 @@
         <field name="name">user rule</field>
         <field model="ir.model" name="model_id" ref="model_res_users"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',user.company_id.id),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index fa3e87aab74..094a1f26b25 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -356,11 +356,13 @@ class users(osv.osv):
         if ids == [uid]:
             for key in values.keys():
                 if not (key in self.SELF_WRITEABLE_FIELDS or key.startswith('context_')):
+                    print 'Not Found', key
                     break
             else:
-                # check that user is not selecting an invalid company_id
-                if 'company_id' not in values or (values.get('company_id') in self.read(cr, uid, uid, ['company_ids'], context=context)['company_ids']):
-                    uid = 1 # safe fields only, so we write as super-user to bypass access rights
+                if 'company_id' in values:
+                    if not (values['company_id'] in self.read(cr, uid, 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
 
         res = super(users, self).write(cr, uid, ids, values, context=context)
 

From f91c52e84cc21dbdaa90898ff8b266fe559e3c5b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 12 Oct 2010 09:12:27 +0200
Subject: [PATCH 212/244] fix

bzr revid: fp@tinyerp.com-20101012071227-khzuqvg1jfc3st7x
---
 bin/addons/base/ir/ir_rule.py        | 1 +
 bin/addons/base/res/res_security.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index 799a411c15f..ba1eaca3f8d 100644
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -35,6 +35,7 @@ class ir_rule(osv.osv):
         for rule in self.browse(cr, uid, ids, context):
             eval_user_data = {'user': self.pool.get('res.users').browse(cr, 1, uid),
                             'time':time}
+            print rule.domain_force
             res[rule.id] = eval(rule.domain_force, eval_user_data)
         return res
 
diff --git a/bin/addons/base/res/res_security.xml b/bin/addons/base/res/res_security.xml
index ea7b541b9a1..3ca0685baee 100644
--- a/bin/addons/base/res/res_security.xml
+++ b/bin/addons/base/res/res_security.xml
@@ -17,7 +17,7 @@
         <field name="name">company rule</field>
         <field model="ir.model" name="model_id" ref="model_res_company"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|', ('child_ids', 'child_of', [company_id]), ('parent_id', 'child_of', [company_id])]</field>
+        <field name="domain_force">['|', ('child_ids', 'child_of', [user.company_id.id]), ('parent_id', 'child_of', [user.company_id.id])]</field>
     </record>
 
     <!-- Record Rule For User -->

From 5ba8d704991309c2e60ba451e915322c8aa61694 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Oct 2010 10:36:13 +0200
Subject: [PATCH 213/244] [FIX] remove stray debugging print

bzr revid: xmo@openerp.com-20101012083613-dhil3g2k06i6lf60
---
 bin/addons/base/res/res_user.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 094a1f26b25..10d4b0f9ce9 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -356,7 +356,6 @@ class users(osv.osv):
         if ids == [uid]:
             for key in values.keys():
                 if not (key in self.SELF_WRITEABLE_FIELDS or key.startswith('context_')):
-                    print 'Not Found', key
                     break
             else:
                 if 'company_id' in values:

From 66cf3ab7dd952648578096b09a87bf260cca8854 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 12 Oct 2010 15:10:42 +0530
Subject: [PATCH 214/244] [MOD/IMP] hr_timesheet : Improvement in data by
 default product service and timesheet jounral

bzr revid: amp@tinyerp.com-20101012094042-5lzwzvy2fxsg94n0
---
 addons/hr_timesheet/hr_timesheet.py       | 25 +++++++++++++++++++++++
 addons/hr_timesheet/hr_timesheet_view.xml |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 75ad6101e11..b1175634981 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -33,6 +33,31 @@ class hr_employee(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', help="Specifies employee's designation as a product with type 'service'."),
         'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal')
     }
+    
+    def _getAnalyticJournal(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        id = self.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
+        if id:
+            journal = self.browse(cr, uid, id[0], context=context)
+            if journal.journal_id:
+                return journal.journal_id.id
+        return False
+    
+    def _getEmployeeProduct(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        id = self.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
+        if id:
+            prod = self.browse(cr, uid, id[0], context=context)
+            if prod.product_id:
+                return prod.product_id.id
+        return False
+        
+    _defaults = {
+        'journal_id' : _getAnalyticJournal,
+        'product_id' : _getEmployeeProduct    
+    }
 hr_employee()
 
 
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index a47fbf24685..664587b75a3 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -111,7 +111,7 @@
                 <page string="Categories" position="after">
                     <page string="Timesheets">
                         <field name="product_id" domain="[('type','=','service')]"/>
-                        <field name="journal_id"/>
+                        <field name="journal_id" widget="selection"/>
                     </page>
                 </page>
             </field>

From 53ffef5ee051f9ea94042560efa6576c242fa5f4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 12 Oct 2010 11:41:47 +0200
Subject: [PATCH 215/244] fix

bzr revid: fp@tinyerp.com-20101012094147-4f7ecedzkm2sml0z
---
 bin/addons/base/ir/ir_rule.py        | 1 +
 bin/addons/base/res/res_security.xml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index ba1eaca3f8d..06f382ce054 100644
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -138,6 +138,7 @@ class ir_rule(osv.osv):
     def domain_get(self, cr, uid, model_name, mode='read', context={}):
         dom = self._compute_domain(cr, uid, model_name, mode=mode)
         if dom:
+            print 'Domain', dom, model_name
             query = self.pool.get(model_name)._where_calc(cr, uid, dom, active_test=False)
             return query.where_clause, query.where_clause_params, query.tables
         return [], [], ['"'+self.pool.get(model_name)._table+'"']
diff --git a/bin/addons/base/res/res_security.xml b/bin/addons/base/res/res_security.xml
index 3ca0685baee..fb9743fbe86 100644
--- a/bin/addons/base/res/res_security.xml
+++ b/bin/addons/base/res/res_security.xml
@@ -17,7 +17,8 @@
         <field name="name">company rule</field>
         <field model="ir.model" name="model_id" ref="model_res_company"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|', ('child_ids', 'child_of', [user.company_id.id]), ('parent_id', 'child_of', [user.company_id.id])]</field>
+        <!-- <field name="domain_force">['|', ('child_ids', 'child_of', [user.company_id.id]), ('parent_id', 'child_of', [user.company_id.id])]</field> -->
+        <field name="domain_force">[]</field>
     </record>
 
     <!-- Record Rule For User -->

From aa7772940c8aae9c5c386aca20ef0fae2a014109 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Oct 2010 11:42:50 +0200
Subject: [PATCH 216/244] [IMP] display more informations about XML parse
 errors (file and line number of troubled element)

bzr revid: xmo@openerp.com-20101012094250-n43amm773c43o9e6
---
 bin/tools/convert.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 6e534fe0400..6059d4a54ec 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -216,6 +216,7 @@ class assertion_report(object):
         return res
 
 class xml_import(object):
+    __logger = logging.getLogger('tools.convert.xml_import')
     @staticmethod
     def nodeattr2bool(node, attr, default=False):
         if not node.get(attr):
@@ -847,7 +848,10 @@ form: module.record_id""" % (xml_id,)
                         try:
                             self._tags[rec.tag](self.cr, rec, n)
                         except:
-                            self.logger.notifyChannel("init", netsvc.LOG_ERROR, '\n'+etree.tostring(rec))
+                            self.__logger.error('Parse error in %s:%d: \n%s',
+                                                rec.getroottree().docinfo.URL,
+                                                rec.sourceline,
+                                                etree.tostring(rec).strip())
                             self.cr.rollback()
                             raise
         return True

From 432f72d2808fa910acff244271c2303689036d43 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 12 Oct 2010 11:57:51 +0200
Subject: [PATCH 217/244] [FIX] ir_rule: removed debugging print statements

bzr revid: odo@openerp.com-20101012095751-ittevizmcxqd1b29
---
 bin/addons/base/ir/ir_rule.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index 06f382ce054..fe32664c1ca 100644
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -34,8 +34,7 @@ class ir_rule(osv.osv):
         res = {}
         for rule in self.browse(cr, uid, ids, context):
             eval_user_data = {'user': self.pool.get('res.users').browse(cr, 1, uid),
-                            'time':time}
-            print rule.domain_force
+                              'time':time}
             res[rule.id] = eval(rule.domain_force, eval_user_data)
         return res
 
@@ -138,7 +137,6 @@ class ir_rule(osv.osv):
     def domain_get(self, cr, uid, model_name, mode='read', context={}):
         dom = self._compute_domain(cr, uid, model_name, mode=mode)
         if dom:
-            print 'Domain', dom, model_name
             query = self.pool.get(model_name)._where_calc(cr, uid, dom, active_test=False)
             return query.where_clause, query.where_clause_params, query.tables
         return [], [], ['"'+self.pool.get(model_name)._table+'"']

From b7d9aa6a50d72d1aea553b00394a4228411a4f0c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 12 Oct 2010 11:58:04 +0200
Subject: [PATCH 218/244] [FIX] reports: fixed yaml_import for new file
 attribute in report tag processing - convert.py was fixed earlier

bzr revid: odo@openerp.com-20101012095804-bdfqqn5qxhya53on
---
 bin/tools/yaml_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 7f271767a04..7b3c5edc6e1 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -675,7 +675,7 @@ class YamlInterpreter(object):
         for dest, f in (('name','string'), ('model','model'), ('report_name','name')):
             values[dest] = getattr(node, f)
             assert values[dest], "Attribute %s of report is empty !" % (f,)
-        for field,dest in (('rml','report_rml'),('file','report_file'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
+        for field,dest in (('rml','report_rml'),('file','report_rml'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
             if getattr(node, field):
                 values[dest] = getattr(node, field)
         if node.auto:

From 6a2408f6cfa17c1f38126cec3453bdd24547e945 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 12 Oct 2010 16:09:32 +0530
Subject: [PATCH 219/244] [MOD/IMP]: Usability Improvenment in Create Invoice
 Button Icon

bzr revid: dbr@tinyerp.com-20101012103932-c0x02udpb2t04vqy
---
 addons/auction/auction_view.xml                           | 2 +-
 .../wizard/auction_lots_make_invoice_buyer_view.xml       | 2 +-
 addons/auction/wizard/auction_lots_make_invoice_view.xml  | 2 +-
 .../wizard/hr_timesheet_invoice_create_final_view.xml     | 4 ++--
 .../wizard/hr_timesheet_invoice_create_view.xml           | 2 +-
 addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml | 2 +-
 addons/sale/sale_view.xml                                 | 2 +-
 addons/sale/wizard/sale_line_invoice.xml                  | 2 +-
 addons/sale/wizard/sale_make_invoice.xml                  | 4 ++--
 addons/sale/wizard/sale_make_invoice_advance.xml          | 4 ++--
 addons/stock/stock_view.xml                               | 8 ++++----
 addons/stock/wizard/stock_invoice_onshipping_view.xml     | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index a3fb7b5a28a..43de651e554 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -123,7 +123,7 @@
                         </group>
                         <separator string="" colspan="4"/>
                         <field name="state"/>
-                        <button name="close" states="draft" string="Create Invoices" type="object" colspan="2" icon="gtk-yes"/>
+                        <button name="close" states="draft" string="Create Invoices" type="object" colspan="2" icon="terp-gtk-go-back-rtl"/>
                     </page>
                     <page string="Accounting" >
                         <group colspan="4" col="4">
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
index 8ec4746dcf8..42eb72c18ff 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
@@ -19,7 +19,7 @@
                     <group colspan="4" col="6">
                         <label string=" " colspan="2"/>
                     	<button icon="gtk-close" special="cancel" string="Close"/>
-                    	<button icon="gtk-yes" string="Create invoices" name="makeInvoices" type="object"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Create invoices" name="makeInvoices" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_lots_make_invoice_view.xml b/addons/auction/wizard/auction_lots_make_invoice_view.xml
index 56903865e5f..4399c689f25 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_view.xml
@@ -18,7 +18,7 @@
                     <group colspan="2" col="2"/>
                     <group colspan="2" col="2">
                     	<button icon="gtk-close" special="cancel" string="Close"/>
-                    	<button icon="gtk-yes" string="Create invoices" name="makeInvoices" type="object"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Create invoices" name="makeInvoices" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index 7b3f5ed4d6a..b45deeae8a2 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -20,7 +20,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="do_create" string="Create Invoices" colspan="1" type="object" icon="gtk-execute"/>
+					<button name="do_create" string="Create Invoices" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
 				</group>
 			</form>
             </field>
@@ -46,4 +46,4 @@
         </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index fc6d6da911e..c50e1b6974a 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -26,7 +26,7 @@
                 <separator colspan="4"/>
                 <group col="2" colspan="4">
                     <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-                    <button name="do_create" string="Create Invoices" colspan="1" type="object" icon="gtk-execute"/>
+                    <button name="do_create" string="Create Invoices" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
                 </group>
             </form>
             </field>
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index 982ee5d4bc0..4c3f6ede30d 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -17,7 +17,7 @@
                 		<button icon="gtk-stop" special="cancel"
                 			string="Cancel" />
                 		<button name="make_invoices" string="Create Invoice"
-                			colspan="1" type="object" icon="terp-dolar" />
+                			colspan="1" type="object" icon="terp-gtk-go-back-rtl" />
                 	</group>
                 </form>
             </field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 913dfa1f82d..e2d43dc405f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -205,7 +205,7 @@
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
                                 <button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
                                 <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
-                                <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-go-forward" type="object"/>
+                                <button name="manual_invoice" states="manual" string="Create Invoice" icon="terp-gtk-go-back-rtl" type="object"/>
                                 <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index c1e9d9c3b89..774759c82c7 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -9,7 +9,7 @@
              <form string="Create invoices">
                  <separator colspan="4" string="Do you really want to create the invoice(s) ?" />
                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                 <button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
+                 <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
             </form>
             </field>
         </record>
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index 106e6945207..e8e698e56b9 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -13,7 +13,7 @@
                     <field name="invoice_date"/>
                     <separator string="" colspan="6"/>
                     <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
+                    <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
                </form>
             </field>
         </record>
@@ -38,4 +38,4 @@
             <field name="model">sale.order</field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 3257d1aafe8..6e192d31108 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -15,7 +15,7 @@
                     <separator string="" colspan="4"/>
                     <label string=""  colspan="2" />
 					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-					<button name="create_invoices" string="Create Partial Invoice" type="object" icon="gtk-ok"/>
+					<button name="create_invoices" string="Create Partial Invoice" type="object" icon="terp-gtk-go-back-rtl"/>
                 </form>
             </field>
         </record>
@@ -55,4 +55,4 @@
             <field name="target">new</field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 649031a4572..6755cefd3eb 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -748,7 +748,7 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-apply"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -937,7 +937,7 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Products Sent" type="action" icon="gtk-go-forward"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -1156,7 +1156,7 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Done" type="action" icon="gtk-execute"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -1371,7 +1371,7 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index eddffb594aa..6284121553c 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -17,7 +17,7 @@
 					<field name="invoice_date" />
 			   	    <separator string="" colspan="4" />
 					<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
-			       	<button name="create_invoice" string="Create Invoices" type="object" icon="gtk-ok"/>
+			       	<button name="create_invoice" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
              </form>
             </field>
 		</record>

From e1f829b0eba128971ce36f8774c9cfb5fbfeda8d Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 12 Oct 2010 17:39:08 +0530
Subject: [PATCH 220/244] [FIX] Export & Synchronize Translations Corrected

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

bzr revid: ach@tinyerp.com-20101012120908-1u5n29r040drhhzs
---
 bin/tools/translate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index b9ce95cdaaa..64c30af5600 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -605,7 +605,7 @@ def trans_generate(lang, modules, dbname=None):
             if fname and obj.report_type in ('pdf', 'xsl'):
                 try:
                     d = etree.parse(tools.file_open(fname))
-                    for t in parse_func(d):
+                    for t in parse_func(d.iter()):
                         push_translation(module, report_type, name, 0, t)
                 except (IOError, etree.XMLSyntaxError):
                     logging.getLogger("i18n").exception("couldn't export translation for report %s %s %s", name, report_type, fname)

From be2fa62439f5f5901256f882a83e37e2b828b699 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 12 Oct 2010 17:48:06 +0530
Subject: [PATCH 221/244] [ADD] hr : Set administrator as employee

bzr revid: vir@tinyerp.com-20101012121806-1mtpbqgmbp49ju3b
---
 addons/hr/hr_data.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml
index f76d1457aa1..ae8e30b23f0 100644
--- a/addons/hr/hr_data.xml
+++ b/addons/hr/hr_data.xml
@@ -16,5 +16,10 @@
             <field name="name">Widower</field>
         </record>
 
+        <record id="employee" model="hr.employee">
+            <field name="name">Administrator</field>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+
     </data>
 </openerp>

From ed83a07b9965575232ee7328f05fe9856f6a85af Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Tue, 12 Oct 2010 18:04:30 +0530
Subject: [PATCH 222/244] [IMP] Sale : SO should have an act_window to see
 relevant pikcings (similar to PO)

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

bzr revid: jvo@tinyerp.com-20101012123430-x89y3r932auw0szo
---
 addons/sale/stock_view.xml | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 93529fd3b7d..dddcad07932 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -23,7 +23,30 @@
                     <field name="sale_line_id" colspan="2"/>
                 </xpath>
             </field>
-        </record>        
+        </record>
+        
+        <act_window
+            domain="[('sale_id', '=', active_id)]"
+            id="act_sale_order_2_stock_picking"
+            name="Picking"
+            res_model="stock.picking"
+            src_model="sale.order"
+            context="{'contact_display': 'partner'}" />
+       
+       <record id="action_sale_picking_out_tree_view" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="stock.view_picking_out_tree"/>
+            <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
+        </record>
+        
+        <record id="action_sale_picking_out_form_view" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="stock.view_picking_out_form"/>
+            <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
+        </record>
+        
         <!-- Adding Sale Order Reference to outgoing picking -->
         
         <record id="stock_picking_out_inherit_sale" model="ir.ui.view">

From 28f89ae44c6f28c5b66a47342af9f98e75f48ead Mon Sep 17 00:00:00 2001
From: niv <niv@niv-laptop>
Date: Tue, 12 Oct 2010 14:56:34 +0200
Subject: [PATCH 223/244] [FIX] Fixed inconsistency in search view of outgoing
 products.

bzr revid: niv@niv-laptop-20101012125634-09d39edhx88z901q
---
 addons/stock/stock_view.xml | 44 +++++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 92d99c4bcc9..af4942f8a50 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1589,8 +1589,8 @@
             </field>
         </record>
 
-        <record id="view_move_search_reception_picking" model="ir.ui.view">
-            <field name="name">stock.move.search2</field>
+        <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 name="type">search</field>
             <field eval="6" name="priority"/>
@@ -1625,6 +1625,42 @@
             </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 name="type">search</field>
+            <field eval="6" name="priority"/>
+            <field name="arch" type="xml">
+                <search string="Stock Moves">
+                    <group col="8" colspan="4">
+                        <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"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
+                        <filter icon="terp-check" name="received" string="Done" domain="[('state','=','done')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="origin"/>
+                        <field name="partner_id" string="Partner"/>
+                        <field name="product_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Customer" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Order" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'origin'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Extended options..." groups="base.group_extended">
+                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record id="action_reception_picking_move" model="ir.actions.act_window">
             <field name="name">Incoming Products</field>
             <field name="res_model">stock.move</field>
@@ -1634,7 +1670,7 @@
             <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">{"search_default_receive":1}</field>
-            <field name="search_view_id" ref="view_move_search_reception_picking"/>
+            <field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_move_reception_picking_tree">
@@ -1768,7 +1804,7 @@
             <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">{"search_default_receive":1}</field>
-            <field name="search_view_id" ref="view_move_search_reception_picking"/>
+            <field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_move_out_picking_tree">

From fc3b34ccc0f0ee1206d726cf1b1f538980870f07 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 12 Oct 2010 18:55:46 +0530
Subject: [PATCH 224/244] [MOD] hr_timesheet_invoice : improvements

bzr revid: vir@tinyerp.com-20101012132546-c7sq4k1b0602o6w0
---
 .../hr_timesheet_invoice_view.xml              |  2 +-
 .../hr_timesheet_invoice_create_view.xml       | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index a284523665c..4a70a80f381 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -80,7 +80,7 @@
             <field name="arch" type="xml">
                 <filter name="others" position="after">
                     <separator orientation="vertical"/>
-                    <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" icon="terp-sale"/>
+                    <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
                 </filter>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index c50e1b6974a..82276553edd 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -10,13 +10,17 @@
             <form string="Invoice analytic lines">
                 <notebook colspan="4">
                     <page string="Billing Data">
-                        <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
-                        <field name="date"/>
-                        <field name="time"/>
-                        <field name="name"/>
-                        <field name="price"/>
-                        <separator string="Force to use a specific product" colspan="4"/>
-                        <field name="product"/>
+	                   <group col="4" colspan="4">
+	                       <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
+		                        <field name="date"/>
+		                        <field name="time"/>
+		                        <field name="name"/>
+		                        <field name="price"/>
+	                       </group>
+	                    <group col="2" colspan="4" groups="base.group_extended">
+	                        <separator string="Force to use a specific product" colspan="4" />
+	                        <field name="product"/>
+	                    </group>
                     </page>
                     <page string="Filter on Accounts" groups="base.group_extended">
                         <separator string="Choose accounts you want to invoice" colspan="4"/>

From 01dc02fe61f2fc0a02d7236a7a16637cefe03c0b Mon Sep 17 00:00:00 2001
From: rch <rch@rch-desktop>
Date: Tue, 12 Oct 2010 18:58:22 +0530
Subject: [PATCH 225/244] [IMP]: Remove My Sales Pipeline from sale dashboard.

bzr revid: rch@rch-desktop-20101012132822-lx9np9aema19qpbz
---
 addons/sale_crm/board_sale_crm_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
index 7d56779a613..58ebdc07cf6 100644
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ b/addons/sale_crm/board_sale_crm_view.xml
@@ -83,8 +83,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.board_crm_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="attributes">
-	                <attribute name="string">My Sales Pipeline</attribute>
+	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="replace">
 	            </xpath>
             </field>
         </record>

From 825308570d3288f9c9d82f87ec0ea4bc21d88684 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Tue, 12 Oct 2010 19:09:56 +0530
Subject: [PATCH 226/244] [IMP]:point_of_sale:Improves the reports

bzr revid: azaz.201186@gmail.com-20101012133956-n53roc67kkxox3g1
---
 addons/point_of_sale/report/pos_details_summary.py   |  2 ++
 addons/point_of_sale/report/pos_details_summary.rml  |  8 ++++----
 addons/point_of_sale/report/pos_payment_report.rml   | 12 ++++++------
 .../point_of_sale/report/pos_payment_report_date.rml |  8 ++++----
 addons/point_of_sale/report/pos_users_product.rml    | 10 +++++-----
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index 5db70b80485..a9e2ac689d3 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -121,8 +121,10 @@ class pos_details_summary(report_sxw.rml_parse):
 
     def _get_start_period(self, objects):
         date_orders = [obj.date_order for obj in objects]
+        print "=========================",date_orders
         min_date = min(date_orders)
         max_date = max(date_orders)
+        print "========================",min_date
         if min_date == max_date:
             return '%s' % min_date
         else:
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 5d2c9210d5c..466500f0960 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -107,7 +107,7 @@
     <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -150,8 +150,8 @@
       <font color="white"> </font>
     </para>
     <para style="P3">Details of Sales</para>
-    <para style="P3">
-      <font face="Helvetica" size="9.0"/>
+    <para style="P6">
+      <font color="white"> </font>
     </para>
     <blockTable colWidths="167.0,115.0,115.0,115.0" style="Table1">
       <tr>
@@ -240,7 +240,7 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_9">
+      <para style="terp_default_1">
         <font color="white"> </font>
       </para>
     </section>
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index 796f60050b3..5201de274ca 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -149,16 +149,16 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Tableau6">
+    <blockTable colWidths="301.0,58.0,34.0,57.0,61.0" style="Tableau6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Qty</para>
+          <para style="terp_tblheader_Details_Centre">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+          <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Unit Price</para>
@@ -172,7 +172,7 @@
 	<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
 	<section>
       <para style="terp_default_8">[[ repeatIn(pos_payment(o), 'line_ids') ]]</para>
-      <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Tableau7">
+      <blockTable colWidths="301.0,58.0,34.0,57.0,61.0" style="Tableau7">
         <tr>
           <td>
             <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
@@ -194,7 +194,7 @@
       </blockTable>
        </section>
        </section>
-      <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Table1">
+      <blockTable colWidths="302.0,57.0,34.0,57.0,61.0" style="Table1">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -215,7 +215,7 @@
           <para style="terp_tblheader_Details">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       </blockTable>
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
index 2bddb2ae4d3..6017407e58f 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Payment" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Sales Lines" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
@@ -128,7 +128,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table3">
+    <blockTable colWidths="301.0,57.0,35.0,57.0,61.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
@@ -149,7 +149,7 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(pos_payment_date(data['form']), 'line_ids') ]]</para>
-      <blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table6">
+      <blockTable colWidths="301.0,58.0,34.0,57.0,61.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
@@ -169,7 +169,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table5">
+    <blockTable colWidths="302.0,57.0,34.0,57.0,61.0" style="Table5">
       <tr>
         <td>
           <para style="Table Contents">
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index b4979b6e47a..2c77f4ea5ba 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -165,7 +165,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="370.0,55.0,95.0" style="Table3">
+    <blockTable colWidths="356.0,68.0,95.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General">Product</para>
@@ -182,7 +182,7 @@
       <para style="terp_default_1">[[ repeatIn(get_data(statement), 'line_ids') and ' ' or removeParentNode('blockTable') ]]</para>
       <section>
         <para style="terp_default_1">[[ repeatIn(get_data(statement), 'line_ids')]]</para>
-        <blockTable colWidths="371.0,55.0,95.0" style="Table6">
+        <blockTable colWidths="356.0,69.0,95.0" style="Table6">
           <tr>
             <td>
               <para style="terp_default_9">[ [[line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
@@ -191,13 +191,13 @@
               <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9_Bold">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
       </section>
     </section>
-    <blockTable colWidths="371.0,55.0,94.0" style="Table5">
+    <blockTable colWidths="357.0,69.0,94.0" style="Table5">
       <tr>
         <td>
           <para style="P1">
@@ -208,7 +208,7 @@
           <para style="terp_tblheader_General_Right">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_total(statement)) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>

From e5bf4fa551b60e82af644e78ea296394b3f31208 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 12 Oct 2010 16:08:05 +0200
Subject: [PATCH 227/244] [IMP] mrp_repair: usability improvements

bzr revid: qdp-launchpad@tinyerp.com-20101012140805-uhb008v7c0pe2t97
---
 addons/mrp_repair/mrp_repair_view.xml | 60 +++++++++++++--------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 04c9587b6c5..15878ec1b37 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -2,24 +2,24 @@
 <openerp>
     <data>
 
-	<record id="view_repair_order_tree" model="ir.ui.view">
-            <field name="name">mrp.repair.tree</field>
-            <field name="model">mrp.repair</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Repairs order" colors="gray:state in ('done','cancel');black:state not in ('done','cancel');blue:state=='draft'">
-                     <field name="name" select="1" />
-                     <field name="product_id" select="1" />
-                     <field name="move_id"/>
-                     <field name="partner_id"/>
-                     <field name="address_id"/>
-                     <field name="location_id"/>
-                     <field name="location_dest_id"/>
-                     <field name="guarantee_limit"/>
-                     <field name="state"/>
-                </tree>
-            </field>
-        </record>
+    <record id="view_repair_order_tree" model="ir.ui.view">
+        <field name="name">mrp.repair.tree</field>
+        <field name="model">mrp.repair</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Repairs order" colors="gray:state in ('done','cancel');black:state not in ('done','cancel');blue:state=='draft'">
+                <field name="name" select="1" />
+                <field name="product_id" select="1" />
+                <field name="move_id"/>
+                <field name="partner_id"/>
+                <field name="address_id"/>
+                <field name="location_id"/>
+                <field name="location_dest_id"/>
+                <field name="guarantee_limit"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
 
     <record id="view_repair_order_form" model="ir.ui.view">
         <field name="name">mrp.repair.form</field>
@@ -177,30 +177,30 @@
           <field name="type">search</field>
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
-              	<group col='4' colspan='4'>
-              	       <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>   
+                  <group col='4' colspan='4'>
+                       <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>   
                        <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
                        <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-dolar" string="invoiced" domain="[('invoiced','=',True)]"/>
                        <separator orientation="vertical"/>
-	              		<field name="name"/>
-	                    <field name="product_id"/>
-	                    <field name="partner_id"/>
-	                    <field name="state" />
-              	</group>
-              	<newline/>
-                  <group expand="0" string="Group By..." colspan="10" col="8" groups="base.group_extended">
-                      <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                       <field name="name"/>
+                       <field name="product_id"/>
+                       <field name="partner_id"/>
+                       <field name="state" />
+                  </group>
+                  <newline/>
+                  <group expand="0" string="Group By..." colspan="10" col="8">
+                      <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                       <separator orientation="vertical"/>
                       <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                       <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                       <separator orientation="vertical"/>
-                      <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'guarantee_limit'}"/>
+                      <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'guarantee_limit'}" help="Guarantee limit"/>
                   </group>
              </search>
           </field>
-	</record>
+    </record>
 
         
 

From bbeb2f743e6ed4a7daab71942152261ad9718d9f Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 12 Oct 2010 16:49:32 +0200
Subject: [PATCH 228/244] [IMP] account, analytic entries analysis: usability
 improvements

bzr revid: qdp-launchpad@tinyerp.com-20101012144932-0wnanfcqovwmwg0x
---
 .../account/report/account_analytic_entries_report_view.xml  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 6f1094599b5..578e55b2737 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -58,8 +58,7 @@
                 <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
-                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
                     <filter string="General Account" icon="terp-folder-green" context="{'group_by':'general_account_id'}"/>
@@ -67,6 +66,8 @@
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Product UOM" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"//>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/>

From b5509fa4cda54529d13b3d016ef383322ecf43e6 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 12 Oct 2010 17:25:40 +0200
Subject: [PATCH 229/244] [FIX] account:
 account_analytic_entries_report_view.xml view

bzr revid: qdp-launchpad@tinyerp.com-20101012152540-w55jexg8t5mxg1tg
---
 addons/account/report/account_analytic_entries_report_view.xml | 2 +-
 addons/stock/report/report_stock_move_view.xml                 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 578e55b2737..6e1ba112606 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -66,7 +66,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Product UOM" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"//>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index e1db3ebfa49..1d9dc4a5ce4 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -74,7 +74,6 @@
                 <filter icon="terp-go-month"
                  string="Month-1"
                  name="month-1"
-                 separator="1"
                  domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
                  help="Last month"/>
                 <filter icon="terp-go-month" string="Month"

From 7878416d56ee755149a0691e7b5324132cfb984b Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 12 Oct 2010 18:08:48 +0200
Subject: [PATCH 230/244] [IMP] stock: usability improvements in product form
 view

bzr revid: qdp-launchpad@tinyerp.com-20101012160848-g9spxni88jhs0m59
---
 addons/stock/product_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 561bb9f2206..60fab009d0e 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -61,8 +61,8 @@
             <field name="arch" type="xml">
                 <field name="standard_price" position="replace">
                     <group col="4" colspan="2">
-                        <field name="standard_price" readonly="True"/>
-                        <button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute"/>
+                        <field name="standard_price" readonly="1"/>
+                        <button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute" attrs="{'readonly':[('cost_method','=','average')]}"/>
                     </group>
                 </field>
             </field>

From 4ac173c566dc9efd042536432b3bd422b15ab44c Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 12 Oct 2010 18:19:59 +0200
Subject: [PATCH 231/244] [IMP] mrp: usabilty improvement

bzr revid: qdp-launchpad@tinyerp.com-20101012161959-xe9bypowozh9snus
---
 addons/mrp/mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7addfbc3194..dcc24fc8e4f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -604,7 +604,7 @@
 
                             <field colspan="2" name="move_lines2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
                                        widget="one2many_list" mode="tree,form" height="275">
-                                   <tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Consumed Products" editable="bottom">
+                                   <tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel') " string="Consumed Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
                                        <field name="product_uom" readonly="1" string="UOM" widget="selection"/>

From e61f615c7b892b10c291f8e43cb27f000cc3d6db Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 12 Oct 2010 19:27:25 +0200
Subject: [PATCH 232/244] [FIX] improve new employee for timesheet

bzr revid: fp@tinyerp.com-20101012172725-5zo9c43yezol5woj
---
 addons/hr_timesheet/hr_timesheet.py       | 30 +++++++++++------------
 addons/hr_timesheet/hr_timesheet_data.xml | 12 +++++++++
 addons/hr_timesheet/hr_timesheet_demo.xml | 14 -----------
 3 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index b1175634981..84e7db409ab 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -35,25 +35,23 @@ class hr_employee(osv.osv):
     }
     
     def _getAnalyticJournal(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        id = self.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
-        if id:
-            journal = self.browse(cr, uid, id[0], context=context)
-            if journal.journal_id:
-                return journal.journal_id.id
+        md = self.pool.get('ir.model.data')
+        try:
+            result = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
+            return result[1]
+        except ValueError, e:
+            pass
         return False
-    
+
     def _getEmployeeProduct(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        id = self.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
-        if id:
-            prod = self.browse(cr, uid, id[0], context=context)
-            if prod.product_id:
-                return prod.product_id.id
+        md = self.pool.get('ir.model.data')
+        try:
+            result = md.get_object_reference(cr, uid, 'hr_timesheet', 'product_consultant')
+            return result[1]
+        except ValueError, e:
+            pass
         return False
-        
+
     _defaults = {
         'journal_id' : _getAnalyticJournal,
         'product_id' : _getEmployeeProduct    
diff --git a/addons/hr_timesheet/hr_timesheet_data.xml b/addons/hr_timesheet/hr_timesheet_data.xml
index 08a769d7ee6..e7cb3d5e0d4 100644
--- a/addons/hr_timesheet/hr_timesheet_data.xml
+++ b/addons/hr_timesheet/hr_timesheet_data.xml
@@ -6,5 +6,17 @@
             <field name="name">Timesheet Journal</field>
             <field name="type">general</field>
         </record>
+
+        <record id="product_consultant" model="product.product">
+            <field name="list_price">75.0</field>
+            <field name="standard_price">30.0</field>
+            <field name="uom_id" ref="product.uom_hour"/>
+            <field name="uom_po_id" ref="product.uom_hour"/>
+            <field name="name">Service on Timesheet</field>
+            <field name="categ_id" ref="product.cat0"/>
+            <field name="type">service</field>
+            <field eval="False" name="purchase_ok"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index f344b60c83e..e7ba5c91342 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -2,20 +2,6 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="product_consultant" model="product.product">
-            <field name="default_code">DEV</field>
-            <field name="list_price">75.0</field>
-            <field name="standard_price">30.0</field>
-            <field name="uom_id" ref="product.uom_hour"/>
-            <field name="uom_po_id" ref="product.uom_hour"/>
-            <field name="name">Consultancy - Senior Developer</field>
-            <field name="categ_id" ref="product.product_category_10"/>
-            <field name="type">service</field>
-            <field name="supply_method">produce</field>
-            <field name="procure_method">make_to_order</field>
-            <field eval="False" name="purchase_ok"/>
-        </record>
-
         <!-- complete our example employee -->
         <record id="hr.employee1" model="hr.employee">
             <field name="product_id" ref="product_consultant"/>

From a2bd94fb4162e6bbc92af229016c56d0f28f08a2 Mon Sep 17 00:00:00 2001
From: "Jan Verlaan (Veritos)" <>
Date: Wed, 13 Oct 2010 01:56:56 +0530
Subject: [PATCH 233/244] [FIX] Stock : Cancelled move lines should not be
 allowed for Invoice creation

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

bzr revid: jvo@tinyerp.com-20101012202656-o67bt1v2x0xy43uh
---
 addons/stock/stock.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0b1bbe3695f..5717143c1a6 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -980,6 +980,8 @@ class stock_picking(osv.osv):
                 invoices_group[partner.id] = invoice_id
             res[picking.id] = invoice_id
             for move_line in picking.move_lines:
+                if move_line.state == 'cancel':
+                    continue
                 origin = move_line.picking_id.name or ''
                 if move_line.picking_id.origin:
                     origin += ':' + move_line.picking_id.origin

From b3a6611ee0fb0dbc3fb8f86e9c9e72dc8898758c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 12 Oct 2010 23:59:40 +0200
Subject: [PATCH 234/244] [IMP] better useability

bzr revid: fp@tinyerp.com-20101012215940-yvnh0sog8voxiz85
---
 addons/account/account_installer.xml          |   2 +-
 addons/analytic/analytic.py                   |   2 +-
 addons/hr/board_hr_view.xml                   |   2 +-
 addons/hr/hr.py                               |   2 +-
 addons/hr/hr_view.xml                         |   8 +-
 addons/hr/installer.py                        |   4 -
 addons/hr_attendance/hr_attendance_view.xml   |  16 ++-
 .../board_hr_evaluation_view.xml              |  15 +--
 addons/hr_expense/board_hr_expense_view.xml   |   8 +-
 addons/hr_expense/hr_expense_view.xml         |   2 +-
 addons/hr_holidays/__openerp__.py             |   1 +
 addons/hr_holidays/board_hr_holidays_view.xml |  40 +++---
 addons/hr_holidays/hr_holidays.py             |   6 +-
 addons/hr_holidays/hr_holidays_data.xml       |  26 ++++
 addons/hr_holidays/hr_holidays_demo.xml       |  14 --
 addons/hr_holidays/hr_holidays_view.xml       |  44 +++---
 .../hr_timesheet_invoice.py                   |   3 +-
 .../wizard/hr_timesheet_invoice_create.py     |  30 ++---
 .../hr_timesheet_invoice_create_view.xml      |  26 ++--
 addons/hr_timesheet_sheet/__openerp__.py      |   1 -
 .../board_hr_timesheet_view.xml               |  47 +------
 addons/hr_timesheet_sheet/report/__init__.py  |   2 -
 .../report/timesheet_report.py                | 123 -----------------
 .../report/timesheet_report_view.xml          | 126 ------------------
 addons/project/board_project_view.xml         |  12 +-
 addons/project/project_view.xml               |  18 +--
 .../project_timesheet_view.xml                |   6 +-
 27 files changed, 144 insertions(+), 442 deletions(-)
 create mode 100644 addons/hr_holidays/hr_holidays_data.xml
 delete mode 100644 addons/hr_timesheet_sheet/report/timesheet_report.py
 delete mode 100644 addons/hr_timesheet_sheet/report/timesheet_report_view.xml

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 2b736a514c3..495b4f4e5ba 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -45,7 +45,7 @@
                                         <field name="account_type"/>
                                         <field name="currency_id" widget="selection" groups="base.group_extended"/>
                                     </form>
-                                    <tree editable="bottom" string="">
+                                    <tree editable="bottom" string="Your bank and cash accounts">
                                         <field name="acc_name"/>
                                         <field name="account_type"/>
                                         <field name="currency_id" widget="selection" groups="base.group_extended"/>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 5f68cf98c1a..bfaa59adf2d 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -187,7 +187,7 @@ class account_analytic_account(osv.osv):
         'credit': fields.function(_credit_calc, method=True, type='float', string='Credit'),
         'quantity': fields.function(_quantity_calc, method=True, type='float', string='Quantity'),
         'quantity_max': fields.float('Maximum Quantity', help='Sets the higher limit of quantity of hours.'),
-        'partner_id': fields.many2one('res.partner', 'Associated Partner'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
         'contact_id': fields.many2one('res.partner.address', 'Contact'),
         'user_id': fields.many2one('res.users', 'Account Manager'),
         'date_start': fields.date('Date Start'),
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index 58204352ac4..c740114789a 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -7,7 +7,7 @@
             name="Human Resources"
             parent="base.dashboard"/>
 
-	<!-- This board view will be complete by other hr_* modules-->
+    <!-- This board view will be complete by other hr_* modules-->
         <record id="board_hr_form" model="ir.ui.view">
             <field name="name">board.hr.form</field>
             <field name="model">board.board</field>
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 655b9d9bfd1..c05836c393a 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -97,7 +97,7 @@ class hr_job(osv.osv):
         'requirements': fields.text('Requirements'),
         'department_id': fields.many2one('hr.department', 'Department'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'state': fields.selection([('open', 'Open'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', readonly=True, required=True),
+        'state': fields.selection([('open', 'In Position'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', readonly=True, required=True),
     }
     _defaults = {
         'expected_employees': 1,
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index e171f2dfba7..2b1cd596024 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -340,10 +340,10 @@
                         </page>
                     </notebook>
                     <group col="6" colspan="4">
-                      <field name="state"/>
-                      <button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
-                <button name="job_open" string="Open" states="old,recruit" type="object" icon="terp-camera_test"/>
-                            <button name="job_old" string="Old" states="open,recruit" type="object" icon="gtk-cancel"/>
+                        <field name="state"/>
+                        <button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
+                        <button name="job_open" string="In Position" states="old,recruit" type="object" icon="terp-camera_test"/>
+                        <button name="job_old" string="Mark as Old" states="open,recruit" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index 1bd615b8699..cdeb2ca77a3 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -48,10 +48,6 @@ class hr_installer(osv.osv_memory):
         'hr_payroll_account': fields.boolean('Payroll Accounting',
             help="Generic Payroll system Integrated with Accountings."),
         }
-    _defaults = {
-        'hr_holidays': True,
-        'hr_expense': True,
-    }
 hr_installer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 44d09bec6cd..7070db1d5b2 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -52,11 +52,11 @@
                 <search string="Hr Attendance Search">
                     <filter icon="terp-stock_align_left_24" string="My Attendances" domain="[('employee_id.user_id.id', '=', uid)]" />
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-today" string="Today" domain="[('name::date','=',current_date)]" />
+                    <filter icon="terp-go-today" string="Today" name="today" domain="[('name::date','=',current_date)]" />
                     <separator orientation="vertical"/>
-                    <field name="employee_id"   />
-                    <field name="name"    />
-                    <field name="action"   />
+                    <field name="employee_id"/>
+                    <field name="name"/>
+                    <field name="action"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter name="employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
@@ -72,7 +72,7 @@
             <field name="res_model">hr.attendance</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{"search_default_employee":1}</field>
+            <field name="context">{"search_default_today":1}</field>
             <field name="search_view_id" ref="view_hr_attendance_filter" />
             <field name="help">Time Tracking functionality aims to manage employee's attendances on the basis of the actions (Sign in/Sign out) performed by them. You can also link this to an attendance machine using OpenERP's webservices features.</field>
         </record>
@@ -81,7 +81,7 @@
 
         <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="4"/>
 
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="3"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="20"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
@@ -116,7 +116,9 @@
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
 
-        <menuitem sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendances" />
+        <menuitem 
+            sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendances"
+            groups="base.group_extended"/>
         <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config"/>
 
         <record id="hr_attendance_employee" model="ir.ui.view">
diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml
index 5a67fe1945d..70d6245b1ee 100644
--- a/addons/hr_evaluation/board_hr_evaluation_view.xml
+++ b/addons/hr_evaluation/board_hr_evaluation_view.xml
@@ -14,19 +14,14 @@
         <record id="board_hr_evaluation_form" model="ir.ui.view">
             <field name="name">board.hr.evaluation.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="hr.board_hr_form"/>              
+            <field name="inherit_id" ref="hr.board_hr_form"/>              
             <field name="type">form</field>
             <field name="arch" type="xml">
-      		<xpath expr="/form/hpaned/child1" position="inside"> 
-				<action colspan="4" height="220" name="%(act_hr_evaluation_tree)d" string="My Evaluation Remaining"  width="510"/>
-			</xpath>
+            <xpath expr="/form/hpaned/child1" position="inside"> 
+                <action colspan="4" height="220" name="%(act_hr_evaluation_tree)d" string="My Evaluation Remaining"  width="510"/>
+            </xpath>
             </field>
         </record>
-        <menuitem
-            action="hr.open_board_hr"
-            icon="terp-graph"
-            id="base.menu_hr_project"
-            parent="base.menu_hr_dasboard"
-            sequence="4"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml
index 69dbad767d9..e79f581dce0 100644
--- a/addons/hr_expense/board_hr_expense_view.xml
+++ b/addons/hr_expense/board_hr_expense_view.xml
@@ -20,12 +20,12 @@
         <record id="board_hr_expense_form" model="ir.ui.view">
             <field name="name">board.hr.expense.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="hr.board_hr_form"/>              
+            <field name="inherit_id" ref="hr.board_hr_form"/>              
             <field name="type">form</field>
             <field name="arch" type="xml">
-      		<xpath expr="/form/hpaned/child1" position="inside"> 
-				 <action colspan="4" height="220" name="%(action_my_expense)d" string="My Expenses" />
-			</xpath>
+                <xpath expr="/form/hpaned/child1" position="inside"> 
+                     <action colspan="4" height="220" name="%(action_my_expense)d" string="My Expenses" />
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 5f07333787e..5d22113272c 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -168,7 +168,7 @@
             <field name="name">Expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_user_id":uid,"search_default_department_id": department_id,"search_default_this":1}</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
             <field name="help">The OpenERP expenses management module allows you to track the full flow. Every month, the employees record their expenses. At the end of the month, their managers validates the expenses sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.</field>
         </record>
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 435465e3ddd..f06b41e69da 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -56,6 +56,7 @@
         'security/ir.model.access.csv',
         'hr_holidays_workflow.xml',
         'hr_holidays_view.xml',
+        'hr_holidays_data.xml',
         'hr_holidays_wizard.xml',
         'hr_holidays_report.xml',
         'report/hr_holidays_report_view.xml',
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index 86786ad1baf..00412073532 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -22,36 +22,36 @@
         <record id="board_hr_holidays_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="hr.board_hr_form"/>              
+            <field name="inherit_id" ref="hr.board_hr_form"/>              
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      		<xpath expr="/form/hpaned/child1" position="inside"> 
-					<action colspan="4" height="220" name="%(action_view_holiday_status_board)d" string="My Leaves"/>
-				</xpath>
+                <xpath expr="/form/hpaned/child1" position="inside"> 
+                    <action colspan="4" height="220" name="%(action_view_holiday_status_board)d" string="My Leaves"/>
+                </xpath>
             </field>
         </record>
         
-        	<!-- Need to merge in above view -->
+            <!-- Need to merge in above view -->
 
-		<record id="action_hr_holidays_leaves_by_month" model="ir.actions.act_window">
-	        <field name="name">Leaves by Month</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="res_model">available.holidays.report</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-	        <field name="domain">[('user_id','=',uid)]</field>
+        <record id="action_hr_holidays_leaves_by_month" model="ir.actions.act_window">
+            <field name="name">Leaves by Month</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">available.holidays.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('user_id','=',uid)]</field>
             <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
-	        <field name="view_id" ref="hr_holidays.view_hr_available_holidays_report_graph"/>
-		</record>
-		<record id="board_hr_holidays_leave_by_month_form" model="ir.ui.view">
+            <field name="view_id" ref="hr_holidays.view_hr_available_holidays_report_graph"/>
+        </record>
+        <record id="board_hr_holidays_leave_by_month_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.leave.month.form</field>
             <field name="model">board.board</field>
- 			<field name="type">form</field>            
-			<field name="inherit_id" ref="hr.board_hr_form"/>           
+            <field name="type">form</field>            
+            <field name="inherit_id" ref="hr.board_hr_form"/>           
             <field name="arch" type="xml">
-	      		<xpath expr="/form/hpaned/child2" position="inside">            
-				 <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="Leaves by Month" />
-				</xpath>  
+                <xpath expr="/form/hpaned/child2" position="inside">            
+                 <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="Leaves by Month" />
+                </xpath>  
             </field>
         </record>
     </data>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 356d697f2c1..eca3c02f301 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -110,9 +110,9 @@ class hr_holidays_status(osv.osv):
 
     # To do: we can add remaining_leaves_category field to display remaining leaves for particular type
     _columns = {
-        'name': fields.char('Name', size=64, required=True, translate=True),
+        'name': fields.char('Leave Type', size=64, required=True, translate=True),
         'categ_id': fields.many2one('crm.case.categ', 'Meeting Category', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you link this type of leave with a category in the CRM, it will synchronize each leave asked with a case in this category, to display it in the company shared calendar for example.'),
-        'color_name': fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
+        'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
         'limit': fields.boolean('Allow to Override Limit', help='If you tick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
         'max_leaves': fields.function(_user_left_days, method=True, string='Maximum Leaves Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
@@ -162,7 +162,7 @@ class hr_holidays(osv.osv):
         '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'),
+        '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),
         '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)')
     }
 
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
new file mode 100644
index 00000000000..54f53f47a32
--- /dev/null
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+
+    <!-- Casual leave -->
+    <record model="hr.holidays.status" id="holiday_status_cl">
+      <field name="name">Casual Leave</field>
+      <field name="double_validation">True</field>
+      <field name="color_name">black</field>
+    </record>
+
+    <!-- Legal Holidays -->
+    <record model="hr.holidays.status" id="holiday_status_sl">
+      <field name="name">Legal Holidays</field>
+      <field name="color_name">blue</field>
+    </record>
+
+    <!-- Sick leave -->
+    <record model="hr.holidays.status" id="holiday_status_sl">
+      <field name="name">Sick Leave</field>
+      <field name="limit">True</field>
+      <field name="color_name">red</field>
+    </record>
+
+  </data>
+</openerp>
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index e59bd5a0353..e12d7de16b5 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -2,13 +2,6 @@
 <openerp>
   <data noupdate="1">
 
-    <!-- Casual leave -->
-    <record model="hr.holidays.status" id="holiday_status_cl">
-      <field name="name">Casual Leave</field>
-      <field name="double_validation">True</field>
-      <field name="color_name">black</field>
-    </record>
-
     <record model="hr.holidays" id="hr_holidays_employee1_allocation_cl">
         <field name="name">Casual Leave for Fabien Pinckaers</field>
         <field name="holiday_status_id" ref="holiday_status_cl"/>
@@ -27,13 +20,6 @@
       <field name="employee_id" ref="hr.employee1"/>
     </record>
 
-    <!-- Sick leave -->
-    <record model="hr.holidays.status" id="holiday_status_sl">
-      <field name="name">Sick Leave</field>
-      <field name="limit">True</field>
-      <field name="color_name">red</field>
-    </record>
-
     <record model="hr.holidays" id="hr_holidays_employee1_sl">
       <field name="name">Doctor Appointment</field>
       <field name="holiday_status_id" ref="holiday_status_sl"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index b1225f04609..6a644d4ec18 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -15,10 +15,15 @@
                         <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
                         <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
                         <separator orientation="vertical"/>
-                       <filter string="This Month" icon="terp-go-month" name="This Month"
+                        <filter string="This Month" icon="terp-go-month" name="This Month"
                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
-                        <field name="employee_id"/>
+                        <field name="employee_id">
+                            <filter icon="terp-personal"
+                                name="my_leaves"
+                                domain="[('employee_id.user_id','=', uid)]"
+                                help="My Leaves" />
+                        </field>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-personal+" help="My Department Holidays"
                                 domain="[('department_id.manager_id','=',uid)]" />
@@ -32,14 +37,14 @@
                     </group>
                     <newline />
                     <group expand="0" string="Group By...">
-                        <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                        <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>                        
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/>                        
-                         <separator orientation="vertical"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"
+                        <separator orientation="vertical"/>
+                        <filter name="group_type" string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"
                             default="context.get('report', False)"/>
-                        <separator orientation="vertical"/>                            
-                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>                   
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -89,7 +94,7 @@
                             <field name="notes" nolabel="1" colspan="4"/>
                             <newline/>
                             <field name="state" colspan="2"/>
-                            <group colspan="2">
+                            <group colspan="2" col="6">
                                 <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                                 <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
@@ -112,7 +117,7 @@
             <form string="Allocation Request">
                 <group col="8" colspan="4">
                     <field name="name" />
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type"/>
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type" groups="base.group_extended"/>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
                         <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
                         </group>
@@ -269,7 +274,7 @@
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
-            <field name="context">{"search_default_department_id": department_id}</field>
+            <field name="context">{"search_default_department_id": department_id, "search_default_my_leaves": 1}</field>
             <field name="domain">[('type','=','remove')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help">Leaves requests can be recorded by employees and validated by their managers. Once a leave request is validated it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc) and manage allowances per type.</field>
@@ -303,7 +308,7 @@
             <field name="name">Allocation Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
-            <field name="context">{'search_default_user_id':uid,'type':'add',"search_default_department_id": department_id}</field>
+            <field name="context">{"search_default_my_leaves": 1,'type':'add',"search_default_department_id": department_id}</field>
             <field name="domain">[('type','=','add')]</field>
             <field name="view_id" ref="allocation_leave_new"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
@@ -331,7 +336,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_holiday_simple"/>
-            <field name="context">{'allocation_type':'company', 'report':True,"search_default_department_id": department_id}</field>
+            <field name="context">{'search_default_group_employee': 1, 'search_default_group_type': 1}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
@@ -349,12 +354,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Type">
-                    <field colspan="4" name="name" />
-                    <field name="limit"/>
-                    <field name="active"/>
-                    <field name="categ_id" widget="selection"/>
-                    <field name="color_name"/>
-                    <field name="double_validation" />
+                    <group colspan="4" col="6">
+                        <field name="name" />
+                        <field name="color_name"/>
+                        <field name="categ_id" widget="selection" groups="base.group_extended"/>
+                        <newline/>
+                        <field name="limit"/>
+                        <field name="double_validation"/>
+                        <field name="active"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 7f79051edce..f605fd760be 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -63,7 +63,8 @@ class account_analytic_account(osv.osv):
 
     _inherit = "account.analytic.account"
     _columns = {
-        'pricelist_id' : fields.many2one('product.pricelist', 'Sale Pricelist'),
+        'pricelist_id' : fields.many2one('product.pricelist', 'Sale Pricelist', 
+            help="The product to invoice is defined on the employee form, the price will be deduced by this pricelist on the product."),
         'amount_max': fields.float('Max. Invoice Price'),
         'amount_invoiced': fields.function(_invoiced_calc, method=True, string='Invoiced Amount',
             help="Total invoiced"),
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 1bb7765b372..475315068ae 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -35,31 +35,14 @@ class hr_timesheet_invoice_create(osv.osv_memory):
     _name = 'hr.timesheet.invoice.create'
     _description = 'Create invoice from timesheet'
     _columns = {
-        'accounts': fields.many2many('account.analytic.account', 'invoice_id', 'account_id', 'Analytic Accounts', required=True),
         'date': fields.boolean('Date', help='The real date of each work will be displayed on the invoice'),
         'time': fields.boolean('Time spent', help='The time of each work done will be displayed on the invoice'),
         'name': fields.boolean('Description', help='The detail of each work done will be displayed on the invoice'),
         'price': fields.boolean('Cost', help='The cost of each work done will be displayed on the invoice. You probably don\'t want to check this'),
         'product': fields.many2one('product.product', 'Product', help='Complete this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'),
-                }
-
-    def _get_accounts(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        if not len(context['active_ids']):
-            return {}
-        #Checking whether the analytic line is invoiced or not
-        analytic_line_obj = self.pool.get('account.analytic.line').browse(cr, uid, context['active_ids'], context=context)
-        for obj_acc in analytic_line_obj:
-            if obj_acc.invoice_id and obj_acc.invoice_id.state !='cancel':
-                raise osv.except_osv(_('Warning'),_('The analytic entry "%s" is already invoiced!')%(obj_acc.name,))
-
-        cr.execute("SELECT distinct(account_id) from account_analytic_line where id IN %s",(tuple(context['active_ids']),))
-        account_ids = cr.fetchall()
-        return [x[0] for x in account_ids]
+    }
 
     _defaults = {
-         'accounts': _get_accounts,
          'date': lambda *args: 1,
          'name': lambda *args: 1
     }
@@ -82,12 +65,17 @@ class hr_timesheet_invoice_create(osv.osv_memory):
         result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
         res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
         data = self.read(cr, uid, ids, [], context=context)[0]
-        account_ids = data['accounts']
+
+        account_ids = {}
+        for line in self.pool.get('account.analytic.line').browse(cr, uid, context['active_ids'], context=context):
+            account_ids[line.account_id.id] = True
+
+        account_ids = account_ids.keys() #data['accounts']
         for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):
             partner = account.partner_id
             if (not partner) or not (account.pricelist_id):
                 raise osv.except_osv(_('Analytic Account incomplete'),
-                        _('Please fill in the Associate Partner and Sale Pricelist fields in the Analytic Account:\n%s') % (account.name,))
+                        _('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n%s') % (account.name,))
 
             if not partner.address:
                 raise osv.except_osv(_('Partner incomplete'),
@@ -190,7 +178,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                 invoice_line_obj.create(cr, uid, curr_line, context=context)
                 cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s" ,(last_invoice, account.id, tuple(context['active_ids'])))
 
-        invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)
+            invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)
 
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index 82276553edd..c02215cf742 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -10,21 +10,17 @@
             <form string="Invoice analytic lines">
                 <notebook colspan="4">
                     <page string="Billing Data">
-	                   <group col="4" colspan="4">
-	                       <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
-		                        <field name="date"/>
-		                        <field name="time"/>
-		                        <field name="name"/>
-		                        <field name="price"/>
-	                       </group>
-	                    <group col="2" colspan="4" groups="base.group_extended">
-	                        <separator string="Force to use a specific product" colspan="4" />
-	                        <field name="product"/>
-	                    </group>
-                    </page>
-                    <page string="Filter on Accounts" groups="base.group_extended">
-                        <separator string="Choose accounts you want to invoice" colspan="4"/>
-                        <field name="accounts" colspan="4" nolabel="1"/>
+                       <group col="4" colspan="4">
+                           <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
+                                <field name="date"/>
+                                <field name="time"/>
+                                <field name="name"/>
+                                <field name="price" groups="base.group_extended"/>
+                           </group>
+                        <group col="2" colspan="4" groups="base.group_extended">
+                            <separator string="Force to use a specific product" colspan="4" />
+                            <field name="product"/>
+                        </group>
                     </page>
                 </notebook>
                 <separator colspan="4"/>
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 1b554a6b242..7b114d46387 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -53,7 +53,6 @@ The validation can be configured in the company:
         'hr_timesheet_sheet_view.xml',
         'hr_timesheet_workflow.xml',
         'process/hr_timesheet_sheet_process.xml',
-        'report/timesheet_report_view.xml',
         'board_hr_timesheet_view.xml',
         'report/hr_timesheet_report_view.xml',
         'wizard/hr_timesheet_current_view.xml',
diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
index f299cb94298..a50042c3dfb 100644
--- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
+++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
+    <menuitem
+        id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" 
+        sequence="0" groups="base.group_hr_manager"/>
     <menuitem
             action="hr.open_board_hr"
             icon="terp-graph"
@@ -9,16 +11,6 @@
             parent="base.menu_hr_dasboard"
             sequence="4"/>
 
-    <record id="action_timesheet_report_all" model="ir.actions.act_window">
-            <field name="name">Timesheets by Month</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">timesheet.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('user_id','=',uid), ('month', '=' , time.strftime('%m')), ('year', '=', time.strftime('%Y'))]</field>
-            <field name="view_id" ref="hr_timesheet_sheet.view_timesheet_report_graph"/>
-        </record>
-
         <record id="action_hr_timesheet_sheet_graph" model="ir.actions.act_window">
             <field name="name">Timesheets</field>
             <field name="type">ir.actions.act_window</field>
@@ -28,39 +20,6 @@
             <field name="view_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_graph"/>
         </record>
 
-        <record id="view_employee_attendance_graph" model="ir.ui.view">
-            <field name="name">Employee Attendance Graph</field>
-            <field name="model">timesheet.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Employee Attendances" type="bar">
-                    <field name="user_id" />
-                    <field name="total_attendance" operator="+"/>
-                    <field name="total_timesheet" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record id="action_employee_attendance_graph" model="ir.actions.act_window">
-            <field name="name">Employee Attendance Graph</field>
-            <field name="res_model">timesheet.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_employee_attendance_graph"/>
-        </record>
-
-        <record id="board_hr_timesheet_form" model="ir.ui.view">
-            <field name="name">board.hr.timesheet.form</field>
-            <field name="model">board.board</field>
-            <field name="inherit_id" ref="hr.board_hr_manager_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child2" position="inside">
-                    <action colspan="4" height="220" name="%(action_employee_attendance_graph)d" string="Employee Attendances" />
-                </xpath>
-            </field>
-        </record>
-
         <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.tree.simplified.board</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
diff --git a/addons/hr_timesheet_sheet/report/__init__.py b/addons/hr_timesheet_sheet/report/__init__.py
index b06b0608356..8dac73f07ec 100644
--- a/addons/hr_timesheet_sheet/report/__init__.py
+++ b/addons/hr_timesheet_sheet/report/__init__.py
@@ -19,7 +19,5 @@
 #
 ##############################################################################
 
-import timesheet_report
 import hr_timesheet_report
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
deleted file mode 100644
index 6688c747983..00000000000
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ /dev/null
@@ -1,123 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import tools
-from osv import fields,osv
-
-class timesheet_report(osv.osv):
-    _name = "timesheet.report"
-    _description = "Timesheet"
-    _auto = False
-    _columns = {
-        'year': fields.char('Year',size=64,required=False, readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
-            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
-            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
-        'day': fields.char('Day', size=128, readonly=True),
-        'name': fields.char('Description', size=64,readonly=True),
-        'product_id' : fields.many2one('product.product', 'Product'),
-        'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
-        'employee_id': fields.many2one('hr.employee', 'Employee',readonly=True),
-        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True),
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
-        'nbr': fields.integer('#Nbr',readonly=True),
-        'total_diff': fields.float('#Total Diff',readonly=True),
-        'total_timesheet': fields.float('#Total Timesheet',readonly=True),
-        'total_attendance': fields.float('#Total Attendance',readonly=True),
-        'company_id': fields.many2one('res.company', 'Company',readonly=True),
-        'department_id':fields.many2one('hr.department','Department',readonly=True),
-        'date_from': fields.date('Date from',readonly=True,),
-        'date_to': fields.date('Date to',readonly=True),
-        'date_current': fields.date('Current date', required=True),
-        'state' : fields.selection([
-            ('new', 'New'),
-            ('draft','Draft'),
-            ('confirm','Confirmed'),
-            ('done','Done')], 'State', readonly=True),
-        'quantity': fields.float('#Quantity',readonly=True),
-        'cost': fields.float('#Cost',readonly=True),
-        }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'timesheet_report')
-        cr.execute("""
-            create or replace view timesheet_report as (
-                    select 
-			min(aal.id) as id,
-                        htss.date_current,
-                        htss.name,
-                        htss.date_from,
-                        htss.date_to,
-                        to_char(htss.date_current,'YYYY') as year,
-                        to_char(htss.date_current,'MM') as month,
-                        to_char(htss.date_current, 'YYYY-MM-DD') as day,
-                        count(*) as nbr,
-                        aal.unit_amount as quantity,
-                        aal.amount as cost,
-                        aal.account_id,
-                        aal.product_id,
-                        (SELECT   sum(day.total_difference)
-                            FROM hr_timesheet_sheet_sheet AS sheet 
-                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
-                            ON (sheet.id = day.sheet_id 
-                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_diff,
-                        (SELECT sum(day.total_timesheet)
-                            FROM hr_timesheet_sheet_sheet AS sheet 
-                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
-                            ON (sheet.id = day.sheet_id 
-                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_timesheet,
-                        (SELECT sum(day.total_attendance)
-                            FROM hr_timesheet_sheet_sheet AS sheet 
-                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
-                            ON (sheet.id = day.sheet_id 
-                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_attendance,
-                        aal.to_invoice,
-                        aal.general_account_id,
-                        htss.employee_id as employee_id,
-                        htss.company_id,
-                        htss.department_id,
-                        htss.state
-		from hr_timesheet_sheet_sheet as htss
-		left join hr_analytic_timesheet as hat ON (hat.create_uid=htss.create_uid)
-		left join account_analytic_line as aal ON (hat.line_id=aal.id)
-		group by
-                        to_char(htss.date_current,'YYYY'),
-                        to_char(htss.date_current,'MM'),
-                        to_char(htss.date_current, 'YYYY-MM-DD'),
-                        aal.account_id,
-                        htss.date_from,
-                        htss.date_to,
-                        aal.unit_amount,
-                        aal.amount,
-                        htss.date_current,
-                        aal.to_invoice,
-                        aal.product_id,
-                        aal.general_account_id,
-                        htss.name,
-                        htss.company_id,
-                        htss.state,
-                        htss.id,
-                        htss.department_id,
-                        htss.employee_id
-  
-            )
-        """)
-timesheet_report()
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
deleted file mode 100644
index 0bdc4527da5..00000000000
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_timesheet_report_graph" model="ir.ui.view">
-            <field name="name">timesheet.report.graph</field>
-            <field name="model">timesheet.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Timesheet" type="bar">
-                    <field name="employee_id" />
-                    <field name="quantity" operator = "+"/>
-                    <field name="state" group = "True"/>
-                </graph>
-            </field>
-        </record>
-        <record id="view_timesheet_report_tree" model="ir.ui.view">
-            <field name="name">timesheet.report.tree</field>
-            <field name="model">timesheet.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('cancel')" string="Timesheet">
-                    <field name="date_current" invisible="1"/>
-                    <field name="name" invisible="1"/>
-                    <field name="employee_id" invisible="1"/>
-                    <field name="date_from" invisible="1"/>
-                    <field name="date_to" invisible="1"/>
-                    <field name="state" invisible="1"/>
-                    <field name="department_id" invisible="1"/>
-                    <field name="company_id" invisible="1"/>
-                    <field name="to_invoice" invisible="1"/>
-                    <field name="product_id" invisible="1"/>
-                    <field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
-                    <field name="general_account_id" invisible="1"/>
-                    <field name="year" invisible="1"/>
-                    <field name="day" invisible="1"/>
-                    <field name="month" invisible="1"/>
-					<field name="total_attendance" sum="#Total Attendance"/>
-                    <field name="total_timesheet" sum="#Total Timesheet"/>
-                    <field name="total_diff" sum="#Total Diff"/>
-                    <field name="quantity" sum="#Quantity"/>
-                    <field name="cost" sum="#Cost"/>
-                </tree>
-            </field>
-        </record>
-        <record id="view_timesheet_report_search" model="ir.ui.view">
-            <field name="name">timesheet.report.search</field>
-            <field name="model">timesheet.report</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Timesheet">
-                    <group col="10" colspan="12">
-                        <filter icon="terp-go-year" string=" Year "
-                                domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                                help="Timesheet in current year"/>
-                        <filter icon="terp-go-month" string=" Month "
-                                name="month"
-                                domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                                help="Timesheet in current month"/>
-                        <filter icon="terp-go-month"
-                            string=" Month-1 "
-                            domain="[('date_current','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet of last month"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new"
-                                string="Draft"
-                                domain="[('state','=','draft')]"/>
-                        <filter icon="terp-camera_test"
-                                string="Confirmed"
-                                domain="[('state','=','confirm')]"/>
-                        <filter icon="terp-dialog-close"
-                                    string="Done"
-                                    domain="[('state','=','done')]"/>
-                        <separator orientation="vertical"/>
-                      <field name="employee_id" />
-                      <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    </group>
-                    <newline/>
-                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                        <field name="general_account_id"/>
-                        <field name="to_invoice" widget="selection"/>
-                        <separator orientation="vertical"/>
-                        <field name="product_id"/>
-                        <separator orientation="vertical"/>
-                        <field name="department_id" widget="selection"/>
-                        <separator orientation="vertical"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <newline/>
-                        <field name="date_to"/>
-                        <field name="date_from"/>
-                    </group>
-                    <newline/>
-                    <group expand="1" string="Group By...">
-                        <filter string="Employee" name="Employee_id" icon="terp-personal" context="{'group_by':'employee_id'}"/>
-                        <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
-                        <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="action_timesheet_report_stat_all" model="ir.actions.act_window">
-            <field name="name">Timesheet Sheet Analysis</field>
-            <field name="res_model">timesheet.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_Employee_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="search_view_id" ref="view_timesheet_report_search"/>
-        </record>
-        <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
-                parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1" groups="base.group_hr_manager"/>
-    </data>
-</openerp>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 275a969cbe9..71b5d87aa1f 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -88,16 +88,10 @@
                         <child1>
                             <action colspan="4"  height="100" name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
                             <action colspan="4"  height="100" name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks" width="510"/>
-                   		</child1>
+                        </child1>
                         <child2>
-                        <vpaned>
-                        	<child1>
-                        		<action colspan="4"  height="100" name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned vs Total Hours" />
-                        	</child1>
-                        	<child2>
-                        		<action colspan="4"  height="100" name="%(project.action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project" />
-                        	</child2>
-                        </vpaned>
+                            <action colspan="4"  height="100" name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned vs Total Hours" />
+                            <action colspan="4"  height="100" name="%(project.action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project" />
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 91564583729..6fd11bd245f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -27,7 +27,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Administration">
-                            <group col="2" colspan="2">
+                            <group col="2" colspan="2" groups="base.group_extended">
                                 <separator colspan="2" string="Scheduling"/>
                                 <field name="priority"/>
                                 <field name="active"/>
@@ -67,16 +67,18 @@
                                 </tree>
                             </field>
                         </page>
-                        <page groups="base.group_extended" string="Accounting">
-                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
+                        <page string="Billing" groups="account.group_account_invoice">
+                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>
                             <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Invoice Address"/>
                             <field name="warn_customer"/>
                             <newline/>
-                            <separator colspan="2" string="Mail Header"/>
-                            <separator colspan="2" string="Mail Footer"/>
-                            <field name="warn_header" nolabel="1" colspan="2"/>
-                            <field name="warn_footer" nolabel="1" colspan="2"/>
-                            <group col="3" colspan="4">
+                            <group colspan="4" col="4" groups="base.group_extended">
+                                <separator colspan="2" string="Mail Header"/>
+                                <separator colspan="2" string="Mail Footer"/>
+                                <field name="warn_header" nolabel="1" colspan="2"/>
+                                <field name="warn_footer" nolabel="1" colspan="2"/>
+                            </group>
+                            <group col="3" colspan="4" groups="base.group_extended">
                                 <separator string="Automatic variables for headers and footer. Use exactly the same notation." colspan="4"/>
                                 <label string="Task: %%(name)s"/>
                                 <label string="User: %%(user_id)s"/>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 2a1b94620a8..61834abbe66 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -11,9 +11,9 @@
                     <group colspan="4" col="4">
                         <separator colspan="4" string="Invoicing Data"/>
                         <field name="pricelist_id" domain="[('type','=','sale')]" widget="selection"/>
-                        <field name="to_invoice" widget="selection"/>
-                        <field name="amount_max"/>
-                        <field name="amount_invoiced"/>
+                        <field name="to_invoice" widget="selection" string="Invoice Task Work"/>
+                        <field name="amount_max" groups="base.group_extended"/>
+                        <field name="amount_invoiced" groups="base.group_extended"/>
                     </group>
                 </field>
             </field>

From e2467286958d97b07feefc4fb1267f930271d852 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 13 Oct 2010 00:31:43 +0200
Subject: [PATCH 235/244] imp

bzr revid: fp@tinyerp.com-20101012223143-huzvwfo7jtea7hk3
---
 addons/hr_contract/hr_contract_view.xml               | 2 +-
 addons/hr_holidays/hr_holidays_view.xml               | 2 +-
 addons/hr_holidays/report/hr_holidays_report_view.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index bfcd9ff8b76..1ad05582d47 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -105,7 +105,7 @@
                     <page string="Miscellaneous">
                         <group colspan="2" col="2">
                         <separator string="Personal Info" colspan="2"/>
-                        <field name="bank_account"/>
+                        <field name="bank_account_id"/>
                         <field name="place_of_birth"/>
                         <field name="children"/>
                         </group>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 6a644d4ec18..1f57b25d402 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -336,7 +336,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_holiday_simple"/>
-            <field name="context">{'search_default_group_employee': 1, 'search_default_group_type': 1}</field>
+            <field name="context">{'search_default_my_leaves': 1, 'search_default_group_type': 1}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index b2fa98a7720..e2ffc0fc0e9 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -98,7 +98,7 @@
         <field name="res_model">hr.holidays.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_user_id": uid, 'search_default_month':1, 'search_default_Employee':1,'search_default_department':1,"search_default_Validated":1, 'group_by':[], 'group_by_no_leaf':1} </field>
+        <field name="context">{'search_default_Employee':1,'search_default_department':1,"search_default_Validated":1, 'group_by':[], 'group_by_no_leaf':1} </field>
         <field name="search_view_id" ref="view_hr_holidays_report_search"/>
     </record>
 

From d54048c6d795b9928fc24489d1ac19f12cc1354b Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 13 Oct 2010 04:59:18 +0000
Subject: [PATCH 236/244] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101013045918-hlirree3j3xy4ga9
---
 addons/account/i18n/de.po                |   2 +-
 addons/account/i18n/hr.po                |  32 +-
 addons/account/i18n/mn.po                |   4 +-
 addons/account/i18n/sr.po                | 736 ++++++++++++-----------
 addons/account_report/i18n/it.po         |   6 +-
 addons/analytic/i18n/de.po               |   2 +-
 addons/analytic_user_function/i18n/mn.po |  12 +-
 addons/base_vat/i18n/fr.po               |  14 +-
 addons/claim_from_delivery/i18n/de.po    |   2 +-
 addons/crm/i18n/nl.po                    |   6 +-
 addons/crm_fundraising/i18n/nl.po        |   6 +-
 addons/crm_helpdesk/i18n/nl.po           |   6 +-
 addons/decimal_precision/i18n/de.po      |   2 +-
 addons/document_webdav/i18n/da.po        |  31 +
 addons/hr_payroll/i18n/de.po             |   2 +-
 addons/idea/i18n/tr.po                   |  14 +-
 addons/point_of_sale/i18n/sr.po          |   8 +-
 addons/procurement/i18n/mn.po            |  86 ++-
 addons/purchase/i18n/de.po               |   2 +-
 addons/report_intrastat/i18n/it.po       |  50 +-
 addons/resource/i18n/de.po               |   2 +-
 addons/resource/i18n/nl.po               |   6 +-
 addons/wiki_faq/i18n/de.po               |   2 +-
 addons/wiki_quality_manual/i18n/de.po    |   2 +-
 addons/wiki_sale_faq/i18n/de.po          |   2 +-
 25 files changed, 579 insertions(+), 458 deletions(-)
 create mode 100644 addons/document_webdav/i18n/da.po

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 94f0c92c017..dfcd273c439 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index ac5de3c9c51..9d97a299adf 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:55+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\n"
+"PO-Revision-Date: 2010-10-12 16:53+0000\n"
+"Last-Translator: zmmaj <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: 2010-09-30 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -411,7 +411,7 @@ msgstr "Zatvaranje plaćanja"
 #. module: account
 #: model:account.journal,name:account.expenses_journal
 msgid "Journal de frais"
-msgstr ""
+msgstr "Dnevnik Provizije"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -640,12 +640,12 @@ msgstr "Uvjeti plaćanja za partnera"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr "Zatvaranje stavke"
+msgstr "Zatvaranje stavke konta"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
 msgid "Open for bank reconciliation"
-msgstr "Otvor za zatvaranje banke"
+msgstr "Otvoreno za zatvaranje banke"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -830,6 +830,8 @@ msgid ""
 "These types are defined according to your country. The type contain more "
 "information about the account and it's specificities."
 msgstr ""
+"Ovi tipovi su kreirani u odnosu na vasu zemlju. Tip sadrzi vise informacija "
+"o kontu i njegovim specificnostima."
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -1040,7 +1042,7 @@ msgstr "Podređeni"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Mapping"
-msgstr ""
+msgstr "Fiskalno mapiranje poreza"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1063,7 +1065,7 @@ msgstr "Izlazni račun"
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
 msgid "Choose Fiscal Year"
-msgstr "Odaberite poreznu godinu"
+msgstr "Izaberite fiskalnu godinu"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
@@ -1079,7 +1081,7 @@ msgstr "Ispiši analitičke dnevnike"
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Voucher Nb"
-msgstr ""
+msgstr "Nbr Vaucera"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -1129,7 +1131,7 @@ msgstr "Novi analitički konto"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Mapping Templates"
-msgstr ""
+msgstr "Predlozci poreskih mapiranja"
 
 #. module: account
 #: rml:account.invoice:0
@@ -1145,17 +1147,17 @@ msgstr "Razdoblje od:"
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "carobnjak.vise.kontnih.naloga"
 
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr ""
+msgstr "Dnevnik Prodaje"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr "Iznos u drugoj valuti."
+msgstr "Iznos je predstavljen opciono u drugoj valuti"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -2081,7 +2083,7 @@ msgstr "Proces izlacnog računa"
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Mapping Remark :"
-msgstr ""
+msgstr "Napomena Fiskalnog mapiranja:"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -2144,7 +2146,7 @@ msgstr "Nova pretplata"
 #. module: account
 #: view:account.payment.term:0
 msgid "Computation"
-msgstr "Izračun"
+msgstr "Proračun"
 
 #. module: account
 #: view:account.analytic.line:0
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 82262de0ce2..a2e5ce8ef6b 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-11 07:18+0000\n"
+"PO-Revision-Date: 2010-10-12 07:43+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index a2514f02d24..19a1204ca17 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 11:37+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 17:21+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -41,12 +41,12 @@ msgstr "Enkodiranje unosa"
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
 msgid "Specify The Message for the Overdue Payment Report."
-msgstr ""
+msgstr "Poruka na opomenama za neplaćene račune."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement from draft"
-msgstr ""
+msgstr "Potvrdi izvode iz pripreme"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
@@ -56,12 +56,12 @@ msgstr "Sredstvo"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr ""
+msgstr "Valuta upotrebljena pri unosu izvoda"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
@@ -74,6 +74,8 @@ msgid ""
 "This account will be used to value incoming stock for the current product "
 "category"
 msgstr ""
+"Ovaj ce se nalog koristiti da vrednuje ulazni magacin za vazecu kategoriju "
+"proizvoda"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -83,24 +85,24 @@ msgstr ""
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
 msgid "Reconciliation result"
-msgstr ""
+msgstr "Rezultat zatvaranja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr "Nesnimljeni unos"
+msgstr "Otvorene stavke"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
 #: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr ""
+msgstr "Osnovna Šifra"
 
 #. module: account
 #: view:account.account:0
 msgid "Account Statistics"
-msgstr "Statistike računa"
+msgstr "Knjigovodstvene statistike"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
@@ -116,7 +118,7 @@ msgstr "Roditelj"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr ""
+msgstr "Nalog za knjiženje"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -129,18 +131,18 @@ msgstr "Ostatak"
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr ""
+msgstr "Predznak šifre osnovice"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
 #: model:ir.ui.menu,name:account.menu_unreconcile_select
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "Ponisti stavke"
 
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "Greska! Dužina period(a) je loša/netačna. "
+msgstr "Greška! Trajanje razdoblja je pogrešno. "
 
 #. module: account
 #: view:account.bank.statement.reconcile:0
@@ -150,7 +152,7 @@ msgstr "Greska! Dužina period(a) je loša/netačna. "
 #: model:ir.actions.act_window,name:account.action_move_line_form
 #: model:ir.ui.menu,name:account.menu_action_move_line_form
 msgid "Entries"
-msgstr "Unosi"
+msgstr "Stavke"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -160,7 +162,7 @@ msgstr "Centralizacija Dugovanja"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
 msgid "Confirm draft invoices"
-msgstr ""
+msgstr "Potvrdi nacrtne fakture"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -170,18 +172,18 @@ msgid ""
 "it's based on the beginning of the month)."
 msgstr ""
 "Dan u mesecu, podesiti na -1 za poslednji dan tekućeg meseca. Ako je "
-"pozitivan, daje dan u sledećem mesecu. Podešen na 0 za ukupan broj dana (u "
+"pozitivan, daje dan u sledećem mesecu. Podesi na 0 za ukupan broj dana (u "
 "suprotnom zasnovan je na početku meseca)."
 
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr "Ukupno duguje"
+msgstr "Ukupno potrazuje"
 
 #. module: account
 #: field:account.config.wizard,charts:0
 msgid "Charts of Account"
-msgstr "Kontni plan"
+msgstr "Kontni planovi"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
@@ -194,12 +196,12 @@ msgstr "Premesti izabranu liniju"
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Entry label"
-msgstr ""
+msgstr "Oznaka stavke"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr ""
+msgstr "Stavke modela"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
@@ -210,23 +212,23 @@ msgstr "Zbir perioda"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
-msgstr ""
+msgstr "Izracunaj Kod ( if type= code) *programiranje"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "Stavke knjiženja"
 
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
 msgid "Aged Trial Balance"
-msgstr ""
+msgstr "Bruto bilanca"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurrent Entries"
-msgstr ""
+msgstr "Ponavljajuće stavke"
 
 #. module: account
 #: field:account.analytic.line,amount:0
@@ -246,7 +248,7 @@ msgstr "Iznos"
 #: model:ir.actions.wizard,name:account.wizard_third_party_ledger
 #: model:ir.ui.menu,name:account.menu_third_party_ledger
 msgid "Partner Ledger"
-msgstr "Partnerski dnevnik"
+msgstr "Salda konti partnera"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -271,6 +273,10 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
+"Daje pogled korišten kada se zapisuju ili pretrazuju stavke ovog dnevnika. "
+"Pogled govori Open ERP-u koja polja trebaju biti vidljiva, neophodna ili "
+"samo za čitanje i u kojem redosledu. Možete kreirati vlastiti pogled za brži "
+"unos stavki ovog dnevnika."
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -281,18 +287,23 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
+"Ako koristite uvjete plaćanja, datum valute plaćanja se izračunava "
+"automatski u trenutku generiranja stavki knjiženja.Ukoliko ostavite praznim "
+"uslove plaćanja i datum valute praznim, to označava direktno plaćanje. "
+"Uslovi plaćanja mogu izračunati više uplata, npr. 50% odmah, 50% za mjesec "
+"dana."
 
 #. module: account
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Fixed"
-msgstr "Popravljeno"
+msgstr "Fiksno"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr ""
+msgstr "Dospela plaćanja"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -314,7 +325,7 @@ msgstr "Poreklo"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "Pomeri Ime"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -324,7 +335,7 @@ msgstr "Referenca"
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Subscription Compute"
-msgstr ""
+msgstr "Proračun pretplate"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -334,19 +345,19 @@ msgstr "Konto br."
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Debit"
-msgstr ""
+msgstr "Razlika duguje"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "Porez"
 
 #. module: account
 #: rml:account.general.journal:0
 msgid "Debit Trans."
-msgstr ""
+msgstr "Dugovna transakcija"
 
 #. module: account
 #: field:account.analytic.line,account_id:0
@@ -360,14 +371,14 @@ msgstr "Analitički konto"
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr ""
+msgstr "Porez na podređene"
 
 #. module: account
 #: rml:account.central.journal:0
 #: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr ""
+msgstr "Naziv dnevnika"
 
 #. module: account
 #: view:account.payment.term:0
@@ -377,7 +388,7 @@ msgstr "Opis na računima"
 #. module: account
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivna analitička konta."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_entry:0
@@ -388,23 +399,23 @@ msgstr "Ukupno stavki"
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr ""
+msgstr "Originalni konto"
 
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr ""
+msgstr "Dozvoli storniranje stavki"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentorderreconcilation0
 msgid "Payment Reconcilation"
-msgstr ""
+msgstr "Zatvaranje plaćanja"
 
 #. module: account
 #: model:account.journal,name:account.expenses_journal
 msgid "Journal de frais"
-msgstr ""
+msgstr "Dnevnik Provizije"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -424,12 +435,12 @@ msgstr "Negativno"
 #. module: account
 #: rml:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "Naziv (Konta/Partnera)"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Contra"
-msgstr ""
+msgstr "Protuknjiženje"
 
 #. module: account
 #: field:account.analytic.account,state:0
@@ -439,36 +450,36 @@ msgstr ""
 #: view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree13
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree13
 msgid "Unpaid Supplier Refunds"
-msgstr ""
+msgstr "Neplaćeni povrati dobavljaču"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Special Computation"
-msgstr ""
+msgstr "Poseban proračun"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement with/without reconciliation from draft statement"
-msgstr ""
+msgstr "Potvrdi izvod sa/bez usklađivanja sa izvodom u pripremi."
 
 #. module: account
 #: wizard_view:account.move.bank.reconcile,init:0
 #: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree
 msgid "Bank reconciliation"
-msgstr ""
+msgstr "Zatvaranje izvoda banke"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Popust(%)"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -477,12 +488,12 @@ msgstr ""
 #: rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "Referenca"
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
 msgid "Tax Use In"
-msgstr ""
+msgstr "Primena poreza za"
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
@@ -494,18 +505,18 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodical Processing"
-msgstr ""
+msgstr "Periodična obrada"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr ""
+msgstr "Statistika analitičkih stavki"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr "obrasci Perskih stopa/tarifa"
+msgstr "Predlošci PDV obrasca"
 
 #. module: account
 #: view:account.invoice:0
@@ -516,12 +527,12 @@ msgstr "Račun dobavljača"
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "Reconcile Paid"
-msgstr ""
+msgstr "Zatvori plaćene"
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
 msgid "Target Moves"
-msgstr ""
+msgstr "Ciljna knjiženja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -532,28 +543,28 @@ msgstr "Poreski obrasci"
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr ""
+msgstr "Plaćeno/Usklađeno"
 
 #. module: account
 #: field:account.account.type,close_method:0
 msgid "Deferral Method"
-msgstr ""
+msgstr "Način odlaganja"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr ""
+msgstr "Dodaj u osnovicu"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr ""
+msgstr "Šifra osnovice povrata"
 
 #. module: account
 #: view:account.invoice.line:0
 msgid "Line"
-msgstr ""
+msgstr "Red"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -564,7 +575,7 @@ msgstr ""
 #: selection:account.tax,applicable_type:0
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr ""
+msgstr "Tačno"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -572,6 +583,8 @@ msgid ""
 "Number of days to add before computation of the day of month.If Date=15/01, "
 "Number of Days=22, Day of Month=-1, then the due date is 28/02."
 msgstr ""
+"Broj dana koje treba dodati prije proracuna dana u mesecu. Ako je "
+"datum=15.01, broj dana=22, dan u mesecu=-1, onda je datum dospeća 28.02."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
@@ -597,7 +610,7 @@ msgstr ""
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
-msgstr ""
+msgstr "Kontrole unosa"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -610,59 +623,59 @@ msgstr ""
 #: wizard_view:account.analytic.account.chart,init:0
 #: wizard_view:account.analytic.line,init:0
 msgid "(Keep empty to open the current situation)"
-msgstr ""
+msgstr "(Zadržite prazno da biste otvorili trenutno stanje)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Mapping"
-msgstr ""
+msgstr "Fiskalno mapiranje konta"
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: account
 #: selection:account.model.line,date:0
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr ""
+msgstr "Uslovi plaćanja za partnera"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr ""
+msgstr "Zatvaranje stavke konta"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
 msgid "Open for bank reconciliation"
-msgstr ""
+msgstr "Otvoreno za zatvaranje banke"
 
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Popust (%)"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,writeoff:0
 #: wizard_field:account.move.line.reconcile,init_partial,writeoff:0
 msgid "Write-Off amount"
-msgstr ""
+msgstr "Iznos otpisa"
 
 #. module: account
 #: help:account.fiscalyear,company_id:0
 msgid "Keep empty if the fiscal year belongs to several companies."
-msgstr ""
+msgstr "Ostavi prazno ako je fiskalna godina vlasništvo više firmi."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Analitičko računovodstvo"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Sub-Total :"
-msgstr ""
+msgstr "Među-iznos"
 
 #. module: account
 #: field:account.analytic.account,line_ids:0
@@ -670,32 +683,32 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
-msgstr ""
+msgstr "Analitičke stavke"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr ""
+msgstr "mesec"
 
 #. module: account
 #: field:account.analytic.account,partner_id:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Povezani partner"
 
 #. module: account
 #: field:account.invoice,comment:0
 msgid "Additional Information"
-msgstr ""
+msgstr "Dodatne informacije"
 
 #. module: account
 #: selection:account.invoice,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Povrat novca kupcu"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 msgid "Select the Period for Analysis"
-msgstr ""
+msgstr "Odaberite period analize"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -703,12 +716,12 @@ msgstr ""
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr ""
+msgstr "Predznak Poreznog koda"
 
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr ""
+msgstr "Ukupan iznos dugovanja kupca"
 
 #. module: account
 #: view:account.move.line:0
@@ -723,39 +736,39 @@ msgstr ""
 #. module: account
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "Analytic Invoice"
-msgstr ""
+msgstr "Analitički račun"
 
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr ""
+msgstr "Naziv polja"
 
 #. module: account
 #: field:account.tax.code,sign:0
 #: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
-msgstr ""
+msgstr "Predznak za roditelja"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr ""
+msgstr "Dnevnik knjiženja kraja godine"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "Nabavka"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
 msgid "Can be draft or validated"
-msgstr ""
+msgstr "Može biti u pripremi ili potvrđen"
 
 #. module: account
 #: wizard_button:account.invoice.pay,init,reconcile:0
 msgid "Partial Payment"
-msgstr ""
+msgstr "Delimično plaćanje"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
@@ -770,23 +783,23 @@ msgstr ""
 #: field:account.period,state:0
 #: field:account.subscription,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr ""
+msgstr "Razdoblje do"
 
 #. module: account
 #: field:account.account.type,partner_account:0
 msgid "Partner account"
-msgstr ""
+msgstr "Konto partnera"
 
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Generate entries before:"
-msgstr ""
+msgstr "Generisi stavke pre:"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -794,7 +807,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 #: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report
 msgid "Cost Ledger"
-msgstr ""
+msgstr "Knjiga troškova"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -802,18 +815,18 @@ msgstr ""
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "(Keep empty for all open fiscal years)"
-msgstr ""
+msgstr "(Ostaviti prazno za sve otvorene poslovne godine)"
 
 #. module: account
 #: field:account.invoice,move_lines:0
 msgid "Move Lines"
-msgstr ""
+msgstr "Stavke knjiženja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
 msgid "Account cost and revenue by journal"
-msgstr ""
+msgstr "Troškovi i prihodi konta po dnevniku"
 
 #. module: account
 #: help:account.account.template,user_type:0
@@ -821,83 +834,85 @@ msgid ""
 "These types are defined according to your country. The type contain more "
 "information about the account and it's specificities."
 msgstr ""
+"Ovi tipovi su kreirani u odnosu na vasu zemlju. Tip sadrzi vise informacija "
+"o kontu i njegovim specificnostima."
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "6"
-msgstr ""
+msgstr "6"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_30
 msgid "Bank Reconciliation"
-msgstr ""
+msgstr "Usklađivanje (zatvaranje) izvoda banke"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr ""
+msgstr "Predlošci za konta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.model,name:account.model_account_analytic_account
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr ""
+msgstr "Analitička konta"
 
 #. module: account
 #: wizard_view:account.print.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_print_journal
 #: model:ir.ui.menu,name:account.menu_print_journal
 msgid "Print Journal"
-msgstr ""
+msgstr "Stampa Dnevnika"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr ""
+msgstr "konto.banka.nalozi,carobjak"
 
 #. module: account
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "Datum kreiranja"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,cancel_invoice:0
 msgid "Cancel Invoice"
-msgstr ""
+msgstr "Storniraj račun"
 
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr ""
+msgstr "Neophodno"
 
 #. module: account
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr ""
+msgstr "Konto rashoda"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
 msgid "Write-Off Journal"
-msgstr ""
+msgstr "Dnevnik otpisa"
 
 #. module: account
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr ""
+msgstr "Iznos u valuti"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
 msgid "Expense Category Account"
-msgstr ""
+msgstr "Konto kategorije troška"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy2_id:0
 msgid "New Fiscal Year"
-msgstr ""
+msgstr "Nova poslovna godina"
 
 #. module: account
 #: help:account.tax,tax_group:0
@@ -909,12 +924,12 @@ msgstr ""
 #. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr ""
+msgstr "Poslovna godina za otvaranje"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Select Chart of Accounts"
-msgstr ""
+msgstr "Odaberite kontni plan"
 
 #. module: account
 #: field:account.analytic.account,quantity:0
@@ -927,7 +942,7 @@ msgstr ""
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Količina"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_to:0
@@ -935,33 +950,33 @@ msgstr ""
 #: wizard_field:account.partner.balance.report,init,date2:0
 #: wizard_field:account.third_party_ledger.report,init,date2:0
 msgid "End date"
-msgstr ""
+msgstr "Krajnji datum"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr ""
+msgstr "Iznos osnvice"
 
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr ""
+msgstr "Odgovorna osoba za ovaj dnevnik"
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr ""
+msgstr "Osnovni dugovni konto"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Entries by Statements"
-msgstr ""
+msgstr "Stavke po izvodima"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 msgid "analytic Invoice"
-msgstr ""
+msgstr "analitički račun"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,period_id:0
@@ -980,22 +995,22 @@ msgstr ""
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
-msgstr ""
+msgstr "Razdoblje"
 
 #. module: account
 #: rml:account.partner.balance:0
 msgid "Grand total"
-msgstr ""
+msgstr "Celokupni iznos"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
 msgid "Financial Accounting"
-msgstr ""
+msgstr "Financijsko računovodstvo"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Neto Ukupno"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1015,62 +1030,62 @@ msgstr ""
 #: field:account.analytic.line,product_uom_id:0
 #: field:account.move.line,product_uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "JM"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,page_split:0
 msgid "One Partner Per Page"
-msgstr ""
+msgstr "Jedan partner po stranici"
 
 #. module: account
 #: field:account.account,child_parent_ids:0
 #: field:account.account.template,child_parent_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Podređeni"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Mapping"
-msgstr ""
+msgstr "Fiskalno mapiranje poreza"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2_new
 msgid "New Supplier Invoice"
-msgstr ""
+msgstr "Novi nabavni račun"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,amount:0
 msgid "Amount paid"
-msgstr ""
+msgstr "Plaćeni iznos"
 
 #. module: account
 #: selection:account.invoice,type:0
 #: model:process.transition,name:account.process_transition_customerinvoice0
 #: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Račun kupca"
 
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
 msgid "Choose Fiscal Year"
-msgstr ""
+msgstr "Izaberite fiskalnu godinu"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
-msgstr ""
+msgstr "Glavna sekvenca"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Print Analytic Journals"
-msgstr ""
+msgstr "Stampaj analitičke dnevnike"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Voucher Nb"
-msgstr ""
+msgstr "Nbr Vaucera"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -1078,73 +1093,75 @@ msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
 msgstr ""
+"Polje redosled se upotrebljava za redjanje redova uslova plaćanja od "
+"najmanjeg do najvećeg"
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_new:0
 msgid "Total write-off"
-msgstr ""
+msgstr "Ukupni otpis"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Kod za izračun cena sa uključenim porezima"
 
 #. module: account
 #: view:account.invoice.tax:0
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax codes"
-msgstr ""
+msgstr "Šifre poreza"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr ""
+msgstr "Predložak kontnog plana"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
-msgstr ""
+msgstr "Konto prihoda"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_form
 msgid "New Analytic Account"
-msgstr ""
+msgstr "Novi analitički račun"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Mapping Templates"
-msgstr ""
+msgstr "Predlozci poreskih mapiranja"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Jedinična cijena"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Period from :"
-msgstr ""
+msgstr "Razdoblje od :"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "carobnjak.vise.kontnih.naloga"
 
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr ""
+msgstr "Dnevnik Prodaje"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr ""
+msgstr "Iznos je predstavljen opciono u drugoj valuti"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -1155,48 +1172,48 @@ msgstr ""
 #. module: account
 #: field:account.payment.term,line_ids:0
 msgid "Terms"
-msgstr ""
+msgstr "Uslovi"
 
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Report"
-msgstr ""
+msgstr "Porezki izvestaj"
 
 #. module: account
 #: wizard_button:account.analytic.account.chart,init,open:0
 #: wizard_button:account.chart,init,open:0
 msgid "Open Charts"
-msgstr ""
+msgstr "Otvori kontne planove"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
 msgid "Are you sure you want to close the fiscal year ?"
-msgstr ""
+msgstr "Da li ste sigurni da želite zatvoriti fiskalnu godinu ?"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Bank Receipt"
-msgstr ""
+msgstr "Bancina primka"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr ""
+msgstr "Bankovni račun"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
 msgid "Tax Template List"
-msgstr ""
+msgstr "Lista predloška poreza"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Invoice import"
-msgstr ""
+msgstr "Uvoz računa"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
 msgid "Standard entry"
-msgstr ""
+msgstr "Standardna stavka"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -1207,11 +1224,16 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
+"Ovaj izbor ce diktirati kako ce se obracunavati stanje trenutnog kursa za "
+"izlazne transakcije. U vecini zemalja vazeci metod je \" srednji\", ali ce "
+"samo mali broj softwerskih sistema biti u mogucnosti da obradi to. Tako da "
+"ako uvozite iz nekog drugog softwerskog sistema bilo bi pametno da koristite "
+"kurs na datum. Dolazece transakcije uvek koriste vazeci kurs toga dana."
 
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr ""
+msgstr "Valuta preduzeca"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
@@ -1221,108 +1243,108 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr ""
+msgstr "Nadređeni analitički konto"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
 msgid "Reconcile With Write-Off"
-msgstr ""
+msgstr "Zatvaranje s otpisom nezatvorenog dela"
 
 #. module: account
 #: field:account.move.line,tax_amount:0
 msgid "Tax/Base Amount"
-msgstr ""
+msgstr "Iznos poreza/osnovice"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,code_digits:0
 msgid "No. of Digits to use for account code"
-msgstr ""
+msgstr "Broj oznaka( brojeva) za upotrebu u šifri konta"
 
 #. module: account
 #: field:account.bank.statement,balance_end_real:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Završni saldo"
 
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr ""
+msgstr "Porezi nabavke"
 
 #. module: account
 #: field:account.payment.term.line,name:0
 msgid "Line Name"
-msgstr ""
+msgstr "Naziv reda"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Fiksni iznos"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Credit"
-msgstr ""
+msgstr "Analitika potraživanja"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
 #: wizard_button:account.move.line.reconcile,init_partial,partial:0
 msgid "Partial Reconcile"
-msgstr ""
+msgstr "Delimično zatvaranje"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr ""
+msgstr "Otvorene stavke"
 
 #. module: account
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
-msgstr ""
+msgstr "Mapiranje poreza"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
 
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Value"
-msgstr ""
+msgstr "Vrednost"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
 #: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "Konto otpisa"
 
 #. module: account
 #: field:account.model.line,model_id:0
 #: field:account.subscription,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr ""
+msgstr "Zatvori fiskalnu godinu"
 
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr ""
+msgstr "Centralizirana stavka zatvaranja"
 
 #. module: account
 #: view:wizard.company.setup:0
 msgid "Message"
-msgstr ""
+msgstr "Poruka"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Select invoices you want to pay and manages advances"
-msgstr ""
+msgstr "Odaberite račune koje želite da platite i unapredite ih"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1331,7 +1353,7 @@ msgstr ""
 #: selection:account.analytic.account,type:0
 #: field:account.journal,view_id:0
 msgid "View"
-msgstr ""
+msgstr "Pregled"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
@@ -1339,24 +1361,24 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
-msgstr ""
+msgstr "Sve"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic lines"
-msgstr ""
+msgstr "Analiticki redovi"
 
 #. module: account
 #: help:account.tax,type:0
 msgid "The computation method for the tax amount."
-msgstr ""
+msgstr "Način izračuna iznosa poreza"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Validated accounting entries."
-msgstr ""
+msgstr "Potvrđene računovodstvene stavke"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
@@ -1365,32 +1387,34 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
 msgstr ""
+"Ako želite poništiti zatvaranja transakcija, morate također provjeriti sve "
+"radnje koje su povezane sa tim transakcijama jer neće biti onemogućene"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr ""
+msgstr "Elektronska datoteka"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr ""
+msgstr "Potraživanja kupca"
 
 #. module: account
 #: field:account.invoice,tax_line:0
 msgid "Tax Lines"
-msgstr ""
+msgstr "Redovi poreza"
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr ""
+msgstr "Sekvence"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
 #: model:ir.ui.menu,name:account.menu_action_account_type_form
 msgid "Account Types"
-msgstr ""
+msgstr "Tipovi konta"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,journal_id:0
@@ -1412,40 +1436,40 @@ msgstr ""
 #: wizard_field:populate_statement_from_inv,init,journal_id:0
 #: field:report.hr.timesheet.invoice.journal,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Dnevnik"
 
 #. module: account
 #: field:account.account,child_id:0
 #: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "Podređena konta"
 
 #. module: account
 #: field:account.account,check_history:0
 msgid "Display History"
-msgstr ""
+msgstr "Prikaži Istoriju"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,date1:0
 msgid "        Start date"
-msgstr ""
+msgstr "        Početni datum"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,display_account:0
 #: wizard_field:account.general.ledger.report,checktype,display_account:0
 msgid "Display accounts "
-msgstr ""
+msgstr "Prikaži konta "
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile_line
 msgid "Statement reconcile line"
-msgstr ""
+msgstr "Red zatvaranja izvoda"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the income account"
-msgstr ""
+msgstr "Ostavite prazno za konto prihoda"
 
 #. module: account
 #: view:account.bank.statement.reconcile:0
@@ -1453,7 +1477,7 @@ msgstr ""
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Write-Off"
-msgstr ""
+msgstr "Otpis"
 
 #. module: account
 #: help:account.invoice,partner_bank:0
@@ -1461,143 +1485,145 @@ msgid ""
 "The partner bank account to pay\n"
 "Keep empty to use the default"
 msgstr ""
+"Partnerov bankovni racun da plati\n"
+"Ostavite prazno da koristite zadane vrednosti"
 
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr ""
+msgstr "Ukupno obaveze"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close.state,init,close:0
 msgid "Close states"
-msgstr ""
+msgstr "Zatvori stanja"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_company_setup
 msgid "wizard.company.setup"
-msgstr ""
+msgstr "carobnjak.kompanija.setup"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
 msgid "account.analytic.line.extended"
-msgstr ""
+msgstr "konto.analitika.prosireni.red"
 
 #. module: account
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr ""
+msgstr "Dnevnik povrata"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income
 msgid "Income"
-msgstr ""
+msgstr "Prihod"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
 msgid "Supplier"
-msgstr ""
+msgstr "Dobavljač"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel.:"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr ""
+msgstr "Iznos poreza"
 
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Positive"
-msgstr ""
+msgstr "Pozitivan"
 
 #. module: account
 #: wizard_view:account.general.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_general_journal
 #: model:ir.ui.menu,name:account.menu_general_journal
 msgid "Print General Journal"
-msgstr ""
+msgstr "Stampa glavne knjige"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
 msgid "Chart of Accounts Templates"
-msgstr ""
+msgstr "Predlošci kontnog plana"
 
 #. module: account
 #: field:account.invoice,move_id:0
 msgid "Invoice Movement"
-msgstr ""
+msgstr "Knjiženja računa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_wizard
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "Generiraj kontni plan iz predloška"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Statements"
-msgstr ""
+msgstr "Zakonski izveštaji"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
 #: field:account.tax.code.template,parent_id:0
 msgid "Parent Code"
-msgstr ""
+msgstr "Šifra nadređenog"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile.select,init,open:0
 msgid "Open for reconciliation"
-msgstr ""
+msgstr "Otvori za usklađivanje"
 
 #. module: account
 #: model:account.journal,name:account.bilan_journal
 msgid "Journal d'ouverture"
-msgstr ""
+msgstr "Dnevnik Otvaranja"
 
 #. module: account
 #: selection:account.tax,tax_group:0
 #: selection:account.tax.template,tax_group:0
 msgid "VAT"
-msgstr ""
+msgstr "PDV"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Account n°"
-msgstr ""
+msgstr "Br. računa"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr "Zadrži prazno da bi koristio na kontu troškova"
+msgstr "Zadrži prazno za korištenje konta troška"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,account_ids:0
 msgid "Account to reconcile"
-msgstr ""
+msgstr "Konto za zatvaranje"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Vezani partner"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
 #: selection:account.third_party_ledger.report,init,result_selection:0
 msgid "Receivable and Payable Accounts"
-msgstr ""
+msgstr "Konta potraživanja i dugovanja partnera"
 
 #. module: account
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr ""
+msgstr "Redovi pretplate"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1605,43 +1631,43 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
-msgstr ""
+msgstr "Nabavka"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total quantity"
-msgstr ""
+msgstr "Ukupna količina"
 
 #. module: account
 #: field:account.invoice,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "Datum dospeća"
 
 #. module: account
 #: wizard_view:account.period.close,init:0
 #: wizard_button:account.period.close,init,close:0
 msgid "Close Period"
-msgstr ""
+msgstr "Zatvori razdoblje"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Due"
-msgstr ""
+msgstr "Рок"
 
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Third party"
-msgstr ""
+msgstr "Treća strana"
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
-msgstr ""
+msgstr "Dozvoljene vrste konta (prazno za bez kontrole)"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "Početni saldo"
 
 #. module: account
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0
@@ -1649,132 +1675,132 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
 msgid "Journals"
-msgstr ""
+msgstr "Dnevnici"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Max Qty:"
-msgstr ""
+msgstr "Max. kol.:"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,refund:0
 msgid "Refund Invoice"
-msgstr ""
+msgstr "Storno računi"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_tree
 #: model:ir.actions.wizard,name:account.wizard_period_close
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
-msgstr ""
+msgstr "Zatvori razdoblje"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
 msgid "Costs & Revenues"
-msgstr ""
+msgstr "Troškovi & prihodi"
 
 #. module: account
 #: constraint:account.account:0
 msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivna konta"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Account Number"
-msgstr ""
+msgstr "Broj računa"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Skip"
-msgstr ""
+msgstr "Preskoči"
 
 #. module: account
 #: field:account.invoice,period_id:0
 msgid "Force Period"
-msgstr ""
+msgstr "Forsiraj razdoblje"
 
 #. module: account
 #: help:account.account.type,sequence:0
 msgid "Gives the sequence order when displaying a list of account types."
-msgstr ""
+msgstr "Daje redoslijed pri prikazu liste vrsta konta."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr ""
+msgstr "Ponovno otvori"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Are you sure you want to create entries?"
-msgstr ""
+msgstr "Jeste sigurni da želite kreirati stavke?"
 
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Include in base amount"
-msgstr ""
+msgstr "Uključi u osnovicu"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Credit"
-msgstr ""
+msgstr "Razlika potražuje"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
 #: model:ir.actions.wizard,name:account.wizard_unreconcile
 msgid "Unreconcile Entries"
-msgstr ""
+msgstr "Poništi zatvaranje stavki"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Pre-generated invoice from control"
-msgstr ""
+msgstr "Prethodno generisani račun iz kontrole"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "Cost Legder for period"
-msgstr ""
+msgstr "Knjiga troškova za razdoblje"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree2
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2
 msgid "New Statement"
-msgstr ""
+msgstr "Nova Stavka"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,from_date:0
 #: wizard_field:account.analytic.line,init,from_date:0
 msgid "From"
-msgstr ""
+msgstr "Od"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Reconciliation of entries from invoice(s) and payment(s)"
-msgstr ""
+msgstr "Zatvaranje stavke računa i plaćanja"
 
 #. module: account
 #: wizard_view:account.central.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_central_journal
 #: model:ir.ui.menu,name:account.menu_central_journal
 msgid "Print Central Journal"
-msgstr ""
+msgstr "Stampa Glavnog dnevnika"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,period_length:0
 msgid "Period length (days)"
-msgstr ""
+msgstr "Duzina razdoblja (dana)"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
-msgstr ""
+msgstr "Procenat"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr ""
+msgstr "Kontni planovi"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1782,46 +1808,46 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
-msgstr ""
+msgstr "Prodaja"
 
 #. module: account
 #: wizard_button:account.account.balance.report,account_selection,checktype:0
 #: wizard_button:account.general.ledger.report,account_selection,checktype:0
 msgid "Next"
-msgstr ""
+msgstr "Sledeće"
 
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
 "The fiscal mapping will determine taxes and the accounts used for the "
 "partner."
-msgstr ""
+msgstr "Fiskalno mapiranje ce odrediti poreze i konta koristena za partnera"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 msgid "Date or Code"
-msgstr ""
+msgstr "Datum ili šifra"
 
 #. module: account
 #: field:account.analytic.account,user_id:0
 msgid "Account Manager"
-msgstr ""
+msgstr "Upravnik računovodstva"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "to :"
-msgstr ""
+msgstr "u :"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,debit:0
 #: wizard_field:account.move.line.reconcile,init_partial,debit:0
 msgid "Debit amount"
-msgstr ""
+msgstr "Iznos duguje"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "year"
-msgstr ""
+msgstr "година"
 
 #. module: account
 #: wizard_button:account.account.balance.report,checktype,report:0
@@ -1838,17 +1864,17 @@ msgstr ""
 #: wizard_button:account.print.journal.report,init,print:0
 #: wizard_button:account.third_party_ledger.report,init,checkreport:0
 msgid "Print"
-msgstr ""
+msgstr "Štampaj"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
 msgid "Start date"
-msgstr ""
+msgstr "Datum početka"
 
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr ""
+msgstr "x Dnevnik knjižnih odobrenja troškova"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -1859,50 +1885,50 @@ msgstr ""
 #: field:account.move.reconcile,type:0
 #: xsl:account.transfer:0
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Allowed (empty for no control)"
-msgstr ""
+msgstr "Dozvoljena konta (prazno bez kontrole)"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Neoporezovani iznos"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr ""
+msgstr "Konto poreza"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr ""
+msgstr "Redovi analitike"
 
 #. module: account
 #: wizard_view:account.invoice.pay,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_pay
 msgid "Pay invoice"
-msgstr ""
+msgstr "Plati račun"
 
 #. module: account
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Greška: Neispravan Bvr broj (kontrolna oznaka)."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree5
 #: model:ir.ui.menu,name:account.menu_invoice_draft
 msgid "Draft Customer Invoices"
-msgstr ""
+msgstr "Izlazni računi u pripremi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr ""
+msgstr "Redovi pretplatnog naloga"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -1910,89 +1936,89 @@ msgstr ""
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "No Filter"
-msgstr ""
+msgstr "Bez filtera"
 
 #. module: account
 #: field:account.payment.term.line,days:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Broj Dana"
 
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr ""
+msgstr "Partnerova refenerenca ovog racuna"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,sortbydate:0
 msgid "Sort by:"
-msgstr ""
+msgstr "Poređaj po:"
 
 #. module: account
 #: field:account.move,to_check:0
 msgid "To Be Verified"
-msgstr ""
+msgstr "Da bude verifikovano"
 
 #. module: account
 #: help:res.partner,debit:0
 msgid "Total amount you have to pay to this supplier."
-msgstr ""
+msgstr "Ukupni iznos koji trebas platiti ovom dobavljacu"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "7"
-msgstr ""
+msgstr "7"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
 msgid "Transfers"
-msgstr ""
+msgstr "Prenos"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Li."
-msgstr ""
+msgstr "Li."
 
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "Account charts"
-msgstr ""
+msgstr "Kontni planovi"
 
 #. module: account
 #: help:account.tax,name:0
 msgid "This name will be displayed on reports"
-msgstr ""
+msgstr "Naziv koji će se ispisati na izvještajima."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Printing date"
-msgstr ""
+msgstr "Datum stampe"
 
 #. module: account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za pregled arhitekture"
 
 #. module: account
 #: wizard_field:account.partner.balance.report,init,date1:0
 msgid "          Start date"
-msgstr ""
+msgstr "          Početni datum"
 
 #. module: account
 #: wizard_view:account.analytic.account.journal.report,init:0
 msgid "Analytic Journal Report"
-msgstr ""
+msgstr "Dnevnik knjiženja analitike"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr ""
+msgstr "Povrat Musteriji"
 
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "Iznos poreza"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
@@ -2002,7 +2028,7 @@ msgstr ""
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr ""
+msgstr "Naziv dnevnika-razdoblja"
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -2028,7 +2054,7 @@ msgstr ""
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
 #: field:wizard.company.setup,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: account
 #: help:account.invoice,number:0
@@ -2036,41 +2062,42 @@ msgid ""
 "Unique number of the invoice, computed automatically when the invoice is "
 "created."
 msgstr ""
+"Jedinstveni broj racuna, koji se automatski kreira kada se racun kreira"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Neodobreni računi"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_expense
 msgid "Expense"
-msgstr ""
+msgstr "Trošak"
 
 #. module: account
 #: field:account.journal,invoice_sequence_id:0
 msgid "Invoice Sequence"
-msgstr ""
+msgstr "Sekvenca računa"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
 msgid "Options"
-msgstr ""
+msgstr "Opcije"
 
 #. module: account
 #: model:process.process,name:account.process_process_invoiceprocess0
 msgid "Customer Invoice Process"
-msgstr ""
+msgstr "Proces izlacnog računa"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Mapping Remark :"
-msgstr ""
+msgstr "Napomena Fiskalnog mapiranja:"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
 msgid "Opening Entries Period"
-msgstr ""
+msgstr "Period početnog stanja"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves
@@ -2082,12 +2109,12 @@ msgstr ""
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "days"
-msgstr ""
+msgstr "dana"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Past"
-msgstr ""
+msgstr "Prošlost"
 
 #. module: account
 #: field:account.analytic.account,company_currency_id:0
@@ -2101,103 +2128,103 @@ msgstr ""
 #: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid invoices"
-msgstr ""
+msgstr "Neplaćeni računi"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment Reconcile"
-msgstr ""
+msgstr "Zatvaranje plaćanja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
 msgid "Statements reconciliation"
-msgstr ""
+msgstr "Zatvaranje izvoda"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
 #: model:ir.ui.menu,name:account.menu_action_subscription_form_new
 msgid "New Subscription"
-msgstr ""
+msgstr "Nova pretplata"
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Computation"
-msgstr ""
+msgstr "Proračun"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr ""
+msgstr "Stavka analitike"
 
 #. module: account
 #: view:res.company:0
 #: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr ""
+msgstr "Poruka kod prekoračenja roka plaćanja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
 #: model:ir.ui.menu,name:account.menu_action_tax_code_tree
 msgid "Chart of Taxes"
-msgstr ""
+msgstr "Shema poreza"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Value Amount"
-msgstr ""
+msgstr "Iznos"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr ""
+msgstr "Zatvorene stavke"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Kontakt Adresa"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create 3 Months Periods"
-msgstr ""
+msgstr "Kreiraj 3-mesecni period"
 
 #. module: account
 #: view:account.invoice:0
 msgid "(keep empty to use the current period)"
-msgstr ""
+msgstr "(ostaviti prazno ako želite koristiti tekuće razdoblje)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree8
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree8
 msgid "Draft Supplier Invoices"
-msgstr ""
+msgstr "Nepotvrđeni ulazni računi"
 
 #. module: account
 #: wizard_field:account.invoice.refund,init,period:0
 msgid "Force period"
-msgstr ""
+msgstr "Forsiraj period"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
-msgstr ""
+msgstr "Detalji"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Consolidation"
-msgstr ""
+msgstr "Konsolidacija"
 
 #. module: account
 #: field:account.chart.template,account_root_id:0
 msgid "Root Account"
-msgstr ""
+msgstr "Osnovni nalog (root)"
 
 #. module: account
 #: rml:account.overdue:0
@@ -2206,11 +2233,14 @@ msgid ""
 "stay unpaid. Please, take appropriate measures in order to carry out this "
 "payment in the next 8 days."
 msgstr ""
+"Ako se ne radi o našoj grešci, čini se da su sledeći računi ostali "
+"neplaćeni. Molimo preduzmite potrebne mere da se izvrši plaćanje u roku od "
+"sljedećih 8 dana."
 
 #. module: account
 #: rml:account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "PDV :"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,account_selection,Account_list:0
@@ -2219,38 +2249,38 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr ""
+msgstr "Kontni plan"
 
 #. module: account
 #: model:account.journal,name:account.check_journal
 msgid "x Checks Journal"
-msgstr ""
+msgstr "x Dnevnik čekova"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_generate_subscription
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Create subscription entries"
-msgstr ""
+msgstr "Kreiraj stavke pretplate"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,journal_id:0
 msgid "Opening Entries Journal"
-msgstr ""
+msgstr "Dnevnik početnog stanja"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Create a Fiscal Year"
-msgstr ""
+msgstr "Kreiraj Fiskalnu Godinu"
 
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr ""
+msgstr "Porezi kod prodaje"
 
 #. module: account
 #: field:account.invoice,date_invoice:0
 msgid "Date Invoiced"
-msgstr ""
+msgstr "Datum izrade računa"
 
 #. module: account
 #: help:account.account.balance.report,checktype,periods:0
@@ -2259,27 +2289,29 @@ msgstr ""
 #: help:account.third_party_ledger.report,init,periods:0
 #: help:account.vat.declaration,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Ako je prazno, sva razdoblja"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
 msgid "Liability"
-msgstr ""
+msgstr "Obveza"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
 msgstr ""
+"(Ukoliko ne selektujete Fiskalnu godinu, uzece se u obzir sve otvorene "
+"fiskalne godine)"
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
-msgstr ""
+msgstr "Porezka osnovica"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2299,46 +2331,46 @@ msgstr ""
 #: rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Reference Type"
-msgstr ""
+msgstr "Tip reference"
 
 #. module: account
 #: wizard_button:account.move.line.unreconcile,init,unrec:0
 #: wizard_button:account.reconcile.unreconcile,init,unrec:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "Poništi zatvaranje"
 
 #. module: account
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
 msgid "Tax Type"
-msgstr ""
+msgstr "Vrsta poreza"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_statemententries0
 msgid "Statement Entries"
-msgstr ""
+msgstr "Stavke izvoda"
 
 #. module: account
 #: field:account.analytic.line,user_id:0
 #: field:account.journal,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_template_form
 msgid "Account Templates"
-msgstr ""
+msgstr "Predlošci konta"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr ""
+msgstr "Predložak kontnog plana"
 
 #. module: account
 #: model:account.journal,name:account.refund_sales_journal
@@ -2348,28 +2380,28 @@ msgstr ""
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Voucher No"
-msgstr ""
+msgstr "Br Potvrde"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic reconciliation"
-msgstr ""
+msgstr "Automatsko zatvaranje"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Import Invoice"
-msgstr ""
+msgstr "Uvezi račun(e)"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "and Journals"
-msgstr ""
+msgstr "i dnevnike"
 
 #. module: account
 #: view:account.tax:0
 msgid "Account Tax"
-msgstr ""
+msgstr "Konto poreza"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -2379,7 +2411,7 @@ msgstr "Pomeri liniju"
 #. module: account
 #: field:account.bank.accounts.wizard,acc_no:0
 msgid "Account No."
-msgstr ""
+msgstr "Broj računa"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -2387,11 +2419,13 @@ msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
 msgstr ""
+"Označite ako se porez računa na osnovi podređenih poreza umesto na osnovi "
+"ukupnog iznosa."
 
 #. module: account
 #: rml:account.central.journal:0
 msgid "Journal Code"
-msgstr ""
+msgstr "Šifra dnevnika"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -2399,16 +2433,18 @@ msgid ""
 "If not applicable (computed through a Python code), the tax won't appear on "
 "the invoice."
 msgstr ""
+"Ako nije primenjivo (izračunato Python kodom), porez se neće iskazati na "
+"računu."
 
 #. module: account
 #: field:account.model,lines_id:0
 msgid "Model Entries"
-msgstr ""
+msgstr "Stavke modela"
 
 #. module: account
 #: field:account.analytic.account,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Završni datum"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2417,13 +2453,13 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
-msgstr ""
+msgstr "Stavke"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
-msgstr ""
+msgstr "Primjenjeni kod (ako je tip=Python kod)"
 
 #. module: account
 #: wizard_button:account.move.journal,init,open:0
diff --git a/addons/account_report/i18n/it.po b/addons/account_report/i18n/it.po
index 58987e1ff3e..2d3a600a78b 100644
--- a/addons/account_report/i18n/it.po
+++ b/addons/account_report/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-11 20:16+0000\n"
-"Last-Translator: simone.sandri <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:46+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/analytic/i18n/de.po b/addons/analytic/i18n/de.po
index 1d151da2e95..fea9b2cd23e 100644
--- a/addons/analytic/i18n/de.po
+++ b/addons/analytic/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/analytic_user_function/i18n/mn.po b/addons/analytic_user_function/i18n/mn.po
index 29affbf3bf3..478065209f3 100644
--- a/addons/analytic_user_function/i18n/mn.po
+++ b/addons/analytic_user_function/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:35+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"PO-Revision-Date: 2010-10-12 14:21+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -41,7 +41,7 @@ msgstr "Аналитик данс"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr ""
+msgstr "Хэрэглэгч/Бүтээгдэхүүн"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,user_id:0
@@ -59,9 +59,9 @@ msgstr ""
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
-msgstr ""
+msgstr "Аналитик хэрэглэгчийн үүрэг"
 
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
-msgstr ""
+msgstr "Хэрэглэгчийн бүтээгдэхүүний аналитик данс"
diff --git a/addons/base_vat/i18n/fr.po b/addons/base_vat/i18n/fr.po
index 986ab70c5c5..9a8776d2680 100644
--- a/addons/base_vat/i18n/fr.po
+++ b/addons/base_vat/i18n/fr.po
@@ -7,15 +7,23 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:48+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-10-12 12:08+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2010-09-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: base_vat
+#: model:ir.module.module,description:base_vat.module_meta_information
+msgid ""
+"Enable the VAT Number for the partner. Check the validity of that VAT Number."
+msgstr ""
+"Active le numéro de TVA sur la fiche partenaire. Vérifie la validité du "
+"numéro de TVA."
+
 #. module: base_vat
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
diff --git a/addons/claim_from_delivery/i18n/de.po b/addons/claim_from_delivery/i18n/de.po
index 99f04fa4284..258499f1a37 100644
--- a/addons/claim_from_delivery/i18n/de.po
+++ b/addons/claim_from_delivery/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: claim_from_delivery
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index d3da4ded812..7fe654c511f 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-10-11 13:45+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:49+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm_fundraising/i18n/nl.po b/addons/crm_fundraising/i18n/nl.po
index fe0003a7ecc..9175de4b202 100644
--- a/addons/crm_fundraising/i18n/nl.po
+++ b/addons/crm_fundraising/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 12:29+0000\n"
-"PO-Revision-Date: 2010-10-11 09:58+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:44+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_fundraising
diff --git a/addons/crm_helpdesk/i18n/nl.po b/addons/crm_helpdesk/i18n/nl.po
index e1d802b6cf6..0db6e9f1a16 100644
--- a/addons/crm_helpdesk/i18n/nl.po
+++ b/addons/crm_helpdesk/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 13:01+0000\n"
-"PO-Revision-Date: 2010-10-11 08:22+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:46+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
diff --git a/addons/decimal_precision/i18n/de.po b/addons/decimal_precision/i18n/de.po
index d2218ef9d4c..12710962429 100644
--- a/addons/decimal_precision/i18n/de.po
+++ b/addons/decimal_precision/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
diff --git a/addons/document_webdav/i18n/da.po b/addons/document_webdav/i18n/da.po
new file mode 100644
index 00000000000..06dd36acc4e
--- /dev/null
+++ b/addons/document_webdav/i18n/da.po
@@ -0,0 +1,31 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-05-30 15:14+0000\n"
+"PO-Revision-Date: 2010-10-12 13:21+0000\n"
+"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n"
+"Language-Team: Danish <da@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_webdav_old
+#: model:ir.module.module,description:document_webdav_old.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"\t* WebDav Interface\n"
+"\t* User Authentification\n"
+"\t* Document Indexation\n"
+msgstr ""
+"Dette er et komplet dokumenthåndteringssystem\n"
+"\t* WebDav Interface\n"
+"\t* Brugergodkendelse\n"
+"\t* Dokumentindeksering\n"
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
index 0780f644296..406f344f044 100644
--- a/addons/hr_payroll/i18n/de.po
+++ b/addons/hr_payroll/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
diff --git a/addons/idea/i18n/tr.po b/addons/idea/i18n/tr.po
index e1bd6fc3db3..b3cadf12a88 100644
--- a/addons/idea/i18n/tr.po
+++ b/addons/idea/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 07:12+0000\n"
-"Last-Translator: Mustafa Yılmaz <apshalasha@gmail.com>\n"
+"PO-Revision-Date: 2010-10-12 23:56+0000\n"
+"Last-Translator: cafer can <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: 2010-09-29 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
@@ -96,7 +96,7 @@ msgstr "Taslak"
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
 msgid "Idea's vote"
-msgstr "Fikrin oyu"
+msgstr ""
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote_stat
@@ -193,7 +193,7 @@ msgstr "Kategoriler"
 #. module: idea
 #: view:idea.stat:0
 msgid "stat"
-msgstr "durum"
+msgstr ""
 
 #. module: idea
 #: field:idea.idea,my_vote:0
@@ -237,7 +237,7 @@ msgstr "Oluşturulma tarihi"
 #. module: idea
 #: field:idea.idea,count_votes:0
 msgid "Count of votes"
-msgstr "Oy sayısı"
+msgstr "Oy Sayımı"
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
@@ -354,7 +354,7 @@ msgstr "Çok Kötü"
 #. module: idea
 #: selection:idea.idea,state:0
 msgid "Canceled"
-msgstr "İptal edilmiş"
+msgstr "İptal Edildi"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 98c46039a41..2005696db44 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-11 21:13+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:46+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -438,7 +438,7 @@ msgstr ""
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Draft Invoice"
-msgstr "Nacrti računa"
+msgstr "Neodobreni računi"
 
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index 9ff3c68e11a..f6f3b4106a8 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 08:51+0000\n"
-"PO-Revision-Date: 2010-09-29 11:36+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"PO-Revision-Date: 2010-10-12 14:21+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -29,6 +29,9 @@ msgid ""
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
 msgstr ""
+"Виртуал агуулах нь тэгтэй тэнцүү бүх бараанд автомат татан авалтыг "
+"эхлүүлдэг. Та энэ сонголтыг ашиглахгүй байх нь дээр, бид танд барааны МТО "
+"тохиргоог ашиглахыг зөвлөж байна."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -92,7 +95,7 @@ msgstr "Шалтгаан"
 #. module: procurement
 #: view:procurement.order.compute:0
 msgid "Compute Procurements"
-msgstr ""
+msgstr "Татан авалт тооцоолох"
 
 #. module: procurement
 #: field:procurement.order,message:0
@@ -102,7 +105,7 @@ msgstr "Сүүлийн алдаа"
 #. module: procurement
 #: help:mrp.property,composition:0
 msgid "Not used in computations, for information purpose only."
-msgstr ""
+msgstr "Тооцоололд ашиглагдахгүй, зөвхөн мэдээллийн зорилгоор ашиглана."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_id:0
@@ -117,7 +120,7 @@ msgstr "Тэмдэглэгээ"
 #. module: procurement
 #: help:procurement.order,message:0
 msgid "Exception occurred while computing procurement orders."
-msgstr ""
+msgstr "Татан авалтын захиалгыг тооцоолж байх үед онцгой тохиолдол гардаг."
 
 #. module: procurement
 #: help:procurement.order,state:0
@@ -131,6 +134,13 @@ msgid ""
 " It is in 'Waiting'. state when the procurement is waiting for another one "
 "to finish."
 msgstr ""
+"Татан авалт үүсэхэд төлөв нь 'Draft'.\n"
+"Татан авалт нь баталгаажсан бол төлөв нь 'Confirmed'.\n"
+"Баталгаажсаны дараа төлөв нь 'Running'.\n"
+"Хэрэв ямар нэгэн онцгой тохиолдол захиалгад үүсвэл төлөв нь  'Exception'.\n"
+"Онцгой тохиолдол устхад төлөв нь 'Ready'.\n"
+"Нэг татан авалт нь нөгөө татан авалтаа дуусахыг хүлээж байхад төлөв нь "
+"'Waiting' байна."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -143,11 +153,14 @@ msgid ""
 "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
+"Виртуал агуулах нь хамгийн бага тоо хэмжээнд ойртож байвал, OpenERP нь "
+"виртуал агуулахыг хамгийн их тоо хэмжээнд хүргэхийн тулд татан авалтыг "
+"боловсруулдаг."
 
 #. module: procurement
 #: view:procurement.order.compute.all:0
 msgid "Scheduler Parameters"
-msgstr ""
+msgstr "Төлөвлөгчийн үзүүлэлт"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action11
@@ -168,7 +181,7 @@ msgstr "Бэлэн"
 #. module: procurement
 #: field:procurement.order.compute.all,automatic:0
 msgid "Automatic orderpoint"
-msgstr ""
+msgstr "Автомат захиалгын цэг"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -197,11 +210,13 @@ msgid ""
 "Reference of the document that created this Procurement.\n"
 "This is automatically completed by OpenERP."
 msgstr ""
+"Татан авалтын үүсгэсэн баримтын дугаар. Үүнийг OpenERP автоматаар "
+"гүйцэтгэдэг."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
 msgid "Minimum Inventory Rule"
-msgstr ""
+msgstr "Хамгийн бага эрхтэй оролцогч"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action4
@@ -257,7 +272,7 @@ msgstr "Нийлүүлэлт"
 #. module: procurement
 #: field:res.company,schedule_range:0
 msgid "Scheduler Range Days"
-msgstr ""
+msgstr "Төлөвлөгчийн өдрийн хязгаар"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -318,6 +333,8 @@ msgid ""
 "If you encode manually a Procurement, you probably want to use a make to "
 "order method."
 msgstr ""
+"Татан авалтыг гараар кодлохоор бол, методуудыг цэгцлэхийн тулд загвар харах "
+"болно."
 
 #. module: procurement
 #: view:res.company:0
@@ -330,6 +347,8 @@ msgid ""
 "Wizard run all the procurements, and generate task, production order or "
 "purchase order based on the product type"
 msgstr ""
+"Визард нь татан авалтыг ажиллуулдаг ба даалгавруудыг биелүүлдэг, барааны "
+"захиалга эсвэл худалдан авалтын захиалга нь барааны төрлөөс хамаарна."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_max_qty:0
@@ -422,6 +441,8 @@ msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
 "than 1!"
 msgstr ""
+"Татан авалтын захиалгын тоо хэмжээг шалгана уу, энэ нь нэгээс бага байх "
+"ёсгүй!"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -429,6 +450,9 @@ msgid ""
 "When the virtual stock goes belong the Max Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
+"Виртуал агуулах нь хамгийн бага тоо хэмжээнд ойртож байвал, OpenERP нь "
+"виртуал агуулахыг хамгийн их тоо хэмжээнд хүргэхийн тулд татан авалтыг "
+"боловсруулдаг."
 
 #. module: procurement
 #: help:procurement.orderpoint.compute,automatic:0
@@ -477,6 +501,9 @@ msgid ""
 "procurements. All procurements that are not between today and today+range "
 "are skipped for futur computation."
 msgstr ""
+"Энэ бол Татан авалтыг тооцоолж байх үед  төлөвлөгчийн дүгнэсэн боломжит "
+"хугацаа юм. Өнөөдөр болон өнөөдрийн хязгаар хооронд багтаагүй татан авалт нь "
+"дараагийн тооцоолол хүртэл орхигдоно."
 
 #. module: procurement
 #: selection:procurement.order,priority:0
@@ -494,6 +521,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the orderpoint "
 "without removing it."
 msgstr ""
+"Хэрэв идэвхтэй талбар нь үнэн болсон бол, захиалгын цэгийг устгалгүйгээр "
+"нуух боломжийг олгоно."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -525,12 +554,12 @@ msgstr "Алдаа"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
-msgstr ""
+msgstr "Автомат захиалгын цэг"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,qty_multiple:0
 msgid "Qty Multiple"
-msgstr ""
+msgstr "Хуваагдах тоо хэмжээ"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
@@ -561,7 +590,7 @@ msgstr ""
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Order to Max"
-msgstr ""
+msgstr "Хамгийн их захиалга"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
@@ -571,7 +600,7 @@ msgstr "Хаагдсан огноо"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Late"
-msgstr ""
+msgstr "Хожимдсон"
 
 #. module: procurement
 #: field:mrp.property,composition:0
@@ -604,7 +633,7 @@ msgstr "Байршлууд"
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "from stock"
-msgstr ""
+msgstr "Агуулахаас"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -624,7 +653,7 @@ msgstr "Дууссан"
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will by rounded up to this multiple."
-msgstr ""
+msgstr "Татан авалтын тоо хэмжээ нь дараа дараагийн талбарт тоймлогдоно."
 
 #. module: procurement
 #: view:make.procurement:0
@@ -659,7 +688,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Current"
-msgstr ""
+msgstr "Одоо"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -695,7 +724,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Төлөвлөгдсөн огноо"
 
 #. module: procurement
 #: field:make.procurement,product_id:0
@@ -749,7 +778,7 @@ msgstr "Хүлээж байна"
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "on order"
-msgstr ""
+msgstr "Захиалга"
 
 #. module: procurement
 #: field:procurement.order,move_id:0
@@ -767,6 +796,9 @@ msgid ""
 "This wizard will plan the procurement for this product. This procurement may "
 "generate task, production orders or purchase orders."
 msgstr ""
+"Энэ визард нь тухайн барааны татан авалтыг төлөвлөдөг. Энэ татан авалт нь "
+"даалгаварууд, барааны захиалга эсвэл худалдан авалтын захиалгыг боловсруулах "
+"боломжтой."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -800,13 +832,15 @@ msgstr ""
 #: model:ir.actions.act_window,name:procurement.action_compute_schedulers
 #: view:procurement.order.compute.all:0
 msgid "Compute Schedulers"
-msgstr ""
+msgstr "Тооцоолол төлөвлөгч"
 
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid ""
 "Wizard checks all the stock minimum rules and generate procurement order."
 msgstr ""
+"Визард нь агуулахын хамгийн бага дүрмийг шалгаад татан авалтын захиалгыг "
+"биелүүлдэг."
 
 #. module: procurement
 #: field:procurement.order,product_uom:0
@@ -826,7 +860,7 @@ msgstr "Маш яаралтай"
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
 msgid "Automatic Orderpoint"
-msgstr ""
+msgstr "Автомат захиалгын цэг"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -848,6 +882,16 @@ msgid ""
 "        if product_id:\n"
 "            w = self.pool.get('product.product"
 msgstr ""
+"Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
+"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
+"\n"
+"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
+"        \"\"\" Finds UoM and UoS of changed product.\n"
+"        @param product_id: Changed id of product.\n"
+"        @return: Dictionary of values.\n"
+"        \"\"\"\n"
+"        if product_id:\n"
+"            w = self.pool.get('product.product"
 
 #. module: procurement
 #: constraint:ir.rule:0
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 9beab0c4d59..82ab4a9320c 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/report_intrastat/i18n/it.po b/addons/report_intrastat/i18n/it.po
index 2c83dde0cb7..4dba312df22 100644
--- a/addons/report_intrastat/i18n/it.po
+++ b/addons/report_intrastat/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-10-12 20:22+0000\n"
+"Last-Translator: simone.sandri <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: 2010-09-29 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
@@ -27,7 +27,7 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Canceled Invoice"
-msgstr ""
+msgstr "Fattura Cancellata"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -43,7 +43,7 @@ msgstr "Intrastat (questo mese)"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Fattura Fornitore"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -58,7 +58,7 @@ msgstr ""
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Period"
-msgstr ""
+msgstr "Periodo"
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_90
@@ -73,22 +73,22 @@ msgstr "Importa"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "VAT :"
-msgstr ""
+msgstr "IVA"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Document"
-msgstr ""
+msgstr "Documento"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Tasse:"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -109,7 +109,7 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Data della fattura"
 
 #. module: report_intrastat
 #: model:ir.module.module,shortdesc:report_intrastat.module_meta_information
@@ -119,17 +119,17 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Base"
-msgstr ""
+msgstr "Base"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantità"
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_89
@@ -144,12 +144,12 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (inclu. taxes):"
-msgstr ""
+msgstr "Totale (tasse incluse)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Refund"
-msgstr ""
+msgstr "Rimborso"
 
 #. module: report_intrastat
 #: constraint:ir.ui.view:0
@@ -164,17 +164,17 @@ msgstr "Report Intrastat"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes"
-msgstr ""
+msgstr "Tasse"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Amount"
-msgstr ""
+msgstr "Importo"
 
 #. module: report_intrastat
 #: view:report.intrastat:0
@@ -214,7 +214,7 @@ msgstr "Codice Intrastat"
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Origin"
-msgstr ""
+msgstr "Origine"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -230,7 +230,7 @@ msgstr "Membro Intrastat"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tax"
-msgstr ""
+msgstr "Tassa"
 
 #. module: report_intrastat
 #: field:report.intrastat,code:0
@@ -250,22 +250,22 @@ msgstr "Esporta"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Rimborso Fornitore"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (excl. taxes):"
-msgstr ""
+msgstr "Totale (tasse escluse)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Price"
-msgstr ""
+msgstr "Prezzo"
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
index 6f3d120040d..63c3fdd1e05 100644
--- a/addons/resource/i18n/de.po
+++ b/addons/resource/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
diff --git a/addons/resource/i18n/nl.po b/addons/resource/i18n/nl.po
index bfb0bc36ad2..6848c21c15b 100644
--- a/addons/resource/i18n/nl.po
+++ b/addons/resource/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-18 06:50+0000\n"
-"PO-Revision-Date: 2010-10-11 12:36+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:44+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
diff --git a/addons/wiki_faq/i18n/de.po b/addons/wiki_faq/i18n/de.po
index b7849cc39cf..47809753226 100644
--- a/addons/wiki_faq/i18n/de.po
+++ b/addons/wiki_faq/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_faq
diff --git a/addons/wiki_quality_manual/i18n/de.po b/addons/wiki_quality_manual/i18n/de.po
index c0b73038993..5515df16029 100644
--- a/addons/wiki_quality_manual/i18n/de.po
+++ b/addons/wiki_quality_manual/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_quality_manual
diff --git a/addons/wiki_sale_faq/i18n/de.po b/addons/wiki_sale_faq/i18n/de.po
index a1e54fc3646..b3843e0e12b 100644
--- a/addons/wiki_sale_faq/i18n/de.po
+++ b/addons/wiki_sale_faq/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_sale_faq

From 0efa32fb0fc0af6280eb02da1b4477036efeaf23 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Wed, 13 Oct 2010 11:06:32 +0530
Subject: [PATCH 237/244] [IMP]:point_of_sale:Improves the period function in
 pos_details_summary.py

bzr revid: azaz.201186@gmail.com-20101013053632-khd9n57zga711dt1
---
 .../report/pos_details_summary.py             | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index a9e2ac689d3..579b28ca6ca 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import time
+import datetime
 from report import report_sxw
 
 
@@ -120,24 +121,15 @@ class pos_details_summary(report_sxw.rml_parse):
         return reduce(lambda x, o: x + len(o.lines), objects, 0)
 
     def _get_start_period(self, objects):
-        date_orders = [obj.date_order for obj in objects]
-        print "=========================",date_orders
-        min_date = min(date_orders)
-        max_date = max(date_orders)
-        print "========================",min_date
-        if min_date == max_date:
-            return '%s' % min_date
-        else:
-            return '%s' % min_date
+        date_orders = sorted([obj.date_order for obj in objects])
+        min_date = date_orders[0]
+        return '%s' % min_date
+
 
     def _get_end_period(self, objects):
         date_orders = [obj.date_order for obj in objects]
-        min_date = min(date_orders)
-        max_date = max(date_orders)
-        if min_date == max_date:
-            return '%s' % max_date
-        else:
-            return '%s' % max_date
+        max_date = date_orders[-1]
+        return '%s' % max_date
 
 
 report_sxw.report_sxw('report.pos.details_summary',

From 6b383b79ae03490756cb5896c9b09afcdda7c1d6 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Wed, 13 Oct 2010 11:45:44 +0530
Subject: [PATCH 238/244] [IMP]:point_of_sale:Improves pos_details_summary
 report

bzr revid: azaz.201186@gmail.com-20101013061544-8g6l5jxmmjrqrze7
---
 .../report/pos_details_summary.py             |   4 +-
 .../report/pos_details_summary.rml            | 100 +++++++++---------
 2 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index 579b28ca6ca..30cfdd7063c 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 import time
-import datetime
+from datetime import datetime
 from report import report_sxw
 
 
@@ -127,7 +127,7 @@ class pos_details_summary(report_sxw.rml_parse):
 
 
     def _get_end_period(self, objects):
-        date_orders = [obj.date_order for obj in objects]
+        date_orders = sorted([obj.date_order for obj in objects])
         max_date = date_orders[-1]
         return '%s' % max_date
 
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 466500f0960..2c119c103f1 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Details of Sales" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
+      <frame id="first" x1="28.0" y1="57.0" width="511" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -44,46 +44,44 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table9">
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table8">
+    <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table11">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,2" stop="0,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,2" stop="1,2"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,3" stop="0,3"/>
@@ -102,12 +100,8 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -146,14 +140,11 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="terp_header_Centre">Details of Sales</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P3">Details of Sales</para>
-    <para style="P6">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="167.0,115.0,115.0,115.0" style="Table1">
+    <blockTable colWidths="149.0,124.0,119.0,120.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -169,16 +160,16 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="166.0,116.0,115.0,115.0" style="Table2">
+    <blockTable colWidths="148.0,124.0,119.0,119.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ '%s' % getcompany(objects)]]</para>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ '%s' % getstartperiod(objects) ]]</para>
+          <para style="terp_default_Centre_8">[[ '%s' % getstartperiod(objects) ]] </para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ '%s' % getendperiod(objects) ]]</para>
@@ -188,13 +179,18 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="256.0,256.0" style="Table4">
+    <section>
+      <para style="Standard">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <blockTable colWidths="256.0,256.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Mode of Taxes</para>
         </td>
         <td>
-          <para style="P2">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
@@ -202,27 +198,30 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(gettaxamount(objects).items(),'p') ]]</para>
-      <blockTable colWidths="256.0,256.0" style="Table6">
+      <blockTable colWidths="256.0,256.0" style="Table5">
         <tr>
           <td>
-            <para style="P5">[[ p[0] ]]</para>
+            <para style="P1">[[ p[0] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9_Bold">[[ p[1] ]] [[company.currency_id.symbol]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_9">
+      <para style="terp_default_1">
         <font color="white"> </font>
       </para>
     </section>
-    <blockTable colWidths="256.0,256.0" style="Table3">
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="257.0,255.0" style="Table9">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Mode of Payment</para>
         </td>
         <td>
-          <para style="P2">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
@@ -230,10 +229,10 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(getpayments(objects).items(),'t') ]]</para>
-      <blockTable colWidths="256.0,256.0" style="Table9">
+      <blockTable colWidths="255.0,255.0" style="Table11">
         <tr>
           <td>
-            <para style="P4">[[ t[0] ]]</para>
+            <para style="P2">[[ t[0] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9_Bold">[[ '%.2f' % (t[1],) ]] [[company.currency_id.symbol]]</para>
@@ -244,25 +243,28 @@
         <font color="white"> </font>
       </para>
     </section>
-    <blockTable colWidths="256.0,256.0" style="Table8">
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="257.0,255.0" style="Table8">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Summary</para>
+          <para style="terp_tblheader_Details">Summary</para>
         </td>
         <td>
-          <para style="P1">
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="256.0,256.0" style="Table7">
+    <blockTable colWidths="257.0,254.0" style="Table7">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Sales total</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ '%d' % getsalestotal(objects) ]] [[company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%d' % getsalestotal(objects) ]]</para>
         </td>
       </tr>
       <tr>
@@ -306,7 +308,7 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_9">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
   </story>

From 91734ec8e1e27ff732d8b8758eba723aa4a0899d Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 13 Oct 2010 08:51:40 +0200
Subject: [PATCH 239/244] [FIX] hr_timesheet_sheet: fixed a typo in security
 file

bzr revid: olt@tinyerp.com-20101013065140-zsuohiimhawbs3o7
---
 addons/hr_timesheet_sheet/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index c11a3ce7099..54d303d116a 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -4,6 +4,6 @@
 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
-"access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_hr_user",1,1,1,1
+"access_timesheet_report_employee","timesheet.report.employee","model_hr_timesheet_report","base.group_hr_user",1,1,1,1
 "access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
 "access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0

From 67b54aefe15037c51d7dd7ce375d8f7a7226ca51 Mon Sep 17 00:00:00 2001
From: ssi <ssi@tinyerp.com>
Date: Wed, 13 Oct 2010 12:48:58 +0530
Subject: [PATCH 240/244] [IMP] account_voucher: modified condition of pay btn
 in Sales Reciept

bzr revid: ssi@tinyerp.com-20101013071858-deza7wlc9ii7ofz3
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 7bc64a825ae..ad44b842587 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -148,12 +148,14 @@
                             <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                        <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
+                        <group  colspan="2" attrs="{'invisible':[('pay_now','!=','pay_now')]}">
+			    <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('state','!=','posted')]}"/>
+			</group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </form>

From 0c1559160c9026469eb0c2a27811943d803b1f27 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 13 Oct 2010 09:56:18 +0200
Subject: [PATCH 241/244] [FIX] procurement: fixed workflow (error in 'confirm'
 after using 'delivery cost' wizard)

bzr revid: olt@tinyerp.com-20101013075618-qrh4jl0pch48aa94
---
 addons/procurement/procurement_workflow.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index b4bcd1e1f04..23b0a08af78 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -188,14 +188,14 @@
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_done"/>
             <field name="condition">action_check_finished()</field>
-			<field name="trigger_model">stock.move</field>
-            <field name="trigger_expr_id">[move_id.id]</field>            
+            <field name="trigger_model">stock.move</field>
+            <field name="trigger_expr_id">move_id and [move_id.id] or []</field>
         </record>
         <record id="trans_make_done_confirm" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="condition">check_move_cancel()</field>
         </record>
-    
+
     </data>
 </openerp>

From 1743200e489362a6c4776ac1ac9d7f239b1ddd63 Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Wed, 13 Oct 2010 15:03:12 +0530
Subject: [PATCH 242/244] [IMP]:lunch:Improved report

bzr revid: vro@tinyerp.com-20101013093312-ifw1pr3jeahsrlie
---
 addons/lunch/report/order.rml | 41 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index 81e1f8bcb78..62003478c4c 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -92,7 +92,7 @@
     <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
     <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
     <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -111,33 +111,33 @@
     <images/>
   </stylesheet>
   <story>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
+    <para style="P15">[[repeatIn(objects,'o')]]</para>
     <section>
-      <para style="P14">[[repeatIn(objects,'o')]]</para>
+      <para style="P15">
+        <font color="white"> </font>
+      </para>
       <blockTable colWidths="262.0,6.0,260.0" style="Table5">
         <tr>
           <td>
-            <para style="P9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P15">[[ o.user_id.address_id.title.name or '' ]] [[ o.user_id.address_id.name ]]</para>
-            <para style="P15">[[ o.user_id.address_id.street ]]</para>
-            <para style="P15">[[ o.user_id.address_id.street2 or removeParentNode('para') ]]</para>
-            <para style="P15">[[ o.user_id.address_id.zip or '' ]] [[ o.user_id.address_id.city or '' ]]</para>
-            <para style="P15">[[ (o.user_id.address_id.state_id and o.user_id.address_id.state_id.name) or removeParentNode('para')]] [[ (o.user_id.address_id.country_id and o.user_id.address_id.country_id.name) or '' ]]</para>
             <para style="P15">
               <font color="white"> </font>
             </para>
           </td>
+          <td>
+            <para style="P9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="P14">[[ o.user_id.address_id.partner_id.title.name or '' ]] [[ o.user_id.address_id.partner_id.name ]]</para>
+            <para style="P14">[[ o.user_id.address_id.street ]]</para>
+            <para style="P14">[[ o.user_id.address_id.street2 or removeParentNode('para') ]]</para>
+            <para style="P14">[[ o.user_id.address_id.zip or '' ]] [[ o.user_id.address_id.city or '' ]]</para>
+            <para style="P14">[[ (o.user_id.address_id.state_id and o.user_id.address_id.state_id.name) or removeParentNode('para')]] [[ (o.user_id.address_id.country_id and o.user_id.address_id.country_id.name) or '' ]]</para>
+            <para style="P14">
+              <font color="white"> </font>
+            </para>
+          </td>
         </tr>
       </blockTable>
       <para style="P1">
@@ -179,7 +179,6 @@
     <blockTable colWidths="132.0,153.0,142.0,101.0" style="Table1">
       <tr>
         <td>
-          <para style="P5">[[repeatIn(objects, 'o') ]]</para>
           <para style="P5">[[ o.user_id.name ]]</para>
         </td>
         <td>

From 54e6589b272a82a0b1d1c2963f27837ff52f3066 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 13 Oct 2010 11:33:37 +0200
Subject: [PATCH 243/244] [FIX] event: now check that Closing Date is after
 Beginning Date

bzr revid: olt@tinyerp.com-20101013093337-jkmo3zx828o13m77
---
 addons/event/event.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 5c510ede613..192844f3f20 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -211,7 +211,7 @@ class event_event(osv.osv):
         'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current',
             help="Total of Open and Done Registrations"),
         'register_prospect': fields.function(_get_register, method=True, string='Unconfirmed Registrations', multi='register_prospect',
-            help="Total of Prospect Registrations"),
+            help="Total of Prospect Registrati./event/event.py:41:ons"),
         'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
         'date_begin': fields.datetime('Beginning date', required=True, help="Beginning Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
         'date_end': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
@@ -262,8 +262,15 @@ class event_event(osv.osv):
 
         return True
 
+    def _check_closing_date(self, cr, uid, ids):
+        for event in self.browse(cr, uid, ids):
+            if event.date_end < event.date_begin:
+                return False
+        return True
+
     _constraints = [
-        (_check_recursion, 'Error ! You cannot create recursive event.', ['parent_id'])
+        (_check_recursion, 'Error ! You cannot create recursive event.', ['parent_id']),
+        (_check_closing_date, 'Error ! Closing Date cannot be set before Beginning Date.', ['date_end']),
     ]
 
     def do_team_change(self, cr, uid, ids, team_id, context=None):

From b3191afaf72ce6abd5f70d1dd439caf82c5db13c Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 13 Oct 2010 11:56:27 +0200
Subject: [PATCH 244/244] [FIX] hr_timesheet: removed duplicate 'journal_id'
 field in view

bzr revid: olt@tinyerp.com-20101013095627-qn52st18zx8xtylr
---
 addons/hr_timesheet/hr_timesheet_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 664587b75a3..08ec23bd872 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -22,7 +22,6 @@
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" invisible="1"/>
                     <field name="amount" sum="Total cost" invisible="1"/>
                     <field name="general_account_id" invisible="1"/>
-                    <field name="journal_id" invisible="1"/>
                 </tree>
             </field>
         </record>