From fefd25861a820d489feeb85f665c79d88b017c24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Fri, 24 Feb 2012 11:52:15 +0100
Subject: [PATCH 001/452] [IMP] new module google_docs

bzr revid: rlo@openerp.com-20120224105215-clev3ip7n8zhb3kt
---
 addons/google_docs/__init__.py    |   1 +
 addons/google_docs/__openerp__.py |   6 ++
 addons/google_docs/google_docs.py | 119 ++++++++++++++++++++++++++++++
 3 files changed, 126 insertions(+)
 create mode 100644 addons/google_docs/__init__.py
 create mode 100644 addons/google_docs/__openerp__.py
 create mode 100644 addons/google_docs/google_docs.py

diff --git a/addons/google_docs/__init__.py b/addons/google_docs/__init__.py
new file mode 100644
index 00000000000..dd6285502c0
--- /dev/null
+++ b/addons/google_docs/__init__.py
@@ -0,0 +1 @@
+import google_docs
diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
new file mode 100644
index 00000000000..991a3e07e2c
--- /dev/null
+++ b/addons/google_docs/__openerp__.py
@@ -0,0 +1,6 @@
+{
+    'name': 'Wiki',
+    'version': '0.1',
+    'depends': ['google_base_account'],
+    'description': 'Module to attach a google document to any model.'
+}
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
new file mode 100644
index 00000000000..a2693ac95a7
--- /dev/null
+++ b/addons/google_docs/google_docs.py
@@ -0,0 +1,119 @@
+from osv import osv, fields
+import gdata.docs.data
+import gdata.docs.client
+from gdata.client import RequestError
+
+class google_docs(osv.osv):
+    _name = 'google.docs'
+
+    _table = 'google_docs_templates'
+    _columns = {
+        'id': fields.integer('ID', readonly=True),
+        'model': fields.many2one('ir.model', 'Model'),
+        'gdocs_res_id': fields.char('Google resource ID', size=64, translate=False)
+    }
+
+    edit_url_template = 'https://docs.google.com/Edit?docid=%s'
+    prefix_gdoc_id_res = 'document:'
+
+    def copy_gdoc(self, cr, uid, model, context=None):
+        '''Associate a copy of the gdoc identified by 'gdocs_res_id' to the current entity.
+           @param cr: the current row from the database cursor.
+           @param uid: the current user ID, for security checks.
+           @param model: the current model name.
+           @param context: a standard dictionary for contextual values.
+           @return the url of the copy itself.
+           @return -1 if the template hasn't been assigned yet.
+           @return -2 if the google_base_account hasn't been configured yet.'''
+
+        if context==None:
+            context={}
+
+        # check template for the current model
+        model_obj = self.pool.get(model)
+        res_gdocs_obj = self.pool.get('google.docs')
+        domain = [('model' , '=', model_obj)]
+        gdoc = res_gdocs_obj.search(cr,uid,domain,context=context)
+        if not gdoc: 
+            return -1
+
+        # check google_base_account
+        users_obj = self.pool.get('res.users')
+        user = users_obj.browse(cr, uid, [uid])[0]
+        if not user.gmail_user or not user.gmail_password: 
+            return -2
+
+        # copy the document
+        client = gdata.docs.client.DocsClient(source='openerp.com')
+        client.ssl = True
+        client.http_client.debug = False
+        client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely')
+        resource = client.get_resource_by_id(gdoc.gdocs_res_id)
+        copied_resource = client.copy_resource(entry=resource, title=resource.title.text + ' (generated from OpenERP)')
+
+        return self.edit_url_template % (copied_resource.resource_id.text,)
+
+    def get_documents_list(self, cr, uid, context=None):
+        '''Return the list of google documents available at the user's account.
+           @param cr: the current row from the database cursor.
+           @param uid: the current user ID, for security checks.
+           @param context: a standard dictionary for contextual values.
+           @return a list with information about the documents in form of tuples (document_name, document_resource_id).
+           @return -2 if the google_base_account hasn't been configured yet.'''
+
+        if context == None:
+            context = {}
+
+        # check google_base_account
+        users_obj = self.pool.get('res.users')
+        user = users_obj.browse(cr, uid, [uid])[0]
+        if not user.gmail_user or not user.gmail_password: 
+            return -2
+
+        # get the documents list
+        client = gdata.docs.client.DocsClient(source='openerp.com')
+        client.ssl = True
+        client.http_client.debug = False
+        client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely')
+
+        return map(lambda doc: (doc.title.text, doc.resource_id.text[len(prefix_gdoc_id_res):]), filter(lambda r: r.resource_id.text.startswith('document:'), client.get_all_resources()))
+
+
+    def set_model_document_template(self, cr, uid, model, resource_id, context=None):
+        '''Set the default document template for the specified model. This template doesn't have to be a google documents template itself, but just a document.
+           @param cr: current row for the database cursor.
+           @param uid: the current user ID, for security checks.
+           @param model: the current model name.
+           @param resource_id: resource_id associated to the chosen document.
+           @param context: a standard dictionary for contextual values.
+           @return 0 on successful execution.
+           @return -2 if the google_base_account hasn't been configured yet.
+           @retrurn -3 if the given resource_id doesn't exist in the user's google docs account.
+        '''
+
+        if context == None:
+            context = {}
+
+        # check google_base_account
+        users_obj = self.pool.get('res.users')
+        user = users_obj.browse(cr, uid, [uid])[0]
+        if not user.gmail_user or not user.gmail_password:
+            return -2
+
+        # check resource_id
+        client = gdata.docs.client.DocsClient(source='openerp.com')
+        client.ssl = True
+        client.http_client.debug = False
+        client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely')
+        try:
+            client.get_resource_by_id(resource_id)
+        except RequestError:
+            return -3
+
+        # set the model document template
+        model_template_id = self.create(cr, uid,
+            { 'model': self.pool.get(model),
+              'gdocs_res_id': resource_id
+            })
+
+        return 0

From e4a58bf7c57a8c00a8c7451372bed96704f522d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Fri, 24 Feb 2012 12:03:09 +0100
Subject: [PATCH 002/452] [FIX]

bzr revid: rlo@openerp.com-20120224110309-0hdmfu8vo918906q
---
 addons/google_docs/google_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index a2693ac95a7..957fcbf0871 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -88,7 +88,7 @@ class google_docs(osv.osv):
            @param context: a standard dictionary for contextual values.
            @return 0 on successful execution.
            @return -2 if the google_base_account hasn't been configured yet.
-           @retrurn -3 if the given resource_id doesn't exist in the user's google docs account.
+           @return -3 if the given resource_id doesn't exist in the user's google docs account.
         '''
 
         if context == None:

From 9d28250005d879408ebbd73a05c8be40ee1a8105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Fri, 24 Feb 2012 14:30:15 +0100
Subject: [PATCH 003/452] [imp]

bzr revid: rlo@openerp.com-20120224133015-2vt3gnkknnh2vrjd
---
 addons/google_docs/google_docs.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 957fcbf0871..46db3eb4448 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -2,6 +2,7 @@ from osv import osv, fields
 import gdata.docs.data
 import gdata.docs.client
 from gdata.client import RequestError
+from gdata.docs.service import DOCUMENT_LABEL
 
 class google_docs(osv.osv):
     _name = 'google.docs'
@@ -13,14 +14,16 @@ class google_docs(osv.osv):
         'gdocs_res_id': fields.char('Google resource ID', size=64, translate=False)
     }
 
+    name_template = 'Sales order %s %s'
     edit_url_template = 'https://docs.google.com/Edit?docid=%s'
-    prefix_gdoc_id_res = 'document:'
+    prefix_gdoc_id_res = DOCUMENT_LABEL + ':'
 
-    def copy_gdoc(self, cr, uid, model, context=None):
+    def copy_gdoc(self, cr, uid, model, folder=None, context=None):
         '''Associate a copy of the gdoc identified by 'gdocs_res_id' to the current entity.
            @param cr: the current row from the database cursor.
            @param uid: the current user ID, for security checks.
            @param model: the current model name.
+           @param folder: folder in which to store the copy.
            @param context: a standard dictionary for contextual values.
            @return the url of the copy itself.
            @return -1 if the template hasn't been assigned yet.
@@ -49,7 +52,7 @@ class google_docs(osv.osv):
         client.http_client.debug = False
         client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely')
         resource = client.get_resource_by_id(gdoc.gdocs_res_id)
-        copied_resource = client.copy_resource(entry=resource, title=resource.title.text + ' (generated from OpenERP)')
+        copied_resource = client.copy_resource(entry=resource, title= self.name_template % (, model))
 
         return self.edit_url_template % (copied_resource.resource_id.text,)
 
@@ -117,3 +120,10 @@ class google_docs(osv.osv):
             })
 
         return 0
+
+
+class google_docs_folder(osv.osv):
+    _name = 'google.docs.folder'
+    _columns = {
+        'res_id': fields.char('GDocs resource id', size=64, translate=False),
+    }

From 9eaa5de2aca09c44976d5472dbb66565038be494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Fri, 24 Feb 2012 14:52:28 +0100
Subject: [PATCH 004/452] [fix]

bzr revid: rlo@openerp.com-20120224135228-rurois3a83l50lu1
---
 addons/google_docs/google_docs.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 46db3eb4448..538511b51c2 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -12,9 +12,9 @@ class google_docs(osv.osv):
         'id': fields.integer('ID', readonly=True),
         'model': fields.many2one('ir.model', 'Model'),
         'gdocs_res_id': fields.char('Google resource ID', size=64, translate=False)
+        'name_template': fields.char('Google resource ID', size=64, translate=False)
     }
 
-    name_template = 'Sales order %s %s'
     edit_url_template = 'https://docs.google.com/Edit?docid=%s'
     prefix_gdoc_id_res = DOCUMENT_LABEL + ':'
 
@@ -32,6 +32,15 @@ class google_docs(osv.osv):
         if context==None:
             context={}
 
+      template_vars = {
+            'db' : cr.dbname,
+            'model' : model,
+            'id' : id,
+            'salt' : salt,
+            'name' : '',
+        }
+            name_template = 'Sales order %s %s'
+
         # check template for the current model
         model_obj = self.pool.get(model)
         res_gdocs_obj = self.pool.get('google.docs')

From 2df3400a35696a0a95925edd1592c2467e9802a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Fri, 24 Feb 2012 14:53:15 +0100
Subject: [PATCH 005/452] [fix]

bzr revid: rlo@openerp.com-20120224135315-31phn9wvp1meth03
---
 addons/google_docs/google_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 538511b51c2..d4f48edb91a 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -12,7 +12,7 @@ class google_docs(osv.osv):
         'id': fields.integer('ID', readonly=True),
         'model': fields.many2one('ir.model', 'Model'),
         'gdocs_res_id': fields.char('Google resource ID', size=64, translate=False)
-        'name_template': fields.char('Google resource ID', size=64, translate=False)
+        'name_template': fields.char('GDoc name template', size=64, translate=False)
     }
 
     edit_url_template = 'https://docs.google.com/Edit?docid=%s'

From 33c3e277b6b496f8aa1c5a22c244390e29a6fba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Fri, 24 Feb 2012 14:54:58 +0100
Subject: [PATCH 006/452] [fix]

bzr revid: rlo@openerp.com-20120224135458-2bz5k9fyyjymylye
---
 addons/google_docs/google_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index d4f48edb91a..0ad64124d04 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -88,7 +88,7 @@ class google_docs(osv.osv):
         client.http_client.debug = False
         client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely')
 
-        return map(lambda doc: (doc.title.text, doc.resource_id.text[len(prefix_gdoc_id_res):]), filter(lambda r: r.resource_id.text.startswith('document:'), client.get_all_resources()))
+        return map(lambda doc: (doc.title.text, doc.resource_id.text[len(prefix_gdoc_id_res):]), filter(lambda r: r.resource_id.text.startswith(prefix_gdoc_id_res), client.get_all_resources()))
 
 
     def set_model_document_template(self, cr, uid, model, resource_id, context=None):

From d680f6c1a16d8f1415b78c8de674c32b6949aba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Fri, 24 Feb 2012 15:01:19 +0100
Subject: [PATCH 007/452] [fix]

bzr revid: rlo@openerp.com-20120224140119-hoapkm5d13uietx1
---
 addons/google_docs/google_docs.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 0ad64124d04..718952fba34 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -27,19 +27,20 @@ class google_docs(osv.osv):
            @param context: a standard dictionary for contextual values.
            @return the url of the copy itself.
            @return -1 if the template hasn't been assigned yet.
-           @return -2 if the google_base_account hasn't been configured yet.'''
+           @return -2 if the google_base_account hasn't been configured yet.
+        '''
 
         if context==None:
             context={}
 
-      template_vars = {
+        template_vars = {
             'db' : cr.dbname,
             'model' : model,
             'id' : id,
             'salt' : salt,
             'name' : '',
         }
-            name_template = 'Sales order %s %s'
+        name_template = 'Sales order %s %s'
 
         # check template for the current model
         model_obj = self.pool.get(model)
@@ -71,7 +72,8 @@ class google_docs(osv.osv):
            @param uid: the current user ID, for security checks.
            @param context: a standard dictionary for contextual values.
            @return a list with information about the documents in form of tuples (document_name, document_resource_id).
-           @return -2 if the google_base_account hasn't been configured yet.'''
+           @return -2 if the google_base_account hasn't been configured yet.
+        '''
 
         if context == None:
             context = {}

From 38291a99acc380b8f5e4f17736f06dfe28815267 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 24 Feb 2012 15:39:23 +0100
Subject: [PATCH 008/452] commit

bzr revid: al@openerp.com-20120224143923-pm9home907bxztqt
---
 addons/google_docs/google_docs.py | 56 +++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 718952fba34..8a48de0b05c 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -4,6 +4,62 @@ import gdata.docs.client
 from gdata.client import RequestError
 from gdata.docs.service import DOCUMENT_LABEL
 
+#    _columns = {
+#        'id': fields.integer('ID', readonly=True),
+#        'model': fields.many2one('ir.model', 'Model'),
+#        'multiple': fields.boolean('Multiple'),
+#        'gdocs_res_id': fields.char('Google resource ID', size=64, translate=False)
+#
+#    }
+#
+##    edit_url_template = 'https://docs.google.com/Edit?docid=%s'
+##    prefix_gdoc_id_res = 'document:'
+#
+#    def google_docs_get(self, cr, uid, model, id):
+#        attachment = self.search(cr, uid, [('res_model', '=', model), ('res_id', '=', id), ('type', '=', 'url'), ('url', 'like', 'https://docs.oogle.com')])
+#        if attachment:
+#            return self.read(cr, uid, attachment)[0]['url']
+#        else:
+#            url = self.pad_generate_url(cr, uid, model, id)
+#            self.create(cr, uid, {
+#                'res_model' : model,
+#                'res_id' : id,
+#                'type' : 'url',
+#                'name' : 'Pad',
+#                'url' : url,
+#            })
+#            return url
+#
+#    def generate_name(self, cr, uid, model, id):
+#        template_vars = {
+#            'db' : cr.dbname,
+#            'model' : model,
+#            'id' : id,
+#            'salt' : salt,
+#            'name' : self.pool.get(model).name_get(cr,uid,[id])[0],
+#        }
+#        return pad_url_template % template_vars
+#        
+#
+#    def button_add_google_docs_google_docs_add_doc(self, cr, uid, model, id):
+#        #pad_url_template = self.pool.get('res.users').browse(cr,uid,[uid])[0].company_id.pad_url_template
+#        #s = string.ascii_uppercase + string.digits
+#        #salt = ''.join([s[random.randint(0, len(s) - 1)] for i in range(8)])
+#
+#        # i lookup in the table google_docs.templates to check the policy
+#
+#        # if multiple: 1
+#
+#            # if i find a template i will duplicate the template
+#
+#            # else empty 'word' text
+#
+#        # else
+#            # if no document exists do like 1 -^
+#            # else 
+#                # jumpt to the existing document
+#
+
 class google_docs(osv.osv):
     _name = 'google.docs'
 

From 8876e8c045fdee003b13cf1befa5e9daa4b2ebae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Fri, 24 Feb 2012 16:02:34 +0100
Subject: [PATCH 009/452] [imp] button

bzr revid: rlo@openerp.com-20120224150234-l1do7nj8576lfwcd
---
 addons/google_docs/res_company.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 addons/google_docs/res_company.xml

diff --git a/addons/google_docs/res_company.xml b/addons/google_docs/res_company.xml
new file mode 100644
index 00000000000..0324039c8f2
--- /dev/null
+++ b/addons/google_docs/res_company.xml
@@ -0,0 +1,16 @@
+<openerp>
+  <data>
+    <record id="view_company_form_with_gdocs" model="ir.ui.view">
+      <field name="name">res.company.form.gdocs</field>
+      <field name="model">res.company</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.view_company_form"/>
+      <field name="arch" type="xml">
+        <xpath expr="//page[@string='Configuration']" position="inside">
+          <separator string="Pad" colspan="4"/>
+          <field name="gdocs_url_template"/>
+        </xpath>
+      </field>
+    </record>
+  </data>
+</openerp>

From fd914eb2e3e09fec08733989e5c8456d4516194a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Fri, 24 Feb 2012 16:29:20 +0100
Subject: [PATCH 010/452] [fix]

bzr revid: rlo@openerp.com-20120224152920-vdi47f2k49kke2e0
---
 addons/google_docs/google_docs.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 8a48de0b05c..90edb15b104 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -67,7 +67,7 @@ class google_docs(osv.osv):
     _columns = {
         'id': fields.integer('ID', readonly=True),
         'model': fields.many2one('ir.model', 'Model'),
-        'gdocs_res_id': fields.char('Google resource ID', size=64, translate=False)
+        'gdocs_res_id': fields.char('Google resource ID', size=64, translate=False),
         'name_template': fields.char('GDoc name template', size=64, translate=False)
     }
 
@@ -96,7 +96,7 @@ class google_docs(osv.osv):
             'salt' : salt,
             'name' : '',
         }
-        name_template = 'Sales order %s %s'
+        name_template = 'Sales order %s'
 
         # check template for the current model
         model_obj = self.pool.get(model)
@@ -118,7 +118,7 @@ class google_docs(osv.osv):
         client.http_client.debug = False
         client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely')
         resource = client.get_resource_by_id(gdoc.gdocs_res_id)
-        copied_resource = client.copy_resource(entry=resource, title= self.name_template % (, model))
+        copied_resource = client.copy_resource(entry=resource, title= self.name_template % (model, ))
 
         return self.edit_url_template % (copied_resource.resource_id.text,)
 

From ebfb0be2e156b49a14790300ce746dba78a159d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Mon, 27 Feb 2012 10:02:24 +0100
Subject: [PATCH 011/452] [IMP] copy from pad

bzr revid: rlo@openerp.com-20120227090224-zujpg9zhf2nd5ioe
---
 addons/google_docs/__openerp__.py             | 12 ++++++++
 .../{res_company.xml => res_gdocs.xml}        |  2 +-
 addons/google_docs/static/src/js/gdocs.js     | 29 +++++++++++++++++++
 addons/google_docs/static/src/xml/gdocs.xml   | 13 +++++++++
 4 files changed, 55 insertions(+), 1 deletion(-)
 rename addons/google_docs/{res_company.xml => res_gdocs.xml} (91%)
 create mode 100644 addons/google_docs/static/src/js/gdocs.js
 create mode 100644 addons/google_docs/static/src/xml/gdocs.xml

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 991a3e07e2c..2461be1e151 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -1,6 +1,18 @@
 {
     'name': 'Wiki',
     'version': '0.1',
+    'author': 'OpenERP SA',
+    'website': 'http://openerp.com',
+    'data': [
+        'res_gdocs.xml'
+    ],
+    'installable': True,
+    'auto_install': False,
+    'web': True,
+    'js': ['static/src/js/gdocs.js'],
+    'qweb' : [
+        "static/src/xml/*.xml",
+    ],
     'depends': ['google_base_account'],
     'description': 'Module to attach a google document to any model.'
 }
diff --git a/addons/google_docs/res_company.xml b/addons/google_docs/res_gdocs.xml
similarity index 91%
rename from addons/google_docs/res_company.xml
rename to addons/google_docs/res_gdocs.xml
index 0324039c8f2..b1a54fdc63e 100644
--- a/addons/google_docs/res_company.xml
+++ b/addons/google_docs/res_gdocs.xml
@@ -2,7 +2,7 @@
   <data>
     <record id="view_company_form_with_gdocs" model="ir.ui.view">
       <field name="name">res.company.form.gdocs</field>
-      <field name="model">res.company</field>
+      <field name="model">google.docs</field>
       <field name="type">form</field>
       <field name="inherit_id" ref="base.view_company_form"/>
       <field name="arch" type="xml">
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
new file mode 100644
index 00000000000..e605577d45a
--- /dev/null
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -0,0 +1,29 @@
+openerp.gdocs = function(instance) {
+
+instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({
+    on_attachments_loaded: function(attachments) {
+        this._super(attachments);
+        var self = this;
+        var $padbtn = self.$element.find('button.gdocs');
+        var is_pad = function(a) {
+            return a.type == 'url' && a.name == 'GDocs';
+        };
+        if (_.any(attachments, is_pad)) {
+            $padbtn.hide();
+        } else {
+            $padbtn.show().click(self.on_add_pad);
+        }
+    },
+    on_add_pad: function() {
+        var self = this;
+        var $padbtn = this.$element.find('button.gdocs');
+        $padbtn.attr('disabled', 'true').find('img, span').toggle();
+        this.view.dataset.call_button('pad_get', [[this.view.datarecord.id], this.view.dataset.get_context()], function(r) {
+            $padbtn.hide();
+            self.do_update();
+            self.do_action(r.result);
+        });
+    }
+});
+
+};
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
new file mode 100644
index 00000000000..52decbfdbc1
--- /dev/null
+++ b/addons/google_docs/static/src/xml/gdocs.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+    <t t-extend="FormView.sidebar.attachments">
+        <t t-jquery="div.oe-binary-file-set" t-operation="append">
+                <button class="button gdoc" type="button">
+                    <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
+                    <span>Add GDoc</span>
+                </button>
+        </t>
+    </t>
+</templates>

From eaf646c9e226c6bb729f5fdbdfdb291bf902631a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Mon, 27 Feb 2012 10:19:29 +0100
Subject: [PATCH 012/452] [imp] view

bzr revid: rlo@openerp.com-20120227091929-pvcmtg5kes25pxid
---
 addons/google_docs/res_gdocs.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_docs/res_gdocs.xml b/addons/google_docs/res_gdocs.xml
index b1a54fdc63e..660252de986 100644
--- a/addons/google_docs/res_gdocs.xml
+++ b/addons/google_docs/res_gdocs.xml
@@ -7,7 +7,7 @@
       <field name="inherit_id" ref="base.view_company_form"/>
       <field name="arch" type="xml">
         <xpath expr="//page[@string='Configuration']" position="inside">
-          <separator string="Pad" colspan="4"/>
+          <separator string="GDoc" colspan="4"/>
           <field name="gdocs_url_template"/>
         </xpath>
       </field>

From cea3437f596f73558e23f1e67d61029daccf8d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Mon, 27 Feb 2012 11:56:36 +0100
Subject: [PATCH 013/452] [imp] view

bzr revid: rlo@openerp.com-20120227105636-czaw0ghb4jl6if1j
---
 addons/google_docs/{res_gdocs.xml => google_docs.xml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename addons/google_docs/{res_gdocs.xml => google_docs.xml} (91%)

diff --git a/addons/google_docs/res_gdocs.xml b/addons/google_docs/google_docs.xml
similarity index 91%
rename from addons/google_docs/res_gdocs.xml
rename to addons/google_docs/google_docs.xml
index 660252de986..d0e842b566e 100644
--- a/addons/google_docs/res_gdocs.xml
+++ b/addons/google_docs/google_docs.xml
@@ -8,7 +8,7 @@
       <field name="arch" type="xml">
         <xpath expr="//page[@string='Configuration']" position="inside">
           <separator string="GDoc" colspan="4"/>
-          <field name="gdocs_url_template"/>
+          <field name="gdocs_url"/>
         </xpath>
       </field>
     </record>

From 37ed7a1d9f1819fd39cbf0eb0679ae17e1afd91a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Mon, 27 Feb 2012 13:38:34 +0100
Subject: [PATCH 014/452] [imp] view

bzr revid: rlo@openerp.com-20120227123834-todar214ngca7pu0
---
 addons/google_docs/google_docs.py           |  3 +--
 addons/google_docs/static/src/js/gdocs.js   | 20 ++++++++++----------
 addons/google_docs/static/src/xml/gdocs.xml |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 90edb15b104..def1f3097e1 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -74,12 +74,11 @@ class google_docs(osv.osv):
     edit_url_template = 'https://docs.google.com/Edit?docid=%s'
     prefix_gdoc_id_res = DOCUMENT_LABEL + ':'
 
-    def copy_gdoc(self, cr, uid, model, folder=None, context=None):
+    def copy_gdoc(self, cr, uid, model, context=None):
         '''Associate a copy of the gdoc identified by 'gdocs_res_id' to the current entity.
            @param cr: the current row from the database cursor.
            @param uid: the current user ID, for security checks.
            @param model: the current model name.
-           @param folder: folder in which to store the copy.
            @param context: a standard dictionary for contextual values.
            @return the url of the copy itself.
            @return -1 if the template hasn't been assigned yet.
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index e605577d45a..30edffaad7f 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -4,22 +4,22 @@ instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.exte
     on_attachments_loaded: function(attachments) {
         this._super(attachments);
         var self = this;
-        var $padbtn = self.$element.find('button.gdocs');
-        var is_pad = function(a) {
+        var $gdocbtn = self.$element.find('button.gdocs');
+        var is_gdoc = function(a) {
             return a.type == 'url' && a.name == 'GDocs';
         };
-        if (_.any(attachments, is_pad)) {
-            $padbtn.hide();
+        if (_.any(attachments, is_gdoc)) {
+            $gdocbtn.hide();
         } else {
-            $padbtn.show().click(self.on_add_pad);
+            $gdocbtn.show().click(self.on_add_gdoc);
         }
     },
-    on_add_pad: function() {
+    on_add_gdoc: function() {
         var self = this;
-        var $padbtn = this.$element.find('button.gdocs');
-        $padbtn.attr('disabled', 'true').find('img, span').toggle();
-        this.view.dataset.call_button('pad_get', [[this.view.datarecord.id], this.view.dataset.get_context()], function(r) {
-            $padbtn.hide();
+        var $gdocbtn = this.$element.find('button.gdocs');alert($gdocbtn);
+        $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
+        this.view.dataset.call_button('copy_gdoc', [[this.view.datarecord.id], this.view.dataset.get_context()], function(r) {
+            $gdocbtn.hide();
             self.do_update();
             self.do_action(r.result);
         });
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
index 52decbfdbc1..bc7a56842ba 100644
--- a/addons/google_docs/static/src/xml/gdocs.xml
+++ b/addons/google_docs/static/src/xml/gdocs.xml
@@ -4,7 +4,7 @@
 <templates id="template" xml:space="preserve">
     <t t-extend="FormView.sidebar.attachments">
         <t t-jquery="div.oe-binary-file-set" t-operation="append">
-                <button class="button gdoc" type="button">
+                <button class="oe_button" type="button">
                     <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
                     <span>Add GDoc</span>
                 </button>

From 95d9cb9f4ec264b0ee35fdc5bef9058d9cfdbe0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Mon, 27 Feb 2012 14:54:25 +0100
Subject: [PATCH 015/452] [imp] view

bzr revid: rlo@openerp.com-20120227135425-879tmcgw20dfy2a1
---
 addons/google_docs/__openerp__.py           |  6 ++--
 addons/google_docs/google_docs.py           | 31 +++++++++++++++++----
 addons/google_docs/static/src/js/gdocs.js   |  1 +
 addons/google_docs/static/src/xml/gdocs.xml |  2 +-
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 2461be1e151..309ca13edc0 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -1,17 +1,17 @@
 {
-    'name': 'Wiki',
+    'name': 'Google Docs',
     'version': '0.1',
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'data': [
-        'res_gdocs.xml'
+        'google_docs.xml'
     ],
     'installable': True,
     'auto_install': False,
     'web': True,
     'js': ['static/src/js/gdocs.js'],
     'qweb' : [
-        "static/src/xml/*.xml",
+        "static/src/xml/gdocs.xml",
     ],
     'depends': ['google_base_account'],
     'description': 'Module to attach a google document to any model.'
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index def1f3097e1..59101ba5b09 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -70,7 +70,15 @@ class google_docs(osv.osv):
         'gdocs_res_id': fields.char('Google resource ID', size=64, translate=False),
         'name_template': fields.char('GDoc name template', size=64, translate=False)
     }
+    print '''
 
+#########################################
+
+GOOGLE DOCS
+
+#########################################
+
+'''
     edit_url_template = 'https://docs.google.com/Edit?docid=%s'
     prefix_gdoc_id_res = DOCUMENT_LABEL + ':'
 
@@ -84,6 +92,15 @@ class google_docs(osv.osv):
            @return -1 if the template hasn't been assigned yet.
            @return -2 if the google_base_account hasn't been configured yet.
         '''
+        print '''
+
+#########################################
+
+google_docs.copy_gdoc()
+
+#########################################
+
+'''
 
         if context==None:
             context={}
@@ -121,14 +138,15 @@ class google_docs(osv.osv):
 
         return self.edit_url_template % (copied_resource.resource_id.text,)
 
+'''
     def get_documents_list(self, cr, uid, context=None):
-        '''Return the list of google documents available at the user's account.
+        ' ''Return the list of google documents available at the user's account.
            @param cr: the current row from the database cursor.
            @param uid: the current user ID, for security checks.
            @param context: a standard dictionary for contextual values.
            @return a list with information about the documents in form of tuples (document_name, document_resource_id).
            @return -2 if the google_base_account hasn't been configured yet.
-        '''
+        '' '
 
         if context == None:
             context = {}
@@ -146,10 +164,11 @@ class google_docs(osv.osv):
         client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely')
 
         return map(lambda doc: (doc.title.text, doc.resource_id.text[len(prefix_gdoc_id_res):]), filter(lambda r: r.resource_id.text.startswith(prefix_gdoc_id_res), client.get_all_resources()))
+'''
 
-
+'''
     def set_model_document_template(self, cr, uid, model, resource_id, context=None):
-        '''Set the default document template for the specified model. This template doesn't have to be a google documents template itself, but just a document.
+        '' 'Set the default document template for the specified model. This template doesn't have to be a google documents template itself, but just a document.
            @param cr: current row for the database cursor.
            @param uid: the current user ID, for security checks.
            @param model: the current model name.
@@ -158,7 +177,7 @@ class google_docs(osv.osv):
            @return 0 on successful execution.
            @return -2 if the google_base_account hasn't been configured yet.
            @return -3 if the given resource_id doesn't exist in the user's google docs account.
-        '''
+        ' ''
 
         if context == None:
             context = {}
@@ -186,7 +205,7 @@ class google_docs(osv.osv):
             })
 
         return 0
-
+'''
 
 class google_docs_folder(osv.osv):
     _name = 'google.docs.folder'
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 30edffaad7f..579414ee74a 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -2,6 +2,7 @@ openerp.gdocs = function(instance) {
 
 instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({
     on_attachments_loaded: function(attachments) {
+        alert('gdocs.js.on_attachments_loaded()');
         this._super(attachments);
         var self = this;
         var $gdocbtn = self.$element.find('button.gdocs');
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
index bc7a56842ba..9f78a91c28f 100644
--- a/addons/google_docs/static/src/xml/gdocs.xml
+++ b/addons/google_docs/static/src/xml/gdocs.xml
@@ -4,7 +4,7 @@
 <templates id="template" xml:space="preserve">
     <t t-extend="FormView.sidebar.attachments">
         <t t-jquery="div.oe-binary-file-set" t-operation="append">
-                <button class="oe_button" type="button">
+                <button class="oe-button" type="button">
                     <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
                     <span>Add GDoc</span>
                 </button>

From 087c191730d611058b0303cf38d10989d868a7f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Mon, 27 Feb 2012 14:57:51 +0100
Subject: [PATCH 016/452] [imp] view

bzr revid: rlo@openerp.com-20120227135751-33nd5qduv2jp58cu
---
 addons/google_docs/google_docs.py | 56 -------------------------------
 1 file changed, 56 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 59101ba5b09..2f2c4919271 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -4,62 +4,6 @@ import gdata.docs.client
 from gdata.client import RequestError
 from gdata.docs.service import DOCUMENT_LABEL
 
-#    _columns = {
-#        'id': fields.integer('ID', readonly=True),
-#        'model': fields.many2one('ir.model', 'Model'),
-#        'multiple': fields.boolean('Multiple'),
-#        'gdocs_res_id': fields.char('Google resource ID', size=64, translate=False)
-#
-#    }
-#
-##    edit_url_template = 'https://docs.google.com/Edit?docid=%s'
-##    prefix_gdoc_id_res = 'document:'
-#
-#    def google_docs_get(self, cr, uid, model, id):
-#        attachment = self.search(cr, uid, [('res_model', '=', model), ('res_id', '=', id), ('type', '=', 'url'), ('url', 'like', 'https://docs.oogle.com')])
-#        if attachment:
-#            return self.read(cr, uid, attachment)[0]['url']
-#        else:
-#            url = self.pad_generate_url(cr, uid, model, id)
-#            self.create(cr, uid, {
-#                'res_model' : model,
-#                'res_id' : id,
-#                'type' : 'url',
-#                'name' : 'Pad',
-#                'url' : url,
-#            })
-#            return url
-#
-#    def generate_name(self, cr, uid, model, id):
-#        template_vars = {
-#            'db' : cr.dbname,
-#            'model' : model,
-#            'id' : id,
-#            'salt' : salt,
-#            'name' : self.pool.get(model).name_get(cr,uid,[id])[0],
-#        }
-#        return pad_url_template % template_vars
-#        
-#
-#    def button_add_google_docs_google_docs_add_doc(self, cr, uid, model, id):
-#        #pad_url_template = self.pool.get('res.users').browse(cr,uid,[uid])[0].company_id.pad_url_template
-#        #s = string.ascii_uppercase + string.digits
-#        #salt = ''.join([s[random.randint(0, len(s) - 1)] for i in range(8)])
-#
-#        # i lookup in the table google_docs.templates to check the policy
-#
-#        # if multiple: 1
-#
-#            # if i find a template i will duplicate the template
-#
-#            # else empty 'word' text
-#
-#        # else
-#            # if no document exists do like 1 -^
-#            # else 
-#                # jumpt to the existing document
-#
-
 class google_docs(osv.osv):
     _name = 'google.docs'
 

From 3568bed68046537878e7386597abfb7978de3cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Mon, 27 Feb 2012 16:13:11 +0100
Subject: [PATCH 017/452] [imp] view

bzr revid: rlo@openerp.com-20120227151311-38go1bn2ihs1n5jq
---
 addons/google_docs/static/src/js/gdocs.js   | 10 ++++++++--
 addons/google_docs/static/src/xml/gdocs.xml |  9 ++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 579414ee74a..14996da46a5 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -2,7 +2,6 @@ openerp.gdocs = function(instance) {
 
 instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({
     on_attachments_loaded: function(attachments) {
-        alert('gdocs.js.on_attachments_loaded()');
         this._super(attachments);
         var self = this;
         var $gdocbtn = self.$element.find('button.gdocs');
@@ -17,7 +16,7 @@ instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.exte
     },
     on_add_gdoc: function() {
         var self = this;
-        var $gdocbtn = this.$element.find('button.gdocs');alert($gdocbtn);
+        var $gdocbtn = this.$element.find('button.gdocs');
         $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
         this.view.dataset.call_button('copy_gdoc', [[this.view.datarecord.id], this.view.dataset.get_context()], function(r) {
             $gdocbtn.hide();
@@ -28,3 +27,10 @@ instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.exte
 });
 
 };
+
+$(function() {
+    console.log($('#gd-button'));
+    $('#gd-button').click(function(){alert('click');});
+    alert('binded');
+}
+);
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
index 9f78a91c28f..61c169fe531 100644
--- a/addons/google_docs/static/src/xml/gdocs.xml
+++ b/addons/google_docs/static/src/xml/gdocs.xml
@@ -4,7 +4,14 @@
 <templates id="template" xml:space="preserve">
     <t t-extend="FormView.sidebar.attachments">
         <t t-jquery="div.oe-binary-file-set" t-operation="append">
-                <button class="oe-button" type="button">
+                <br/>
+                <br/>
+                <br/>
+                <br/>
+                <br/>
+                <br/>
+                <br/>
+                <button class="oe-button" type="button" id='gd-button'>
                     <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
                     <span>Add GDoc</span>
                 </button>

From f0a9682a6aa6814817cca4e31fe9561bed60d126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Mon, 27 Feb 2012 17:12:00 +0100
Subject: [PATCH 018/452] [imp] js things

bzr revid: rlo@openerp.com-20120227161200-toovqcewybgxsitg
---
 addons/google_docs/static/src/js/gdocs.js   | 28 ++++++---------------
 addons/google_docs/static/src/xml/gdocs.xml |  2 +-
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 14996da46a5..11690f70e2a 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -1,22 +1,16 @@
-openerp.gdocs = function(instance) {
+console.log('fegegegwnw')
+openerp.google_docs = function(instance) {
 
+console.log('nw')
 instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({
-    on_attachments_loaded: function(attachments) {
-        this._super(attachments);
-        var self = this;
-        var $gdocbtn = self.$element.find('button.gdocs');
-        var is_gdoc = function(a) {
-            return a.type == 'url' && a.name == 'GDocs';
-        };
-        if (_.any(attachments, is_gdoc)) {
-            $gdocbtn.hide();
-        } else {
-            $gdocbtn.show().click(self.on_add_gdoc);
-        }
+    init: function() {
+        this._super.apply(this, arguments);
+        this.$element.delegate('.oe_google_docs_button', 'click', self.on_add_gdoc);
     },
     on_add_gdoc: function() {
         var self = this;
-        var $gdocbtn = this.$element.find('button.gdocs');
+console.log('--------');
+        var $gdocbtn = this.$element.find('.oe_google_docs_button');
         $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
         this.view.dataset.call_button('copy_gdoc', [[this.view.datarecord.id], this.view.dataset.get_context()], function(r) {
             $gdocbtn.hide();
@@ -28,9 +22,3 @@ instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.exte
 
 };
 
-$(function() {
-    console.log($('#gd-button'));
-    $('#gd-button').click(function(){alert('click');});
-    alert('binded');
-}
-);
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
index 61c169fe531..7ee2297c545 100644
--- a/addons/google_docs/static/src/xml/gdocs.xml
+++ b/addons/google_docs/static/src/xml/gdocs.xml
@@ -11,7 +11,7 @@
                 <br/>
                 <br/>
                 <br/>
-                <button class="oe-button" type="button" id='gd-button'>
+                <button class="oe_google_docs_button" type="button">
                     <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
                     <span>Add GDoc</span>
                 </button>

From af04b6860cfe10259a63a44cd6b4a4f8234eed8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Mon, 27 Feb 2012 17:14:13 +0100
Subject: [PATCH 019/452] [imp] js things

bzr revid: rlo@openerp.com-20120227161413-ie6cn7rwoezhht6v
---
 addons/google_docs/static/src/js/gdocs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 11690f70e2a..6ef889e3fa0 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -5,7 +5,7 @@ console.log('nw')
 instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({
     init: function() {
         this._super.apply(this, arguments);
-        this.$element.delegate('.oe_google_docs_button', 'click', self.on_add_gdoc);
+        this.$element.delegate('.oe_google_docs_button', 'click', this.on_add_gdoc);
     },
     on_add_gdoc: function() {
         var self = this;

From ec2ceb5d6bf9c9a12102de64b2eded66cc7c7062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Tue, 28 Feb 2012 09:22:26 +0100
Subject: [PATCH 020/452] [imp] js is calling the module

bzr revid: rlo@openerp.com-20120228082226-su74ddghivymtp09
---
 addons/google_docs/static/src/js/gdocs.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 6ef889e3fa0..32a57e18c0c 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -1,18 +1,15 @@
-console.log('fegegegwnw')
-openerp.google_docs = function(instance) {
+openerp.google_docs = function(instance, session) {
 
-console.log('nw')
 instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({
     init: function() {
         this._super.apply(this, arguments);
-        this.$element.delegate('.oe_google_docs_button', 'click', this.on_add_gdoc);
+                this.$element.delegate('.oe_google_docs_button', 'click', this.on_add_gdoc);
     },
     on_add_gdoc: function() {
         var self = this;
-console.log('--------');
         var $gdocbtn = this.$element.find('.oe_google_docs_button');
         $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
-        this.view.dataset.call_button('copy_gdoc', [[this.view.datarecord.id], this.view.dataset.get_context()], function(r) {
+        new openerp.sessions.session0.web.DataSet(this, 'google.docs').call_button('copy_gdoc', [[this.view.datarecord.id], this.view.dataset.get_context()], function(r) {
             $gdocbtn.hide();
             self.do_update();
             self.do_action(r.result);

From 841f8b12b413dd7a0d4091182d092128f27da5f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Tue, 28 Feb 2012 15:46:23 +0100
Subject: [PATCH 021/452] [imp] gdata code

bzr revid: rlo@openerp.com-20120228144623-4bk6lsnthk2elqbv
---
 addons/google_docs/google_docs.py | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 2f2c4919271..1dd632aab83 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -49,38 +49,40 @@ google_docs.copy_gdoc()
         if context==None:
             context={}
 
-        template_vars = {
+        '''template_vars = {
             'db' : cr.dbname,
             'model' : model,
             'id' : id,
             'salt' : salt,
             'name' : '',
-        }
+        }'''
         name_template = 'Sales order %s'
 
-        # check template for the current model
-        model_obj = self.pool.get(model)
-        res_gdocs_obj = self.pool.get('google.docs')
-        domain = [('model' , '=', model_obj)]
-        gdoc = res_gdocs_obj.search(cr,uid,domain,context=context)
-        if not gdoc: 
-            return -1
-
         # check google_base_account
         users_obj = self.pool.get('res.users')
         user = users_obj.browse(cr, uid, [uid])[0]
         if not user.gmail_user or not user.gmail_password: 
             return -2
 
+        # check template for the current model
+        # TODO check module logic
+        '''model_obj = self.pool.get(model[0])
+        res_gdocs_obj = self.pool.get('google.docs')
+        domain = [('model' , '=', model_obj)]
+        gdoc = res_gdocs_obj.search(cr,uid,domain,context=context)
+        if not gdoc:
+            
+            return -1
+'''
         # copy the document
         client = gdata.docs.client.DocsClient(source='openerp.com')
         client.ssl = True
         client.http_client.debug = False
         client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely')
-        resource = client.get_resource_by_id(gdoc.gdocs_res_id)
-        copied_resource = client.copy_resource(entry=resource, title= self.name_template % (model, ))
+        resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
+        new_resource = client.post(entry=resource, uri='https://docs.google.com/feeds/default/private/full/')
 
-        return self.edit_url_template % (copied_resource.resource_id.text,)
+        return self.edit_url_template % (new_resource.resource_id.text,)
 
 '''
     def get_documents_list(self, cr, uid, context=None):

From f8213e68f0a1d5ffde27a47b70211a0cb205db9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Wed, 29 Feb 2012 09:38:33 +0100
Subject: [PATCH 022/452] [imp] integration with google_base_account

bzr revid: rlo@openerp.com-20120229083833-yd0wfg8x5ywc9e1c
---
 addons/google_docs/google_docs.py         | 9 +++++++--
 addons/google_docs/static/src/js/gdocs.js | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 1dd632aab83..1c36533e614 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -23,7 +23,7 @@ GOOGLE DOCS
 #########################################
 
 '''
-    edit_url_template = 'https://docs.google.com/Edit?docid=%s'
+    edit_url_template = 'https://docs.google.com/document/d/%s/edit'
     prefix_gdoc_id_res = DOCUMENT_LABEL + ':'
 
     def copy_gdoc(self, cr, uid, model, context=None):
@@ -61,6 +61,9 @@ google_docs.copy_gdoc()
         # check google_base_account
         users_obj = self.pool.get('res.users')
         user = users_obj.browse(cr, uid, [uid])[0]
+        print '%s' % user.__dict__
+        print '%s' % user.gmail_user
+        print '%s' % user.gmail_password
         if not user.gmail_user or not user.gmail_password: 
             return -2
 
@@ -81,7 +84,9 @@ google_docs.copy_gdoc()
         client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely')
         resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
         new_resource = client.post(entry=resource, uri='https://docs.google.com/feeds/default/private/full/')
-
+        print new_resource.__dict__
+        print new_resource.resource_id.text
+        print new_resource.resource_id
         return self.edit_url_template % (new_resource.resource_id.text,)
 
 '''
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 32a57e18c0c..6e0ae93fdf3 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -10,6 +10,7 @@ instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.exte
         var $gdocbtn = this.$element.find('.oe_google_docs_button');
         $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
         new openerp.sessions.session0.web.DataSet(this, 'google.docs').call_button('copy_gdoc', [[this.view.datarecord.id], this.view.dataset.get_context()], function(r) {
+            console.log(r);
             $gdocbtn.hide();
             self.do_update();
             self.do_action(r.result);

From 4c04da28b7e3c78785cbb51892b26facc1b15f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Wed, 29 Feb 2012 13:29:40 +0100
Subject: [PATCH 023/452] [imp] working... the only thing missing is linking
 from the model web to the gdoc web

bzr revid: rlo@openerp.com-20120229122940-16h3bwa6j8zbz01s
---
 addons/google_docs/google_docs.py         | 152 +++++-----------------
 addons/google_docs/static/src/js/gdocs.js |   4 +-
 2 files changed, 36 insertions(+), 120 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 1c36533e614..57cd9441566 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -4,162 +4,80 @@ import gdata.docs.client
 from gdata.client import RequestError
 from gdata.docs.service import DOCUMENT_LABEL
 
-class google_docs(osv.osv):
-    _name = 'google.docs'
+class google_docs_config(osv.osv):
+    _name = 'google.docs.config'
+    _inherit = 'ir.attachment'
 
-    _table = 'google_docs_templates'
     _columns = {
-        'id': fields.integer('ID', readonly=True),
         'model': fields.many2one('ir.model', 'Model'),
-        'gdocs_res_id': fields.char('Google resource ID', size=64, translate=False),
-        'name_template': fields.char('GDoc name template', size=64, translate=False)
+        'gdocs_resource_id': fields.char('Google resource ID', size=64),
+        'name_template': fields.char('GDoc name template', size=64)
     }
-    print '''
 
-#########################################
+    _defaults = {
+        'name_template': 'Google Document'
+    }
 
-GOOGLE DOCS
-
-#########################################
-
-'''
     edit_url_template = 'https://docs.google.com/document/d/%s/edit'
     prefix_gdoc_id_res = DOCUMENT_LABEL + ':'
 
     def copy_gdoc(self, cr, uid, model, context=None):
+        #import pdb; pdb.set_trace()
         '''Associate a copy of the gdoc identified by 'gdocs_res_id' to the current entity.
            @param cr: the current row from the database cursor.
            @param uid: the current user ID, for security checks.
            @param model: the current model name.
            @param context: a standard dictionary for contextual values.
            @return the url of the copy itself.
-           @return -1 if the template hasn't been assigned yet.
            @return -2 if the google_base_account hasn't been configured yet.
         '''
-        print '''
-
-#########################################
-
-google_docs.copy_gdoc()
-
-#########################################
-
-'''
 
         if context==None:
             context={}
 
-        '''template_vars = {
-            'db' : cr.dbname,
-            'model' : model,
-            'id' : id,
-            'salt' : salt,
-            'name' : '',
-        }'''
         name_template = 'Sales order %s'
 
         # check google_base_account
         users_obj = self.pool.get('res.users')
         user = users_obj.browse(cr, uid, [uid])[0]
-        print '%s' % user.__dict__
-        print '%s' % user.gmail_user
-        print '%s' % user.gmail_password
         if not user.gmail_user or not user.gmail_password: 
             return -2
 
-        # check template for the current model
-        # TODO check module logic
-        '''model_obj = self.pool.get(model[0])
-        res_gdocs_obj = self.pool.get('google.docs')
-        domain = [('model' , '=', model_obj)]
-        gdoc = res_gdocs_obj.search(cr,uid,domain,context=context)
-        if not gdoc:
-            
-            return -1
-'''
-        # copy the document
+        # create the document
         client = gdata.docs.client.DocsClient(source='openerp.com')
         client.ssl = True
         client.http_client.debug = False
         client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely')
         resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
-        new_resource = client.post(entry=resource, uri='https://docs.google.com/feeds/default/private/full/')
-        print new_resource.__dict__
-        print new_resource.resource_id.text
-        print new_resource.resource_id
-        return self.edit_url_template % (new_resource.resource_id.text,)
+        gdocs_resource = client.post(entry=resource, uri='https://docs.google.com/feeds/default/private/full/')
+        return gdocs_resource
 
-'''
-    def get_documents_list(self, cr, uid, context=None):
-        ' ''Return the list of google documents available at the user's account.
-           @param cr: the current row from the database cursor.
-           @param uid: the current user ID, for security checks.
-           @param context: a standard dictionary for contextual values.
-           @return a list with information about the documents in form of tuples (document_name, document_resource_id).
-           @return -2 if the google_base_account hasn't been configured yet.
-        '' '
+class google_docs(osv.osv):
+    _name = 'google.docs'
 
-        if context == None:
-            context = {}
 
-        # check google_base_account
-        users_obj = self.pool.get('res.users')
-        user = users_obj.browse(cr, uid, [uid])[0]
-        if not user.gmail_user or not user.gmail_password: 
-            return -2
+    def doc_get(self, cr, uid, model, id, context=None):
+        google_docs_ref = self.pool.get('google.docs.config')
+        gdocs_resource_id = google_docs_ref.search(cr, uid, [('model', '=', model)])
 
-        # get the documents list
-        client = gdata.docs.client.DocsClient(source='openerp.com')
-        client.ssl = True
-        client.http_client.debug = False
-        client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely')
+        if gdocs_resource_id:
+            return google_docs_ref.edit_url_template % (gdocs_resource_id, )
+        else:
+            gdocs_resource = google_docs_ref.copy_gdoc(cr, uid, model, context)
+            print gdocs_resource
+            if gdocs_resource == -2:
+                return gdocs_resource
 
-        return map(lambda doc: (doc.title.text, doc.resource_id.text[len(prefix_gdoc_id_res):]), filter(lambda r: r.resource_id.text.startswith(prefix_gdoc_id_res), client.get_all_resources()))
-'''
+            print gdocs_resource
 
-'''
-    def set_model_document_template(self, cr, uid, model, resource_id, context=None):
-        '' 'Set the default document template for the specified model. This template doesn't have to be a google documents template itself, but just a document.
-           @param cr: current row for the database cursor.
-           @param uid: the current user ID, for security checks.
-           @param model: the current model name.
-           @param resource_id: resource_id associated to the chosen document.
-           @param context: a standard dictionary for contextual values.
-           @return 0 on successful execution.
-           @return -2 if the google_base_account hasn't been configured yet.
-           @return -3 if the given resource_id doesn't exist in the user's google docs account.
-        ' ''
-
-        if context == None:
-            context = {}
-
-        # check google_base_account
-        users_obj = self.pool.get('res.users')
-        user = users_obj.browse(cr, uid, [uid])[0]
-        if not user.gmail_user or not user.gmail_password:
-            return -2
-
-        # check resource_id
-        client = gdata.docs.client.DocsClient(source='openerp.com')
-        client.ssl = True
-        client.http_client.debug = False
-        client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely')
-        try:
-            client.get_resource_by_id(resource_id)
-        except RequestError:
-            return -3
-
-        # set the model document template
-        model_template_id = self.create(cr, uid,
-            { 'model': self.pool.get(model),
-              'gdocs_res_id': resource_id
+            import pdb; pdb.set_trace()
+            # save the reference
+            gdocs_resource_id = gdocs_resource.resource_id.text[gdocs_resource.prefix_gdoc_id_res+1:]
+            google_docs_ref.create(cr, uid, {
+                'model': model,
+                'google_resource_id': gdocs_resource_id,
+                'name': gdocs_resource_title.text,
             })
-
-        return 0
-'''
-
-class google_docs_folder(osv.osv):
-    _name = 'google.docs.folder'
-    _columns = {
-        'res_id': fields.char('GDocs resource id', size=64, translate=False),
-    }
+            print gdocs_resource.resource_id.text
+            print gdocs_resource_id
+            return google_docs_ref.edit_url_template % (gdocs_resource_id,)
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 6e0ae93fdf3..14103681306 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -9,11 +9,9 @@ instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.exte
         var self = this;
         var $gdocbtn = this.$element.find('.oe_google_docs_button');
         $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
-        new openerp.sessions.session0.web.DataSet(this, 'google.docs').call_button('copy_gdoc', [[this.view.datarecord.id], this.view.dataset.get_context()], function(r) {
+        new openerp.sessions.session0.web.DataSet(this, 'google.docs').call('doc_get', [this.view.datarecord.id, this.view.dataset.get_context()], function(r) {
             console.log(r);
-            $gdocbtn.hide();
             self.do_update();
-            self.do_action(r.result);
         });
     }
 });

From 854e18a73724b97107dcaf172c77855713fe7a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Wed, 29 Feb 2012 13:37:58 +0100
Subject: [PATCH 024/452] [imp]fixrkremove pdb statements

bzr revid: rlo@openerp.com-20120229123758-0tcguv9olvul3trk
---
 addons/google_docs/google_docs.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 57cd9441566..abc7d81e189 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -70,9 +70,8 @@ class google_docs(osv.osv):
 
             print gdocs_resource
 
-            import pdb; pdb.set_trace()
             # save the reference
-            gdocs_resource_id = gdocs_resource.resource_id.text[gdocs_resource.prefix_gdoc_id_res+1:]
+            gdocs_resource_id = gdocs_resource.resource_id.text[len(google_docs_ref.prefix_gdoc_id_res):]
             google_docs_ref.create(cr, uid, {
                 'model': model,
                 'google_resource_id': gdocs_resource_id,

From 67ffbbac7a14a31d278043f1a5b962a41730ece1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Wed, 29 Feb 2012 13:39:42 +0100
Subject: [PATCH 025/452] [fix] remove debug statements

bzr revid: rlo@openerp.com-20120229123942-a3ntcfz15xgqek4g
---
 addons/google_docs/google_docs.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index abc7d81e189..e253d62ffbb 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -64,12 +64,9 @@ class google_docs(osv.osv):
             return google_docs_ref.edit_url_template % (gdocs_resource_id, )
         else:
             gdocs_resource = google_docs_ref.copy_gdoc(cr, uid, model, context)
-            print gdocs_resource
             if gdocs_resource == -2:
                 return gdocs_resource
 
-            print gdocs_resource
-
             # save the reference
             gdocs_resource_id = gdocs_resource.resource_id.text[len(google_docs_ref.prefix_gdoc_id_res):]
             google_docs_ref.create(cr, uid, {
@@ -77,6 +74,5 @@ class google_docs(osv.osv):
                 'google_resource_id': gdocs_resource_id,
                 'name': gdocs_resource_title.text,
             })
-            print gdocs_resource.resource_id.text
-            print gdocs_resource_id
+
             return google_docs_ref.edit_url_template % (gdocs_resource_id,)

From 1ade3b205fc01dc4d476fa295d8e046a44755b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Wed, 29 Feb 2012 18:23:19 +0100
Subject: [PATCH 026/452] [fix]

bzr revid: rlo@openerp.com-20120229172319-rzwcu1egrhw9ggms
---
 addons/google_docs/google_docs.py         | 9 +++++----
 addons/google_docs/static/src/js/gdocs.js | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index e253d62ffbb..b60acd16197 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -55,11 +55,12 @@ class google_docs_config(osv.osv):
 class google_docs(osv.osv):
     _name = 'google.docs'
 
-
-    def doc_get(self, cr, uid, model, id, context=None):
+    def doc_get(self, cr, uid, model, ids, context=None):
         google_docs_ref = self.pool.get('google.docs.config')
-        gdocs_resource_id = google_docs_ref.search(cr, uid, [('model', '=', model)])
-
+        gdocs_resource_id = google_docs_ref.search(cr, uid, [('model', '=', model), ('id', 'in', ids)])
+        #print gdocs_resource_id
+        #print google_docs_ref.edit_url_template % (gdocs_resource_id, )
+        #import pdb; pdb.set_trace()
         if gdocs_resource_id:
             return google_docs_ref.edit_url_template % (gdocs_resource_id, )
         else:
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 14103681306..a126bfed5c3 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -9,8 +9,8 @@ instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.exte
         var self = this;
         var $gdocbtn = this.$element.find('.oe_google_docs_button');
         $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
-        new openerp.sessions.session0.web.DataSet(this, 'google.docs').call('doc_get', [this.view.datarecord.id, this.view.dataset.get_context()], function(r) {
-            console.log(r);
+        var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
+            ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord.id]], function(r) {
             self.do_update();
         });
     }

From cde742506ee92500e9cd2e4c41b041613d225442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Wed, 29 Feb 2012 19:45:20 +0100
Subject: [PATCH 027/452] [fix] logic...

bzr revid: rlo@openerp.com-20120229184520-vs679o9drs1vls4r
---
 addons/google_docs/google_docs.py | 97 +++++++++++++++++++++----------
 1 file changed, 65 insertions(+), 32 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index b60acd16197..689f5522cd3 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -4,24 +4,25 @@ import gdata.docs.client
 from gdata.client import RequestError
 from gdata.docs.service import DOCUMENT_LABEL
 
-class google_docs_config(osv.osv):
-    _name = 'google.docs.config'
+class google_docs_ir_attachment(osv.osv):
     _inherit = 'ir.attachment'
 
-    _columns = {
-        'model': fields.many2one('ir.model', 'Model'),
-        'gdocs_resource_id': fields.char('Google resource ID', size=64),
-        'name_template': fields.char('GDoc name template', size=64)
-    }
+    def _auth(self, cr, uid):
+        # check google_base_account
+        users_obj = self.pool.get('res.users')
+        user = users_obj.browse(cr, uid, [uid])[0]
+        if not user.gmail_user or not user.gmail_password: 
+            return -2
 
-    _defaults = {
-        'name_template': 'Google Document'
-    }
+        # login
+        client = gdata.docs.client.DocsClient(source='openerp.com')
+        client.ssl = True
+        client.http_client.debug = False
+        client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely')
+        
+        return client
 
-    edit_url_template = 'https://docs.google.com/document/d/%s/edit'
-    prefix_gdoc_id_res = DOCUMENT_LABEL + ':'
-
-    def copy_gdoc(self, cr, uid, model, context=None):
+    def create_empty_gdoc(self, cr, uid, model, context=None):
         #import pdb; pdb.set_trace()
         '''Associate a copy of the gdoc identified by 'gdocs_res_id' to the current entity.
            @param cr: the current row from the database cursor.
@@ -35,45 +36,77 @@ class google_docs_config(osv.osv):
         if context==None:
             context={}
 
-        name_template = 'Sales order %s'
-
-        # check google_base_account
-        users_obj = self.pool.get('res.users')
-        user = users_obj.browse(cr, uid, [uid])[0]
-        if not user.gmail_user or not user.gmail_password: 
+        client = _auth(cr, uid)
+        if client == -2:
             return -2
 
-        # create the document
-        client = gdata.docs.client.DocsClient(source='openerp.com')
-        client.ssl = True
-        client.http_client.debug = False
-        client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely')
         resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
         gdocs_resource = client.post(entry=resource, uri='https://docs.google.com/feeds/default/private/full/')
         return gdocs_resource
 
+    def copy_gdoc(self, cr, uid, model, gdocs_resource_id, context=None):
+        if context==None:
+            context={}
+
+        client = _auth(cr, uid)
+        if client == -2:
+            return -2
+
+        # fetch and copy the original document
+        original_resource = client.get_resource_by_id(gdocs_resource_id)
+        return client.copy_resource(entry=original_resource)
+
+    def gdoc_get(self, cr, uid, model, context=None):
+        google_docs_config_ref = self.pool.get('google.docs.config')
+        google_template_ids = google_docs_config_ref.search(cr, uid, [('model', '=', model)])
+        if not google_template_ids:
+            # there isn't any template. Create an empty doc.
+            return self.create_gdoc(cr, uid, model, context)
+
+        # otherwise, copy document from existing template
+        return self.copy_gdoc(cr, uid, model, google_template_ids[0].gdocs_resource_id
+
+class google_docs_config(osv.osv):
+    _name = 'google.docs.config'
+
+    _columns = {
+        'model_id': fields.many2one('ir.model', 'Model'),
+        'gdocs_resource_id': fields.char('Google resource ID', size=64),
+        'name_template': fields.char('GDoc name template', size=64),
+        'url': fields.char('url for the template', size=122),
+    }
+
+    _defaults = {
+        'name_template': 'Google Document'
+    }
+
+    edit_url_template = 'https://docs.google.com/document/d/%s/edit'
+    prefix_gdoc_id_res = DOCUMENT_LABEL + ':'
+
+
 class google_docs(osv.osv):
     _name = 'google.docs'
 
-    def doc_get(self, cr, uid, model, ids, context=None):
-        google_docs_ref = self.pool.get('google.docs.config')
+    def doc_get(self, cr, uid, model, ids, context=None):# TODO fix logic here
+        google_docs_ref = self.pool.get('ir.attachment')
         gdocs_resource_id = google_docs_ref.search(cr, uid, [('model', '=', model), ('id', 'in', ids)])
         #print gdocs_resource_id
         #print google_docs_ref.edit_url_template % (gdocs_resource_id, )
-        #import pdb; pdb.set_trace()
         if gdocs_resource_id:
             return google_docs_ref.edit_url_template % (gdocs_resource_id, )
         else:
-            gdocs_resource = google_docs_ref.copy_gdoc(cr, uid, model, context)
+            ir_attachment_res = self.pool.get('ir.attachment')
+            gdocs_resource = ir_attachment_res.create_empty_gdoc(cr, uid, model, context)
             if gdocs_resource == -2:
                 return gdocs_resource
 
             # save the reference
             gdocs_resource_id = gdocs_resource.resource_id.text[len(google_docs_ref.prefix_gdoc_id_res):]
+            import pdb; pdb.set_trace()
             google_docs_ref.create(cr, uid, {
-                'model': model,
-                'google_resource_id': gdocs_resource_id,
-                'name': gdocs_resource_title.text,
+                'model_id': self.pool.get(model),
+                'gdocs_resource_id': gdocs_resource_id,
+                'name': gdocs_resource.title.text,
             })
 
             return google_docs_ref.edit_url_template % (gdocs_resource_id,)

From 2947f6dbb8563bfab55d457e9b1c0cc99f0fc4f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Thu, 1 Mar 2012 15:45:07 +0100
Subject: [PATCH 028/452] [imp] add middleware support for spreadsheets and
 presentations

bzr revid: rlo@openerp.com-20120301144507-k9kqsrdzwi0h8mf5
---
 addons/google_docs/google_docs.py | 93 ++++++++++++++++++++-----------
 1 file changed, 59 insertions(+), 34 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 689f5522cd3..3e6c398b155 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -22,39 +22,70 @@ class google_docs_ir_attachment(osv.osv):
         
         return client
 
-    def create_empty_gdoc(self, cr, uid, model, context=None):
+    def create_empty_google_doc(self, cr, uid, model, id, context=None):
         #import pdb; pdb.set_trace()
         '''Associate a copy of the gdoc identified by 'gdocs_res_id' to the current entity.
            @param cr: the current row from the database cursor.
            @param uid: the current user ID, for security checks.
            @param model: the current model name.
            @param context: a standard dictionary for contextual values.
-           @return the url of the copy itself.
+           @return the document object.
            @return -2 if the google_base_account hasn't been configured yet.
         '''
 
-        if context==None:
+        if context is None:
             context={}
 
-        client = _auth(cr, uid)
+        # authenticate
+        client = self._auth(cr, uid)
         if client == -2:
             return -2
 
-        resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
-        gdocs_resource = client.post(entry=resource, uri='https://docs.google.com/feeds/default/private/full/')
+        if 'type' not in context:
+            context['type'] = 'text'
+
+        # create the document in google docs
+        if context['type']=='slide':
+            local_resource = gdata.docs.data.Resource(gdata.docs.data.PRESENTATION_LABEL)
+        elif context['type']=='spreadsheet':
+            local_resource = gdata.docs.data.Resource(gdata.docs.data.SPREADSHEET_LABEL)
+        else:
+            local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
+        gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
+
+        # register into the db
+        self.create(cr, uid, {
+            'model': context['active_model'], #model,
+            'res_id': context['active_id'],
+            'type': 'url',
+            #'name': TODO pending from the working config
+            'url': gdocs_resource.get_alternate_link().href
+        })
+
         return gdocs_resource
 
     def copy_gdoc(self, cr, uid, model, gdocs_resource_id, context=None):
-        if context==None:
+        if context is None:
             context={}
 
-        client = _auth(cr, uid)
+        client = self._auth(cr, uid)
         if client == -2:
             return -2
 
         # fetch and copy the original document
         original_resource = client.get_resource_by_id(gdocs_resource_id)
-        return client.copy_resource(entry=original_resource)
+        copy_resource = client.copy_resource(entry=original_resource)
+
+        # register into the db
+        self.create(cr, uid, {
+            'model': context['active_model'],
+            'res_id': context['active_id'],
+            'type': 'url',
+            #'name': TODO pending from the working config
+            'url': copy_resource.get_alternate_link().href
+        })
+
+        return copy_resource
 
     def gdoc_get(self, cr, uid, model, context=None):
         google_docs_config_ref = self.pool.get('google.docs.config')
@@ -64,7 +95,7 @@ class google_docs_ir_attachment(osv.osv):
             return self.create_gdoc(cr, uid, model, context)
 
         # otherwise, copy document from existing template
-        return self.copy_gdoc(cr, uid, model, google_template_ids[0].gdocs_resource_id
+        return self.copy_gdoc(cr, uid, model, google_template_ids[0].gdocs_resource_id)
 
 class google_docs_config(osv.osv):
     _name = 'google.docs.config'
@@ -72,41 +103,35 @@ class google_docs_config(osv.osv):
     _columns = {
         'model_id': fields.many2one('ir.model', 'Model'),
         'gdocs_resource_id': fields.char('Google resource ID', size=64),
-        'name_template': fields.char('GDoc name template', size=64),
-        'url': fields.char('url for the template', size=122),
+        'name_template': fields.char('GDoc name template ', size=64, help='This is the name which appears on google side'),
+        'name': fields.char('Name', size=64, help='This is the attachment\'s name. As well, it appears on the panel.')
+        # 'multi': fields.boolean('Multiple documents')
     }
 
     _defaults = {
         'name_template': 'Google Document'
     }
 
-    edit_url_template = 'https://docs.google.com/document/d/%s/edit'
-    prefix_gdoc_id_res = DOCUMENT_LABEL + ':'
 
 
 class google_docs(osv.osv):
     _name = 'google.docs'
 
     def doc_get(self, cr, uid, model, ids, context=None):# TODO fix logic here
-        google_docs_ref = self.pool.get('ir.attachment')
-        gdocs_resource_id = google_docs_ref.search(cr, uid, [('model', '=', model), ('id', 'in', ids)])
-        #print gdocs_resource_id
-        #print google_docs_ref.edit_url_template % (gdocs_resource_id, )
-        if gdocs_resource_id:
-            return google_docs_ref.edit_url_template % (gdocs_resource_id, )
-        else:
-            ir_attachment_res = self.pool.get('ir.attachment')
-            gdocs_resource = ir_attachment_res.create_empty_gdoc(cr, uid, model, context)
-            if gdocs_resource == -2:
-                return gdocs_resource
+        google_docs_config_ref = self.pool.get('google.docs.config')
+        ir_attachment_ref = self.pool.get('ir.attachment')
+        google_docs_config = google_docs_config_ref.search(cr, uid, [('model_id', '=', model)])
+        
+        if not google_docs_config:
+            google_document = ir_attachment_ref.create_empty_google_doc(cr, uid, model, ids, context)
+        #else:
+            
 
-            # save the reference
-            gdocs_resource_id = gdocs_resource.resource_id.text[len(google_docs_ref.prefix_gdoc_id_res):]
-            import pdb; pdb.set_trace()
-            google_docs_ref.create(cr, uid, {
-                'model_id': self.pool.get(model),
-                'gdocs_resource_id': gdocs_resource_id,
-                'name': gdocs_resource.title.text,
-            })
+        print google_docs_config
 
-            return google_docs_ref.edit_url_template % (gdocs_resource_id,)
+        if not google_docs_config:
+            return -1
+
+        
+
+        return 0

From 82937d5cc8a812bee3ed4199757417e78f534dff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Thu, 1 Mar 2012 16:09:14 +0100
Subject: [PATCH 029/452] [imp] add frontend support for spreadsheets and
 presentations

bzr revid: rlo@openerp.com-20120301150914-0733ak0tdhdpaw8h
---
 addons/google_docs/static/src/js/gdocs.js   | 28 ++++++++++++++++++---
 addons/google_docs/static/src/xml/gdocs.xml | 12 +++++++--
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index a126bfed5c3..9723aac2723 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -3,14 +3,34 @@ openerp.google_docs = function(instance, session) {
 instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({
     init: function() {
         this._super.apply(this, arguments);
-                this.$element.delegate('.oe_google_docs_button', 'click', this.on_add_gdoc);
+        this.$element.delegate('.oe_google_docs_text_button', 'click', this.on_add_text_gdoc);
+        this.$element.delegate('.oe_google_docs_spreadsheet_button', 'click', this.on_add_spreadsheet_gdoc);
+        this.$element.delegate('.oe_google_docs_slide_button', 'click', this.on_add_slide_gdoc);
     },
-    on_add_gdoc: function() {
+    on_add_text_gdoc: function() {
         var self = this;
-        var $gdocbtn = this.$element.find('.oe_google_docs_button');
+        var $gdocbtn = this.$element.find('.oe_google_docs_text_button');
         $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
         var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
-            ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord.id]], function(r) {
+        ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord.id], 'text'], function(r) {
+            self.do_update();
+        });
+    },
+    on_add_spreadsheet_gdoc: function() {
+        var self = this;
+        var $gdocbtn = this.$element.find('.oe_google_docs_spreadsheet_button');
+        $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
+        var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
+        ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord, id], 'spreadsheet'], function(r) {
+            self.do_update();
+        });
+    },
+    on_add_slide_gdoc: function() {
+        var self = this;
+        var $gdocbtn = this.$element.find('.oe_google_docs_slide_button');
+        $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
+        var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
+        ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord,id], 'slide'], function(r) {
             self.do_update();
         });
     }
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
index 7ee2297c545..f401512e96b 100644
--- a/addons/google_docs/static/src/xml/gdocs.xml
+++ b/addons/google_docs/static/src/xml/gdocs.xml
@@ -11,9 +11,17 @@
                 <br/>
                 <br/>
                 <br/>
-                <button class="oe_google_docs_button" type="button">
+                <button class="oe_google_docs_text_button" type="button">
                     <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
-                    <span>Add GDoc</span>
+                    <span>Add GDoc - text</span>
+                </button>
+                <button class="oe_google_docs_spreadsheet_button" type="button">
+                    <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
+                    <span>Add GDoc - spreadsheet</span>
+                </button>
+                <button class="oe_google_docs_slide_button" type="button">
+                    <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
+                    <span>Add GDoc - presentation</span>
                 </button>
         </t>
     </t>

From 663a525f76ccf263dbb37b451a9c7f2898217a2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Thu, 1 Mar 2012 16:25:30 +0100
Subject: [PATCH 030/452] [imp] integrate frontend - middleware

bzr revid: rlo@openerp.com-20120301152530-2ldz1w96y4pu2x9w
---
 addons/google_docs/google_docs.py | 47 +++++++++----------------------
 1 file changed, 14 insertions(+), 33 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 3e6c398b155..040dce932ea 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -22,32 +22,26 @@ class google_docs_ir_attachment(osv.osv):
         
         return client
 
-    def create_empty_google_doc(self, cr, uid, model, id, context=None):
+    def create_empty_google_doc(self, cr, uid, model, id, type_doc):
         #import pdb; pdb.set_trace()
         '''Associate a copy of the gdoc identified by 'gdocs_res_id' to the current entity.
            @param cr: the current row from the database cursor.
            @param uid: the current user ID, for security checks.
            @param model: the current model name.
-           @param context: a standard dictionary for contextual values.
+           @param type_doc: text, spreadsheet or slide.
            @return the document object.
            @return -2 if the google_base_account hasn't been configured yet.
         '''
 
-        if context is None:
-            context={}
-
         # authenticate
         client = self._auth(cr, uid)
         if client == -2:
             return -2
 
-        if 'type' not in context:
-            context['type'] = 'text'
-
         # create the document in google docs
-        if context['type']=='slide':
+        if type_doc=='slide':
             local_resource = gdata.docs.data.Resource(gdata.docs.data.PRESENTATION_LABEL)
-        elif context['type']=='spreadsheet':
+        elif type_doc=='spreadsheet':
             local_resource = gdata.docs.data.Resource(gdata.docs.data.SPREADSHEET_LABEL)
         else:
             local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
@@ -55,8 +49,8 @@ class google_docs_ir_attachment(osv.osv):
 
         # register into the db
         self.create(cr, uid, {
-            'model': context['active_model'], #model,
-            'res_id': context['active_id'],
+            'model': model,
+            'res_id': ids[0],
             'type': 'url',
             #'name': TODO pending from the working config
             'url': gdocs_resource.get_alternate_link().href
@@ -64,7 +58,7 @@ class google_docs_ir_attachment(osv.osv):
 
         return gdocs_resource
 
-    def copy_gdoc(self, cr, uid, model, gdocs_resource_id, context=None):
+    def copy_gdoc(self, cr, uid, model, id):
         if context is None:
             context={}
 
@@ -78,8 +72,8 @@ class google_docs_ir_attachment(osv.osv):
 
         # register into the db
         self.create(cr, uid, {
-            'model': context['active_model'],
-            'res_id': context['active_id'],
+            'model': model,
+            'res_id': id[0],
             'type': 'url',
             #'name': TODO pending from the working config
             'url': copy_resource.get_alternate_link().href
@@ -87,16 +81,6 @@ class google_docs_ir_attachment(osv.osv):
 
         return copy_resource
 
-    def gdoc_get(self, cr, uid, model, context=None):
-        google_docs_config_ref = self.pool.get('google.docs.config')
-        google_template_ids = google_docs_config_ref.search(cr, uid, [('model', '=', model)])
-        if not google_template_ids:
-            # there isn't any template. Create an empty doc.
-            return self.create_gdoc(cr, uid, model, context)
-
-        # otherwise, copy document from existing template
-        return self.copy_gdoc(cr, uid, model, google_template_ids[0].gdocs_resource_id)
-
 class google_docs_config(osv.osv):
     _name = 'google.docs.config'
 
@@ -117,21 +101,18 @@ class google_docs_config(osv.osv):
 class google_docs(osv.osv):
     _name = 'google.docs'
 
-    def doc_get(self, cr, uid, model, ids, context=None):# TODO fix logic here
+    def doc_get(self, cr, uid, model, id, type_doc):# TODO fix logic here
         google_docs_config_ref = self.pool.get('google.docs.config')
         ir_attachment_ref = self.pool.get('ir.attachment')
         google_docs_config = google_docs_config_ref.search(cr, uid, [('model_id', '=', model)])
-        
+
         if not google_docs_config:
-            google_document = ir_attachment_ref.create_empty_google_doc(cr, uid, model, ids, context)
-        #else:
-            
+            google_document = ir_attachment_ref.create_empty_google_doc(cr, uid, model, ids, type_doc)
+        else:
+            google_document = ir_attachment_ref.copy_gdoc(cr, uid, model, id)
 
         print google_docs_config
 
         if not google_docs_config:
             return -1
 
-        
-
-        return 0

From 65d257d4e9fd9bee1c6ab82e63f4f122aa2ffe41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Thu, 1 Mar 2012 16:28:05 +0100
Subject: [PATCH 031/452] [imp]

bzr revid: rlo@openerp.com-20120301152805-p7wosq6x4johbosj
---
 addons/google_docs/google_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 040dce932ea..34b4e5a16ed 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -107,7 +107,7 @@ class google_docs(osv.osv):
         google_docs_config = google_docs_config_ref.search(cr, uid, [('model_id', '=', model)])
 
         if not google_docs_config:
-            google_document = ir_attachment_ref.create_empty_google_doc(cr, uid, model, ids, type_doc)
+            google_document = ir_attachment_ref.create_empty_google_doc(cr, uid, model, id, type_doc)
         else:
             google_document = ir_attachment_ref.copy_gdoc(cr, uid, model, id)
 

From 2b774dddfb3bd5cfd43fccade36f6ac362ab25d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Fri, 2 Mar 2012 09:15:13 +0100
Subject: [PATCH 032/452] [imp] js

bzr revid: rlo@openerp.com-20120302081513-mzexq3vw6ftzw45s
---
 addons/google_docs/static/src/js/gdocs.js | 77 ++++++++++++-----------
 1 file changed, 42 insertions(+), 35 deletions(-)

diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 9723aac2723..825bd577b66 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -1,40 +1,47 @@
 openerp.google_docs = function(instance, session) {
 
-instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({
-    init: function() {
-        this._super.apply(this, arguments);
-        this.$element.delegate('.oe_google_docs_text_button', 'click', this.on_add_text_gdoc);
-        this.$element.delegate('.oe_google_docs_spreadsheet_button', 'click', this.on_add_spreadsheet_gdoc);
-        this.$element.delegate('.oe_google_docs_slide_button', 'click', this.on_add_slide_gdoc);
-    },
-    on_add_text_gdoc: function() {
-        var self = this;
-        var $gdocbtn = this.$element.find('.oe_google_docs_text_button');
-        $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
-        var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
-        ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord.id], 'text'], function(r) {
-            self.do_update();
-        });
-    },
-    on_add_spreadsheet_gdoc: function() {
-        var self = this;
-        var $gdocbtn = this.$element.find('.oe_google_docs_spreadsheet_button');
-        $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
-        var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
-        ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord, id], 'spreadsheet'], function(r) {
-            self.do_update();
-        });
-    },
-    on_add_slide_gdoc: function() {
-        var self = this;
-        var $gdocbtn = this.$element.find('.oe_google_docs_slide_button');
-        $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
-        var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
-        ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord,id], 'slide'], function(r) {
-            self.do_update();
-        });
-    }
-});
 
+        instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({
+            init: function() {
+                this._super.apply(this, arguments);
+                this.$element.delegate('.oe_google_docs_text_button', 'click', this.on_add_text_gdoc);
+                this.$element.delegate('.oe_google_docs_spreadsheet_button', 'click', this.on_add_spreadsheet_gdoc);
+                this.$element.delegate('.oe_google_docs_slide_button', 'click', this.on_add_slide_gdoc);
+            },
+            on_add_text_gdoc: function() {
+                console.log('on_add_text_gdoc:');
+                var self = this;
+                var $gdocbtn = this.$element.find('.oe_google_docs_text_button');
+                $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
+                var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
+                ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord.id], 'text'], function(r) {
+                    console.log('on_add_text_gdoc: return');
+                    self.do_update();
+                });
+            },
+            on_add_spreadsheet_gdoc: function() {
+                console.log('on_add_spreadsheet_gdoc:');
+                var self = this;
+                var $gdocbtn = this.$element.find('.oe_google_docs_spreadsheet_button');
+                $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
+                var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
+                console.log('on_add_spreadsheet_gdoc:');
+                ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord.id], 'spreadsheet'], function(r) {
+                    console.log('on_add_spreadsheet_gdoc: return');
+                    self.do_update();
+                });
+            },
+            on_add_slide_gdoc: function() {
+                console.log ('on_add_slide_gdoc:');
+                var self = this;
+                var $gdocbtn = this.$element.find('.oe_google_docs_slide_button');
+                $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
+                var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
+                ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord.id], 'slide'], function(r) {
+                    console.log('on_add_slide_gdoc: return');
+                    self.do_update();
+                });
+            }
+        });
 };
 

From 9afb5cfe64b8f67e4ccfe6e048046fb6937aeef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Fri, 2 Mar 2012 09:30:13 +0100
Subject: [PATCH 033/452] [imp] py

bzr revid: rlo@openerp.com-20120302083013-4pvtkjma36ovlzhy
---
 addons/google_docs/google_docs.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 34b4e5a16ed..5e1f30e38fa 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -22,8 +22,8 @@ class google_docs_ir_attachment(osv.osv):
         
         return client
 
-    def create_empty_google_doc(self, cr, uid, model, id, type_doc):
-        #import pdb; pdb.set_trace()
+    def create_empty_google_doc(self, cr, uid, model, ids, type_doc):
+        import pdb; pdb.set_trace()
         '''Associate a copy of the gdoc identified by 'gdocs_res_id' to the current entity.
            @param cr: the current row from the database cursor.
            @param uid: the current user ID, for security checks.
@@ -49,16 +49,16 @@ class google_docs_ir_attachment(osv.osv):
 
         # register into the db
         self.create(cr, uid, {
-            'model': model,
+            'res_model': model,
             'res_id': ids[0],
             'type': 'url',
-            #'name': TODO pending from the working config
+            'name': 'new_foo', # TODO pending from the working config
             'url': gdocs_resource.get_alternate_link().href
         })
 
         return gdocs_resource
 
-    def copy_gdoc(self, cr, uid, model, id):
+    def copy_gdoc(self, cr, uid, model, ids):
         if context is None:
             context={}
 
@@ -72,10 +72,10 @@ class google_docs_ir_attachment(osv.osv):
 
         # register into the db
         self.create(cr, uid, {
-            'model': model,
-            'res_id': id[0],
+            'res_model': model,
+            'res_id': ids[0],
             'type': 'url',
-            #'name': TODO pending from the working config
+            'name': 'copy_foo', # TODO pending from the working config
             'url': copy_resource.get_alternate_link().href
         })
 

From f0775d762e80c2fdd48b689b253bb02db14e569a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Fri, 2 Mar 2012 09:40:06 +0100
Subject: [PATCH 034/452] [imp] kind of working, just the configuration is
 missing

bzr revid: rlo@openerp.com-20120302084006-m3qx6zfypl6g57r8
---
 addons/google_docs/google_docs.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 5e1f30e38fa..3f544c983bc 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -23,7 +23,6 @@ class google_docs_ir_attachment(osv.osv):
         return client
 
     def create_empty_google_doc(self, cr, uid, model, ids, type_doc):
-        import pdb; pdb.set_trace()
         '''Associate a copy of the gdoc identified by 'gdocs_res_id' to the current entity.
            @param cr: the current row from the database cursor.
            @param uid: the current user ID, for security checks.
@@ -52,7 +51,7 @@ class google_docs_ir_attachment(osv.osv):
             'res_model': model,
             'res_id': ids[0],
             'type': 'url',
-            'name': 'new_foo', # TODO pending from the working config
+            'name': 'new_foo %s' % (type_doc,) , # TODO pending from the working config
             'url': gdocs_resource.get_alternate_link().href
         })
 
@@ -75,7 +74,7 @@ class google_docs_ir_attachment(osv.osv):
             'res_model': model,
             'res_id': ids[0],
             'type': 'url',
-            'name': 'copy_foo', # TODO pending from the working config
+            'name': 'copy_foo %s' (type_doc,) , # TODO pending from the working config
             'url': copy_resource.get_alternate_link().href
         })
 

From ff1fc1a7e9476f33e8a580c0c1f8942e5004bf0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Fri, 2 Mar 2012 11:35:05 +0100
Subject: [PATCH 035/452] [imp]

bzr revid: rlo@openerp.com-20120302103505-em22nbb5chumfzuf
---
 addons/google_docs/__openerp__.py         |  3 +-
 addons/google_docs/google_docs.py         | 43 +++++++++++++++++------
 addons/google_docs/static/src/js/gdocs.js | 18 ++++++----
 3 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 309ca13edc0..be8eb85d21e 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -1,8 +1,9 @@
 {
     'name': 'Google Docs',
-    'version': '0.1',
+    'version': '0.2',
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
+    'category': 'Tools',
     'data': [
         'google_docs.xml'
     ],
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 3f544c983bc..a63043e65ba 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -1,8 +1,31 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2012 OpenERP SA (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 from osv import osv, fields
-import gdata.docs.data
-import gdata.docs.client
-from gdata.client import RequestError
-from gdata.docs.service import DOCUMENT_LABEL
+try:
+    import gdata.docs.data
+    import gdata.docs.client
+    from gdata.client import RequestError
+    from gdata.docs.service import DOCUMENT_LABEL
+except ImportError:
+    raise osv.except_osv(_('Google Docs Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list'))
 
 class google_docs_ir_attachment(osv.osv):
     _inherit = 'ir.attachment'
@@ -12,7 +35,7 @@ class google_docs_ir_attachment(osv.osv):
         users_obj = self.pool.get('res.users')
         user = users_obj.browse(cr, uid, [uid])[0]
         if not user.gmail_user or not user.gmail_password: 
-            return -2
+            return False
 
         # login
         client = gdata.docs.client.DocsClient(source='openerp.com')
@@ -29,13 +52,13 @@ class google_docs_ir_attachment(osv.osv):
            @param model: the current model name.
            @param type_doc: text, spreadsheet or slide.
            @return the document object.
-           @return -2 if the google_base_account hasn't been configured yet.
+           @return False if the google_base_account hasn't been configured yet.
         '''
 
         # authenticate
         client = self._auth(cr, uid)
-        if client == -2:
-            return -2
+        if client == False:
+            return False
 
         # create the document in google docs
         if type_doc=='slide':
@@ -62,8 +85,8 @@ class google_docs_ir_attachment(osv.osv):
             context={}
 
         client = self._auth(cr, uid)
-        if client == -2:
-            return -2
+        if client == False:
+            return False
 
         # fetch and copy the original document
         original_resource = client.get_resource_by_id(gdocs_resource_id)
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 825bd577b66..63978868901 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -9,36 +9,40 @@ openerp.google_docs = function(instance, session) {
                 this.$element.delegate('.oe_google_docs_slide_button', 'click', this.on_add_slide_gdoc);
             },
             on_add_text_gdoc: function() {
-                console.log('on_add_text_gdoc:');
                 var self = this;
                 var $gdocbtn = this.$element.find('.oe_google_docs_text_button');
                 $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
                 var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
                 ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord.id], 'text'], function(r) {
-                    console.log('on_add_text_gdoc: return');
+                    console.log(r);
+                    if (r == 'False') {
+                        var params = {
+                            error: response,
+                            message: "The user google credentials are not set yet. Contact your administrator for help."
+                        }
+                        $(openerp.web.qweb.render("DialogWarning", params)).dialog({
+                            title: "User Google credentials are not yet set.",
+                            modal: true,
+                        });
+                    }
                     self.do_update();
                 });
             },
             on_add_spreadsheet_gdoc: function() {
-                console.log('on_add_spreadsheet_gdoc:');
                 var self = this;
                 var $gdocbtn = this.$element.find('.oe_google_docs_spreadsheet_button');
                 $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
                 var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
-                console.log('on_add_spreadsheet_gdoc:');
                 ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord.id], 'spreadsheet'], function(r) {
-                    console.log('on_add_spreadsheet_gdoc: return');
                     self.do_update();
                 });
             },
             on_add_slide_gdoc: function() {
-                console.log ('on_add_slide_gdoc:');
                 var self = this;
                 var $gdocbtn = this.$element.find('.oe_google_docs_slide_button');
                 $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
                 var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
                 ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord.id], 'slide'], function(r) {
-                    console.log('on_add_slide_gdoc: return');
                     self.do_update();
                 });
             }

From 01e67d6dd52daae8e4a54202501167b451655ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Mon, 5 Mar 2012 14:52:40 +0100
Subject: [PATCH 036/452] [imp] init config

bzr revid: rlo@openerp.com-20120305135240-o1a4sjcerod4l7jh
---
 addons/google_docs/google_docs.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index a63043e65ba..c254b4944ea 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -104,7 +104,9 @@ class google_docs_ir_attachment(osv.osv):
         return copy_resource
 
 class google_docs_config(osv.osv):
-    _name = 'google.docs.config'
+    #_name = 'google.docs.config'
+    _inherit = 'res.users'
+    _description = 'User\'s gdocs config'
 
     _columns = {
         'model_id': fields.many2one('ir.model', 'Model'),
@@ -118,7 +120,19 @@ class google_docs_config(osv.osv):
         'name_template': 'Google Document'
     }
 
-
+    def create(self, cr, uid, vals, context=None):
+        res = super(users, self).create(cr, uid, vals, context=context)
+        model_obj=self.pool.get('ir.model')
+        if vals.get('context_gdocs_resource_id') and vals.get('context_model_id'):
+            self.write(cr, uid, #[vals['model_id']], {'member_ids':[(4, res)]}, 
+                {
+                    'model_id': model_obj.get(cr, uid, vals.get('context_model_id'))[0],
+                    'gdocs_resource_id': vals.get('context_gdocs_resource_id'),
+                    'name_template': vals('context_name_template'),
+                    'name': vals('context_name'),
+                },
+                context)
+        return res
 
 class google_docs(osv.osv):
     _name = 'google.docs'

From ce1d3ce094db59b966adf02f8f0a841d84df1707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Mon, 5 Mar 2012 15:50:01 +0100
Subject: [PATCH 037/452] [imp] config view

bzr revid: rlo@openerp.com-20120305145001-uut48z736imzbwtn
---
 addons/google_docs/google_docs.py           |  2 +-
 addons/google_docs/res_config_user_view.xml | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 addons/google_docs/res_config_user_view.xml

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index c254b4944ea..dc4fc7d07b7 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -124,7 +124,7 @@ class google_docs_config(osv.osv):
         res = super(users, self).create(cr, uid, vals, context=context)
         model_obj=self.pool.get('ir.model')
         if vals.get('context_gdocs_resource_id') and vals.get('context_model_id'):
-            self.write(cr, uid, #[vals['model_id']], {'member_ids':[(4, res)]}, 
+            self.write(cr, uid, 
                 {
                     'model_id': model_obj.get(cr, uid, vals.get('context_model_id'))[0],
                     'gdocs_resource_id': vals.get('context_gdocs_resource_id'),
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
new file mode 100644
index 00000000000..f328e408c10
--- /dev/null
+++ b/addons/google_docs/res_config_user_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- add google docs config field in user form -->
+        <record id="view_google_docs_users_config_inherited_form" model="ir.ui.view">
+            <field name="name">res.gdocs.users.form</field>
+            <field name="model">res.users</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <group name="default_filters" position="inside">
+                    <field name="context_model_id" string='Model ID' completion='1' readonly='0'/>
+                    <field name="context_context_gdocs_resource_id" string='Google Docs resource ID' completion='1' readonly='0'/>
+                </group>
+            </field>
+        </record>
+    </data>
+</openerp>

From fd89caf3cb964e150cb5b8cc7c224cc64ae32fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Mon, 5 Mar 2012 17:11:15 +0100
Subject: [PATCH 038/452] [imp]

bzr revid: rlo@openerp.com-20120305161115-i20h6xst3sg5n181
---
 addons/google_docs/google_docs.py           | 42 ++++++++++-----------
 addons/google_docs/res_config_user_view.xml | 12 +++---
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index dc4fc7d07b7..8e093271c9e 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -103,10 +103,27 @@ class google_docs_ir_attachment(osv.osv):
 
         return copy_resource
 
-class google_docs_config(osv.osv):
-    #_name = 'google.docs.config'
+class google_docs(osv.osv):
+    _name = 'google.docs'
+
+    def doc_get(self, cr, uid, model, id, type_doc):# TODO fix logic here
+        google_docs_config_ref = self.pool.get('res.users')
+        ir_attachment_ref = self.pool.get('ir.attachment')
+        google_docs_config = google_docs_config_ref.search(cr, uid, [('model_id', '=', model)])
+
+        if not google_docs_config:
+            google_document = ir_attachment_ref.create_empty_google_doc(cr, uid, model, id, type_doc)
+        else:
+            google_document = ir_attachment_ref.copy_gdoc(cr, uid, model, id)
+
+        print google_docs_config
+
+        if not google_docs_config:
+            return -1
+
+class users(osv.osv):
     _inherit = 'res.users'
-    _description = 'User\'s gdocs config'
+    _description = "User\'s gdocs config"
 
     _columns = {
         'model_id': fields.many2one('ir.model', 'Model'),
@@ -134,21 +151,4 @@ class google_docs_config(osv.osv):
                 context)
         return res
 
-class google_docs(osv.osv):
-    _name = 'google.docs'
-
-    def doc_get(self, cr, uid, model, id, type_doc):# TODO fix logic here
-        google_docs_config_ref = self.pool.get('google.docs.config')
-        ir_attachment_ref = self.pool.get('ir.attachment')
-        google_docs_config = google_docs_config_ref.search(cr, uid, [('model_id', '=', model)])
-
-        if not google_docs_config:
-            google_document = ir_attachment_ref.create_empty_google_doc(cr, uid, model, id, type_doc)
-        else:
-            google_document = ir_attachment_ref.copy_gdoc(cr, uid, model, id)
-
-        print google_docs_config
-
-        if not google_docs_config:
-            return -1
-
+google_docs_config()
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index f328e408c10..1292947812f 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <!-- add google docs config field in user form -->
-        <record id="view_google_docs_users_config_inherited_form" model="ir.ui.view">
-            <field name="name">res.gdocs.users.form</field>
+
+        <record model="ir.ui.view" id="view_google_docs_users_config_inherited_form">
+            <field name="name">google_docs.config.user.inherited.form</field>
             <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form" />
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
                 <group name="default_filters" position="inside">
-                    <field name="context_model_id" string='Model ID' completion='1' readonly='0'/>
-                    <field name="context_context_gdocs_resource_id" string='Google Docs resource ID' completion='1' readonly='0'/>
+                    <field name="context_model_id" completion="1"
+                        readonly="0"/>
                 </group>
             </field>
         </record>

From 0102ccd723b7e5837f657cb5fdc643e4b0ec00a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Tue, 6 Mar 2012 11:31:51 +0100
Subject: [PATCH 039/452] [imp]

bzr revid: rlo@openerp.com-20120306103151-983wrsjoyw6rlo2h
---
 addons/google_docs/__openerp__.py  |  2 +-
 addons/google_docs/google_docs.py  |  2 +-
 addons/google_docs/google_docs.xml | 32 +++++++++++++++++-------------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index be8eb85d21e..84fc2899ec3 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -1,5 +1,5 @@
 {
-    'name': 'Google Docs',
+    'name': 'Google Docs integration',
     'version': '0.2',
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 8e093271c9e..1fc3daf7959 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -151,4 +151,4 @@ class users(osv.osv):
                 context)
         return res
 
-google_docs_config()
+users()
diff --git a/addons/google_docs/google_docs.xml b/addons/google_docs/google_docs.xml
index d0e842b566e..12107a53419 100644
--- a/addons/google_docs/google_docs.xml
+++ b/addons/google_docs/google_docs.xml
@@ -1,16 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
-  <data>
-    <record id="view_company_form_with_gdocs" model="ir.ui.view">
-      <field name="name">res.company.form.gdocs</field>
-      <field name="model">google.docs</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base.view_company_form"/>
-      <field name="arch" type="xml">
-        <xpath expr="//page[@string='Configuration']" position="inside">
-          <separator string="GDoc" colspan="4"/>
-          <field name="gdocs_url"/>
-        </xpath>
-      </field>
-    </record>
-  </data>
+    <data>
+
+        <!-- add google docs config field in user form -->
+
+        <record model="ir.ui.view" id="view_google_docs_users_config_inherited_form">
+            <field name="name">res.user.google_docs.config.inherited</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="signature" position="after">
+                    <field name="context_model_id" completion="1"
+                        readonly="0" groups='base.view_users_form_extended'/>
+                </field>
+            </field>
+        </record>
+    </data>
 </openerp>

From b216e3af53b8424c0243f953536c91c660951bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Tue, 6 Mar 2012 11:38:11 +0100
Subject: [PATCH 040/452] [imp]

bzr revid: rlo@openerp.com-20120306103811-tjj7cgdc21jl2hs1
---
 addons/google_docs/google_docs.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/google_docs/google_docs.xml b/addons/google_docs/google_docs.xml
index 12107a53419..e623e23f005 100644
--- a/addons/google_docs/google_docs.xml
+++ b/addons/google_docs/google_docs.xml
@@ -11,8 +11,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="signature" position="after">
-                    <field name="context_model_id" completion="1"
-                        readonly="0" groups='base.view_users_form_extended'/>
+                    <field name="context_model_id"/>
                 </field>
             </field>
         </record>

From 2a33e0e3b7c128040b1d8a1100cf66fa85e5c70d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Tue, 6 Mar 2012 13:03:19 +0100
Subject: [PATCH 041/452] [imp]

bzr revid: rlo@openerp.com-20120306120319-uy3rny4texi1yzlu
---
 addons/google_docs/google_docs.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/google_docs/google_docs.xml b/addons/google_docs/google_docs.xml
index e623e23f005..cb1fed68657 100644
--- a/addons/google_docs/google_docs.xml
+++ b/addons/google_docs/google_docs.xml
@@ -10,9 +10,9 @@
             <field name="inherit_id" ref="base.view_users_form" />
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="signature" position="after">
+                <group name="default_filters" position="inside">
                     <field name="context_model_id"/>
-                </field>
+                </group>
             </field>
         </record>
     </data>

From 80229d461930b205f15d1d8d2651efe1913360ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Tue, 6 Mar 2012 13:58:58 +0100
Subject: [PATCH 042/452] [imp] user config

bzr revid: rlo@openerp.com-20120306125858-22qgeowa58mw419r
---
 addons/google_docs/google_docs.py  | 10 +++++-----
 addons/google_docs/google_docs.xml |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 1fc3daf7959..91c6d1daab4 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -126,15 +126,15 @@ class users(osv.osv):
     _description = "User\'s gdocs config"
 
     _columns = {
-        'model_id': fields.many2one('ir.model', 'Model'),
-        'gdocs_resource_id': fields.char('Google resource ID', size=64),
-        'name_template': fields.char('GDoc name template ', size=64, help='This is the name which appears on google side'),
-        'name': fields.char('Name', size=64, help='This is the attachment\'s name. As well, it appears on the panel.')
+        'context_model_id': fields.many2one('ir.model', 'Model'),
+        'context_gdocs_resource_id': fields.char('Google resource ID', size=64),
+        'context_name_template': fields.char('GDoc name template ', size=64, help='This is the name which appears on google side'),
+        'context_name': fields.char('Name', size=64, help='This is the attachment\'s name. As well, it appears on the panel.')
         # 'multi': fields.boolean('Multiple documents')
     }
 
     _defaults = {
-        'name_template': 'Google Document'
+        'context_name_template': 'Google Document'
     }
 
     def create(self, cr, uid, vals, context=None):
diff --git a/addons/google_docs/google_docs.xml b/addons/google_docs/google_docs.xml
index cb1fed68657..0aeff3dde5f 100644
--- a/addons/google_docs/google_docs.xml
+++ b/addons/google_docs/google_docs.xml
@@ -12,6 +12,9 @@
             <field name="arch" type="xml">
                 <group name="default_filters" position="inside">
                     <field name="context_model_id"/>
+                    <field name='context_gdocs_resource_id'/>
+                    <field name='context_name'/>
+                    <field name='context_name_template'/>
                 </group>
             </field>
         </record>

From 98036bbe03dde733bd680a947639309f97a4664e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Tue, 6 Mar 2012 14:08:08 +0100
Subject: [PATCH 043/452] [imp] user config

bzr revid: rlo@openerp.com-20120306130808-c9vvp9zq67j6g4jx
---
 addons/google_docs/google_docs.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/google_docs/google_docs.xml b/addons/google_docs/google_docs.xml
index 0aeff3dde5f..333909f11a0 100644
--- a/addons/google_docs/google_docs.xml
+++ b/addons/google_docs/google_docs.xml
@@ -10,12 +10,15 @@
             <field name="inherit_id" ref="base.view_users_form" />
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <group name="default_filters" position="inside">
-                    <field name="context_model_id"/>
-                    <field name='context_gdocs_resource_id'/>
-                    <field name='context_name'/>
-                    <field name='context_name_template'/>
-                </group>
+                <field name="signature" position="after">
+                    <group colspan='4'>
+                        <separator string='Google Docs Config' colspan='4'/>
+                        <field name="context_model_id"/>
+                        <field name='context_gdocs_resource_id'/>
+                        <field name='context_name'/>
+                        <field name='context_name_template'/>
+                    </group>
+                </field>
             </field>
         </record>
     </data>

From 1fcc9a8b17bf2c730afa5ebaf71ee3d5d4975196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Wed, 7 Mar 2012 10:30:30 +0100
Subject: [PATCH 044/452] [imp] add entries into user preferences form

bzr revid: rlo@openerp.com-20120307093030-hrp6k8vvyhej7enc
---
 .../google_base_account_view.xml              | 46 +++++++++++++------
 addons/google_docs/google_docs.xml            | 20 ++++++++
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
index 9296ba135c0..eb01e3ad370 100644
--- a/addons/google_base_account/google_base_account_view.xml
+++ b/addons/google_base_account/google_base_account_view.xml
@@ -1,20 +1,36 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-		<record id="view_users_gogole_form" model="ir.ui.view">
-        <field name="name">res.users.google.form1</field>
-          <field name="model">res.users</field>
-          <field name="type">form</field>
-          <field name="inherit_id" ref="base.view_users_form"/>
-          <field name="arch" type="xml">
-              <xpath expr="//notebook[last()]" position="inside">
-                     <page string=" Synchronization ">
-                     	<separator string="Google Account" colspan="4" />
-						<field name="gmail_user"/>
-                      <field name="gmail_password" password="True"/>
-					</page>
-              </xpath>
-          </field>
-     </record>
+        <record id="view_users_gogole_form" model="ir.ui.view">
+            <field name="name">res.users.google.form1</field>
+            <field name="model">res.users</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook[last()]" position="inside">
+                    <page string=" Synchronization ">
+                        <separator string="Google Account" colspan="4" />
+                        <field name="gmail_user"/>
+                        <field name="gmail_password" password="True"/>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+        <record id='view_user_preferences_google_form' model='ir.ui.view'>
+            <field name='name'>res.users.prefs.google.form1</field>
+            <field name='model'>res.users</field>
+            <field name='type'>form</field>
+            <field name='inherit_id' ref='base.view_users_form_simple_modif'/>
+            <field name='arch' type='xml'>
+                <xpath expr='form[last()]' position='after'>
+                    <group name='google_base_config' colspan='4'>
+                        <separator string="Google Account" colspan="4" />
+                        <field name="gmail_user"/>
+                        <field name="gmail_password" password="True"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/google_docs/google_docs.xml b/addons/google_docs/google_docs.xml
index 333909f11a0..1d49319749a 100644
--- a/addons/google_docs/google_docs.xml
+++ b/addons/google_docs/google_docs.xml
@@ -4,6 +4,26 @@
 
         <!-- add google docs config field in user form -->
 
+        <record model="ir.ui.view" id="view_google_docs_users_preferences_inherited_form">
+            <field name="name">res.user.google_docs.prefs.inherited</field>
+            <field name="model">res.users</field>
+            <field name='inherit_id' ref='base.view_users_form_simple_modif'/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <group name='default_filters' position='inside'>
+                <!--field name="signature" position="after">
+                    <group colspan='4'>
+                        <separator string='Google Docs Config' colspan='4'/-->
+                        <field name="context_model_id"/>
+                        <field name='context_gdocs_resource_id'/>
+                        <field name='context_name'/>
+                        <field name='context_name_template'/>
+                    <!--/group>
+                </field-->
+                </group>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_google_docs_users_config_inherited_form">
             <field name="name">res.user.google_docs.config.inherited</field>
             <field name="model">res.users</field>

From 714c70e435e4efd24537a68c853e6b13b2f457b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Mon, 12 Mar 2012 13:38:52 +0100
Subject: [PATCH 045/452] [imp] menu entry

bzr revid: rlo@openerp.com-20120312123852-qc8881g3s3w1rk9n
---
 addons/google_docs/res_config_user_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 1292947812f..cc6268f6757 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -16,5 +16,6 @@
                 </group>
             </field>
         </record>
+        <menuitem name='Google Docs configuration' id='menu_gdocs_config' parent='base.menu_config'/>
     </data>
 </openerp>

From a08205304ba18db7160c56ba4dc5502f36c689e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Mon, 12 Mar 2012 15:41:31 +0100
Subject: [PATCH 046/452] [imp]

bzr revid: rlo@openerp.com-20120312144131-k6sx56o0x699cr56
---
 addons/google_docs/google_docs.py           | 27 ++++++++++++---------
 addons/google_docs/res_config_user_view.xml |  5 ++--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 91c6d1daab4..874c8893ca6 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -109,7 +109,7 @@ class google_docs(osv.osv):
     def doc_get(self, cr, uid, model, id, type_doc):# TODO fix logic here
         google_docs_config_ref = self.pool.get('res.users')
         ir_attachment_ref = self.pool.get('ir.attachment')
-        google_docs_config = google_docs_config_ref.search(cr, uid, [('model_id', '=', model)])
+        google_docs_config = google_docs_config_ref.search(cr, uid, [('context_model_id', '=', model)])
 
         if not google_docs_config:
             google_document = ir_attachment_ref.create_empty_google_doc(cr, uid, model, id, type_doc)
@@ -121,20 +121,22 @@ class google_docs(osv.osv):
         if not google_docs_config:
             return -1
 
-class users(osv.osv):
-    _inherit = 'res.users'
-    _description = "User\'s gdocs config"
+class config(osv.osv):
+    _name = 'google.docs.config'
+    _description = "Google Docs templates config"
 
     _columns = {
         'context_model_id': fields.many2one('ir.model', 'Model'),
         'context_gdocs_resource_id': fields.char('Google resource ID', size=64),
         'context_name_template': fields.char('GDoc name template ', size=64, help='This is the name which appears on google side'),
-        'context_name': fields.char('Name', size=64, help='This is the attachment\'s name. As well, it appears on the panel.')
-        # 'multi': fields.boolean('Multiple documents')
+        'context_name': fields.char('Name', size=64, help='This is the attachment\'s name. As well, it appears on the panel.'),
+        'context_multiple': fields.boolean('Multiple documents')
     }
 
     _defaults = {
-        'context_name_template': 'Google Document'
+        'context_name_template': 'Google Document',
+        'context_name': 'pr_%(name)',
+        'context_multiple': False,
     }
 
     def create(self, cr, uid, vals, context=None):
@@ -143,12 +145,13 @@ class users(osv.osv):
         if vals.get('context_gdocs_resource_id') and vals.get('context_model_id'):
             self.write(cr, uid, 
                 {
-                    'model_id': model_obj.get(cr, uid, vals.get('context_model_id'))[0],
-                    'gdocs_resource_id': vals.get('context_gdocs_resource_id'),
-                    'name_template': vals('context_name_template'),
-                    'name': vals('context_name'),
+                    'context_model_id': model_obj.get(cr, uid, vals.get('context_model_id'))[0],
+                    'context_gdocs_resource_id': vals.get('context_gdocs_resource_id'),
+                    'context_name_template': vals.get('context_name_template'),
+                    'context_name': self.context_name % {'name': vals.get('context_name')},
+                    'context_multiple': vals.get('context_multiple'),
                 },
                 context)
         return res
 
-users()
+config()
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index cc6268f6757..25d043808f6 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -6,8 +6,7 @@
 
         <record model="ir.ui.view" id="view_google_docs_users_config_inherited_form">
             <field name="name">google_docs.config.user.inherited.form</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form" />
+            <field name="model">google.docs.config</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <group name="default_filters" position="inside">
@@ -16,6 +15,6 @@
                 </group>
             </field>
         </record>
-        <menuitem name='Google Docs configuration' id='menu_gdocs_config' parent='base.menu_config'/>
+        <menuitem name='Google Docs configuration' id='menu_gdocs_config' parent='menu_management' action='view_google_docs_users_config_inherited_form'/>
     </data>
 </openerp>

From a03c7370a726745028b4ae95fb080212edcb09b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Wed, 14 Mar 2012 10:28:16 +0100
Subject: [PATCH 047/452] [fix] fix views according to review

bzr revid: rlo@openerp.com-20120314092816-9y67h31gmm7lfjgf
---
 .../google_base_account_view.xml              | 16 ---------------
 addons/google_docs/google_docs.xml            | 20 -------------------
 2 files changed, 36 deletions(-)

diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
index eb01e3ad370..3f228a6dee8 100644
--- a/addons/google_base_account/google_base_account_view.xml
+++ b/addons/google_base_account/google_base_account_view.xml
@@ -16,21 +16,5 @@
                 </xpath>
             </field>
         </record>
-
-        <record id='view_user_preferences_google_form' model='ir.ui.view'>
-            <field name='name'>res.users.prefs.google.form1</field>
-            <field name='model'>res.users</field>
-            <field name='type'>form</field>
-            <field name='inherit_id' ref='base.view_users_form_simple_modif'/>
-            <field name='arch' type='xml'>
-                <xpath expr='form[last()]' position='after'>
-                    <group name='google_base_config' colspan='4'>
-                        <separator string="Google Account" colspan="4" />
-                        <field name="gmail_user"/>
-                        <field name="gmail_password" password="True"/>
-                    </group>
-                </xpath>
-            </field>
-        </record>
     </data>
 </openerp>
diff --git a/addons/google_docs/google_docs.xml b/addons/google_docs/google_docs.xml
index 1d49319749a..333909f11a0 100644
--- a/addons/google_docs/google_docs.xml
+++ b/addons/google_docs/google_docs.xml
@@ -4,26 +4,6 @@
 
         <!-- add google docs config field in user form -->
 
-        <record model="ir.ui.view" id="view_google_docs_users_preferences_inherited_form">
-            <field name="name">res.user.google_docs.prefs.inherited</field>
-            <field name="model">res.users</field>
-            <field name='inherit_id' ref='base.view_users_form_simple_modif'/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <group name='default_filters' position='inside'>
-                <!--field name="signature" position="after">
-                    <group colspan='4'>
-                        <separator string='Google Docs Config' colspan='4'/-->
-                        <field name="context_model_id"/>
-                        <field name='context_gdocs_resource_id'/>
-                        <field name='context_name'/>
-                        <field name='context_name_template'/>
-                    <!--/group>
-                </field-->
-                </group>
-            </field>
-        </record>
-
         <record model="ir.ui.view" id="view_google_docs_users_config_inherited_form">
             <field name="name">res.user.google_docs.config.inherited</field>
             <field name="model">res.users</field>

From 7774af75d71376aa937acbbe3804daa3cdd92b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Wed, 14 Mar 2012 11:42:05 +0100
Subject: [PATCH 048/452] [imp] menu entry

bzr revid: rlo@openerp.com-20120314104205-y3rpasw7vft8lcb7
---
 addons/google_docs/__openerp__.py           | 7 +++++--
 addons/google_docs/res_config_user_view.xml | 8 +++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 84fc2899ec3..437e5a864f5 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -4,9 +4,9 @@
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'category': 'Tools',
-    'data': [
+    ''' 'data': [
         'google_docs.xml'
-    ],
+    ],'''
     'installable': True,
     'auto_install': False,
     'web': True,
@@ -14,6 +14,9 @@
     'qweb' : [
         "static/src/xml/gdocs.xml",
     ],
+    'update_xml': [
+        'res_config_user_view.xml'
+    ],
     'depends': ['google_base_account'],
     'description': 'Module to attach a google document to any model.'
 }
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 25d043808f6..ecad7aaeb74 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -15,6 +15,12 @@
                 </group>
             </field>
         </record>
-        <menuitem name='Google Docs configuration' id='menu_gdocs_config' parent='menu_management' action='view_google_docs_users_config_inherited_form'/>
+        <record model='ir.actions.act_window' id='action_google_docs_users_config_inherited_form'>
+            <field name='name'>google_docs.config.user.inherited.form</field>
+            <field name='res_model'>google.docs.config</field>
+            <field name='type'>ir.actions.act_window</field>
+            <field name='view_id' ref='view_google_docs_users_config_inherited_form'/>
+        </record>
+        <menuitem name='Google Docs configuration' id='menu_gdocs_config' parent='base.menu_administration' action='action_google_docs_users_config_inherited_form'/>
     </data>
 </openerp>

From d7eafc7be860c2716a7f4cf23841aa2c4d4b92e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Wed, 14 Mar 2012 12:14:02 +0100
Subject: [PATCH 049/452] [imp] menu entry

bzr revid: rlo@openerp.com-20120314111402-pgvsget19m5ttzli
---
 addons/google_docs/res_config_user_view.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index ecad7aaeb74..6dee0d6211e 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -4,10 +4,10 @@
 
         <!-- add google docs config field in user form -->
 
-        <record model="ir.ui.view" id="view_google_docs_users_config_inherited_form">
-            <field name="name">google_docs.config.user.inherited.form</field>
+        <record model="ir.ui.view" id="view_google_docs_model_config_form">
+            <field name="name">google_docs.config.form</field>
             <field name="model">google.docs.config</field>
-            <field name="type">form</field>
+            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <group name="default_filters" position="inside">
                     <field name="context_model_id" completion="1"
@@ -16,11 +16,13 @@
             </field>
         </record>
         <record model='ir.actions.act_window' id='action_google_docs_users_config_inherited_form'>
-            <field name='name'>google_docs.config.user.inherited.form</field>
+            <field name='name'>Models configuration</field>
             <field name='res_model'>google.docs.config</field>
             <field name='type'>ir.actions.act_window</field>
-            <field name='view_id' ref='view_google_docs_users_config_inherited_form'/>
+            <field name='view_type'>form</field>
+            <field name='view_id' ref='view_google_docs_model_config_form'/>
         </record>
-        <menuitem name='Google Docs configuration' id='menu_gdocs_config' parent='base.menu_administration' action='action_google_docs_users_config_inherited_form'/>
+        <menuitem name='Google Docs configuration' id='menu_gdocs_config' parent='base.menu_administration'/>
+        <menuitem name='Models configuration' id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config_inherited_form'/>
     </data>
 </openerp>

From 416ffbb6350c45bc834974f36a3483348d58996a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Wed, 14 Mar 2012 13:55:02 +0100
Subject: [PATCH 050/452] [imp]

bzr revid: rlo@openerp.com-20120314125502-ca1g8cw7y3dm65e4
---
 addons/google_docs/google_docs.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 874c8893ca6..4d2533b9c0b 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -140,15 +140,15 @@ class config(osv.osv):
     }
 
     def create(self, cr, uid, vals, context=None):
-        res = super(users, self).create(cr, uid, vals, context=context)
+        res = super(config, self).create(cr, uid, vals, context=context)
         model_obj=self.pool.get('ir.model')
         if vals.get('context_gdocs_resource_id') and vals.get('context_model_id'):
             self.write(cr, uid, 
                 {
-                    'context_model_id': model_obj.get(cr, uid, vals.get('context_model_id'))[0],
+                    'context_model_id': model_obj.read(cr, uid, [vals.get('context_model_id')])[0],
                     'context_gdocs_resource_id': vals.get('context_gdocs_resource_id'),
                     'context_name_template': vals.get('context_name_template'),
-                    'context_name': self.context_name % {'name': vals.get('context_name')},
+                    'context_name': vals.get('context_name'),
                     'context_multiple': vals.get('context_multiple'),
                 },
                 context)

From 38cd2dbe298f3b93b8ebc6dc87e016f0e6e09173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Wed, 14 Mar 2012 14:18:51 +0100
Subject: [PATCH 051/452] [imp] config form

bzr revid: rlo@openerp.com-20120314131851-a3kzuzxt7f33fc9x
---
 addons/google_docs/google_docs.py | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 4d2533b9c0b..0d99f5f6d35 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -139,19 +139,4 @@ class config(osv.osv):
         'context_multiple': False,
     }
 
-    def create(self, cr, uid, vals, context=None):
-        res = super(config, self).create(cr, uid, vals, context=context)
-        model_obj=self.pool.get('ir.model')
-        if vals.get('context_gdocs_resource_id') and vals.get('context_model_id'):
-            self.write(cr, uid, 
-                {
-                    'context_model_id': model_obj.read(cr, uid, [vals.get('context_model_id')])[0],
-                    'context_gdocs_resource_id': vals.get('context_gdocs_resource_id'),
-                    'context_name_template': vals.get('context_name_template'),
-                    'context_name': vals.get('context_name'),
-                    'context_multiple': vals.get('context_multiple'),
-                },
-                context)
-        return res
-
 config()

From 78903a8554d776632a17cde897ddcd2a7093b329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Wed, 14 Mar 2012 16:29:29 +0100
Subject: [PATCH 052/452] [imp]

bzr revid: rlo@openerp.com-20120314152929-gqshx94zrcn34qzk
---
 addons/google_docs/google_docs.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 0d99f5f6d35..e78444fb045 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -139,4 +139,11 @@ class config(osv.osv):
         'context_multiple': False,
     }
 
+    def has_config_set(self, cr, uid, model):
+        print model
+        import pdb
+        pdb.set_trace()
+        domain = [('context_model_id', '=', model)]
+        return self.search_count(cr, uid, domain) != 0
+
 config()

From ebb97da4d16ffdbf74091bc6742f1f175ac0142b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?=
 <rlo@openerp.com>
Date: Fri, 16 Mar 2012 10:00:54 +0100
Subject: [PATCH 053/452] [fix] fix according to requirements

bzr revid: rlo@openerp.com-20120316090054-0datu37ojj98lx13
---
 addons/google_docs/google_docs.py         | 12 +++----
 addons/google_docs/static/src/js/gdocs.js | 39 ++++++++++-------------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index e78444fb045..e822bb304bf 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -106,7 +106,7 @@ class google_docs_ir_attachment(osv.osv):
 class google_docs(osv.osv):
     _name = 'google.docs'
 
-    def doc_get(self, cr, uid, model, id, type_doc):# TODO fix logic here
+    def doc_get(self, cr, uid, model, id, type_doc):
         google_docs_config_ref = self.pool.get('res.users')
         ir_attachment_ref = self.pool.get('ir.attachment')
         google_docs_config = google_docs_config_ref.search(cr, uid, [('context_model_id', '=', model)])
@@ -139,11 +139,11 @@ class config(osv.osv):
         'context_multiple': False,
     }
 
-    def has_config_set(self, cr, uid, model):
-        print model
-        import pdb
-        pdb.set_trace()
+    def get_config(self, cr, uid, model):
         domain = [('context_model_id', '=', model)]
-        return self.search_count(cr, uid, domain) != 0
+        if self.search_count(cr, uid, domain) != 0:
+            return False
+        else:
+            return self.search(cr, uid, domain)
 
 config()
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 63978868901..b7353fd0bba 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -4,11 +4,24 @@ openerp.google_docs = function(instance, session) {
         instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({
             init: function() {
                 this._super.apply(this, arguments);
-                this.$element.delegate('.oe_google_docs_text_button', 'click', this.on_add_text_gdoc);
-                this.$element.delegate('.oe_google_docs_spreadsheet_button', 'click', this.on_add_spreadsheet_gdoc);
-                this.$element.delegate('.oe_google_docs_slide_button', 'click', this.on_add_slide_gdoc);
+                var self = this;
+                var config = new instance.web.DataSet(this, 'google.docs.config', this.view.dataset.get_context());
+                config.call('get_config', [this.view.dataset.ids[this.view.dataset.index]], function(r) {
+                    console.log(r);
+                    // if the configuration isn't set, the buttons should be hidden.
+                    if (r==false) {
+                        $('.oe_google_docs_text_button').css('display', 'none');
+
+                        return;
+                    }
+
+                    var attachment = new instance.web.DataSet(this, 'ir.attachment', self.view.dataset.get_context());
+                    attachment.call('copy_gdoc', [self.view.dataset.model, [self.view.datarecord.id]], function(res) {
+                        console.log(res);
+                    });
+                });
             },
-            on_add_text_gdoc: function() {
+            on_add_gdoc: function() {
                 var self = this;
                 var $gdocbtn = this.$element.find('.oe_google_docs_text_button');
                 $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
@@ -28,24 +41,6 @@ openerp.google_docs = function(instance, session) {
                     self.do_update();
                 });
             },
-            on_add_spreadsheet_gdoc: function() {
-                var self = this;
-                var $gdocbtn = this.$element.find('.oe_google_docs_spreadsheet_button');
-                $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
-                var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
-                ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord.id], 'spreadsheet'], function(r) {
-                    self.do_update();
-                });
-            },
-            on_add_slide_gdoc: function() {
-                var self = this;
-                var $gdocbtn = this.$element.find('.oe_google_docs_slide_button');
-                $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
-                var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
-                ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord.id], 'slide'], function(r) {
-                    self.do_update();
-                });
-            }
         });
 };
 

From 9d5db695ee3e1cfc1f0d306bccf117640a14927b Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Mon, 19 Mar 2012 11:31:32 +0100
Subject: [PATCH 054/452] [REF] correct the code and change the view files

bzr revid: mva@openerp.com-20120319103132-av7c09avg4p0xgt3
---
 addons/google_docs/__openerp__.py           |  3 --
 addons/google_docs/google_docs.py           | 53 +++++++++++----------
 addons/google_docs/google_docs.xml          | 25 ----------
 addons/google_docs/res_config_user_view.xml | 30 +++++++++---
 addons/google_docs/static/src/js/gdocs.js   |  3 +-
 addons/google_docs/static/src/xml/gdocs.xml | 10 +---
 6 files changed, 54 insertions(+), 70 deletions(-)
 delete mode 100644 addons/google_docs/google_docs.xml

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 437e5a864f5..237804c4f5b 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -4,9 +4,6 @@
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'category': 'Tools',
-    ''' 'data': [
-        'google_docs.xml'
-    ],'''
     'installable': True,
     'auto_install': False,
     'web': True,
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index e822bb304bf..d37f28eb349 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -30,22 +30,22 @@ except ImportError:
 class google_docs_ir_attachment(osv.osv):
     _inherit = 'ir.attachment'
 
-    def _auth(self, cr, uid):
+    def _auth(self, cr, uid,context=None):
         # check google_base_account
         users_obj = self.pool.get('res.users')
         user = users_obj.browse(cr, uid, [uid])[0]
-        if not user.gmail_user or not user.gmail_password: 
+        if not user.gmail_user or not user.gmail_password:
             return False
 
         # login
         client = gdata.docs.client.DocsClient(source='openerp.com')
         client.ssl = True
         client.http_client.debug = False
-        client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely')
+        client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely') #authentification in a gmail account
         
         return client
 
-    def create_empty_google_doc(self, cr, uid, model, ids, type_doc):
+    def create_empty_google_doc(self, cr, uid, model, ids, type_doc,context=None):
         '''Associate a copy of the gdoc identified by 'gdocs_res_id' to the current entity.
            @param cr: the current row from the database cursor.
            @param uid: the current user ID, for security checks.
@@ -54,12 +54,13 @@ class google_docs_ir_attachment(osv.osv):
            @return the document object.
            @return False if the google_base_account hasn't been configured yet.
         '''
-
+        
         # authenticate
         client = self._auth(cr, uid)
         if client == False:
-            return False
-
+            return False #return an error
+        
+        
         # create the document in google docs
         if type_doc=='slide':
             local_resource = gdata.docs.data.Resource(gdata.docs.data.PRESENTATION_LABEL)
@@ -67,6 +68,7 @@ class google_docs_ir_attachment(osv.osv):
             local_resource = gdata.docs.data.Resource(gdata.docs.data.SPREADSHEET_LABEL)
         else:
             local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
+        
         gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
 
         # register into the db
@@ -76,30 +78,28 @@ class google_docs_ir_attachment(osv.osv):
             'type': 'url',
             'name': 'new_foo %s' % (type_doc,) , # TODO pending from the working config
             'url': gdocs_resource.get_alternate_link().href
-        })
-
+        },context=context)
+        
+        
         return gdocs_resource
 
-    def copy_gdoc(self, cr, uid, model, ids):
-        if context is None:
-            context={}
-
+    def copy_gdoc(self, cr, uid, model, ids,context=None):
         client = self._auth(cr, uid)
         if client == False:
             return False
-
         # fetch and copy the original document
         original_resource = client.get_resource_by_id(gdocs_resource_id)
         copy_resource = client.copy_resource(entry=original_resource)
-
+        
         # register into the db
         self.create(cr, uid, {
             'res_model': model,
             'res_id': ids[0],
             'type': 'url',
-            'name': 'copy_foo %s' (type_doc,) , # TODO pending from the working config
+            'name': 'file_name',
+            'name': 'copy_foo %s' (type_doc,) ,  #TODO pending from the working config
             'url': copy_resource.get_alternate_link().href
-        })
+        },context=context)
 
         return copy_resource
 
@@ -107,20 +107,17 @@ class google_docs(osv.osv):
     _name = 'google.docs'
 
     def doc_get(self, cr, uid, model, id, type_doc):
-        google_docs_config_ref = self.pool.get('res.users')
         ir_attachment_ref = self.pool.get('ir.attachment')
-        google_docs_config = google_docs_config_ref.search(cr, uid, [('context_model_id', '=', model)])
+        google_docs_config = self.pool.get('google.docs.config').search(cr, uid, [('context_model_id', '=', model)])
 
-        if not google_docs_config:
-            google_document = ir_attachment_ref.create_empty_google_doc(cr, uid, model, id, type_doc)
-        else:
+        if google_docs_config:
             google_document = ir_attachment_ref.copy_gdoc(cr, uid, model, id)
-
-        print google_docs_config
-
-        if not google_docs_config:
+        else:
+            google_document = ir_attachment_ref.create_empty_google_doc(cr, uid, model, id, type_doc)
             return -1
 
+
+
 class config(osv.osv):
     _name = 'google.docs.config'
     _description = "Google Docs templates config"
@@ -138,6 +135,10 @@ class config(osv.osv):
         'context_name': 'pr_%(name)',
         'context_multiple': False,
     }
+    def has_config_set(self, cr, uid, model,context=None):
+        print model
+        import pdb
+        pdb.set_trace()
 
     def get_config(self, cr, uid, model):
         domain = [('context_model_id', '=', model)]
diff --git a/addons/google_docs/google_docs.xml b/addons/google_docs/google_docs.xml
deleted file mode 100644
index 333909f11a0..00000000000
--- a/addons/google_docs/google_docs.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- add google docs config field in user form -->
-
-        <record model="ir.ui.view" id="view_google_docs_users_config_inherited_form">
-            <field name="name">res.user.google_docs.config.inherited</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form" />
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="signature" position="after">
-                    <group colspan='4'>
-                        <separator string='Google Docs Config' colspan='4'/>
-                        <field name="context_model_id"/>
-                        <field name='context_gdocs_resource_id'/>
-                        <field name='context_name'/>
-                        <field name='context_name_template'/>
-                    </group>
-                </field>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 6dee0d6211e..09fa3ae4dda 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -4,25 +4,41 @@
 
         <!-- add google docs config field in user form -->
 
-        <record model="ir.ui.view" id="view_google_docs_model_config_form">
-            <field name="name">google_docs.config.form</field>
+        <record model="ir.ui.view" id="view_google_docs_model_config_tree">
+            <field name="name">google_docs.config.tree</field>
             <field name="model">google.docs.config</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <group name="default_filters" position="inside">
-                    <field name="context_model_id" completion="1"
-                        readonly="0"/>
+                    <field name="context_model_id"/>
                 </group>
             </field>
         </record>
-        <record model='ir.actions.act_window' id='action_google_docs_users_config_inherited_form'>
+
+        <record model="ir.ui.view" id="view_google_docs_users_config_inherited_form">
+            <field name="name">google_docs.config.form</field>
+            <field name="model">google.docs.config</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <group colspan='4'>
+                <field name="context_model_id"/>
+                <field name='context_gdocs_resource_id'/>
+                <field name='context_name'/>
+                <field name='context_name_template'/>
+            </group>
+            </field>
+        </record>
+
+
+
+        <record model='ir.actions.act_window' id='action_google_docs_users_config'>
             <field name='name'>Models configuration</field>
             <field name='res_model'>google.docs.config</field>
             <field name='type'>ir.actions.act_window</field>
             <field name='view_type'>form</field>
-            <field name='view_id' ref='view_google_docs_model_config_form'/>
+            <field name='view_id' ref='view_google_docs_model_config_tree'/>
         </record>
         <menuitem name='Google Docs configuration' id='menu_gdocs_config' parent='base.menu_administration'/>
-        <menuitem name='Models configuration' id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config_inherited_form'/>
+        <menuitem name='Models configuration' id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config'/>
     </data>
 </openerp>
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index b7353fd0bba..c6bc1caa5ed 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -4,6 +4,7 @@ openerp.google_docs = function(instance, session) {
         instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({
             init: function() {
                 this._super.apply(this, arguments);
+                this.$element.delegate('.oe_google_docs_text_button', 'click', this.on_add_text_gdoc);
                 var self = this;
                 var config = new instance.web.DataSet(this, 'google.docs.config', this.view.dataset.get_context());
                 config.call('get_config', [this.view.dataset.ids[this.view.dataset.index]], function(r) {
@@ -21,7 +22,7 @@ openerp.google_docs = function(instance, session) {
                     });
                 });
             },
-            on_add_gdoc: function() {
+            on_add_text_gdoc: function() {
                 var self = this;
                 var $gdocbtn = this.$element.find('.oe_google_docs_text_button');
                 $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
index f401512e96b..1182e9f8421 100644
--- a/addons/google_docs/static/src/xml/gdocs.xml
+++ b/addons/google_docs/static/src/xml/gdocs.xml
@@ -4,13 +4,6 @@
 <templates id="template" xml:space="preserve">
     <t t-extend="FormView.sidebar.attachments">
         <t t-jquery="div.oe-binary-file-set" t-operation="append">
-                <br/>
-                <br/>
-                <br/>
-                <br/>
-                <br/>
-                <br/>
-                <br/>
                 <button class="oe_google_docs_text_button" type="button">
                     <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
                     <span>Add GDoc - text</span>
@@ -19,10 +12,11 @@
                     <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
                     <span>Add GDoc - spreadsheet</span>
                 </button>
+                <!--
                 <button class="oe_google_docs_slide_button" type="button">
                     <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
                     <span>Add GDoc - presentation</span>
-                </button>
+                </button>-->
         </t>
     </t>
 </templates>

From f77cecb90c39041267455b05b23764f85e6783a5 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Tue, 20 Mar 2012 17:03:20 +0100
Subject: [PATCH 055/452] [IMP] add oauth

bzr revid: mva@openerp.com-20120320160320-tykxuosgpq1r28ag
---
 addons/google_docs/google_docs.py           | 52 +++++++++++++++------
 addons/google_docs/res_config_user_view.xml |  2 -
 addons/google_docs/static/src/js/gdocs.js   |  1 -
 addons/google_docs/static/src/xml/gdocs.xml |  7 ++-
 4 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index d37f28eb349..09bb1879bdd 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -24,6 +24,9 @@ try:
     import gdata.docs.client
     from gdata.client import RequestError
     from gdata.docs.service import DOCUMENT_LABEL
+    import gdata.auth
+    import gdata.docs.service
+    import webbrowser
 except ImportError:
     raise osv.except_osv(_('Google Docs Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list'))
 
@@ -56,11 +59,15 @@ class google_docs_ir_attachment(osv.osv):
         '''
         
         # authenticate
+
+        '''
         client = self._auth(cr, uid)
         if client == False:
-            return False #return an error
-        
-        
+            return False
+        '''
+        client = self.pool.get('google.oauth')
+        client.login(cr,uid,ids,context=context)
+
         # create the document in google docs
         if type_doc=='slide':
             local_resource = gdata.docs.data.Resource(gdata.docs.data.PRESENTATION_LABEL)
@@ -68,8 +75,9 @@ class google_docs_ir_attachment(osv.osv):
             local_resource = gdata.docs.data.Resource(gdata.docs.data.SPREADSHEET_LABEL)
         else:
             local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
-        
-        gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
+       
+       #create a new doc in Google Docs 
+        gdocs_resource = client.Post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
 
         # register into the db
         self.create(cr, uid, {
@@ -117,14 +125,13 @@ class google_docs(osv.osv):
             return -1
 
 
-
 class config(osv.osv):
     _name = 'google.docs.config'
     _description = "Google Docs templates config"
 
     _columns = {
         'context_model_id': fields.many2one('ir.model', 'Model'),
-        'context_gdocs_resource_id': fields.char('Google resource ID', size=64),
+        'context_gdocs_resource_id': fields.char('Google resource ID', size=64,help='This is the id of the template document you kind find it in the URL'),
         'context_name_template': fields.char('GDoc name template ', size=64, help='This is the name which appears on google side'),
         'context_name': fields.char('Name', size=64, help='This is the attachment\'s name. As well, it appears on the panel.'),
         'context_multiple': fields.boolean('Multiple documents')
@@ -135,16 +142,35 @@ class config(osv.osv):
         'context_name': 'pr_%(name)',
         'context_multiple': False,
     }
-    def has_config_set(self, cr, uid, model,context=None):
-        print model
-        import pdb
-        pdb.set_trace()
-
     def get_config(self, cr, uid, model):
         domain = [('context_model_id', '=', model)]
         if self.search_count(cr, uid, domain) != 0:
             return False
         else:
             return self.search(cr, uid, domain)
-
 config()
+
+
+
+class oauth (osv.osv):
+    _name = 'google.oauth'
+    def login(self,cr,uid,ids,context=None):
+        consumer_key = '751376579939.apps.googleusercontent.com'
+        consumer_secret = '_KGpgyO8DZIseyG3N-j-h8gN'
+        gd_client = gdata.docs.service.DocsService()
+        #Set OAuth input parameters
+        gd_client.SetOAuthInputParameters(gdata.auth.OAuthSignatureMethod.HMAC_SHA1,consumer_key, consumer_secret=consumer_secret)
+        #Fetch OAuth Request token
+        request_token = gd_client.FetchOAuthRequestToken()
+        #Set the fetched OAuth token
+        gd_client.SetOAuthToken(request_token)
+        #Generate OAuth authorization URL
+        auth_url = gd_client.GenerateOAuthAuthorizationURL()
+        webbrowser.open(auth_url)
+        print gd_client.SetOAuthToken(request_token) 
+        consumer_key = raw_input('Please enter consumer key: ')
+
+        #Upgrade to an OAuth access token
+        gd_client.UpgradeToOAuthAccessToken()
+        #Access Token
+        gd_client.token_store.find_token(request_token.scopes[0])
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 09fa3ae4dda..9920cc6965b 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -29,8 +29,6 @@
             </field>
         </record>
 
-
-
         <record model='ir.actions.act_window' id='action_google_docs_users_config'>
             <field name='name'>Models configuration</field>
             <field name='res_model'>google.docs.config</field>
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index c6bc1caa5ed..c32dc4c8829 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -12,7 +12,6 @@ openerp.google_docs = function(instance, session) {
                     // if the configuration isn't set, the buttons should be hidden.
                     if (r==false) {
                         $('.oe_google_docs_text_button').css('display', 'none');
-
                         return;
                     }
 
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
index 1182e9f8421..927b35f115d 100644
--- a/addons/google_docs/static/src/xml/gdocs.xml
+++ b/addons/google_docs/static/src/xml/gdocs.xml
@@ -5,14 +5,13 @@
     <t t-extend="FormView.sidebar.attachments">
         <t t-jquery="div.oe-binary-file-set" t-operation="append">
                 <button class="oe_google_docs_text_button" type="button">
-                    <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
-                    <span>Add GDoc - text</span>
+                    <!--<img src="/web/static/src/img/throbber.gif"  width="16" height="16"/>-->
+                    <span>Add A Goole Docs</span>
                 </button>
-                <button class="oe_google_docs_spreadsheet_button" type="button">
+                <!--<button class="oe_google_docs_spreadsheet_button" type="button">
                     <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
                     <span>Add GDoc - spreadsheet</span>
                 </button>
-                <!--
                 <button class="oe_google_docs_slide_button" type="button">
                     <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
                     <span>Add GDoc - presentation</span>

From dda93ab1ec568c66cc36d7a74ea093f4c9f573e9 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Fri, 23 Mar 2012 11:29:04 +0100
Subject: [PATCH 056/452] [REF] refactore the oauth connexion

bzr revid: mva@openerp.com-20120323102904-v72btptb9a4pnvht
---
 addons/google_docs/google_docs.py | 85 ++++++++++++++++++++-----------
 1 file changed, 56 insertions(+), 29 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 09bb1879bdd..8257f595db1 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -25,7 +25,6 @@ try:
     from gdata.client import RequestError
     from gdata.docs.service import DOCUMENT_LABEL
     import gdata.auth
-    import gdata.docs.service
     import webbrowser
 except ImportError:
     raise osv.except_osv(_('Google Docs Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list'))
@@ -57,7 +56,6 @@ class google_docs_ir_attachment(osv.osv):
            @return the document object.
            @return False if the google_base_account hasn't been configured yet.
         '''
-        
         # authenticate
 
         '''
@@ -65,8 +63,8 @@ class google_docs_ir_attachment(osv.osv):
         if client == False:
             return False
         '''
-        client = self.pool.get('google.oauth')
-        client.login(cr,uid,ids,context=context)
+        client = self.pool.get('google.oauth').login(cr,uid,ids)
+
 
         # create the document in google docs
         if type_doc=='slide':
@@ -77,7 +75,7 @@ class google_docs_ir_attachment(osv.osv):
             local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
        
        #create a new doc in Google Docs 
-        gdocs_resource = client.Post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
+       #gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
 
         # register into the db
         self.create(cr, uid, {
@@ -85,16 +83,17 @@ class google_docs_ir_attachment(osv.osv):
             'res_id': ids[0],
             'type': 'url',
             'name': 'new_foo %s' % (type_doc,) , # TODO pending from the working config
-            'url': gdocs_resource.get_alternate_link().href
+            'url': ''#gdocs_resource.get_alternate_link().href
         },context=context)
         
         
-        return gdocs_resource
+        return 1
 
     def copy_gdoc(self, cr, uid, model, ids,context=None):
-        client = self._auth(cr, uid)
-        if client == False:
-            return False
+        #client = self._auth(cr, uid)
+        #with oauth already connect check for the correct token
+        #if client == False:
+        #    return False
         # fetch and copy the original document
         original_resource = client.get_resource_by_id(gdocs_resource_id)
         copy_resource = client.copy_resource(entry=original_resource)
@@ -154,23 +153,51 @@ config()
 
 class oauth (osv.osv):
     _name = 'google.oauth'
-    def login(self,cr,uid,ids,context=None):
-        consumer_key = '751376579939.apps.googleusercontent.com'
-        consumer_secret = '_KGpgyO8DZIseyG3N-j-h8gN'
-        gd_client = gdata.docs.service.DocsService()
-        #Set OAuth input parameters
-        gd_client.SetOAuthInputParameters(gdata.auth.OAuthSignatureMethod.HMAC_SHA1,consumer_key, consumer_secret=consumer_secret)
-        #Fetch OAuth Request token
-        request_token = gd_client.FetchOAuthRequestToken()
-        #Set the fetched OAuth token
-        gd_client.SetOAuthToken(request_token)
-        #Generate OAuth authorization URL
-        auth_url = gd_client.GenerateOAuthAuthorizationURL()
-        webbrowser.open(auth_url)
-        print gd_client.SetOAuthToken(request_token) 
-        consumer_key = raw_input('Please enter consumer key: ')
 
-        #Upgrade to an OAuth access token
-        gd_client.UpgradeToOAuthAccessToken()
-        #Access Token
-        gd_client.token_store.find_token(request_token.scopes[0])
+    '''
+    def open_url(self,uid,ids,url,context=None):
+        return {'type' : 'ir.actions.act_url',
+                'url' : url,
+                'target': 'new',
+                }
+    '''
+    def login(self,cr,uid,ids,context=None):
+    
+        # subscribe the google API
+        CONSUMER_KEY = '751376579939.apps.googleusercontent.com'
+        CONSUMER_SECRET = '_KGpgyO8DZIseyG3N-j-h8gN' 
+
+
+        local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
+        SCOPES = ['https://docs.google.com/feeds/'] #select the google service
+
+        client = gdata.docs.client.DocsClient(source='openerp.com')
+
+        #the callback url
+        oauth_callback_url = 'http://127.0.0.1:8069/'#TODO give a correct dynamic url
+
+        #create a temporary token need to create a google authorization
+        request_token = client.GetOAuthToken(SCOPES, oauth_callback_url, CONSUMER_KEY, CONSUMER_SECRET)
+        #create an autorization google link
+        auth_url = request_token.generate_authorization_url()
+        #openthe link in your browser
+        webbrowser.open(str(auth_url))
+
+        #when you accept the autorization you are linked in your callback url
+        #you need to catch this url for the moment I copy past it in a raw_input
+        url_after=raw_input()
+
+        #create an autorization token
+        request_token_authorized = gdata.gauth.AuthorizeRequestToken(request_token, url_after)
+        #upgrade the token
+        access_token = client.GetAccessToken(request_token_authorized)
+
+
+        #when your access token you can connect your google services
+        client.auth_token = gdata.gauth.OAuthHmacToken(CONSUMER_KEY,
+                                                       CONSUMER_SECRET,
+                                                       access_token.token,
+                                                       access_token.token_secret,
+                                                       gdata.gauth.ACCESS_TOKEN)
+
+        return client

From 3590c952ec73a4b933dfac889ffb20838475f345 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Wed, 28 Mar 2012 10:29:48 +0200
Subject: [PATCH 057/452] [IMP] add gdata docs library in google base account
 remove oauth authentification and replace with google_login method in
 google_base_account remove unuse button in sidebar and correct the
 copy_resource method

bzr revid: mva@openerp.com-20120328082948-7my72vqn0gcbsf2l
---
 .../wizard/google_login.py                    |   2 +
 addons/google_docs/__openerp__.py             |  21 +++
 addons/google_docs/google_docs.py             | 129 +++++-------------
 addons/google_docs/res_config_user_view.xml   |   6 +-
 addons/google_docs/static/src/xml/gdocs.xml   |   9 --
 5 files changed, 57 insertions(+), 110 deletions(-)

diff --git a/addons/google_base_account/wizard/google_login.py b/addons/google_base_account/wizard/google_login.py
index 78f27e51da4..ab1c34f1329 100644
--- a/addons/google_base_account/wizard/google_login.py
+++ b/addons/google_base_account/wizard/google_login.py
@@ -43,6 +43,8 @@ class google_login(osv.osv_memory):
             gd_client = gdata.contacts.service.ContactsService()
         if type == 'calendar':
             gd_client = gdata.calendar.service.CalendarService()
+        if type =='docs_client':
+            gd_client = gdata.docs.client.DocsClient()
         else:
             gd_client = gdata.contacts.service.ContactsService()     
         try:    
diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 237804c4f5b..b1cfd1490d5 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -1,3 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 {
     'name': 'Google Docs integration',
     'version': '0.2',
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 8257f595db1..bba8524023a 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -25,7 +25,6 @@ try:
     from gdata.client import RequestError
     from gdata.docs.service import DOCUMENT_LABEL
     import gdata.auth
-    import webbrowser
 except ImportError:
     raise osv.except_osv(_('Google Docs Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list'))
 
@@ -33,17 +32,17 @@ class google_docs_ir_attachment(osv.osv):
     _inherit = 'ir.attachment'
 
     def _auth(self, cr, uid,context=None):
-        # check google_base_account
-        users_obj = self.pool.get('res.users')
-        user = users_obj.browse(cr, uid, [uid])[0]
-        if not user.gmail_user or not user.gmail_password:
-            return False
-
-        # login
-        client = gdata.docs.client.DocsClient(source='openerp.com')
-        client.ssl = True
-        client.http_client.debug = False
-        client.ClientLogin(user.gmail_user, user.gmail_password, client.source, service='writely') #authentification in a gmail account
+        '''
+        Connexion with google base account
+        @return client object for connexion
+        '''
+        #pool the google.login in google_base_account
+        google_pool = self.pool.get('google.login')
+        
+        #get gmail password and login
+        user_config = google_pool.default_get( cr, uid, {'user' : '' , 'password' : ''},context=context)
+        #login gmail account
+        client = google_pool.google_login( user_config['user'], user_config['password'], type='docs_client', context=context)
         
         return client
 
@@ -56,47 +55,31 @@ class google_docs_ir_attachment(osv.osv):
            @return the document object.
            @return False if the google_base_account hasn't been configured yet.
         '''
-        # authenticate
-
-        '''
-        client = self._auth(cr, uid)
-        if client == False:
-            return False
-        '''
-        client = self.pool.get('google.oauth').login(cr,uid,ids)
-
-
+        #login with the base account google module
+        client = self._auth(cr, uid,context=context)
         # create the document in google docs
-        if type_doc=='slide':
-            local_resource = gdata.docs.data.Resource(gdata.docs.data.PRESENTATION_LABEL)
-        elif type_doc=='spreadsheet':
-            local_resource = gdata.docs.data.Resource(gdata.docs.data.SPREADSHEET_LABEL)
-        else:
-            local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
-       
-       #create a new doc in Google Docs 
-       #gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
-
+        local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
+        #create a new doc in Google Docs 
+        gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
+        name = gdocs_resource.title
         # register into the db
         self.create(cr, uid, {
             'res_model': model,
             'res_id': ids[0],
             'type': 'url',
-            'name': 'new_foo %s' % (type_doc,) , # TODO pending from the working config
-            'url': ''#gdocs_resource.get_alternate_link().href
+            'name': name,
+            'url': gdocs_resource.get_alternate_link().href,
         },context=context)
         
         
         return 1
 
-    def copy_gdoc(self, cr, uid, model, ids,context=None):
-        #client = self._auth(cr, uid)
-        #with oauth already connect check for the correct token
-        #if client == False:
-        #    return False
+    def copy_gdoc(self, cr, uid, model, google_res_id, ids,context=None):
+        client = self._auth(cr, uid)
         # fetch and copy the original document
-        original_resource = client.get_resource_by_id(gdocs_resource_id)
-        copy_resource = client.copy_resource(entry=original_resource)
+        original_resource = client.get_resource_by_id(google_res_id)
+        #copy the document you choose in the configuration 
+        copy_resource = client.copy_resource(original_resource,'copy_foo')
         
         # register into the db
         self.create(cr, uid, {
@@ -104,7 +87,7 @@ class google_docs_ir_attachment(osv.osv):
             'res_id': ids[0],
             'type': 'url',
             'name': 'file_name',
-            'name': 'copy_foo %s' (type_doc,) ,  #TODO pending from the working config
+            'name': 'copy_foo' ,  #TODO pending from the working config
             'url': copy_resource.get_alternate_link().href
         },context=context)
 
@@ -113,12 +96,14 @@ class google_docs_ir_attachment(osv.osv):
 class google_docs(osv.osv):
     _name = 'google.docs'
 
-    def doc_get(self, cr, uid, model, id, type_doc):
+    def doc_get(self, cr, uid, model, id, type_doc,context=None):
         ir_attachment_ref = self.pool.get('ir.attachment')
         google_docs_config = self.pool.get('google.docs.config').search(cr, uid, [('context_model_id', '=', model)])
-
+        # check if a model is configurate with a template
         if google_docs_config:
-            google_document = ir_attachment_ref.copy_gdoc(cr, uid, model, id)
+            for google_config in self.pool.get('google.docs.config').browse(cr,uid,google_docs_config,context=context):
+                google_res_id = google_config.context_gdocs_resource_id
+            google_document = ir_attachment_ref.copy_gdoc(cr, uid, model,google_res_id, id)
         else:
             google_document = ir_attachment_ref.create_empty_google_doc(cr, uid, model, id, type_doc)
             return -1
@@ -133,13 +118,11 @@ class config(osv.osv):
         'context_gdocs_resource_id': fields.char('Google resource ID', size=64,help='This is the id of the template document you kind find it in the URL'),
         'context_name_template': fields.char('GDoc name template ', size=64, help='This is the name which appears on google side'),
         'context_name': fields.char('Name', size=64, help='This is the attachment\'s name. As well, it appears on the panel.'),
-        'context_multiple': fields.boolean('Multiple documents')
     }
 
     _defaults = {
         'context_name_template': 'Google Document',
         'context_name': 'pr_%(name)',
-        'context_multiple': False,
     }
     def get_config(self, cr, uid, model):
         domain = [('context_model_id', '=', model)]
@@ -147,57 +130,7 @@ class config(osv.osv):
             return False
         else:
             return self.search(cr, uid, domain)
+
 config()
 
 
-
-class oauth (osv.osv):
-    _name = 'google.oauth'
-
-    '''
-    def open_url(self,uid,ids,url,context=None):
-        return {'type' : 'ir.actions.act_url',
-                'url' : url,
-                'target': 'new',
-                }
-    '''
-    def login(self,cr,uid,ids,context=None):
-    
-        # subscribe the google API
-        CONSUMER_KEY = '751376579939.apps.googleusercontent.com'
-        CONSUMER_SECRET = '_KGpgyO8DZIseyG3N-j-h8gN' 
-
-
-        local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
-        SCOPES = ['https://docs.google.com/feeds/'] #select the google service
-
-        client = gdata.docs.client.DocsClient(source='openerp.com')
-
-        #the callback url
-        oauth_callback_url = 'http://127.0.0.1:8069/'#TODO give a correct dynamic url
-
-        #create a temporary token need to create a google authorization
-        request_token = client.GetOAuthToken(SCOPES, oauth_callback_url, CONSUMER_KEY, CONSUMER_SECRET)
-        #create an autorization google link
-        auth_url = request_token.generate_authorization_url()
-        #openthe link in your browser
-        webbrowser.open(str(auth_url))
-
-        #when you accept the autorization you are linked in your callback url
-        #you need to catch this url for the moment I copy past it in a raw_input
-        url_after=raw_input()
-
-        #create an autorization token
-        request_token_authorized = gdata.gauth.AuthorizeRequestToken(request_token, url_after)
-        #upgrade the token
-        access_token = client.GetAccessToken(request_token_authorized)
-
-
-        #when your access token you can connect your google services
-        client.auth_token = gdata.gauth.OAuthHmacToken(CONSUMER_KEY,
-                                                       CONSUMER_SECRET,
-                                                       access_token.token,
-                                                       access_token.token_secret,
-                                                       gdata.gauth.ACCESS_TOKEN)
-
-        return client
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 9920cc6965b..be56f324d2d 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -4,7 +4,7 @@
 
         <!-- add google docs config field in user form -->
 
-        <record model="ir.ui.view" id="view_google_docs_model_config_tree">
+        <record model="ir.ui.view" id="view_google_docs_config_tree">
             <field name="name">google_docs.config.tree</field>
             <field name="model">google.docs.config</field>
             <field name="type">tree</field>
@@ -15,7 +15,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_google_docs_users_config_inherited_form">
+        <record model="ir.ui.view" id="view_google_docs_config_form">
             <field name="name">google_docs.config.form</field>
             <field name="model">google.docs.config</field>
             <field name="type">form</field>
@@ -34,7 +34,7 @@
             <field name='res_model'>google.docs.config</field>
             <field name='type'>ir.actions.act_window</field>
             <field name='view_type'>form</field>
-            <field name='view_id' ref='view_google_docs_model_config_tree'/>
+            <field name='view_id' ref='view_google_docs_config_form'/>
         </record>
         <menuitem name='Google Docs configuration' id='menu_gdocs_config' parent='base.menu_administration'/>
         <menuitem name='Models configuration' id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config'/>
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
index 927b35f115d..acb352bf9b0 100644
--- a/addons/google_docs/static/src/xml/gdocs.xml
+++ b/addons/google_docs/static/src/xml/gdocs.xml
@@ -5,17 +5,8 @@
     <t t-extend="FormView.sidebar.attachments">
         <t t-jquery="div.oe-binary-file-set" t-operation="append">
                 <button class="oe_google_docs_text_button" type="button">
-                    <!--<img src="/web/static/src/img/throbber.gif"  width="16" height="16"/>-->
                     <span>Add A Goole Docs</span>
                 </button>
-                <!--<button class="oe_google_docs_spreadsheet_button" type="button">
-                    <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
-                    <span>Add GDoc - spreadsheet</span>
-                </button>
-                <button class="oe_google_docs_slide_button" type="button">
-                    <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
-                    <span>Add GDoc - presentation</span>
-                </button>-->
         </t>
     </t>
 </templates>

From 2f1baf8f40908b54db0950f596fbe98e35d7cf9a Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Wed, 28 Mar 2012 11:34:56 +0200
Subject: [PATCH 058/452] [IMP] replace the static name in the document name

bzr revid: mva@openerp.com-20120328093456-7wgnnvizvg0r747i
---
 addons/google_docs/google_docs.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index bba8524023a..8c882a3422a 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -61,13 +61,13 @@ class google_docs_ir_attachment(osv.osv):
         local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
         #create a new doc in Google Docs 
         gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
-        name = gdocs_resource.title
+        
         # register into the db
         self.create(cr, uid, {
             'res_model': model,
             'res_id': ids[0],
             'type': 'url',
-            'name': name,
+            'name': ('new_%s' % gdocs_resource.title.text),
             'url': gdocs_resource.get_alternate_link().href,
         },context=context)
         
@@ -86,8 +86,7 @@ class google_docs_ir_attachment(osv.osv):
             'res_model': model,
             'res_id': ids[0],
             'type': 'url',
-            'name': 'file_name',
-            'name': 'copy_foo' ,  #TODO pending from the working config
+            'name': 'copy_%s' % gdocs_resource.title.text,
             'url': copy_resource.get_alternate_link().href
         },context=context)
 

From c46481f1deb9e692058cd1ed42f9b96127ad6556 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Wed, 28 Mar 2012 11:47:18 +0200
Subject: [PATCH 059/452] [IMP] add a raise error to check if configuration is
 ok

bzr revid: mva@openerp.com-20120328094718-xk5brbglmeo49cid
---
 addons/google_docs/google_docs.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 8c882a3422a..13d9634dcf8 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -43,7 +43,8 @@ class google_docs_ir_attachment(osv.osv):
         user_config = google_pool.default_get( cr, uid, {'user' : '' , 'password' : ''},context=context)
         #login gmail account
         client = google_pool.google_login( user_config['user'], user_config['password'], type='docs_client', context=context)
-        
+        if not client:
+            raise osv.except_osv(('Google Docs Error!'),("Check your google configuration in users/synchronization") )
         return client
 
     def create_empty_google_doc(self, cr, uid, model, ids, type_doc,context=None):

From 774aa481c2f60df74d8b01f03b00cad002d8e105 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Wed, 28 Mar 2012 12:10:15 +0200
Subject: [PATCH 060/452] [IMP] correct the copy with the good document title

bzr revid: mva@openerp.com-20120328101015-4v1fit8z3cno9y91
---
 addons/google_docs/google_docs.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 13d9634dcf8..1e6071cd716 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -78,16 +78,17 @@ class google_docs_ir_attachment(osv.osv):
     def copy_gdoc(self, cr, uid, model, google_res_id, ids,context=None):
         client = self._auth(cr, uid)
         # fetch and copy the original document
+        print 'test'
         original_resource = client.get_resource_by_id(google_res_id)
-        #copy the document you choose in the configuration 
-        copy_resource = client.copy_resource(original_resource,'copy_foo')
+        #copy the document you choose in the configuration
+        copy_resource = client.copy_resource(original_resource,'copy_%s' % original_resource.title.text)
         
         # register into the db
         self.create(cr, uid, {
             'res_model': model,
             'res_id': ids[0],
             'type': 'url',
-            'name': 'copy_%s' % gdocs_resource.title.text,
+            'name': 'copy_%s' % original_resource.title.text,
             'url': copy_resource.get_alternate_link().href
         },context=context)
 

From 95a86ec57dfb22569ed9b1bd8ea36ae44f9e6856 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Wed, 28 Mar 2012 13:41:13 +0200
Subject: [PATCH 061/452] [IMP] add some comment and add a raise if the google
 resource is not correct

bzr revid: mva@openerp.com-20120328114113-vspkkbvpdfnt3mho
---
 addons/google_docs/google_docs.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 1e6071cd716..6e91ee64658 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -76,13 +76,18 @@ class google_docs_ir_attachment(osv.osv):
         return 1
 
     def copy_gdoc(self, cr, uid, model, google_res_id, ids,context=None):
+        '''
+        copy an existing document in google docs
+        '''
+
         client = self._auth(cr, uid)
         # fetch and copy the original document
-        print 'test'
-        original_resource = client.get_resource_by_id(google_res_id)
-        #copy the document you choose in the configuration
-        copy_resource = client.copy_resource(original_resource,'copy_%s' % original_resource.title.text)
-        
+        try:
+            original_resource = client.get_resource_by_id(google_res_id)
+            #copy the document you choose in the configuration
+            copy_resource = client.copy_resource(original_resource,'copy_%s' % original_resource.title.text)
+        except:
+            raise osv.except_osv(('Google Docs Error!'),("Your ressource id is not correct. You can find the id in the google docs URL") )
         # register into the db
         self.create(cr, uid, {
             'res_model': model,
@@ -126,6 +131,10 @@ class config(osv.osv):
         'context_name': 'pr_%(name)',
     }
     def get_config(self, cr, uid, model):
+        '''
+        Method use with the js to hidde or show the add google doc button 
+        @return : list of configuration ids or false
+        '''
         domain = [('context_model_id', '=', model)]
         if self.search_count(cr, uid, domain) != 0:
             return False

From d4152e970378881f82373d4e09c8d23eea1d2535 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Fri, 30 Mar 2012 16:51:49 +0200
Subject: [PATCH 062/452] [IMP] change js remove unusfull code and the file
 name configuration

bzr revid: mva@openerp.com-20120330145149-04gqj8lvleb9pa53
---
 addons/google_docs/google_docs.py           | 39 ++++++++++++---------
 addons/google_docs/res_config_user_view.xml | 11 +++---
 addons/google_docs/static/src/js/gdocs.js   | 20 ++++-------
 addons/google_docs/static/src/xml/gdocs.xml |  3 +-
 4 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 6e91ee64658..3045cbab279 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -47,7 +47,7 @@ class google_docs_ir_attachment(osv.osv):
             raise osv.except_osv(('Google Docs Error!'),("Check your google configuration in users/synchronization") )
         return client
 
-    def create_empty_google_doc(self, cr, uid, model, ids, type_doc,context=None):
+    def create_empty_google_doc(self, cr, uid, name_gdocs, model, ids, type_doc,context=None):
         '''Associate a copy of the gdoc identified by 'gdocs_res_id' to the current entity.
            @param cr: the current row from the database cursor.
            @param uid: the current user ID, for security checks.
@@ -62,24 +62,22 @@ class google_docs_ir_attachment(osv.osv):
         local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
         #create a new doc in Google Docs 
         gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
-        
         # register into the db
         self.create(cr, uid, {
             'res_model': model,
             'res_id': ids[0],
             'type': 'url',
-            'name': ('new_%s' % gdocs_resource.title.text),
+            'name': 'Google Doc',
             'url': gdocs_resource.get_alternate_link().href,
         },context=context)
         
         
         return 1
 
-    def copy_gdoc(self, cr, uid, model, google_res_id, ids,context=None):
+    def copy_gdoc(self, cr, uid, name_gdocs, model, google_res_id, ids,context=None):
         '''
         copy an existing document in google docs
         '''
-
         client = self._auth(cr, uid)
         # fetch and copy the original document
         try:
@@ -93,7 +91,7 @@ class google_docs_ir_attachment(osv.osv):
             'res_model': model,
             'res_id': ids[0],
             'type': 'url',
-            'name': 'copy_%s' % original_resource.title.text,
+            'name': name_gdocs,
             'url': copy_resource.get_alternate_link().href
         },context=context)
 
@@ -104,14 +102,20 @@ class google_docs(osv.osv):
 
     def doc_get(self, cr, uid, model, id, type_doc,context=None):
         ir_attachment_ref = self.pool.get('ir.attachment')
-        google_docs_config = self.pool.get('google.docs.config').search(cr, uid, [('context_model_id', '=', model)])
+        pool_gdoc_config = self.pool.get('google.docs.config')
+        google_docs_config = pool_gdoc_config.search(cr, uid, [('model_id', '=', model)])
+        name_gdocs=''
+        if google_docs_config:
+            name_gdocs = pool_gdoc_config.browse(cr,uid,google_docs_config,context=context)[0].name_template
+            print name_gdocs
+        
         # check if a model is configurate with a template
         if google_docs_config:
             for google_config in self.pool.get('google.docs.config').browse(cr,uid,google_docs_config,context=context):
-                google_res_id = google_config.context_gdocs_resource_id
-            google_document = ir_attachment_ref.copy_gdoc(cr, uid, model,google_res_id, id)
+                google_res_id = google_config.gdocs_resource_id
+            google_document = ir_attachment_ref.copy_gdoc(cr, uid,name_gdocs ,model,google_res_id, id)
         else:
-            google_document = ir_attachment_ref.create_empty_google_doc(cr, uid, model, id, type_doc)
+            google_document = ir_attachment_ref.create_empty_google_doc(cr, uid,name_gdocs, model, id, type_doc)
             return -1
 
 
@@ -120,24 +124,25 @@ class config(osv.osv):
     _description = "Google Docs templates config"
 
     _columns = {
-        'context_model_id': fields.many2one('ir.model', 'Model'),
-        'context_gdocs_resource_id': fields.char('Google resource ID', size=64,help='This is the id of the template document you kind find it in the URL'),
-        'context_name_template': fields.char('GDoc name template ', size=64, help='This is the name which appears on google side'),
-        'context_name': fields.char('Name', size=64, help='This is the attachment\'s name. As well, it appears on the panel.'),
+        'model_id': fields.many2one('ir.model', 'Model'),
+        'gdocs_resource_id': fields.char('Google resource ID', size=64,help='This is the id of the template document you kind find it in the URL'),
+        'name_template': fields.char('GDoc name template ', size=64, help='This is the name which appears on google side'),
     }
 
     _defaults = {
-        'context_name_template': 'Google Document',
-        'context_name': 'pr_%(name)',
+        'name_template': 'pr_%(name)',
     }
     def get_config(self, cr, uid, model):
         '''
         Method use with the js to hidde or show the add google doc button 
         @return : list of configuration ids or false
         '''
-        domain = [('context_model_id', '=', model)]
+        domain = [('model_id', '=', model)]
         if self.search_count(cr, uid, domain) != 0:
             return False
+        # attached only one document to a model 
+        if self.pool.get('ir.attachment').search_count(cr,uid,[('url','like','https://docs.google.com/document%')]) !=0:
+            return False
         else:
             return self.search(cr, uid, domain)
 
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index be56f324d2d..46abe5b2d80 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -10,7 +10,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <group name="default_filters" position="inside">
-                    <field name="context_model_id"/>
+                    <field name="model_id"/>
                 </group>
             </field>
         </record>
@@ -21,10 +21,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <group colspan='4'>
-                <field name="context_model_id"/>
-                <field name='context_gdocs_resource_id'/>
-                <field name='context_name'/>
-                <field name='context_name_template'/>
+                <field name="model_id"/>
+                <field name='gdocs_resource_id'/>
+                <field name='name_template'/>
             </group>
             </field>
         </record>
@@ -34,7 +33,7 @@
             <field name='res_model'>google.docs.config</field>
             <field name='type'>ir.actions.act_window</field>
             <field name='view_type'>form</field>
-            <field name='view_id' ref='view_google_docs_config_form'/>
+            <field name='view_id' ref='view_google_docs_config_tree'/>
         </record>
         <menuitem name='Google Docs configuration' id='menu_gdocs_config' parent='base.menu_administration'/>
         <menuitem name='Models configuration' id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config'/>
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index c32dc4c8829..9dc4f5c88d3 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -8,36 +8,28 @@ openerp.google_docs = function(instance, session) {
                 var self = this;
                 var config = new instance.web.DataSet(this, 'google.docs.config', this.view.dataset.get_context());
                 config.call('get_config', [this.view.dataset.ids[this.view.dataset.index]], function(r) {
-                    console.log(r);
                     // if the configuration isn't set, the buttons should be hidden.
                     if (r==false) {
-                        $('.oe_google_docs_text_button').css('display', 'none');
+                        $('.oe_google_docs_text_button',this.$element).hide();
                         return;
                     }
 
                     var attachment = new instance.web.DataSet(this, 'ir.attachment', self.view.dataset.get_context());
                     attachment.call('copy_gdoc', [self.view.dataset.model, [self.view.datarecord.id]], function(res) {
-                        console.log(res);
                     });
                 });
             },
+            start: function() {
+                this._super();
+                console.log($('.oe_google_docs_text_button',this.$element))
+                $('.oe_google_docs_text_button',this.$element)
+            },
             on_add_text_gdoc: function() {
                 var self = this;
                 var $gdocbtn = this.$element.find('.oe_google_docs_text_button');
                 $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
                 var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
                 ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord.id], 'text'], function(r) {
-                    console.log(r);
-                    if (r == 'False') {
-                        var params = {
-                            error: response,
-                            message: "The user google credentials are not set yet. Contact your administrator for help."
-                        }
-                        $(openerp.web.qweb.render("DialogWarning", params)).dialog({
-                            title: "User Google credentials are not yet set.",
-                            modal: true,
-                        });
-                    }
                     self.do_update();
                 });
             },
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
index acb352bf9b0..2de7efcbd43 100644
--- a/addons/google_docs/static/src/xml/gdocs.xml
+++ b/addons/google_docs/static/src/xml/gdocs.xml
@@ -5,7 +5,8 @@
     <t t-extend="FormView.sidebar.attachments">
         <t t-jquery="div.oe-binary-file-set" t-operation="append">
                 <button class="oe_google_docs_text_button" type="button">
-                    <span>Add A Goole Docs</span>
+                    <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
+                    <span>Goole Docs</span>
                 </button>
         </t>
     </t>

From a85f78a48bb5a8681746925eaf6eb62243472453 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 2 Apr 2012 11:58:17 +0530
Subject: [PATCH 063/452] [ADD]event_sale: Add event_items fields for
 product_ids and sales_ends fields.

bzr revid: atp@tinyerp.com-20120402062817-yjd1pay0kqolv8fe
---
 addons/event_sale/event_sale.py       | 30 +++++++++++++++++-
 addons/event_sale/event_sale_view.xml | 45 +++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index df115c0eef4..0208714b083 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -92,4 +92,32 @@ class sale_order_line(osv.osv):
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.log(cr, uid, registration_id, message)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
-
+    
+class event_event(osv.osv):
+    _inherit = 'event.event'
+    _columns = {
+        'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
+    }
+    
+class event_items(osv.osv):
+    _name = "event.items"
+    _columns = {
+        'product_id': fields.many2one('product.product', 'Product', required=True),
+        'qty': fields.integer('Quantity'),
+        'price': fields.integer('Price'),
+        'uom_id': fields.many2one('product.uom', 'Unit of Measure'),
+        'discount': fields.integer('Discount'),
+        'event_id': fields.many2one('event.event', 'Event'),
+        'sales_end_date': fields.date('Sales End')
+        }
+    
+    def onchange_product_id(self, cr, uid, ids, product, context=None):
+        product_obj = self.pool.get('product.product')
+        data = {}
+        if not product:
+            return {'value': data}
+        price = product_obj.browse(cr, uid, product).list_price
+        uom = product_obj.browse(cr, uid, product).uom_id.id
+        data['price'] = price
+        data['uom_id'] = uom
+        return {'value': data}
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 4387e3a725a..1eb15e944a9 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -29,5 +29,50 @@
                 </xpath>
              </field>
         </record>
+        
+        <record model="ir.ui.view" id="view_event_form_inherit">
+            <field name="name">Events Inherit</field>
+            <field name="model">event.event</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="event.view_event_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook[last()]" position="inside">
+                    <page string="Event Items">
+                        <field name="event_item_ids" nolabel="1"/>
+                    </page>
+                </xpath>                
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_event_items_tree">
+            <field name="name">Event Items Tree</field>
+            <field name="model">event.items</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Event Items">
+                    <field name="product_id"/>
+                    <field name="price"/>
+                    <field name="uom_id"/>
+                    <field name="discount"/>                  
+                    <field name="sales_end_date"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_event_items_form">
+            <field name="name">Event Items Form</field>
+            <field name="model">event.items</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Event Items">
+                    <field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
+                    <field name="price"/>
+                    <field name="uom_id"/>
+                    <field name="discount"/>
+                    <field name="sales_end_date"/>
+                </form>
+            </field>
+        </record>
+        
     </data>
 </openerp>

From fb989dbfb7161b9f79ce5bf2024a5f13423b1b6f Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Mon, 2 Apr 2012 15:18:17 +0200
Subject: [PATCH 064/452] [IMP] change the way to name the attachement and
 change when you already have a google document the button will be hide

bzr revid: mva@openerp.com-20120402131817-oxv227m8i11pfsjx
---
 addons/google_docs/google_docs.py         | 19 +++++------
 addons/google_docs/static/src/js/gdocs.js | 40 +++++++++++++----------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 3045cbab279..e195fcf21a6 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -105,9 +105,11 @@ class google_docs(osv.osv):
         pool_gdoc_config = self.pool.get('google.docs.config')
         google_docs_config = pool_gdoc_config.search(cr, uid, [('model_id', '=', model)])
         name_gdocs=''
+        model_fields_dic = self.pool.get(model).read(cr,uid,id,[])
+        
         if google_docs_config:
             name_gdocs = pool_gdoc_config.browse(cr,uid,google_docs_config,context=context)[0].name_template
-            print name_gdocs
+            name_gdocs = name_gdocs % model_fields_dic[0]
         
         # check if a model is configurate with a template
         if google_docs_config:
@@ -130,22 +132,17 @@ class config(osv.osv):
     }
 
     _defaults = {
-        'name_template': 'pr_%(name)',
+        'name_template': 'pr_%(name)s',
     }
-    def get_config(self, cr, uid, model):
+    def get_config(self, cr, uid, ids, model,context=None):
         '''
         Method use with the js to hidde or show the add google doc button 
         @return : list of configuration ids or false
         '''
-        domain = [('model_id', '=', model)]
-        if self.search_count(cr, uid, domain) != 0:
-            return False
-        # attached only one document to a model 
-        if self.pool.get('ir.attachment').search_count(cr,uid,[('url','like','https://docs.google.com/document%')]) !=0:
-            return False
+        if self.pool.get('ir.attachment').search_count(cr,uid,[('url','like','https://docs.google.com/document%'),('res_model','=',model),('res_id','=',ids[0])]) !=0:
+            return  False
         else:
-            return self.search(cr, uid, domain)
-
+            return True
 config()
 
 
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 9dc4f5c88d3..425de5045d8 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -5,31 +5,35 @@ openerp.google_docs = function(instance, session) {
             init: function() {
                 this._super.apply(this, arguments);
                 this.$element.delegate('.oe_google_docs_text_button', 'click', this.on_add_text_gdoc);
-                var self = this;
-                var config = new instance.web.DataSet(this, 'google.docs.config', this.view.dataset.get_context());
-                config.call('get_config', [this.view.dataset.ids[this.view.dataset.index]], function(r) {
-                    // if the configuration isn't set, the buttons should be hidden.
-                    if (r==false) {
-                        $('.oe_google_docs_text_button',this.$element).hide();
-                        return;
-                    }
+            },
+
+
+           on_attachments_loaded: function(attachments) {
+               this._super(attachments);
+               var config = new instance.web.DataSet(this, 'google.docs.config', this.view.dataset.get_context());
+               config.call('get_config', [[this.view.datarecord.id],this.view.dataset.model,this.view.dataset.get_context()], function(r) {
+               if (r == false){
+               $('.oe_google_docs_text_button',this.$element).hide();
+               }
+               });
+           },
 
-                    var attachment = new instance.web.DataSet(this, 'ir.attachment', self.view.dataset.get_context());
-                    attachment.call('copy_gdoc', [self.view.dataset.model, [self.view.datarecord.id]], function(res) {
-                    });
-                });
-            },
-            start: function() {
-                this._super();
-                console.log($('.oe_google_docs_text_button',this.$element))
-                $('.oe_google_docs_text_button',this.$element)
-            },
             on_add_text_gdoc: function() {
                 var self = this;
                 var $gdocbtn = this.$element.find('.oe_google_docs_text_button');
                 $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
                 var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
                 ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord.id], 'text'], function(r) {
+                    if (r == 'False') {
+                        var params = {
+                            error: response,
+                            message: "The user google credentials are not set yet. Contact your administrator for help."
+                        }
+                        $(openerp.web.qweb.render("DialogWarning", params)).dialog({
+                            title: "User Google credentials are not yet set.",
+                            modal: true,
+                        });
+                    }
                     self.do_update();
                 });
             },

From 515af1d3d988af70a833a22ada9edce49dd3c351 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Tue, 3 Apr 2012 09:07:52 +0200
Subject: [PATCH 065/452] [IMP] change the domain to enable spreadsheet and
 reindentation in the js file

bzr revid: mva@openerp.com-20120403070752-4gfw1hg3p6ifzmwi
---
 addons/google_docs/google_docs.py         | 2 +-
 addons/google_docs/static/src/js/gdocs.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index e195fcf21a6..5a6d33e9725 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -139,7 +139,7 @@ class config(osv.osv):
         Method use with the js to hidde or show the add google doc button 
         @return : list of configuration ids or false
         '''
-        if self.pool.get('ir.attachment').search_count(cr,uid,[('url','like','https://docs.google.com/document%'),('res_model','=',model),('res_id','=',ids[0])]) !=0:
+        if self.pool.get('ir.attachment').search_count(cr,uid,[('url','like','https://docs.google.com/%'),('res_model','=',model),('res_id','=',ids[0])]) !=0:
             return  False
         else:
             return True
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 425de5045d8..a8e941f01f6 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -13,7 +13,7 @@ openerp.google_docs = function(instance, session) {
                var config = new instance.web.DataSet(this, 'google.docs.config', this.view.dataset.get_context());
                config.call('get_config', [[this.view.datarecord.id],this.view.dataset.model,this.view.dataset.get_context()], function(r) {
                if (r == false){
-               $('.oe_google_docs_text_button',this.$element).hide();
+                    $('.oe_google_docs_text_button',this.$element).hide();
                }
                });
            },

From cbf9c244beab1689c1499baad9a3084d18625474 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Tue, 10 Apr 2012 12:46:27 +0530
Subject: [PATCH 066/452] [IMP] set home page of all menus

bzr revid: jap@tinyerp.com-20120410071627-4gk2gz2fhf45ruux
---
 addons/account/account_invoice_view.xml               |  3 +++
 addons/account/board_account_view.xml                 |  2 +-
 addons/document/board_document_view.xml               |  4 ++--
 addons/document/document_view.xml                     |  4 ++++
 addons/event/event_view.xml                           |  2 ++
 addons/hr/hr_board.xml                                |  2 +-
 addons/hr/hr_view.xml                                 |  3 +++
 addons/membership/membership_view.xml                 |  2 ++
 addons/mrp/board_manufacturing_view.xml               |  4 ++--
 addons/mrp/mrp_view.xml                               |  3 +++
 addons/project/board_project_view.xml                 |  4 ++--
 addons/project/project_view.xml                       |  3 +++
 addons/purchase/board_purchase_view.xml               |  2 +-
 addons/purchase/purchase_view.xml                     | 11 +++++++----
 .../purchase_requisition_view.xml                     |  2 +-
 addons/sale/board_sale_view.xml                       |  4 ++--
 addons/sale/sale_view.xml                             |  2 +-
 addons/stock/board_warehouse_view.xml                 |  2 +-
 addons/stock/stock_view.xml                           |  5 ++++-
 19 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6d499b4d3ad..4444c51dd02 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -430,6 +430,9 @@
             <field name="help">With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers.</field>
         </record>
 
+        <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="14" 
+		groups="group_account_user,group_account_manager,group_account_invoice"
+		action="action_invoice_tree1"/>
 
         <record id="action_invoice_tree1_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 6417bb99d88..1d7865c0f01 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -63,7 +63,7 @@
 
         <menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_reporting_dashboard" groups="group_account_user,group_account_manager"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
-        <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="14" action="open_board_account"/>
+       <!-- <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="14" action="open_board_account"/>-->
 
 
     </data>
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 4412423c97b..44fb44d2a18 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -49,8 +49,8 @@
             id="menu_reports_document_manager"
             icon="terp-graph"/>
 
-         <menuitem name="Knowledge" icon="terp-stock" id="knowledge.menu_document"
-            sequence="19" groups="base.group_system,base.group_document_user" action="open_board_document_manager"/>
+       <!--  <menuitem name="Knowledge" icon="terp-stock" id="knowledge.menu_document"
+            sequence="19" groups="base.group_system,base.group_document_user" action="open_board_document_manager"/> -->
 
         <record model="ir.ui.view" id="board_document_manager_form1">
             <field name="name">board.document.manager.form1</field>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index e426444f26d..4ddd85bb8f7 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -357,6 +357,10 @@
         action="action_document_file_form"
         id="menu_document_files"
         parent="menu_document_doc"/>
+		
+    <menuitem name="Knowledge" icon="terp-stock" id="knowledge.menu_document"
+              sequence="19" groups="base.group_system,base.group_document_user" action="action_document_file_form"/>
+			  		
 
     <record model="ir.actions.act_window" id="action_document_file_directory_form">
         <field name="type">ir.actions.act_window</field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 0825cef42c5..200b9f88237 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -304,6 +304,8 @@
            <field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
        </record>
 
+       <menuitem  name="Events" id="event_main_menu" action="action_event_view"/>
+
       <act_window
             id="act_event_list_register_event"
             name="Registration"
diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml
index 6b541f5a557..e366a1d63cb 100644
--- a/addons/hr/hr_board.xml
+++ b/addons/hr/hr_board.xml
@@ -52,7 +52,7 @@
         <field name="view_id" ref="board_hr_manager_form"/>
     </record>
 
-    <menuitem id="menu_hr_dashboard_manager" parent="menu_hr_dashboard" icon="terp-graph" action="open_board_hr_manager" groups="base.group_hr_manager" sequence="5"/>
+    <!--<menuitem id="menu_hr_dashboard_manager" parent="menu_hr_dashboard" icon="terp-graph" action="open_board_hr_manager" groups="base.group_hr_manager" sequence="5"/>-->
 
 </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index a954d916385..df5de845c9e 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -188,6 +188,9 @@
             <field name="help">Here you can manage your work force by creating employees and assigning them specific properties in the system. Maintain all employee related information and keep track of anything that needs to be recorded for them. The personal information tab will help you maintain their identity data. The Categories tab gives you the opportunity to assign them related employee categories depending on their position and activities within the company. A category can be a seniority level within the company or a department. The Timesheets tab allows to assign them a specific timesheet and analytic journal where they will be able to enter time through the system. In the note tab, you can enter text data that should be recorded for a specific employee.</field>
         </record>
 
+        <menuitem id="menu_hr_root" name="Human Resources" sequence="15"
+            groups="base.group_hr_manager,base.group_hr_user,base.group_user" action="open_view_employee_list_my" />
+						
         <record id="open_view_employee_list_my_kanban" model="ir.actions.act_window.view">
             <field name="sequence" eval="0"/>
             <field name="view_mode">kanban</field>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index bdb04525d43..074bed97fcd 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -208,6 +208,8 @@
 
         <menuitem name="Members" parent="menu_membership" id="menu_members" sequence="2" action="action_membership_members"/>
 
+        <menuitem name="Association" id="base.menu_association" sequence="9" action="action_membership_members"/>
+			
         <!-- PARTNERS -->
 
         <record model="ir.ui.view" id="view_partner_tree">
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index cb81d51d439..4ce4f5e5995 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -35,8 +35,8 @@
             id="menu_board_manufacturing" parent="menus_dash_mrp"
             sequence="1"/>
 
-        <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" sequence="8"
-            action="open_board_manufacturing"/>
+      <!--  <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" sequence="8"
+            action="open_board_manufacturing"/> -->
 
 
     </data>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index f96147e9344..7533ddea12e 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -840,6 +840,9 @@
         <menuitem action="mrp_production_action" id="menu_mrp_production_action"
             parent="menu_mrp_manufacturing" sequence="1"/>
 
+        <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
+            groups="group_mrp_user,group_mrp_manager" sequence="8"  action="mrp_production_action"/>			
+			
         <record id="mrp_production_action_planning" model="ir.actions.act_window">
             <field name="name">Manufacturing Orders</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index f4a855283ba..bca37ac3fc4 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -117,9 +117,9 @@
             parent="menu_project_dashboard"
             sequence="1"/>
 
-        <menuitem
+     <!--   <menuitem
             icon="terp-project" id="base.menu_main_pm"
-            name="Project" sequence="10" action="open_board_project"/>
+            name="Project" sequence="10" action="open_board_project"/> -->
 
     </data>
 </openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 95538513f0c..2b86de95427 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -542,6 +542,9 @@
 
         <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="5"/>
 
+		<menuitem id="base.menu_main_pm" name="Project" sequence="10" action="action_view_task"
+            groups="group_project_manager,group_project_user"/>
+		
         <record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
             <field name="name">Overpassed Tasks</field>
             <field name="res_model">project.task</field>
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 4c9e776b96b..4d8280059b0 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -116,7 +116,7 @@
             parent="menu_purchase_deshboard"
             sequence="4"/>
 
-        <menuitem icon="terp-purchase" id="base.menu_purchase_root" action="open_board_purchase" name="Purchases"/>
+      <!--  <menuitem icon="terp-purchase" id="base.menu_purchase_root" action="open_board_purchase" name="Purchases"/> -->
 
 
     </data>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 007c85b98f1..4de426e71f9 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -3,7 +3,7 @@
     <data>
        <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="3"
            groups="group_purchase_manager,group_purchase_user"
-           web_icon="images/purchases.png"
+           web_icon="images/purchases.png" 
            web_icon_hover="images/purchases-hover.png"/>
        <menuitem id="menu_procurement_management" name="Purchase"
             parent="base.menu_purchase_root" sequence="1" />
@@ -312,8 +312,11 @@
         </record>
         <menuitem action="purchase_rfq" id="menu_purchase_rfq"
             parent="menu_procurement_management"
-            sequence="6"/>
-
+            sequence="0"/>
+			
+        <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="3" action="purchase_rfq"
+           groups="group_purchase_manager,group_purchase_user"/>		
+		
         <record id="purchase_form_action" model="ir.actions.act_window">
             <field name="name">Purchase Orders</field>
             <field name="type">ir.actions.act_window</field>
@@ -323,7 +326,7 @@
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help">Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices.</field>
         </record>
-        <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management" />
+        <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management" sequence="6"/>
 
 
         <record id="purchase_order_line_form" model="ir.ui.view">
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index d6a736eea9c..5e77f46b1a2 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -173,7 +173,7 @@
 
     <menuitem
         id="menu_purchase_requisition_pro_mgt"
-        sequence="0"
+        sequence="10"
         parent="purchase.menu_procurement_management"
         action="action_purchase_requisition"/>
 
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 8a6caf1a849..4d45151dece 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -124,9 +124,9 @@
             <field name="view_id" ref="board_sales_form"/>
         </record>
 
-        <menuitem
+       <!-- <menuitem
             id="base.menu_base_partner" action="open_board_sales"
-            name="Sales"/>
+            name="Sales"/> -->
 
     </data>
 </openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 09ad9381e26..6feff81e9ee 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,7 +1,7 @@
 <openerp>
     <data>
         <menuitem icon="terp-partner"
-            id="base.menu_base_partner" name="Sales"
+            id="base.menu_base_partner" name="Sales" action="base.action_partner_form"
             sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index b8de9cf445e..a24f59aa08f 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -70,7 +70,7 @@
 
         <menuitem id="menu_dashboard_stock" name="Warehouse"  sequence="10" parent="base.menu_reporting_dashboard"/>
         <menuitem action="open_board_warehouse" icon="terp-graph"  groups="group_stock_manager"  id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
-        <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"  groups="group_stock_manager" action="open_board_warehouse"/>
+      <!--  <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"  groups="group_stock_manager" action="open_board_warehouse"/>-->
 
     </data>
 </openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 592cb180d22..1d81f80829c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -4,7 +4,7 @@
 
         <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"
                   groups="group_stock_manager,group_stock_user" sequence="5"
-                  web_icon="images/warehouse.png"
+                  web_icon="images/warehouse.png" 
                   web_icon_hover="images/warehouse-hover.png"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Receive/Deliver By Orders" parent="menu_stock_root" sequence="1"/>
         <menuitem id="menu_stock_products_moves" name="Receive/Deliver Products" parent="menu_stock_root" sequence="2" groups="base.group_extended"/>
@@ -1924,6 +1924,9 @@
         <record model="ir.actions.todo.category" id="category_stock_management_config">
             <field name="name">Stock Management</field>
         </record>
+		
+        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" 
+		          groups="group_stock_manager,group_stock_user" sequence="5" action="product.product_normal_action"/>		
 
     </data>
 </openerp>

From 4347226b1d16f73c84f9606b613ec0053602d628 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Tue, 10 Apr 2012 16:21:25 +0530
Subject: [PATCH 067/452] [IMP] board: improve xml code to set module kanban on
 setting main menu

bzr revid: jap@tinyerp.com-20120410105125-ysmtfc1qgizmldly
---
 addons/board/board_data_admin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml
index 5f8c2f1b05c..88580c3deb5 100644
--- a/addons/board/board_data_admin.xml
+++ b/addons/board/board_data_admin.xml
@@ -54,7 +54,7 @@
         </record>
 
         <!-- bind adminitration dashboard to the root administration -->
-        <menuitem id="base.menu_administration" icon="terp-administration"  name="Settings" sequence="50" action="open_board_administration_form"/>
+       <!-- <menuitem id="base.menu_administration" icon="terp-administration"  name="Settings" sequence="50" action="open_board_administration_form"/> -->
 
         <!-- add a menu item in adminitration/reporting/dashboards -->
         <menuitem id="base.menu_reporting_board" name="Reporting" parent="base.menu_administration" sequence="11" groups="base.group_extended"/>

From 95952a8d56abb3c69e3597991b3c3819e65c8775 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 17 Apr 2012 15:03:40 +0530
Subject: [PATCH 068/452] [ADD] added functionality which checks the available
 seats at the time of confirming registration, and set current date in demo
 data inorder to show the upcoming events

bzr revid: bde@tinyerp.com-20120417093340-824lazijkbf83m1x
---
 addons/event/event.py       | 12 ++++++++++++
 addons/event/event_demo.xml |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 6bf1ea24786..071835fa240 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -102,6 +102,14 @@ class event_event(osv.osv):
             total_confirmed = self.event.register_current
             if total_confirmed < self.event.register_min or total_confirmed > self.event.register_max and self.event.register_max!=0:
                 raise osv.except_osv(_('Error!'),_("The total of confirmed registration for the event '%s' does not meet the expected minimum/maximum. You should maybe reconsider those limits before going further") % (self.event.name))
+            
+    def check_registration_limits_before(self, cr, uid, ids, no_of_registration, context=None):
+        total_confirmed = self.browse(cr, uid, ids, context=context).register_current
+        register_max = self.browse(cr, uid, ids, context=context).register_max
+        available_seats = register_max - total_confirmed
+        if no_of_registration > available_seats:
+            raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
+
 
     def confirm_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
@@ -295,6 +303,10 @@ class event_registration(osv.osv):
     def registration_open(self, cr, uid, ids, context=None):
         """ Open Registration
         """
+        event_obj = self.pool.get('event.event')
+        event_id = self.browse(cr, uid, ids, context=context)[0].event_id.id
+        no_of_registration = self.browse(cr, uid, ids, context=context)[0].nb_register
+        event_obj.check_registration_limits_before(cr, uid, event_id, no_of_registration, context=context)
         res = self.confirm_registration(cr, uid, ids, context=context)
         self.mail_user(cr, uid, ids, context=context)
         return res
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 96bc64e12aa..d5907b4bebf 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -38,16 +38,16 @@
 
     <record id="event_1" model="event.event">
         <field name="name">Opera of Verdi</field>
-        <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-05 21:00:00')" name="date_end"/>
+        <field eval="time.strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
+        <field eval="time.strftime('%Y-%m-%d 21:00:00')" name="date_end"/>
         <field name="type" ref="event_type_1"/>
         <field name="register_min">50</field>
         <field name="register_max">350</field>
     </record>
     <record id="event_2" model="event.event">
         <field name="name">Conference on ERP Business</field>
-        <field eval="time.strftime('%Y-%m-05 14:00:00')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-05 16:30:00')" name="date_end"/>
+        <field eval="time.strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
+        <field eval="time.strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
         <field name="type" ref="event_type_2"/>
         <field name="register_max">200</field>
     </record>

From 27d279e3c3e21233005efa5b4c2aca788044f912 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 17 Apr 2012 17:01:20 +0530
Subject: [PATCH 069/452] [IMP] improved the date manipulation in
 event/event_demo.xml

bzr revid: bde@tinyerp.com-20120417113120-cm6tro3par1vtpy2
---
 addons/event/event_demo.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index d5907b4bebf..81dad07b5e4 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -38,16 +38,16 @@
 
     <record id="event_1" model="event.event">
         <field name="name">Opera of Verdi</field>
-        <field eval="time.strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-%d 21:00:00')" name="date_end"/>
+        <field eval="(DateTime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
+        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')" name="date_end"/>
         <field name="type" ref="event_type_1"/>
         <field name="register_min">50</field>
         <field name="register_max">350</field>
     </record>
     <record id="event_2" model="event.event">
         <field name="name">Conference on ERP Business</field>
-        <field eval="time.strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
+        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
+        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
         <field name="type" ref="event_type_2"/>
         <field name="register_max">200</field>
     </record>

From 89547acdfb6d883b6fc5c8790dbd2cc3abadedca Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Wed, 18 Apr 2012 14:56:37 +0530
Subject: [PATCH 070/452] [ADD] added text area in kanban view inorder to input
 number of seats

bzr revid: bde@tinyerp.com-20120418092637-uprsxgafbu1tl8vw
---
 addons/event/__openerp__.py           | 3 +++
 addons/event/event.py                 | 6 +++++-
 addons/event/event_view.xml           | 1 +
 addons/event/static/src/css/event.css | 3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index ea0e4316ef5..b9753835aeb 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -54,6 +54,9 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/event.css'],
+    'js': [
+        #'static/src/js/event.js',
+    ],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event.py b/addons/event/event.py
index 6bf1ea24786..27b8269db20 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -215,10 +215,13 @@ class event_event(osv.osv):
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
         user = user_pool.browse(cr, uid, uid, context=context)
+        print "user", user
         curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , ids[0])])
+        print "curr_reg_ids", curr_reg_ids
         #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe
         if not curr_reg_ids:
-            curr_reg_ids = [register_pool.create(cr, 1, {'event_id': ids[0] ,'email': user.user_email, 'name':user.name, 'user_id': user.id,})]
+            curr_reg_ids = [register_pool.create(cr, 1, {'event_id': ids[0] ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': 5})]
+            print "::::::::::::::", curr_reg_ids
         return register_pool.confirm_registration(cr, 1, curr_reg_ids, context=context)
 
     def unsubscribe_to_event(self, cr, uid, ids, context=None):
@@ -288,6 +291,7 @@ class event_registration(osv.osv):
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
     def confirm_registration(self, cr, uid, ids, context=None):
+        print "confirm_registrationconfirm_registration"
         self.message_append(cr, uid, ids,_('State set to open'),body_text= _('Open'))
         return self.write(cr, uid, ids, {'state': 'open'}, context=context)
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 4e22569c3e1..d4bbe059084 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -203,6 +203,7 @@
                             </p>
                             <t t-if="record.register_avail.raw_value != 0">
                               <t t-if="!record.is_subscribed.raw_value">
+                                  <textarea class="no_of_seats"/>
                                   <button type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
                                   <span >Subscribe</span>
                                   </button>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index a0f738e6323..52cf194dbe7 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -115,4 +115,7 @@ div.oe_fold_column{
    display: inline;
    background-color: #DC5F59;
  }
+ .no_of_seats{
+    width:40px;
+ }
 

From a163b926e393ef63b30c5f23aad2d652be7ef57d Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 18 Apr 2012 17:54:59 +0530
Subject: [PATCH 071/452] [IMP]stock: click on warehouse menu tn open product
 kanban view

bzr revid: dbr@tinyerp.com-20120418122459-l27y5wa1b38oaid6
---
 addons/product/product_view.xml | 11 +++++++++--
 addons/stock/stock_view.xml     |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 2a12fc9ad08..b721dd2031d 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -263,19 +263,26 @@
         </record>
 
         <record id="open_view_product_tree1" model="ir.actions.act_window.view">
-            <field name="sequence" eval="1"/>
+            <field name="sequence" eval="2"/>
             <field name="view_mode">tree</field>
            <field name="view_id" ref="product_product_tree_view"/>
             <field name="act_window_id" ref="product_normal_action_sell"/>
         </record>
 
         <record id="open_view_product_form1" model="ir.actions.act_window.view">
-            <field name="sequence" eval="2"/>
+            <field name="sequence" eval="3"/>
             <field name="view_mode">form</field>
             <field name="view_id" ref="product_normal_form_view"/>
             <field name="act_window_id" ref="product_normal_action_sell"/>
         </record>
 
+        <record id="open_view_product_kanban1" model="ir.actions.act_window.view">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">kanban</field>
+           <field name="view_id" ref="product_kanban_view"/>
+            <field name="act_window_id" ref="product_normal_action"/>
+        </record>
+
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
         <menuitem action="product.product_normal_action_sell" id="product.menu_products" parent="base.menu_product" sequence="1"/>
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index cfa73a8806d..4edc1cef753 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -5,7 +5,7 @@
         <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"
                   groups="group_stock_manager,group_stock_user" sequence="5"
                   web_icon="images/warehouse.png" 
-                  web_icon_hover="images/warehouse-hover.png"/>
+                  web_icon_hover="images/warehouse-hover.png" action="product.product_normal_action"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Receive/Deliver By Orders" parent="menu_stock_root" sequence="1"/>
         <menuitem id="menu_stock_products_moves" name="Receive/Deliver Products" parent="menu_stock_root" sequence="2" groups="base.group_extended"/>
         <menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/>

From c6ee2737b344ce7f211eac70c9b57c3b7850ea5f Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 19 Apr 2012 12:58:30 +0530
Subject: [PATCH 072/452] [IMP]sale : remove action of partner form

bzr revid: dbr@tinyerp.com-20120419072830-gu41w6tmdmfgowp5
---
 addons/hr/hr_board.xml    | 1 -
 addons/sale/sale_view.xml | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml
index 20c0e626619..582d6175d8b 100644
--- a/addons/hr/hr_board.xml
+++ b/addons/hr/hr_board.xml
@@ -24,7 +24,6 @@
         <field name="view_id" ref="board_hr_form"/>
     </record>
 
-    <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" action="open_board_hr"/>
     <menuitem id="menu_hr_reporting" parent="base.menu_reporting" name="Human Resources" sequence="40" />
     <menuitem id="menu_hr_dashboard" parent="base.menu_reporting_dashboard"  name="Human Resources" sequence="35"/>
     <menuitem id="menu_hr_dashboard_user" parent="menu_hr_dashboard" action="open_board_hr" icon="terp-graph" sequence="4"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 9b6ede9a278..fc9bc907b1e 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -2,8 +2,7 @@
     <data>
         <menuitem icon="terp-partner"
 
-            id="base.menu_base_partner" name="Sales" action="base.action_partner_form"
-            sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/>
+            id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 

From d30492d5e316feb39772bae44906712e697c666b Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 19 Apr 2012 16:04:08 +0530
Subject: [PATCH 073/452] [IMP]sale: Add action

bzr revid: dbr@tinyerp.com-20120419103408-d3fag9s327hdow8h
---
 addons/sale/sale_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index fc9bc907b1e..9a0147ef909 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,8 +1,6 @@
 <openerp>
     <data>
-        <menuitem icon="terp-partner"
-
-            id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager" action="base.action_partner_form"/>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 

From 6a15e8bf4a84355acdbf0bdb2fe3dd77e23108fb Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Thu, 19 Apr 2012 17:45:06 +0530
Subject: [PATCH 074/452] [ADD] added image on home page dashboard for event
 module

bzr revid: bde@tinyerp.com-20120419121506-o0fgrf39f306r9h0
---
 addons/event/event_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index f3f3c165f93..bff081c1911 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -2,7 +2,9 @@
 <openerp>
     <data>
 
-        <menuitem  name="Events" id="event_main_menu"/>
+        <menuitem  name="Events" id="event_main_menu" 
+            web_icon="images/icon.png"
+            web_icon_hover="images/icon.png"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
     <!-- EVENTS  -->

From edd102bc770c84f546dd45147bbc07feca762145 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 23 Apr 2012 11:37:44 +0530
Subject: [PATCH 076/452] [IMP]: Improve code.

bzr revid: atp@tinyerp.com-20120423060744-gx0jm63z8ba6cq5i
---
 addons/event/event.py | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index f8a15112bfa..a633dc41961 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -115,12 +115,10 @@ class event_event(osv.osv):
             
     def check_registration_limits_before(self, cr, uid, ids, no_of_registration, context=None):
         available_seats = self.check_available_seats(cr, uid, ids, context=context)
-        if no_of_registration > available_seats:
-            if available_seats == 0:
-                raise osv.except_osv(_('Warning!'),_("No Tickets Available!"))
-            else:
-                raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
-
+        if available_seats and no_of_registration > available_seats:
+             raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
+        elif available_seats == 0:
+            raise osv.except_osv(_('Warning!'),_("No Tickets Available!"))
 
     def confirm_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
@@ -231,16 +229,10 @@ class event_event(osv.osv):
     }
 
     def subscribe_to_event(self, cr, uid, ids, context=None):
-        num_of_seats = int(context.get('ticket', 1))
-        available_seats = self.check_available_seats(cr, uid, ids, context=context)
-        if num_of_seats > available_seats:
-            if available_seats == 0:
-                raise osv.except_osv(_('Warning!'),_("No Tickets Available!"))
-            else:
-                raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
-
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
+        num_of_seats = int(context.get('ticket', 1))
+        self.check_registration_limits_before(cr, uid, ids, num_of_seats, context=context)
         user = user_pool.browse(cr, uid, uid, context=context)
         curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , ids[0])])
         #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe

From b3d0828564370a97f340b567131425fc8ba9e8c8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 23 Apr 2012 11:50:57 +0200
Subject: [PATCH 077/452] [FIX] bloody logo link

bzr revid: xmo@openerp.com-20120423095057-gytshtkft5002693
---
 addons/web/static/src/xml/base.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 57970c1486e..65c084731bc 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -275,7 +275,10 @@
         </tr>
         <tr>
             <td class="oe_leftbar" valign="top">
-                <a href="#" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
+                <t t-js="d">
+                    d.url = '/' + (window.location.search || '');
+                </t>
+                <a t-att-href="url" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
                 <div class="oe_secondary_menus_container"/>
                 <div class="oe_footer">
                     Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a>

From f490733e49e366ef2297ee6afc76f1db27781a14 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 23 Apr 2012 18:41:07 +0530
Subject: [PATCH 078/452] [IMP]project: set project action for a project menu

bzr revid: dbr@tinyerp.com-20120423131107-eaoqtajoxyk12i8l
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8a708a5a0f8..1344566c6bf 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -547,7 +547,7 @@
 
         <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="5"/>
 
-		<menuitem id="base.menu_main_pm" name="Project" sequence="10" action="action_view_task"
+		<menuitem id="base.menu_main_pm" name="Project" sequence="10" action="open_view_project_all"
             groups="group_project_manager,group_project_user"/>
 		
         <record id="action_view_task_overpassed_draft" model="ir.actions.act_window">

From 9046ab46fa7df9dcca66e17380823c55bb87267d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 24 Apr 2012 12:59:41 +0200
Subject: [PATCH 079/452] [WIP] VS-less search view: remove visualsearch, start
 building coherent model backing to the view

bzr revid: xmo@openerp.com-20120424105941-x8dvot5mjruvxcho
---
 addons/web/__openerp__.py           |  16 -
 addons/web/static/src/css/base.css  |   6 +-
 addons/web/static/src/css/base.sass |  24 +-
 addons/web/static/src/js/search.js  | 442 +++++++++++++---------------
 addons/web/static/src/xml/base.xml  |  15 +
 addons/web/static/test/search.js    | 143 +++++++++
 addons/web/static/test/test.html    |   2 +
 7 files changed, 389 insertions(+), 259 deletions(-)
 create mode 100644 addons/web/static/test/search.js

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 1ca0553c8e2..abcb25647f8 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -35,19 +35,6 @@
         "static/lib/underscore/underscore.string.js",
         "static/lib/backbone/backbone.js",
 
-        "static/lib/visualsearch/lib/js/visualsearch.js",
-        "static/lib/visualsearch/lib/js/utils/backbone_extensions.js",
-        "static/lib/visualsearch/lib/js/utils/hotkeys.js",
-        "static/lib/visualsearch/lib/js/utils/inflector.js",
-        "static/lib/visualsearch/lib/js/utils/jquery_extensions.js",
-        "static/lib/visualsearch/lib/js/utils/search_parser.js",
-        "static/lib/visualsearch/lib/js/models/search_facets.js",
-        "static/lib/visualsearch/lib/js/models/search_query.js",
-        "static/lib/visualsearch/lib/js/templates/templates.js",
-        "static/lib/visualsearch/lib/js/views/search_facet.js",
-        "static/lib/visualsearch/lib/js/views/search_input.js",
-        "static/lib/visualsearch/lib/js/views/search_box.js",
-
         "static/lib/labjs/LAB.src.js",
         "static/lib/py.js/lib/py.js",
         "static/src/js/boot.js",
@@ -73,9 +60,6 @@
         "static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css",
         "static/lib/jquery.ui.notify/css/ui.notify.css",
         "static/lib/jquery.tipsy/tipsy.css",
-        "static/lib/visualsearch/lib/css/reset.css",
-        "static/lib/visualsearch/lib/css/workspace.css",
-        "static/lib/visualsearch/lib/css/icons.css",
 #        "static/src/css/base_old.css",
         "static/src/css/base.css",
         "static/src/css/data_export.css",
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 2b90d47c002..1a5136f93e4 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1048,6 +1048,8 @@
 .openerp .oe_searchview {
   position: relative;
   float: right;
+  padding-right: 20px;
+  background: white;
 }
 .openerp .oe_searchview .VS-search .VS-search-box {
   min-height: 0;
@@ -1133,7 +1135,7 @@
 .openerp .oe_searchview .VS-search .VS-icon-cancel {
   right: 24px;
 }
-.openerp .oe_searchview .VS-search .oe_vs_unfold_drawer {
+.openerp .oe_searchview .oe_searchview_unfold_drawer {
   position: absolute;
   top: 0;
   right: 0;
@@ -1143,7 +1145,7 @@
   color: #cccccc;
   cursor: pointer;
 }
-.openerp .oe_searchview .VS-search .oe_vs_unfold_drawer:before {
+.openerp .oe_searchview .oe_searchview_unfold_drawer:before {
   content: "▾";
 }
 .openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index fc645a92e44..ee38da2cc56 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -821,6 +821,8 @@ $colour4: #8a89ba
     .oe_searchview
         position: relative
         float: right
+        padding-right: 20px
+        background: white
         .VS-search
             .VS-search-box
                 min-height: 0
@@ -908,17 +910,17 @@ $colour4: #8a89ba
             .VS-icon-cancel
                 right: 24px
 
-            .oe_vs_unfold_drawer
-                position: absolute
-                top: 0
-                right: 0
-                height: 100%
-                line-height: 23px
-                padding: 0 7px 0 4px
-                color: #ccc
-                cursor: pointer
-                &:before
-                    content: "▾"
+        .oe_searchview_unfold_drawer
+            position: absolute
+            top: 0
+            right: 0
+            height: 100%
+            line-height: 23px
+            padding: 0 7px 0 4px
+            color: #ccc
+            cursor: pointer
+            &:before
+                content: "▾"
 
         &.oe_searchview_open_drawer
             .oe_searchview_drawer
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index c2df866b5c6..f37cf1ae60b 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -6,67 +6,143 @@ _.mixin({
     sum: function (obj) { return _.reduce(obj, function (a, b) { return a + b; }, 0); }
 });
 
-// Have SearchBox optionally use callback function to produce inputs and facets
-// (views) set on callbacks.make_facet and callbacks.make_input keys when
-// initializing VisualSearch
-var SearchBox_renderFacet = function (facet, position) {
-    var view = new (this.app.options.callbacks['make_facet'] || VS.ui.SearchFacet)({
-      app   : this.app,
-      model : facet,
-      order : position
-    });
+/** @namespace */
+var my = instance.web.search = {};
 
-    // Input first, facet second.
-    this.renderSearchInput();
-    this.facetViews.push(view);
-    this.$('.VS-search-inner').children().eq(position*2).after(view.render().el);
+my.FacetValue = Backbone.Model.extend({
 
-    view.calculateSize();
-    _.defer(_.bind(view.calculateSize, view));
-
-    return view;
-  }; // warning: will not match
-// Ensure we're replacing the function we think
-if (SearchBox_renderFacet.toString() !== VS.ui.SearchBox.prototype.renderFacet.toString().replace(/(VS\.ui\.SearchFacet)/, "(this.app.options.callbacks['make_facet'] || $1)")) {
-    throw new Error(
-        "Trying to replace wrong version of VS.ui.SearchBox#renderFacet. "
-        + "Please fix replacement.");
-}
-var SearchBox_renderSearchInput = function () {
-    var input = new (this.app.options.callbacks['make_input'] || VS.ui.SearchInput)({position: this.inputViews.length, app: this.app});
-    this.$('.VS-search-inner').append(input.render().el);
-    this.inputViews.push(input);
-  };
-// Ensure we're replacing the function we think
-if (SearchBox_renderSearchInput.toString() !== VS.ui.SearchBox.prototype.renderSearchInput.toString().replace(/(VS\.ui\.SearchInput)/, "(this.app.options.callbacks['make_input'] || $1)")) {
-    throw new Error(
-        "Trying to replace wrong version of VS.ui.SearchBox#renderSearchInput. "
-        + "Please fix replacement.");
-}
-var SearchBox_searchEvent = function (e) {
-    var query = null;
-    this.renderFacets();
-    this.focusSearch(e);
-    this.app.options.callbacks.search(query, this.app.searchQuery);
-  };
-if (SearchBox_searchEvent.toString() !== VS.ui.SearchBox.prototype.searchEvent.toString().replace(
-        /this\.value\(\);\n[ ]{4}this\.focusSearch\(e\);\n[ ]{4}this\.value\(query\)/,
-        'null;\n    this.renderFacets();\n    this.focusSearch(e)')) {
-    throw new Error(
-        "Trying to replace wrong version of VS.ui.SearchBox#searchEvent. "
-        + "Please fix replacement.");
-}
-_.extend(VS.ui.SearchBox.prototype, {
-    renderFacet: SearchBox_renderFacet,
-    renderSearchInput: SearchBox_renderSearchInput,
-    searchEvent: SearchBox_searchEvent
 });
-_.extend(VS.model.SearchFacet.prototype, {
-    value: function () {
-        if (this.has('json')) {
-            return this.get('json');
+my.FacetValues = Backbone.Collection.extend({
+    model: my.FacetValue
+});
+my.Facet = Backbone.Model.extend({
+    initialize: function (attrs) {
+        var values = attrs.values;
+        delete attrs.values;
+
+        Backbone.Model.prototype.initialize.apply(this, arguments);
+
+        this.values = new my.FacetValues(values || []);
+        this.values.on('add remove change reset', function () {
+            this.trigger('change', this);
+        }, this);
+    },
+    get: function (key) {
+        if (key !== 'values') {
+            return Backbone.Model.prototype.get.call(this, key);
         }
-        return this.get('value');
+        return this.values.toJSON();
+    },
+    set: function (key, value) {
+        if (key !== 'values') {
+            return Backbone.Model.prototype.set.call(this, key, value);
+        }
+        this.values.reset(value);
+    }
+});
+my.SearchQuery = Backbone.Collection.extend({
+    model: my.Facet,
+    initialize: function () {
+        Backbone.Collection.prototype.initialize.apply(
+            this, arguments);
+        this.on('change', function (facet) {
+            if(!facet.values.isEmpty()) { return; }
+
+            this.remove(facet);
+        }, this);
+    },
+    add: function (value, options) {
+        options || (options = {});
+        if (value instanceof Array) {
+            throw new Error("Can't add multiple facets to a query at once");
+        }
+        var model = this._prepareModel(value, options);
+        var previous = this.detect(function (facet) {
+            return facet.get('category') === model.get('category')
+                && facet.get('field') === model.get('field');
+        });
+        if (previous) {
+            previous.values.add(model.get('values'));
+            return this;
+        }
+        return Backbone.Collection.prototype.add.call(this, model, options);
+    },
+    toggle: function (value, options) {
+        options || (options = {});
+
+        var facet = this.detect(function (facet) {
+            return facet.get('category') === value.category
+                && facet.get('field') === value.field;
+        });
+        if (!facet) {
+            return this.add(value, options);
+        }
+
+        var changed = false;
+        _(value.values).each(function (val) {
+            var already_value = facet.values.detect(function (v) {
+                return v.get('value') === val.value
+                    && v.get('label') === val.label;
+            });
+            // toggle value
+            if (already_value) {
+                facet.values.remove(already_value, {silent: true});
+            } else {
+                facet.values.add(val, {silent: true});
+            }
+            changed = true;
+        });
+        // "Commit" changes to values array as a single call, so observers of
+        // change event don't get misled by intermediate incomplete toggling
+        // states
+        facet.trigger('change', facet);
+        return this;
+    }
+});
+
+my.InputView = instance.web.Widget.extend({
+    template: 'SearchView.InputView'
+});
+my.FacetView = instance.web.Widget.extend({
+    template: 'SearchView.FacetView',
+    init: function (parent, model) {
+        this._super(parent);
+        this.model = model;
+        this.model.on('change', this.model_changed, this);
+    },
+    destroy: function () {
+        this.model.off('change', this.model_changed, this);
+        this._super();
+    },
+    start: function () {
+        var self = this;
+        var $e = self.$element.find('span');
+        var q = $.when(this._super());
+        return q.pipe(function () {
+            var values = self.model.values.map(function (value) {
+                return new my.FacetValueView(self, value).appendTo($e);
+            });
+
+            return $.when.apply(null, values);
+        });
+    },
+    model_changed: function () {
+        this.$element.text(this.$element.text() + '*');
+    }
+});
+my.FacetValueView = instance.web.Widget.extend({
+    template: 'SearchView.FacetView.Value',
+    init: function (parent, model) {
+        this._super(parent);
+        this.model = model;
+        this.model.on('change', this.model_changed, this);
+    },
+    destroy: function () {
+        this.model.off('change', this.model_changed, this);
+        this._super();
+    },
+    model_changed: function () {
+        this.$element.text(this.$element.text() + '*');
     }
 });
 
@@ -74,13 +150,13 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
     template: "SearchView",
     /**
      * @constructs instance.web.SearchView
-     * @extends instance.web.OldWidget
+     * @extends instance.web.Widget
      *
      * @param parent
-     * @param element_id
      * @param dataset
      * @param view_id
      * @param defaults
+     * @param hidden
      */
     init: function(parent, dataset, view_id, defaults, hidden) {
         this._super(parent);
@@ -99,6 +175,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
 
         this.filter_data = {};
 
+        this.input_subviews = [];
+
         this.ready = $.Deferred();
     },
     start: function() {
@@ -106,34 +184,16 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         var p = this._super();
 
         this.setup_global_completion();
-        this.vs = VS.init({
-            container: this.$element,
-            query: '',
-            callbacks: {
-                make_facet: this.proxy('make_visualsearch_facet'),
-                make_input: this.proxy('make_visualsearch_input'),
-                search: function (query, searchCollection) {
-                    self.do_search();
-                },
-                facetMatches: function (callback) {
-                },
-                valueMatches : function(facet, searchTerm, callback) {
-                }
+        this.query = new my.SearchQuery()
+                .on('add change reset', this.proxy('do_search'))
+                .on('add change reset', this.proxy('renderFacets'))
+                .on('remove', function (record, collection, options) {
+            self.renderFacets();
+            if (options.trigger_search) {
+                self.do_search();
             }
         });
 
-        var search = function () { self.vs.searchBox.searchEvent({}); };
-        // searchQuery operations
-        this.vs.searchQuery
-            .off('add').on('add', search)
-            .off('change').on('change', search)
-            .off('reset').on('reset', search)
-            .off('remove').on('remove', function (record, collection, options) {
-                if (options['trigger_search']) {
-                    search();
-                }
-            });
-
         if (this.hidden) {
             this.$element.hide();
         }
@@ -154,7 +214,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                 .then(this.on_loaded);
         }
 
-        this.$element.on('click', '.oe_vs_unfold_drawer', function () {
+        this.$element.on('click', '.oe_searchview_unfold_drawer', function () {
             self.$element.toggleClass('oe_searchview_open_drawer');
         });
 
@@ -172,7 +232,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
      */
     setup_stuff_drawer: function () {
         var self = this;
-        $('<div class="oe_vs_unfold_drawer">').appendTo(this.$element.find('.VS-search-box'));
+        $('<div class="oe_searchview_unfold_drawer">').appendTo(this.$element);
         var $drawer = $('<div class="oe_searchview_drawer">').appendTo(this.$element);
         var $filters = $('<div class="oe_searchview_filters">').appendTo($drawer);
 
@@ -301,50 +361,28 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
      */
     select_completion: function (e, ui) {
         e.preventDefault();
-        this.vs.searchQuery.add(new VS.model.SearchFacet(_.extend(
-            {app: this.vs}, ui.item)));
-        this.vs.searchBox.searchEvent({});
-    },
 
-    /**
-     * Builds the right SearchFacet view based on the facet object to render
-     * (e.g. readonly facets for filters)
-     *
-     * @param {Object} options
-     * @param {VS.model.SearchFacet} options.model facet object to render
-     */
-    make_visualsearch_facet: function (options) {
-        return new instance.web.search.FilterGroupFacet(options);
-
-//        if (options.model.get('field') instanceof instance.web.search.FilterGroup) {
-//            return new instance.web.search.FilterGroupFacet(options);
-//        }
-//        return new VS.ui.SearchFacet(options);
+        // FIXME: could have multiple values, shitty API
+        this.query.add_value(ui.item.category, ui.item.values[0]);
     },
-    /**
-     * Proxies searches on a SearchInput to the search view's global completion
-     *
-     * Also disables SearchInput.autocomplete#_move so search view's
-     * autocomplete can get the corresponding events, or something.
-     *
-     * @param options
-     */
-    make_visualsearch_input: function (options) {
-        var self = this, input = new VS.ui.SearchInput(options);
-        input.setupAutocomplete = function () {
-            _.extend(this.box.autocomplete({
-                minLength: 1,
-                delay: 0,
-                search: function () {
-                    self.$element.autocomplete('search', input.box.val());
-                    return false;
-                }
-            }).data('autocomplete'), {
-                _move: function () {},
-                close: function () { self.$element.autocomplete('close'); }
-            });
-        };
-        return input;
+    renderFacets: function () {
+        var self = this;
+        var $e = this.$element.find('div.oe_searchview_facets');
+        _.invoke(this.input_subviews, 'destroy');
+        this.input_subviews = [];
+
+        var i = new my.InputView(this);
+        i.appendTo($e);
+        this.input_subviews.push(i);
+        this.query.each(function (facet) {
+            var f = new my.FacetView(this, facet);
+            f.appendTo($e);
+            self.input_subviews.push(f);
+
+            var i = new my.InputView(this);
+            i.appendTo($e);
+            self.input_subviews.push(i);
+        }, this);
     },
 
     /**
@@ -428,8 +466,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                 this.setup_stuff_drawer(),
                 $.when.apply(null, _(this.inputs).invoke('facet_for_defaults', this.defaults))
                     .then(function () {
-                        self.vs.searchQuery.reset(_(arguments).compact(), {silent: true});
-                        self.vs.searchBox.renderFacets();
+                        self.query.reset(_(arguments).compact(), {silent: true});
+                        self.renderFacets();
                     }))
             .then(function () { self.ready.resolve(); })
     },
@@ -583,7 +621,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
     do_search: function () {
         var domains = [], contexts = [], groupbys = [], errors = [];
 
-        this.vs.searchQuery.each(function (facet) {
+        return this.on_search([], [], []);
+        this.query.each(function (facet) {
             var field = facet.get('field');
             try {
                 var domain = field.get_domain(facet);
@@ -647,40 +686,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
     }
 });
 
-/** @namespace */
-instance.web.search = {};
-
-instance.web.search.FilterGroupFacet = VS.ui.SearchFacet.extend({
-    events: _.extend({
-        'click': 'selectFacet'
-    }, VS.ui.SearchFacet.prototype.events),
-
-    render: function () {
-        this.setMode('not', 'editing');
-        this.setMode('not', 'selected');
-
-        var value = this.model.get('value');
-        this.$el.html(QWeb.render('SearchView.filters.facet', {
-            facet: this.model
-        }));
-        // virtual input so SearchFacet code has something to play with
-        this.box = $('<input>').val(value);
-
-        return this;
-    },
-    enableEdit: function () {
-        this.selectFacet()
-    },
-    keydown: function (e) {
-        var key = VS.app.hotkeys.key(e);
-        if (key !== 'right') {
-            return VS.ui.SearchFacet.prototype.keydown.call(this, e);
-        }
-        e.preventDefault();
-        this.deselectFacet();
-        this.options.app.searchBox.focusNextFacet(this, 1);
-    }
-});
 /**
  * Registry of search fields, called by :js:class:`instance.web.SearchView` to
  * find and instantiate its field widgets.
@@ -780,8 +785,8 @@ instance.web.search.Input = instance.web.search.Widget.extend( /** @lends instan
         return $.when(null)
     },
     /**
-     * Returns a VS.model.SearchFacet instance for the provided defaults if
-     * they apply to this widget, or null if they don't.
+     * Returns a Facet instance for the provided defaults if they apply to
+     * this widget, or null if they don't.
      *
      * This default implementation will try calling
      * :js:func:`instance.web.search.Input#facet_for` if the widget's name
@@ -845,14 +850,11 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
             return f.attrs && f.attrs.name && !!defaults[f.attrs.name];
         });
         if (_.isEmpty(fs)) { return $.when(null); }
-        return $.when(new VS.model.SearchFacet({
+        return $.when({
             category: _t("Filter"),
-            value: _(fs).map(function (f) {
-                return f.attrs.string || f.attrs.name }).join(' | '),
-            json: fs,
-            field: this,
-            app: this.view.vs
-        }));
+            values: fs,
+            field: this
+        });
     },
     /**
      * Fetches contexts for all enabled filters in the group
@@ -861,7 +863,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
      * @return {*} combined contexts of the enabled filters in this group
      */
     get_context: function (facet) {
-        var contexts = _(facet.get('json')).chain()
+        var contexts = _(facet.get('values')).chain()
             .map(function (filter) { return filter.attrs.context; })
             .reject(_.isEmpty)
             .value();
@@ -879,7 +881,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
      * @return {Array} enabled filters in this group
      */
     get_groupby: function (facet) {
-        return  _(facet.get('json')).chain()
+        return  _(facet.get('values')).chain()
             .map(function (filter) { return filter.attrs.context; })
             .reject(_.isEmpty)
             .value();
@@ -891,7 +893,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
      * @return {*} combined domains of the enabled filters in this group
      */
     get_domain: function (facet) {
-        var domains = _(facet.get('json')).chain()
+        var domains = _(facet.get('values')).chain()
             .map(function (filter) { return filter.attrs.domain; })
             .reject(_.isEmpty)
             .value();
@@ -911,10 +913,10 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
     toggle: function (filter) {
         // FIXME: oh god, my eyes, they hurt
         var self = this, fs;
-        var facet = this.view.vs.searchQuery.detect(function (f) {
+        var facet = this.view.query.detect(function (f) {
             return f.get('field') === self; });
         if (facet) {
-            fs = facet.get('json');
+            fs = facet.get('values');
 
             if (_.include(fs, filter)) {
                 fs = _.without(fs, filter);
@@ -922,12 +924,10 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
                 fs.push(filter);
             }
             if (_(fs).isEmpty()) {
-                this.view.vs.searchQuery.remove(facet, {trigger_search: true});
+                this.view.query.remove(facet, {trigger_search: true});
             } else {
                 facet.set({
-                    json: fs,
-                    value: _(fs).map(function (f) {
-                        return f.attrs.string || f.attrs.name }).join(' | ')
+                    values: fs
                 });
             }
             return;
@@ -935,13 +935,10 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
             fs = [filter];
         }
 
-        this.view.vs.searchQuery.add({
+        this.view.query.add({
             category: _t("Filter"),
-            value: _(fs).map(function (f) {
-                return f.attrs.string || f.attrs.name }).join(' | '),
-            json: fs,
-            field: this,
-            app: this.view.vs
+            values: fs,
+            field: this
         });
     }
 });
@@ -985,13 +982,10 @@ instance.web.search.Field = instance.web.search.Input.extend( /** @lends instanc
         this.load_attrs(_.extend({}, field, view_section.attrs));
     },
     facet_for: function (value) {
-        return $.when(new VS.model.SearchFacet({
+        return $.when({
             category: this.attrs.string || this.attrs.name,
-            value: String(value),
-            json: value,
-            field: this,
-            app: this.view.vs
-        }));
+            values: [{label: String(value), value: value}]
+        });
     },
     get_value: function (facet) {
         return facet.value();
@@ -1061,8 +1055,7 @@ instance.web.search.CharField = instance.web.search.Field.extend( /** @lends ins
         return $.when([{
             category: this.attrs.string,
             label: label,
-            value: value,
-            field: this
+            value: [{label: label, value: value}]
         }]);
     }
 });
@@ -1142,11 +1135,11 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends
                 return label.toLowerCase().indexOf(needle.toLowerCase()) !== -1;
             })
             .map(function (sel) {
+                // FIXME fucking repetition man, find something better
                 return {
                     category: self.attrs.string,
-                    field: self,
                     value: sel[1],
-                    json: sel[0]
+                    values: [{value: sel[0], label: sel[1]}]
                 };
             }).value();
         if (_.isEmpty(results)) { return $.when(null); }
@@ -1159,16 +1152,14 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends
             return sel[0] === value;
         });
         if (!match) { return $.when(null); }
-        return $.when(new VS.model.SearchFacet({
+        return $.when({
             category: this.attrs.string,
             value: match[1],
-            json: match[0],
-            field: this,
-            app: this.view.app
-        }));
+            values: [{label: match[1], value: match[0]}]
+        });
     },
     get_value: function (facet) {
-        return facet.get('json');
+        return facet.get('values');
     }
 });
 instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/** @lends instance.web.search.BooleanField# */{
@@ -1197,7 +1188,7 @@ instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/**
  */
 instance.web.search.DateField = instance.web.search.Field.extend(/** @lends instance.web.search.DateField# */{
     get_value: function (facet) {
-        return instance.web.date_to_str(facet.get('json'));
+        return openerp.web.date_to_str(facet.get('values'));
     },
     complete: function (needle) {
         var d = Date.parse(needle);
@@ -1210,9 +1201,8 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst
         return $.when([{
             category: this.attrs.string,
             label: label,
-            value: value,
-            json: d,
-            field: this
+            // FIXME: brain broken
+            values: [{label: value, value: d}]
         }]);
     }
 });
@@ -1229,7 +1219,7 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst
  */
 instance.web.search.DateTimeField = instance.web.search.DateField.extend(/** @lends instance.web.search.DateTimeField# */{
     get_value: function (facet) {
-        return instance.web.datetime_to_str(facet.get('json'));
+        return openerp.web.datetime_to_str(facet.get('values'));
     }
 });
 instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
@@ -1252,8 +1242,7 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
                     return {
                         category: self.attrs.string,
                         value: result[1],
-                        json: result[0],
-                        field: self
+                        values: [{label: result[1], value: result[0]}]
                     };
                 }));
         });
@@ -1261,28 +1250,24 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
     facet_for: function (value) {
         var self = this;
         if (value instanceof Array) {
-            return $.when(new VS.model.SearchFacet({
+            return $.when({
                 category: this.attrs.string,
                 value: value[1],
-                json: value[0],
-                field: this,
-                app: this.view.vs
-            }));
+                values: [{label: value[1], value: value[0]}]
+            });
         }
         return this.model.call('name_get', [value], {}).pipe(function (names) {
-                return new VS.model.SearchFacet({
+            return {
                 category: self.attrs.string,
                 value: names[0][1],
-                json: names[0][0],
-                field: self,
-                app: self.view.vs
-            });
+                values: [{label: names[0][1], value: names[0][0]}]
+            };
         })
     },
     make_domain: function (name, operator, facet) {
         // ``json`` -> actual auto-completed id
-        if (facet.get('json')) {
-            return [[name, '=', facet.get('json')]];
+        if (facet.get('values')) {
+            return [[name, '=', facet.get('values')]];
         }
 
         return this._super(name, operator, facet);
@@ -1332,13 +1317,10 @@ instance.web.search.Advanced = instance.web.search.Input.extend({
         // Create Filter (& FilterGroup around it) with that domain
         var f = new instance.web.search.FilterGroup(filters, this.view);
         // add group to query
-        this.view.vs.searchQuery.add({
+        this.query.add({
             category: _t("Advanced"),
-            value: _(filters).map(function (f) {
-                return f.attrs.string || f.attrs.name }).join(' | '),
-            json: filters,
-            field: f,
-            app: this.view.vs
+            values: filters,
+            field: f
         });
         // remove all propositions
         _.invoke(children, 'destroy');
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 65c084731bc..fcdf68a12ca 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1290,7 +1290,22 @@
 </t>
 
 <div t-name="SearchView" class="oe_searchview">
+    <div class="oe_searchview_facets"/>
 </div>
+
+<div t-name="SearchView.InputView"
+     class="oe_searchview_input"
+     style="height: 2em; min-width: 1em; display: inline-block;"
+     contenteditable="true"/>
+<div t-name="SearchView.FacetView"
+     class="oe_searchview_facet"
+     style="outline: 1px solid black; min-width: 40px; height: 2em; display: inline-block">
+    <t t-esc="widget.model.get('category')"/>: <span/>
+</div>
+<span t-name="SearchView.FacetView.Value">
+    <t t-esc="widget.model.get('label')"/>
+</span>
+
 <t t-name="SearchView.managed-filters">
     <option class="oe-filters-title" value="">Filters</option>
     <optgroup label="-- Filters --">
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
new file mode 100644
index 00000000000..c8d23caf49c
--- /dev/null
+++ b/addons/web/static/test/search.js
@@ -0,0 +1,143 @@
+$(document).ready(function () {
+    var instance;
+    module('query', {
+        setup: function () {
+            instance = window.openerp.init([]);
+            window.openerp.web.corelib(instance);
+            window.openerp.web.coresetup(instance);
+            window.openerp.web.chrome(instance);
+            window.openerp.web.data(instance);
+            window.openerp.web.search(instance);
+        }
+    });
+    test('Adding a facet to the query creates a facet and a value', function () {
+        var query = new instance.web.search.SearchQuery;
+        var field = {};
+        query.add({
+            category: 'Foo',
+            field: field,
+            values: [{label: 'Value', value: 3}]
+        });
+
+        var facet = query.at(0);
+        equal(facet.get('category'), 'Foo');
+        equal(facet.get('field'), field);
+        deepEqual(facet.get('values'), [{label: 'Value', value: 3}]);
+    });
+    test('Adding an array of facet is not valid', function () {
+        var query = new instance.web.search.SearchQuery;
+
+        raises(function () {
+            query.add([
+                { category: 'Foo', field: {}, values: [{label: 'Value', value: 3}] },
+                { category: 'Bar', field: {}, values: [{label: 'Value 2', value: 4}] }
+            ]);
+        });
+    });
+    test('If a facet already exists, add values to it', function () {
+        var query = new instance.web.search.SearchQuery;
+        var field = {};
+        query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
+        query.add({category: 'A', field: field, values: [{label: 'V2', value: 1}]});
+
+        equal(query.length, 1, "adding an existing facet should merge new values into old facet");
+        var facet = query.at(0);
+        deepEqual(facet.get('values'), [
+            {label: 'V1', value: 0},
+            {label: 'V2', value: 1}
+        ]);
+    });
+    test('Facet being implicitly changed should trigger change, not add', function () {
+        var query = new instance.web.search.SearchQuery;
+        var field = {}, added = false, changed = false;
+        query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
+        query.on('add', function () { added = true; })
+             .on('change', function () { changed = true });
+        query.add({category: 'A', field: field, values: [{label: 'V2', value: 1}]});
+
+        ok(!added, "query.add adding values to a facet should not trigger an add");
+        ok(changed, "query.add adding values to a facet should not trigger a change");
+    });
+    test('Toggling a facet, value which does not exist should add it', function () {
+        var query = new instance.web.search.SearchQuery;
+        var field = {};
+        query.toggle({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
+
+        equal(query.length, 1, "Should have created a single facet");
+        var facet = query.at(0);
+        equal(facet.values.length, 1, "Facet should have a single value");
+        deepEqual(facet.get('values'), [{label: 'V1', value: 0}],
+                  "Facet's value should match input");
+    });
+    test('Toggling a facet which exists with a value which does not should add the value to the facet', function () {
+        var field = {};
+        var query = new instance.web.search.SearchQuery;
+        query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
+        query.toggle({category: 'A', field: field, values: [{label: 'V2', value: 1}]});
+
+        equal(query.length, 1, "Should have edited the existing facet");
+        var facet = query.at(0);
+        equal(facet.values.length, 2, "Should have added the value to the existing facet");
+        deepEqual(facet.get('values'), [
+            {label: 'V1', value: 0},
+            {label: 'V2', value: 1}
+        ]);
+    });
+    test('Toggling a facet which exists with a value which does as well should remove the value from the facet', function () {
+        var field = {};
+        var query = new instance.web.search.SearchQuery;
+        query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
+        query.add({category: 'A', field: field, values: [{label: 'V2', value: 1}]});
+
+        query.toggle({category: 'A', field: field, values: [{label: 'V2', value: 1}]});
+
+        equal(query.length, 1, 'Should have the same single facet');
+        var facet = query.at(0);
+        equal(facet.values.length, 1, "Should only have one value left in the facet");
+        deepEqual(facet.get('values'), [
+            {label: 'V1', value: 0}
+        ]);
+    });
+    test('Toggling off the last value of a facet should remove the facet', function () {
+        var field = {};
+        var query = new instance.web.search.SearchQuery;
+        query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
+
+        query.toggle({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
+
+        equal(query.length, 0, 'Should have removed the facet');
+    });
+    test('Intermediate emptyness should not remove the facet', function () {
+        var field = {};
+        var query = new instance.web.search.SearchQuery;
+        query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
+
+        query.toggle({category: 'A', field: field, values: [
+            {label: 'V1', value: 0},
+            {label: 'V2', value: 1}
+        ]});
+
+        equal(query.length, 1, 'Should not have removed the facet');
+        var facet = query.at(0);
+        equal(facet.values.length, 1, "Should have one value");
+        deepEqual(facet.get('values'), [
+            {label: 'V2', value: 1}
+        ]);
+    });
+    // TODO: if the last FacetValue of a facet is removed, the facet should be removed from the query
+
+    test('Reseting with multiple facets should still work to load defaults', function () {
+        var query = new instance.web.search.SearchQuery;
+        var field = {};
+        query.reset([
+            {category: 'A', field: field, values: [{label: 'V1', value: 0}]},
+            {category: 'B', field: field, values: [{label: 'V2', value: 1}]}]);
+
+        equal(query.length, 1, 'Should have created a single facet');
+        equal(query.at(0).values.length, 2, 'the facet should have merged two values');
+        deepEqual(query.at(0).get('values'), [
+            {label: 'V1', value: 0},
+            {label: 'V2', value: 1}
+        ])
+    });
+});
diff --git a/addons/web/static/test/test.html b/addons/web/static/test/test.html
index 84dd3ee7f27..cc1916399f3 100644
--- a/addons/web/static/test/test.html
+++ b/addons/web/static/test/test.html
@@ -10,6 +10,7 @@
 
     <script src="/web/static/lib/underscore/underscore.js" type="text/javascript"></script>
     <script src="/web/static/lib/underscore/underscore.string.js" type="text/javascript"></script>
+    <script src="/web/static/lib/backbone/backbone.js" type="text/javascript"></script>
 
     <!-- jquery -->
     <script src="/web/static/lib/jquery/jquery-1.6.4.js"></script>
@@ -53,4 +54,5 @@
     <script type="text/javascript" src="/web/static/test/formats.js"></script>
     <script type="text/javascript" src="/web/static/test/rpc.js"></script>
     <script type="text/javascript" src="/web/static/test/evals.js"></script>
+    <script type="text/javascript" src="/web/static/test/search.js"></script>
 </html>

From 595eec05a6e241518bcc4bb82aa5fe0dc000a425 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 24 Apr 2012 14:38:24 +0200
Subject: [PATCH 080/452] [FIX] make SearchQuery#add(Array) work correctly
 (fixing #reset at the same time)

bzr revid: xmo@openerp.com-20120424123824-x3nsecztz9gsiar4
---
 addons/web/static/src/js/search.js | 30 +++++++++++++++++-------------
 addons/web/static/test/search.js   | 20 ++++++++++----------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index f37cf1ae60b..4c1862365ca 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -51,21 +51,25 @@ my.SearchQuery = Backbone.Collection.extend({
             this.remove(facet);
         }, this);
     },
-    add: function (value, options) {
+    add: function (values, options) {
         options || (options = {});
-        if (value instanceof Array) {
-            throw new Error("Can't add multiple facets to a query at once");
+        if (!(values instanceof Array)) {
+            values = [values];
         }
-        var model = this._prepareModel(value, options);
-        var previous = this.detect(function (facet) {
-            return facet.get('category') === model.get('category')
-                && facet.get('field') === model.get('field');
-        });
-        if (previous) {
-            previous.values.add(model.get('values'));
-            return this;
-        }
-        return Backbone.Collection.prototype.add.call(this, model, options);
+
+        _(values).each(function (value) {
+            var model = this._prepareModel(value, options);
+            var previous = this.detect(function (facet) {
+                return facet.get('category') === model.get('category')
+                    && facet.get('field') === model.get('field');
+            });
+            if (previous) {
+                previous.values.add(model.get('values'));
+                return;
+            }
+            Backbone.Collection.prototype.add.call(this, model, options);
+        }, this);
+        return this;
     },
     toggle: function (value, options) {
         options || (options = {});
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index c8d23caf49c..7403afb5d0d 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -24,15 +24,16 @@ $(document).ready(function () {
         equal(facet.get('field'), field);
         deepEqual(facet.get('values'), [{label: 'Value', value: 3}]);
     });
-    test('Adding an array of facet is not valid', function () {
+    test('Adding two facets', function () {
         var query = new instance.web.search.SearchQuery;
+        query.add([
+            { category: 'Foo', field: {}, values: [{label: 'Value', value: 3}] },
+            { category: 'Bar', field: {}, values: [{label: 'Value 2', value: 4}] }
+        ]);
 
-        raises(function () {
-            query.add([
-                { category: 'Foo', field: {}, values: [{label: 'Value', value: 3}] },
-                { category: 'Bar', field: {}, values: [{label: 'Value 2', value: 4}] }
-            ]);
-        });
+        equal(query.length, 2);
+        equal(query.at(0).values.length, 1);
+        equal(query.at(1).values.length, 1);
     });
     test('If a facet already exists, add values to it', function () {
         var query = new instance.web.search.SearchQuery;
@@ -107,7 +108,7 @@ $(document).ready(function () {
 
         equal(query.length, 0, 'Should have removed the facet');
     });
-    test('Intermediate emptyness should not remove the facet', function () {
+    test('Intermediate emptiness should not remove the facet', function () {
         var field = {};
         var query = new instance.web.search.SearchQuery;
         query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
@@ -124,14 +125,13 @@ $(document).ready(function () {
             {label: 'V2', value: 1}
         ]);
     });
-    // TODO: if the last FacetValue of a facet is removed, the facet should be removed from the query
 
     test('Reseting with multiple facets should still work to load defaults', function () {
         var query = new instance.web.search.SearchQuery;
         var field = {};
         query.reset([
             {category: 'A', field: field, values: [{label: 'V1', value: 0}]},
-            {category: 'B', field: field, values: [{label: 'V2', value: 1}]}]);
+            {category: 'A', field: field, values: [{label: 'V2', value: 1}]}]);
 
         equal(query.length, 1, 'Should have created a single facet');
         equal(query.at(0).values.length, 2, 'the facet should have merged two values');

From 6754110eb7c0415584d2998b89273f36a79b0be1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 24 Apr 2012 18:07:59 +0200
Subject: [PATCH 081/452] [IMP] get started on doc for VS-less searchview

bzr revid: xmo@openerp.com-20120424160759-aghh2pzioy1k4yw4
---
 doc/conf.py         |   1 +
 doc/index.rst       |   4 +-
 doc/search-view.rst | 149 +++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 135 insertions(+), 19 deletions(-)

diff --git a/doc/conf.py b/doc/conf.py
index 69e49d0e5a7..a5ff6bed7e1 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -247,6 +247,7 @@ texinfo_documents = [
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
 #texinfo_show_urls = 'footnote'
 
+todo_include_todos = True
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
diff --git a/doc/index.rst b/doc/index.rst
index 888ff7705f2..9f54b879acc 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -16,14 +16,14 @@ Contents:
     async
     rpc
 
+    search-view
+
 Older stuff
 -----------
 
 .. toctree::
    :maxdepth: 2
 
-   search-view
-
    getting-started
    production
    widgets
diff --git a/doc/search-view.rst b/doc/search-view.rst
index 89051884596..4675649a805 100644
--- a/doc/search-view.rst
+++ b/doc/search-view.rst
@@ -13,21 +13,128 @@ multiple fields). The goal for this change is twofold:
 * Improve the looks and behaviors of the view, and the fit within
   OpenERP Web's new design.
 
-The faceted search is implemented through a monkey-patched
-`VisualSearch <http://documentcloud.github.com/visualsearch/>`_
-[#]_. VisualSearch is based on `Backbone
+The internal structure of the faceted search is inspired by
+`VisualSearch <http://documentcloud.github.com/visualsearch/>`_ [#]_.
+
+As does VisualSearch, the new search view is based on `Backbone
 <http://documentcloud.github.com/backbone/>`_ and makes significant
-use of Backbone's models and views. As a result, understanding the
-implementation of the OpenERP Web 6.2 search view also requires a
-basic understanding of Backbone.
+use of Backbone's models and collections (OpenERP Web's widgets make a
+good replacement for Backbone's own views). As a result, understanding
+the implementation details of the OpenERP Web 7 search view also
+requires a basic understanding of Backbone's models, collections and
+events.
 
 .. note::
 
     This document may mention *fetching* data. This is a shortcut for
-    "returning a deferred to [whatever is being fetched]". Unless
-    further noted, the function or method may opt to return nothing by
-    fetching ``null`` (which can easily be done by returning
-    ``$.when(null)``, which simply wraps the ``null`` in a Deferred).
+    "returning a :js:class:`Deferred` to [whatever is being
+    fetched]". Unless further noted, the function or method may opt to
+    return nothing by fetching ``null`` (which can easily be done by
+    returning ``$.when(null)``, which simply wraps the ``null`` in a
+    Deferred).
+
+Working with the search view: creating new inputs
+-------------------------------------------------
+
+The primary component of search views, as with all other OpenERP
+views, are inputs. The search view has two types of inputs — filters
+and fields — but only one is easly customizable: fields.
+
+The mapping from OpenERP field types (and widgets) to search view
+objects is stored in the ``openerp.web.search.fields``
+:js:class:`~openerp.web.Registry` where new field types and widgets
+can be added.
+
+Search view inputs have three main roles:
+
+Loading defaults
+++++++++++++++++
+
+Once the search view has initialized all its inputs, it will call
+:js:func:`~openerp.web.search.Input.facet_for_defaults` on each input,
+passing it a mapping (a javascript object) of ``name:value`` extracted
+from the action's context.
+
+This method should fetch a :js:class:`~openerp.web.search.Facet` (or
+an equivalent object) for the field's default value if applicable (if
+a default value for the field is found in the ``defaults`` mapping).
+
+A default implementation is provided which checks if ``defaults``
+contains a non-falsy value for the field's ``@name`` and calls
+:js:func:`openerp.web.search.Input.facet_for` with that value.
+
+There is no default implementation of
+:js:func:`openerp.web.search.Input.facet_for` [#]_, but
+:js:class:`openerp.web.search.Field` provides one, which uses the
+value as-is to fetch a :js:class:`~openerp.web.search.Facet`.
+
+Providing completions
++++++++++++++++++++++
+
+An important component of the new search view is the auto-completion
+pane, and the task of providing completion items is delegated to
+inputs through the :js:func:`~openerp.web.search.Input.complete`
+method.
+
+This method should take a single argument (the string being typed by
+the user) and should fetch an ``Array`` of possible completions [#]_.
+
+A default implementation is provided which fetches nothing.
+
+A completion item is an object literal with two keys:
+
+``label``
+
+    The string which will be displayed in the completion pane. It may
+    be formatted using HTML (inline only), as a result if ``value`` is
+    interpolated into it it *must* be escaped. ``_.escape`` can be
+    used for this.
+
+``facet``
+
+    Either a :js:class:`~openerp.web.search.Facet` object or (more
+    commonly) the corresponding attributes object. This is the facet
+    which will be inserted into the search query if the completion
+    item is selected by the user.
+
+If the ``facet`` is not provided (not present, ``null``, ``undefined``
+or any other falsy value), the completion item will not be selectable
+and will act as a section title of sort (the ``label`` will be
+formatted differently). If an input *may* fetch multiple completion
+items, it *should* prefix those with a section title using its own
+name. This has no technical consequence but is clearer for users.
+
+Providing drawer/supplementary UI
++++++++++++++++++++++++++++++++++
+
+For some inputs (fields or not), interaction via autocompletion may be
+awkward or even impossible.
+
+These may opt to being rendered in a "drawer" as well or instead. In
+that case, they will undergo the normal widget lifecycle and be
+rendered inside the drawer.
+
+.. Found no good type-based way to handle this, since there is no MI
+   (so no type-tagging) and it's possible for both Field and non-Field
+   input to be put into the drawer, for whatever reason (e.g. some
+   sort of auto-detector completion item for date widgets, but a
+   second more usual calendar widget in the drawer for more
+   obvious/precise interactions)
+
+Any input can note its desire to be rendered in the drawer by setting
+its :js:attr:`~openerp.web.search.Input.in_drawer` attribute to
+``true``, either on its class or on its instance.
+
+It will be rendered in the full width of the drawer, and instantiated
+only once.
+
+.. todo:: drawer API (if a widget wants to close the drawer in some
+          way), part of the low-level SearchView API/interactions?
+
+
+.. todo:: handle filters and filter groups via a "driver" input which
+          dynamically collects, lays out and renders filters? =>
+          exercises drawer thingies
 
 Interaction between the Search View and VisualSearch
 ----------------------------------------------------
@@ -197,7 +304,7 @@ Converting from facet objects
 
 Ultimately, the point of the search view is to allow searching. In
 OpenERP this is done via :ref:`domains <openerpserver:domains>`. On
-the other hand, the OpenERP Web 6.2 search view's state is modelled
+the other hand, the OpenERP Web 7 search view's state is modelled
 after a collection of :js:class:`~VS.model.SearchFacet`, and each
 field of a search view may have special requirements when it comes to
 the domains it produces [#]_.
@@ -223,7 +330,7 @@ Changes
 .. todo:: merge in changelog instead
 
 The displaying of the search view was significantly altered from
-OpenERP Web 6.1 to OpenERP Web 6.2.
+OpenERP Web 6.1 to OpenERP Web 7.
 
 As a result, while the external API used to interact with the search
 view does not change many internal details — including the interaction
@@ -247,7 +354,7 @@ Widgets API
 
 * :js:func:`~openerp.web.search.Input.clear` has been removed since
   clearing the search view now simply consists of removing all search
-  facets from VisualSearch
+  facets
 
 * :js:func:`~openerp.web.search.Input.get_domain` and
   :js:func:`~openerp.web.search.Input.get_context` now take a
@@ -300,10 +407,18 @@ Many To One
   :js:func:`openerp.web.search.ManyToOneField.setup_autocomplete` has
   been removed.
 
-.. [#] the library code is untouched, all patching is performed in the
-       Search view's implementation module. Changes to the
-       VisualSearch code should only update the library to new
-       revisions or releases.
+.. [#] the original view was implemented on top of a monkey-patched
+       VisualSearch, but as our needs diverged from VisualSearch's goal this
+       made less and less sense ultimately leading to a clean-room
+       reimplementation
+
+.. [#] In case you are extending the search view with a brand new type
+       of input
+
+.. [#] Ideally this array should not hold more than about 10 items,
+       but the search view does not put any constraint on this at the
+       moment. Note that this may change.
+
 .. [#] search view fields may also bundle context data to add to the
        search context
 

From 5fbb9b5e6adf552875d651c5751c738562eaf28f Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 25 Apr 2012 17:23:27 +0530
Subject: [PATCH 082/452] [IMP] crm: improved view

bzr revid: tpa@tinyerp.com-20120425115327-0zhzw6pihh02p98n
---
 addons/crm/crm_lead_view.xml      | 10 ++++-----
 addons/crm/crm_phonecall_view.xml | 34 ++++++++++++++-----------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7de9858713a..40bca1a6dab 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -53,12 +53,12 @@
         <field name="arch" type="xml">
             <form string="Leads Form" layout="manual">
                 <div class="oe_form_topbar">
-                    <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_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
                     <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause" />
                     <button name="case_escalate" string="Escalate" states="open,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
                     <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" />
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
@@ -401,13 +401,13 @@
         <field name="arch" type="xml">
             <form string="Opportunities" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
-                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <button name="case_escalate" string="Escalate" states="open,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
                     <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
+                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
+                    <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
@@ -458,7 +458,7 @@
                                 string="Create"
                                 attrs="{'invisible':[('partner_id','!=',False)]}"/>
                         </group>
-                        
+
                         <group col="3" colspan="2">
                             <field name="email_from" string="Email" />
                             <button string="Mail"
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index eb836428b6e..be6a29faee3 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -58,7 +58,18 @@
         <field name="model">crm.phonecall</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Phone Call">
+            <form layout="manual">
+				<div class="oe_form_topbar">
+                    <button name="case_open" string="Todo" states="pending" type="object" icon="gtk-go-forward" />
+                    <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause" />
+                    <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to" />
+                    <button name="case_reset" string="Reset to Todo" states="cancel" type="object" icon="gtk-convert" />
+				    <button name="case_cancel" string="Cancel" states="open,pending" type="object" icon="gtk-cancel" />
+				    <div class="oe_right">
+				        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done" statusbar_colors='{"pending":"red"}' select="1"/>
+				    </div>
+				</div>
+                <sheet string="Phone Call" layout="auto">
                  <group colspan="6" col="7">
                     <field name="name" required="1"/>
                     <field name="partner_phone"/>
@@ -103,25 +114,10 @@
                 </group>
                 <separator string="Description" colspan="4" />
                 <field name="description" nolabel="1" colspan="4" />
-                <separator colspan="4" />
-                <group col="8" colspan="4">
-                    <field name="state" widget="statusbar" statusbar_visible="open,done" statusbar_colors='{"pending":"red"}' select="1"/>
-                    <button name="case_cancel" string="Cancel"
-                        states="open,pending" type="object"
-                        icon="gtk-cancel" />
-                    <button name="case_open" string="Todo"
-                        states="pending" type="object"
-                        icon="gtk-go-forward" />
-                    <button name="case_pending" string="Not Held"
-                        states="open" type="object" icon="gtk-media-pause" />
-                    <button name="case_close" string="Held"
-                        states="open,pending" type="object"
-                        icon="gtk-jump-to" />
-                    <button name="case_reset" string="Reset to Todo"
-                        states="cancel" type="object"
-                        icon="gtk-convert" />
-                </group>
+            </sheet>
+            <div class="oe_form_sheet_width">
                 <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+            </div>
             </form>
         </field>
     </record>

From eef8d03d411c6b5d7bb0711f403e42a3e3894c55 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 25 Apr 2012 17:39:35 +0530
Subject: [PATCH 083/452] [IMP] crm_claim: improved view

bzr revid: tpa@tinyerp.com-20120425120935-u0yjq2ltezf9wxju
---
 addons/crm_claim/crm_claim_view.xml | 33 ++++++++++++-----------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index ada4db06237..4f555f2a2ac 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -66,7 +66,18 @@
             <field name="model">crm.claim</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Claims">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
+                    <button name="case_close" string="Done" states="open,pending" type="object" icon="gtk-jump-to" />
+                    <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" />
+                    <div class="oe_right">
+                        <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Claims" layout="auto">
                     <group>
                         <field name="name" />
                         <field name="date"/>
@@ -102,25 +113,6 @@
                                 </group>
                                 <separator colspan="4" string="Claim/Action Description"/>
                                 <field name="description" colspan="4" nolabel="1"/>
-                                <separator colspan="4" string=""/>
-                                <group col="8" colspan="4">
-                                    <field name="state" select="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                                    <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_open" string="Open"
-                                        states="draft,pending" type="object"
-                                        icon="gtk-go-forward" />
-                                    <button name="case_close" string="Done"
-                                        states="open,pending" type="object"
-                                        icon="gtk-jump-to" />
-                                    <button name="case_reset"
-                                        string="Reset to Draft" states="done,cancel"
-                                        type="object" icon="gtk-convert" />
-                                </group>
                             </page>
                             <page string="Follow Up">
                                 <group colspan="2" col="2">
@@ -170,6 +162,7 @@
                             </page>
                         </notebook>
                     </group>
+                </sheet>
                 </form>
             </field>
         </record>

From 611adc838f6c790b99ea49e12f2c523142d51b29 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 25 Apr 2012 14:20:56 +0200
Subject: [PATCH 084/452] [REM] older searchview doc (deprecated/replaced)

bzr revid: xmo@openerp.com-20120425122056-bdvsfjbtc7bmhsuw
---
 doc/search-view.rst | 236 +++++++++++++++++---------------------------
 1 file changed, 92 insertions(+), 144 deletions(-)

diff --git a/doc/search-view.rst b/doc/search-view.rst
index 4675649a805..9d5944d41d6 100644
--- a/doc/search-view.rst
+++ b/doc/search-view.rst
@@ -16,13 +16,12 @@ multiple fields). The goal for this change is twofold:
 The internal structure of the faceted search is inspired by
 `VisualSearch <http://documentcloud.github.com/visualsearch/>`_ [#]_.
 
-As does VisualSearch, the new search view is based on `Backbone
-<http://documentcloud.github.com/backbone/>`_ and makes significant
-use of Backbone's models and collections (OpenERP Web's widgets make a
-good replacement for Backbone's own views). As a result, understanding
-the implementation details of the OpenERP Web 7 search view also
-requires a basic understanding of Backbone's models, collections and
-events.
+As does VisualSearch, the new search view is based on `Backbone`_ and
+makes significant use of Backbone's models and collections (OpenERP
+Web's widgets make a good replacement for Backbone's own views). As a
+result, understanding the implementation details of the OpenERP Web 7
+search view also requires a basic understanding of Backbone's models,
+collections and events.
 
 .. note::
 
@@ -45,7 +44,7 @@ objects is stored in the ``openerp.web.search.fields``
 :js:class:`~openerp.web.Registry` where new field types and widgets
 can be added.
 
-Search view inputs have three main roles:
+Search view inputs have four main roles:
 
 Loading defaults
 ++++++++++++++++
@@ -81,7 +80,9 @@ the user) and should fetch an ``Array`` of possible completions [#]_.
 
 A default implementation is provided which fetches nothing.
 
-A completion item is an object literal with two keys:
+A completion item is a javascript object with two keys (technically it
+can have any number of keys, but only these two will be used by the
+search view):
 
 ``label``
 
@@ -136,168 +137,105 @@ only once.
           dynamically collects, lays out and renders filters? =>
           exercises drawer thingies
 
-Interaction between the Search View and VisualSearch
-----------------------------------------------------
+Programmatic interactions: internal model
+-----------------------------------------
 
-The core data abstraction in VisualSearch is
-:js:class:`VS.model.SearchQuery`, a backbone Collection holding
-instances of the :js:class:`VS.model.SearchFacet` backbone Model.
+This new searchview is built around an instance of
+:js:class:`~openerp.web.search.SearchQuery` available as
+:js:attr:`openerp.web.SearchView.query`.
 
-Backbone models can hold any number of informal properties interacted
-with through the :js:func:`~Backbone.Model.get` and
-:js:func:`~Backbone.Model.set` methods. VisualSearch reserves three
-such properties for its behavior, these properties *must* be correctly
-set on all search facets created programmatically:
+The query is a `backbone collection`_ of
+:js:class:`~openerp.web.search.Facet` objects, which can be interacted
+with directly by external objects or search view controls
+(e.g. widgets displayed in the drawer).
 
-``app``
-  a reference to the VisualSearch instance using this facet. In the
-  search view, this instance is available as the
-  :js:attr:`~openerp.web.SearchView.vs` attribute to the searchview
-  instance.
+.. js:class:: openerp.web.search.SearchQuery
 
-``category``
-  the *name* of the facet, displayed in the first section of a facet
-  view.
+    The current search query of the search view, provides convenience
+    behaviors for manipulating :js:class:`~openerp.web.search.Facet`
+    on top of the usual `backbone collection`_ methods.
 
-``value``
-  the *displayed value* of the facet, it is directly printed to the
-  right of the category.
+    The query ensures all of its facets contain at least one
+    :js:class:`~openerp.web.search.FacetValue` instance. Otherwise,
+    the facet is automatically removed from the query.
 
-The search view uses additional keys to store state and data it needs
-to associate with facet objects:
+    .. js:function:: openerp.web.search.SearchQuery.add(values, options)
 
-``field``
-  the search field instance which created the facet, used when the
-  search view needs to serialize the facets.
+        Overridden from the base ``add`` method so that adding a facet
+        which is *already* in the collection will merge the value of
+        the new facet into the old one rather than add a second facet
+        with different values.
 
-``json``
-  the "logical" value of the facet, can be absent if the logical and
-  "printable" values of the facet are the same (e.g. for a basic text
-  field).
+        :param values: facet, facet attributes or array thereof
+        :returns: the collection itself
 
-  This value may be a complex javascript object such as an array (the
-  name stands for json-compatible value, it is not a JSON-encoded
-  string).
+    .. js:function:: openerp.web.search.SearchQuery.toggle(value, options)
 
-.. note::
+        Convenience method for toggling facet values in a query:
+        removes the values (through the facet itself) if they are
+        present, adds them if they are not. If the facet itself is not
+        in the collection, adds it automatically.
 
-     in order to simplify getting the logical value of a search facet
-     model, :js:class:`VS.model.SearchFacet` has been extended with a
-     :js:func:`~VS.model.SearchFacet.value` method
+        A toggling is atomic: only one change event will be triggered
+        on the facet regardless of the number of values added to or
+        removed from the facet (if the facet already exists), and the
+        facet is only removed from the query if it has no value *at
+        the end* of the toggling.
 
-Extensions and patches to VisualSearch
-++++++++++++++++++++++++++++++++++++++
+        :param value: facet or facet attributes
+        :returns: the collection
 
-.. js:function:: VS.model.SearchFacet.value()
+.. js:class:: openerp.web.search.Facet
 
-    Bundles the logic of selecting between ``json`` and ``value`` in
-    order to get the logical value of a facet.
+    A `backbone model`_ representing a single facet of the current
+    research. May map to a search field, or to a more complex or
+    fuzzier input (e.g. a custom filter or an advanced search).
 
-.. js:attribute:: VS.options.callbacks.make_facet
+    .. js:attribute:: category
 
-    Called by :js:class:`VS.ui.SearchBox` when it needs to create a
-    new search facet *view*. By default this is not supported by
-    VisualSearch, and requires monkey-patching
-    :js:func:`VS.ui.SearchBox.renderFacet`.
+        The displayed name of the facet, as a ``String``. This is a
+        backbone model attribute.
 
-    This patch should not alter any behavior if
-    :js:attr:`~VS.options.callbacks.make_facet` is not used.
+    .. js:attribute:: field
 
-.. js:attribute:: VS.options.callbacks.make_input
+        The :js:class:`~openerp.web.search.Input` instance which
+        originally created the facet, used to delegate some operations
+        (such as serializing the facet's values to domains and
+        contexts). This is a backbone model attribute.
 
-    Similar to :js:attr:`~VS.options.callbacks.make_facet`, but called
-    when the :js:class:`~VS.ui.SearchBox` needs to create a search
-    input view. It requires monkey-patching
-    :js:func:`VS.ui.SearchBox.renderSearchInput`.
+    .. js:attribute:: values
 
-Finally, :js:func:`VS.ui.SearchBox.searchEvent` is monkey-patched to
-get rid of its serialize/load round-tripping of facet data: the
-additional attributes needed by the search view don't round-trip (at
-all) so VisualSearch must not load any data from its (fairly
-simplistic) text-serialization format.
+        :js:class:`~openerp.web.search.FacetValues` as a javascript
+        attribute, stores all the values for the facet and helps
+        propagate their events to the facet. Is also available as a
+        backbone attribute (via ``#get`` and ``#set``) in which cases
+        it serializes to and deserializes from javascript arrays (via
+        ``Collection#toJSON`` and ``Collection#reset``).
 
-.. note::
+.. js:class:: openerp.web.search.FacetValues
 
-    a second issue is that — as of `commit 3fca87101d`_ — VisualSearch
-    correctly serializes facet categories containing spaces but is
-    unable to load them back in. It also does not handle facets with
-    *empty* categories correctly.
+    `Backbone collection`_ of
+    :js:class:`~openerp.web.search.FacetValue` instances.
 
-Loading Defaults
-----------------
+.. js:class:: openerp.web.search.FacetValue
 
-After loading the view data, the SearchView will call
-:js:func:`openerp.web.search.Input.facet_for_defaults` on each of its
-inputs with the ``defaults`` mapping of key:values (where each key
-corresponds to an input). This method should look into the
-``defaults`` mapping and fetch the field's default value as a
-:js:class:`~VS.models.SearchFacet` if applicable.
+    `Backbone model`_ representing a single value within a facet,
+    represents a pair of (displayed name, logical value).
 
-The default implementation is to check if there is a default value for
-the current input's name (via
-:js:attr:`openerp.web.search.Input.attrs.name`) and if there is to
-convert this value to a :js:class:`~VS.models.SearchFacet` by calling
-:js:func:`openerp.web.search.Input.facet_for`.
+    .. js:attribute:: label
 
-There is no built-in (default) implementation of
-:js:func:`openerp.web.search.Input.facet_for`. This method should
-fetch the :js:class:`~VS.models.SearchFacet` corresponding to the
-"raw" value passed as argument.
+        Backbone model attribute storing the "displayable"
+        representation of the value, visually output to the
+        user. Must be a string.
 
-Providing auto-completion
--------------------------
+    .. js:attribute:: value
 
-An important component of the unified search view is the faceted
-autocompletion pane. In order to provide good user and developer
-experiences, this pane is pluggable (value-wise): each and every
-control of the search view can check for (and provide) categorized
-auto-completions for a given value being typed by the user.
+        Backbone model attribute storing the logical/internal value
+        (of itself), will be used by
+        :js:class:`~openerp.web.search.Input` to serialize to domains
+        and contexts.
 
-This is done by implementing
-:js:func:`openerp.web.search.Input.complete`: the method is provided
-with a value to complete, and should fetch an ``Array`` of completion
-values. These completion values will then be provided to the global
-autocompletion list, implemented via `jquery-ui autocomplete
-<http://jqueryui.com/demos/autocomplete/>`_.
-
-Because the search view uses a custom renderer for its completion, it
-was possible to fix some incompatibilities between the attributes of
-completion items and VisualSearch's facet model:
-
-Actual completion items
-+++++++++++++++++++++++
-
-These are selectable items, and upon selection are turned into actual
-search facet objects. They should have all the properties of a search
-facet (as described above) and can have one more optional property:
-``label``.
-
-When rendering an item in the list, the renderer will first try to use
-the ``label`` property if it exists (``label`` can contain HTML and
-will be inserted as-is, so it can bold or emphasize some of its
-elements), if it does not the ``value`` property will be used.
-
-.. note:: the ``app`` key should not be specified on completion item,
-          it will be set automatically when the search view creates
-          the facet from the item.
-
-Section titles
-++++++++++++++
-
-A second kind of completion values is the section titles. Section
-titles are similar to completion items but only have a ``category``
-property. They will be rendered in a different style and can not be
-selected in the auto-completion (they will be skipped).
-
-.. note::
-
-    Technically, section title items can have any property they want
-    *as long as they do not have a value property*. A ``value``
-    property set to ``false``, ``null`` or ``undefined`` is **not**
-    equivalent to not having a ``value`` property.
-
-If an input *may* fetch more than one completion item, it *should*
-prepend a section title (using its own name) to the completion items.
+        Can be of any type.
 
 Converting from facet objects
 -----------------------------
@@ -327,7 +265,7 @@ Converting to facet objects
 Changes
 -------
 
-.. todo:: merge in changelog instead
+.. todo:: merge in changelog instead?
 
 The displaying of the search view was significantly altered from
 OpenERP Web 6.1 to OpenERP Web 7.
@@ -422,5 +360,15 @@ Many To One
 .. [#] search view fields may also bundle context data to add to the
        search context
 
+.. _Backbone:
+    http://documentcloud.github.com/backbone/
+
+.. _Backbone.Collection:
+.. _Backbone collection:
+    http://documentcloud.github.com/backbone/#Collection
+
+.. _Backbone model:
+    http://documentcloud.github.com/backbone/#Model
+
 .. _commit 3fca87101d:
-     https://github.com/documentcloud/visualsearch/commit/3fca87101d
+    https://github.com/documentcloud/visualsearch/commit/3fca87101d

From 087b673564d8f3d5b30ea9d3c802e87d14c5acb4 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 25 Apr 2012 18:15:59 +0530
Subject: [PATCH 085/452] [IMP] crm_helpdesk: improved view

bzr revid: tpa@tinyerp.com-20120425124559-zk226lcgs4n6g2yt
---
 addons/crm_helpdesk/crm_helpdesk_view.xml | 41 +++++++++--------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 5f2fee07ff1..bc25468b5fb 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -28,8 +28,20 @@
             <field name="model">crm.helpdesk</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Helpdesk Support">
-                    <group colspan="4" col="7">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="case_open" states="draft,pending" string="Open" type="object" icon="gtk-go-forward" />
+                    <button name="case_pending" states="draft,open" string="Pending" type="object" icon="gtk-media-pause" />
+                    <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" icon="gtk-go-up" />
+                    <button name="case_close" states="open,draft,pending" string="Close" type="object" icon="gtk-jump-to" />
+                    <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
+                    <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" />
+                    <div class="oe_right">
+                        <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Helpdesk Support" layout="auto">
+                    <group colspan="4" col="7" class="oe_form_header">
                         <field name="name" select="1" string="Query"/>
                         <field name="section_id" widget="selection"/>
                         <field name="user_id" select="1"/>
@@ -64,30 +76,6 @@
 
                             <separator colspan="4" string="Notes"/>
                             <field name="description" colspan="4" nolabel="1" />
-                            <separator colspan="4"/>
-                            <group col="8" colspan="4">
-                                <field name="state" select="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                                <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" />
-                                <button name="case_pending"
-                                    states="draft,open" string="Pending"
-                                    type="object" icon="gtk-media-pause" />
-                                <button name="case_escalate"
-                                    states="open,draft,pending"
-                                    string="Escalate" type="object"
-                                    icon="gtk-go-up" />
-                                <button name="case_close"
-                                    states="open,draft,pending" string="Close"
-                                    type="object" icon="gtk-jump-to" />
-                                <button name="case_reset"
-                                    states="done,cancel"
-                                    string="Reset to Draft" type="object"
-                                    icon="gtk-convert" />
-                            </group>
                         </page>
                         <page string="Communication &amp; History" groups="base.group_extended">
                             <group colspan="4">
@@ -136,6 +124,7 @@
                             </group>
                         </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>

From 129499546120dd3e2cf099c75aee2a78478f65d8 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 25 Apr 2012 18:30:11 +0530
Subject: [PATCH 086/452] [IMP] event: improved view

bzr revid: tpa@tinyerp.com-20120425130011-ifxbaqreeu369cik
---
 addons/event/event_view.xml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 4e22569c3e1..7627ac94427 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -50,8 +50,18 @@
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                    </div>
+                </div>
+                <sheet string="Events" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="name"/>
                         <field name="date_begin"/>
                         <field name="date_end"/>
@@ -96,13 +106,6 @@
                                     </group>
                             </form>
                             </field>
-                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                        <group col="4" colspan="2">
-                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        </group>
                     </page>
                     <page string="Speakers" groups="base.group_extended">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
@@ -127,6 +130,7 @@
                         </group>
                     </page>
                     </notebook>
+            </sheet>
             </form>
             </field>
         </record>

From 99c1d2cdc59ebea380d66851ae09d4a31dd7627f Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 25 Apr 2012 18:39:57 +0530
Subject: [PATCH 087/452] [IMP] hr: improved view.

bzr revid: tpa@tinyerp.com-20120425130957-6r6fih3emqyan6ip
---
 addons/hr/hr_view.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index a954d916385..ce49c8da6ca 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -346,7 +346,16 @@
             <field name="model">hr.job</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Job">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <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"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="recruit,open"/>
+                    </div>
+                </div>
+                <sheet string="Job" layout="auto">
                     <group col="6" colspan="4">
                     <field name="name" />
                     <field name="department_id" />
@@ -368,12 +377,7 @@
                             <field name="employee_ids" colspan="4" nolabel="1" widget="many2many" mode="tree,form"/>
                         </page>
                     </notebook>
-                    <group col="6" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
-                        <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>
+                </sheet>
                 </form>
             </field>
         </record>

From b6adc8491a59d4dd932608288d862be93f3d18f5 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 25 Apr 2012 18:48:28 +0530
Subject: [PATCH 088/452] [IMP] sale_crm : Remove menu

bzr revid: dbr@tinyerp.com-20120425131828-g0ghy9g10yx462gf
---
 addons/sale_crm/board_sale_crm_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
index a5fa08222e0..76b22c59d62 100644
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ b/addons/sale_crm/board_sale_crm_view.xml
@@ -29,7 +29,5 @@
             </xpath>
             </field>
         </record>
-        <menuitem name="Sales"
-            id="base.menu_base_partner" action="sale.open_board_sales"/>
     </data>
 </openerp>

From 21f8477ce46c7c98301967344fb56461f1c1bf24 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 25 Apr 2012 18:49:43 +0530
Subject: [PATCH 089/452] [IMP] hr_evaluation: improved view

bzr revid: tpa@tinyerp.com-20120425131943-heu93zp6l4i7pu67
---
 addons/hr_evaluation/hr_evaluation_view.xml | 28 ++++++++++-----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e38a8796895..2c192513ed4 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -154,7 +154,18 @@
             <field name="model">hr_evaluation.evaluation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Appraisal">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object" icon="gtk-execute"/>
+                    <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object" icon="gtk-go-forward"/>
+                    <button name="button_done" string="Done" states="progress" type="object" icon="gtk-jump-to"/>
+                    <button name="button_draft" string="Reset to Draft" states="cancel" type="object" icon="terp-stock_effects-object-colorize"/>
+                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Appraisal" layout="auto">
                     <group col="4" colspan="3">
                         <separator string="Appraisal Data" colspan="4"/>
                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
@@ -198,20 +209,7 @@
                             <field name="note_summary" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
-                    <newline/>
-                    <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
-                        <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
-                                icon="gtk-cancel"/>
-                        <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object"
-                                icon="gtk-execute"/>
-                        <button name="button_done" string="Done" states="progress" type="object"
-                                icon="gtk-jump-to"/>
-                        <button name="button_draft" string="Reset to Draft" states="cancel" type="object"
-                                icon="terp-stock_effects-object-colorize"/>
-                        <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object"
-                                icon="gtk-go-forward"/>
-                    </group>
+              </sheet>
               </form>
             </field>
         </record>

From bbe06d51043c25e1145c2036d743b26a8badc126 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 25 Apr 2012 18:57:01 +0530
Subject: [PATCH 090/452] [IMP] hr_expence: improved view

bzr revid: tpa@tinyerp.com-20120425132701-bsr6t8n5yocneegs
---
 addons/hr_expense/hr_expense_view.xml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 66d2aa89617..c5aaa8a83d7 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -65,7 +65,18 @@
             <field name="type">form</field>
             <field name="model">hr.expense.expense</field>
             <field name="arch" type="xml">
-                <form string="Expenses Sheet">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="confirm" states="draft" string="Submit to Manager" type="workflow" icon="gtk-apply"/>
+                    <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
+                    <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_user"/>
+                    <button name="invoice" states="accepted" string="Invoice" type="object" icon="gtk-go-forward" groups="base.group_hr_user"/>
+                    <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,accepted,invoiced" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
+                    </div>
+                </div>
+                <sheet string="Expenses Sheet" layout="auto">
                     <group colspan="4" col="6">
                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                         <field name="name"/>
@@ -99,14 +110,6 @@
                                     </group>
                                 </form>
                             </field>
-                            <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,invoiced" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
-                            <group col="6" colspan="2">
-                                <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_user"/>
-                                <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
-                                <button name="confirm" states="draft" string="Submit to Manager" type="workflow" icon="gtk-apply"/>
-                                <button name="invoice" states="accepted" string="Invoice" type="object" icon="gtk-go-forward" groups="base.group_hr_user"/>
-                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
-                            </group>
                         </page>
                         <page string="Other Info" groups="base.group_extended">
                             <group col="2" colspan="2">
@@ -124,6 +127,7 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>

From f2801c6071c4fb9f77f1c8d0291176cb5c4c5bb2 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 10:19:51 +0530
Subject: [PATCH 091/452] [IMP] Improved view of leave request

bzr revid: tpa@tinyerp.com-20120426044951-5qfdb1itenm2afux
---
 addons/hr_holidays/hr_holidays_view.xml | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 066ac29c6e3..c1fd627f139 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -63,7 +63,18 @@
             <field name="type">form</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
-                <form string="Leave Request">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
+                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
+                    <button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
+                    </div>
+                </div>
+                <sheet string="Leave Request" layout="auto">
                     <group col="8" colspan="4">
                     <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_manager"/>
@@ -87,17 +98,13 @@
                             <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                             <separator string="Reasons" colspan="4"/>
                             <field name="notes" nolabel="1" colspan="4"/>
-                            <group colspan="4" col="8">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
-                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
-                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                                <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                                <button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
-                            </group>
                             <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
+                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>

From 01a55597b319a3e0c5e44407373d4ff4031210a5 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 10:32:23 +0530
Subject: [PATCH 092/452] [IMP] Improved view of allocation request

bzr revid: tpa@tinyerp.com-20120426050223-1e22zbue2es6qfka
---
 addons/hr_holidays/hr_holidays_view.xml | 29 +++++++++++++++----------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index c1fd627f139..ab31447aa86 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -98,7 +98,6 @@
                             <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                             <separator string="Reasons" colspan="4"/>
                             <field name="notes" nolabel="1" colspan="4"/>
-                            <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                         </page>
                     </notebook>
                 </sheet>
@@ -115,8 +114,19 @@
             <field name="model">hr.holidays</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Allocation Request">
-                <group col="8" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
+                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
+                    <button string="Set to Draft" name="set_to_draft" states="cancel,validate,refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
+                    </div>
+                </div>
+                <sheet string="Allocation Request" layout="auto">
+                <group col="8" colspan="4" class="oe_form_header">
                     <field name="name"/>
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
@@ -137,17 +147,12 @@
                         <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                         <separator string="Reasons" colspan="4"/>
                         <field name="notes" nolabel="1" colspan="4"/>
-                        <group colspan="4" col="8">
-                            <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
-                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
-                            <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                            <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                            <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate,refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
-                        </group>
-                        <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                     </page>
                 </notebook>
+            </sheet>
+            <div class="oe_form_sheet_width">
+                <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+            </div>
             </form>
             </field>
         </record>

From f0ccc94e139bac0cacf2e9de1eb68c3a658d03e9 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 10:56:33 +0530
Subject: [PATCH 093/452] [IMP]project: change sequence of button

bzr revid: kjo@tinyerp.com-20120426052633-wz91k7qetnlw3a5l
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 956b159a0bb..f4a301ef084 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,13 +20,13 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                 <div class="oe_form_topbar">
-                    <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"/>
                     <button name="set_open" string="Re-open 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="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
                     <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
+                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
                     </div>
@@ -224,13 +224,13 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                     <div class="oe_form_topbar">
-                        <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-media-play"/>
                         <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 name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
                         <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"/>
                         <div class="oe_right">
                             <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
                         </div>

From c784871374d5daa2507a395606f51d887206ed20 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 11:19:03 +0530
Subject: [PATCH 094/452] [IMP] hr_timesheet_sheet:improved view

bzr revid: tpa@tinyerp.com-20120426054903-vk2931wzi2a8b83q
---
 .../hr_timesheet_sheet_view.xml               | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index d822f10d944..21cfb8482b5 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -60,8 +60,18 @@
             <field name="model">hr_timesheet_sheet.sheet</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Timesheet">
-                    <group colspan="4" col="6">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="button_confirm" states="draft" string="Submited to Manager" type="object" icon="terp-check"/>
+                    <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>
+                    <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" groups="base.group_hr_user"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="new,confirm,done"/>
+                    </div>
+                </div>
+                <sheet string="Timesheet" layout="auto">
+                    <group colspan="4" col="6" class="oe_form_header">
                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                         <field name="user_id" invisible="1"/>
                         <field name="date_from"/>
@@ -142,13 +152,7 @@
                             </group>
                         </page>
                     </notebook>
-                    <group col="6" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
-                        <button name="button_confirm" states="draft" string="Submited to Manager" 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" groups="base.group_hr_user"/>
-                        <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>

From 313bbfd5d522d6c4bd6ee23ae6f9dffde33714fe Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 11:33:59 +0530
Subject: [PATCH 095/452] [IMP] idea: improved view

bzr revid: tpa@tinyerp.com-20120426060359-3cmt4bgvkm7uhb43
---
 addons/idea/idea_view.xml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index b5a23b80481..72b8dbfa3fc 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -182,8 +182,17 @@
         <field name="model">idea.idea</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-        <form string="New Idea">
-            <group col="6" colspan="4">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                <button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
+                <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
+                <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/>
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,close"/>
+                </div>
+            </div>
+            <sheet string="New Idea" layout="auto">
+            <group col="6" colspan="4" class="oe_form_header">
                 <field name="name" select="1" />
                 <field name="category_id" select="1"/>
                 <field name="open_date" select="1"/>
@@ -234,15 +243,9 @@
                             <field name="nbr"/>
                         </tree>
                     </field>
-
                 </page>
             </notebook>
-            <group colspan="4" col="6">
-                <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
-                <button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
-                <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
-                <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/>
-            </group>
+        </sheet>
         </form>
         </field>
     </record>

From e175b4b5f4a3efe4f897db87ee13e70c94fd6445 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 11:36:16 +0530
Subject: [PATCH 096/452] [IMP]project_issuer: add button and state at topbar

bzr revid: kjo@tinyerp.com-20120426060616-aamxajk5xo2ps1yk
---
 addons/project_issue/project_issue_view.xml | 26 +++++++++++++--------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 7c22ad748c0..705f8fc7b05 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -50,7 +50,19 @@
             <field name="model">project.issue</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Issue Tracker Form">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                    <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 New" states="done,cancel" type="object" icon="gtk-convert"/>
+                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Issue Tracker Form" layout="auto">
                     <group colspan="4" col="6">
                         <field name="name"/>
                         <field name="project_id" required="True" on_change="on_change_project(project_id)"/>
@@ -86,15 +98,6 @@
                             <separator string= "Description" colspan="4"/>
                             <field name="description" nolabel="1" colspan="4"/>
                             <separator colspan="4"/>
-                            <group col="8" colspan="4">
-                            <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                            <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="Done" 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_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                            <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
-                            </group>
                         </page>
                         <page string="Extra Info">
                             <group col="4" colspan="4">
@@ -113,7 +116,10 @@
                             </group>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>

From 4a3025550b745b4995876b11608ba756792665be Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 11:39:21 +0530
Subject: [PATCH 097/452] [IMP] lunch: improved view

bzr revid: tpa@tinyerp.com-20120426060921-akgutslerj1l8oxi
---
 addons/lunch/lunch_view.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 7d9cd7255d3..d8ddf82f849 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -23,7 +23,15 @@
             <field name="name">Order</field>
             <field name="model">lunch.order</field>
             <field name="arch" type="xml">
-                <form string="Order">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok" attrs="{'invisible':[('state','=','confirmed')]}"/>
+                    <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed"/>
+                    </div>
+                </div>
+                <sheet string="Order" layout="auto">
                     <field name="user_id" select="1"/>
                     <field name="date" select="1"/>
                     <field name="product" select="1" on_change="onchange_product(product)"/>
@@ -31,13 +39,7 @@
                     <field name="descript"/>
                     <field name="price"/>
                     <field name="cashmove"/>
-                    <newline/>
-                   <separator string="" colspan="4"/>
-                    <group colspan="4" col="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
-                        <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok" attrs="{'invisible':[('state','=','confirmed')]}"/>
-                        <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>

From c2c2f87dd165dd74b5359042fd78a471ee353328 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 11:59:46 +0530
Subject: [PATCH 098/452] [IMP] revert the last change

bzr revid: kjo@tinyerp.com-20120426062946-4zxstuvx0ddm0kd1
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index ba6bf6ba780..f4a301ef084 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -229,7 +229,6 @@
                         <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 name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
-                        <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
                         <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"/>
                         <div class="oe_right">
@@ -259,6 +258,7 @@
                             </group>
                             <group col="3" colspan="2">
                                 <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
+                                <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
                             </group>
 
                             <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}"/>

From e2ad2c91bf2505dc832c72bd84a866b222b26790 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 12:12:38 +0530
Subject: [PATCH 099/452] [IMP] improved indentation

bzr revid: tpa@tinyerp.com-20120426064238-vmg237l0jd5td2jb
---
 addons/crm/crm_phonecall_view.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 0a7103cb510..9e4280f1e64 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -59,17 +59,17 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-				<div class="oe_form_topbar">
-                    <button name="case_open" string="Todo" states="pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause" />
-                    <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to" />
-                    <button name="case_reset" string="Reset to Todo" states="cancel" type="object" icon="gtk-convert" />
-				    <button name="case_cancel" string="Cancel" states="open,pending" type="object" icon="gtk-cancel" />
-				    <div class="oe_right">
-				        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done" statusbar_colors='{"pending":"red"}' select="1"/>
-				    </div>
-				</div>
-                <sheet string="Phone Call" layout="auto">
+            <div class="oe_form_topbar">
+                <button name="case_open" string="Todo" states="pending" type="object" icon="gtk-go-forward" />
+                <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause" />
+                <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to" />
+                <button name="case_reset" string="Reset to Todo" states="cancel" type="object" icon="gtk-convert" />
+                <button name="case_cancel" string="Cancel" states="open,pending" type="object" icon="gtk-cancel" />
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done" statusbar_colors='{"pending":"red"}' select="1"/>
+                </div>
+            </div>
+            <sheet string="Phone Call" layout="auto">
                  <group colspan="6" col="7">
                     <field name="name" required="1"/>
                     <field name="partner_phone"/>

From 56e5d0de6250317cee3971e25c58bafd3bb6b4e3 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 12:32:01 +0530
Subject: [PATCH 100/452] [IMP]project_long_term: add button and state at
 topbar

bzr revid: kjo@tinyerp.com-20120426070201-zwwqq9uijfh2byex
---
 .../project_long_term_view.xml                | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7231395a2a9..219cccae6e2 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -103,7 +103,18 @@
             <field name="model">project.phase</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project Phase">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <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"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
+                    </div>
+                </div>
+                <sheet string="Project Phase" layout="auto">
                     <group colspan="6" col="6">
                         <group colspan="6" col="7" >
                             <field name="name" colspan="4"/>
@@ -128,15 +139,6 @@
                                     <field name="date_end"/>
                                   </form>
                              </field>
-                            <separator string="" colspan="4"/>
-                            <group col="12" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' 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"/>
-                            </group>
                         </page>
                         <page string="Tasks Details">
                             <field colspan="4" name="task_ids" readonly="1" context="{'default_project_id' :project_id}" nolabel="1">
@@ -173,6 +175,7 @@
                         </page>
                     </notebook>
                     <newline/>
+                </sheet>
                 </form>
             </field>
         </record>

From 83b6b2a1e58afd04f1942da2fb335ee9a0511ee8 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 12:36:55 +0530
Subject: [PATCH 101/452] [IMP] market_campaign: improved view of campaign

bzr revid: tpa@tinyerp.com-20120426070655-sz8wz151snmlx5yd
---
 .../marketing_campaign_view.xml               | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index d04cde0e428..b618e2d0390 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -15,7 +15,17 @@
         <field name="model">marketing.campaign</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Campaign">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
+                <button name="state_done_set" string="Done" states="running" icon="terp-dialog-close"/>
+                <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
+                <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
+                <div class="oe_right">
+                    <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,running,done"/>
+                </div>
+            </div>
+            <sheet string="Campaign" layout="auto">
                 <group colspan="4" col="6">
                     <group colspan="2" col="2">
                         <separator string="Campaign" colspan="2" />
@@ -34,14 +44,7 @@
                     </group>
                 </group>
                 <field name="activity_ids" nolabel = "1" colspan="4" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
-                <separator string="" colspan="4" />
-                <group col="10" colspan="4">
-                    <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
-                    <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_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
-                    <button name="state_done_set" string="Done" states="running" icon="terp-dialog-close"/>
-                </group>
+              </sheet>
               </form>
         </field>
     </record>

From bdeac6b5f36dd4d24481695180d86583164af999 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 12:39:23 +0530
Subject: [PATCH 102/452] [IMP] market_campaign: improved view of segments

bzr revid: tpa@tinyerp.com-20120426070923-jttlccs7hoesx2xj
---
 .../marketing_campaign_view.xml               | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index b618e2d0390..315cce6966a 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -138,7 +138,17 @@
         <field name="model">marketing.campaign.segment</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Segments">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                <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_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
+                <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
+                <div class="oe_right">
+                    <field name="state" readonly="1" nolabel="1" widget="statusbar" statusbar_visible="draft,running,done"/>
+                </div>
+            </div>
+            <sheet string="Segments" layout="auto">
                 <group colspan="2" col="2">
                     <separator string="Segment" colspan="4"/>
                     <field name="name"/>
@@ -162,14 +172,7 @@
                     <field name="date_run" readonly="1"/>
                     <field name="date_done" readonly="1"/>
                 </group>
-                <separator string="" colspan="4"/>
-                <group col="6" colspan="4">
-                    <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
-                    <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_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
-                </group>
+            </sheet>
             </form>
         </field>
     </record>

From baa8158e77b1bacd2ae8e332497b6dcfa2b9cc9f Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 12:42:37 +0530
Subject: [PATCH 103/452] [IMP] market_campaign: improved view of market
 campaign activities

bzr revid: tpa@tinyerp.com-20120426071237-ev10lthxgp0pb4pm
---
 .../marketing_campaign_view.xml               | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 315cce6966a..efef0f7be72 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -362,7 +362,16 @@
         <field name="model">marketing.campaign.workitem</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Marketing Campaign Activities">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
+                <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
+                <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
+                <div class="oe_right">
+                    <field name="state" readonly="True" nolabel="1" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
+                </div>
+            </div>
+            <sheet string="Marketing Campaign Activities" layout="auto">
                 <group colspan="4" col="6">
                     <group colspan="2" col="2">
                         <separator string="Campaign Step" colspan="2"/>
@@ -386,13 +395,7 @@
                     <separator string="Error Message" colspan="4"/>
                     <field name="error_msg" nolabel="1" colspan="4"/>
                 </group>
-                <separator string="" colspan="4"/>
-                <group colspan="4" col="11">
-                    <field name="state" readonly="True" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
-                    <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"/>
-                </group>
+            </sheet>
             </form>
         </field>
     </record>

From de51d6b236448b8b4be499ac6b59ec151a067c45 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 13:00:27 +0530
Subject: [PATCH 104/452] [IMP] improved sequence of the button

bzr revid: tpa@tinyerp.com-20120426073027-4plcov0livglxv5m
---
 addons/crm/crm_lead_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a242596a677..7add9410491 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -54,11 +54,11 @@
             <form string="Leads Form" layout="manual">
                 <div class="oe_form_topbar">
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
                     <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause" />
                     <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
                     <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" />
+                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
@@ -402,9 +402,9 @@
             <form string="Opportunities" layout="manual">
                 <div class="oe_form_topbar">
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
+                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
-                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
                     <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
                     <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />

From 29b04c66392c1192d5bb4b5c2a69881ef6bd6c92 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 14:10:41 +0530
Subject: [PATCH 105/452] [IMP] set buttons in proper sequence.

bzr revid: tpa@tinyerp.com-20120426084041-6t3ps0qt7frl05rl
---
 addons/crm_claim/crm_claim_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index e3853994f43..60d5379787f 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -69,8 +69,8 @@
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <button name="case_close" string="Done" states="open,pending" type="object" icon="gtk-jump-to" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <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" />
                     <div class="oe_right">

From f9c8ab38c08606170fe7d4780d5cffb369a06003 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 14:12:45 +0530
Subject: [PATCH 106/452] [IMP]purchase: add state at topbar

bzr revid: kjo@tinyerp.com-20120426084245-mjpjg77mrosyy1sh
---
 addons/purchase/purchase_view.xml | 32 ++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index a074f4d7a08..483f090d4a7 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -130,7 +130,22 @@
             <field name="model">purchase.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Purchase Order">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                    <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
+                    <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
+                    <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
+                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
+                    <button name="purchase_approve" states="confirmed" string="Approved" icon="gtk-go-forward"/>
+                    <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
+                    <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
+                    <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
+                    </div>
+                </div>
+                <sheet string="Purchase Order" layout="auto">
                     <group col="6" colspan="4">
                         <field name="name"/>
                         <field name="date_order"/>
@@ -164,18 +179,6 @@
                                 <field name="amount_total" sum="Total amount"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
-                            <group col="11" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
-                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
-                                <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                                <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
-                                <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
-                                <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
-                                <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
-                                <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
-                                <button name="purchase_approve" states="confirmed" string="Approved" icon="gtk-go-forward"/>
-                                <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
-                            </group>
                         </page>
                         <page string="Delivery &amp; Invoicing">
                             <group colspan="2" col="2">
@@ -203,7 +206,10 @@
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>

From 18a5714ab4d85529f1f51c0dc0e6b4474caa7457 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 14:14:00 +0530
Subject: [PATCH 107/452] [IMP] improved view

bzr revid: tpa@tinyerp.com-20120426084400-k36hv8xbqunb5v73
---
 addons/mrp/mrp_view.xml | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 121567b3e56..86e8b655f95 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -632,7 +632,20 @@
             <field name="model">mrp.production</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Manufacturing Orders">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <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_recreate" states="picking_except" string="Recreate Picking" icon="terp-document-new"/>
+                    <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
+                    <button name="action_cancel" type="object" states="confirmed" string="Cancel" icon="gtk-stop"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Manufacturing Orders" layout="auto">
                     <group colspan="4" col="7">
                         <field name="name" string="Reference"/>
                         <field name="date_planned"/>
@@ -699,17 +712,6 @@
                                            states="done,cancel"/>
                                    </tree>
                                </field>
-                            <separator colspan="4"/>
-                            <group col="9" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
-                                <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
-                                <button name="action_cancel" type="object" states="confirmed" string="Cancel" icon="gtk-stop"/>
-                                <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_recreate" states="picking_except" string="Recreate Picking" icon="terp-document-new"/>
-                            </group>
                         </page>
                         <page string="Finished Products">
                             <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
@@ -787,7 +789,10 @@
                             <field name="move_prod_id"/>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>

From ba083690454213034895ad841db2f78405f0170a Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 14:21:11 +0530
Subject: [PATCH 108/452] [IMP] point_of_sale: improved view.

bzr revid: tpa@tinyerp.com-20120426085111-0ewm61gmf34wab2d
---
 addons/point_of_sale/point_of_sale_view.xml | 24 +++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 2622c2ba863..3b938c6ad4e 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -16,8 +16,18 @@
             <field name="model">pos.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="PoS Orders">
-                    <group col="7" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="%(action_pos_payment)d" string="Payment" icon="gtk-apply" type="action" states="draft"/>
+                    <button name="refund" string="Return Products" type="object" icon="gtk-ok"
+                        attrs="{'invisible':[('state','=','draft')]}"/>
+                    <button name="%(action_report_pos_receipt)d" string="Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
+                    </div>
+                </div>
+                <sheet string="PoS Orders" layout="auto">
+                    <group col="7" colspan="4" class="oe_form_header">
                         <field name="name"/>
                         <field name="date_order"/>
                         <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_customer':1}" attrs="{'readonly': [('state','=','invoiced')]}"/>
@@ -50,15 +60,6 @@
                                 <button name="button_dummy" string="Update" icon="gtk-execute" states="draft" />
                                 <button name="%(action_pos_discount)d" string="Discount" icon="gtk-remove" type="action" states="draft" />
                             </group>
-
-                            <separator colspan="4"/>
-                            <group colspan="4" col="8">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
-                                <button name="%(action_pos_payment)d" string="Payment" icon="gtk-apply" type="action" states="draft"/>
-                                <button name="refund" string="Return Products" type="object" icon="gtk-ok"
-                                    attrs="{'invisible':[('state','=','draft')]}"/>
-                                <button name="%(action_report_pos_receipt)d" string="Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
-                            </group>
                         </page>
                         <page string="Payment">
                             <field name="statement_ids" colspan="4" nolabel="1">
@@ -99,6 +100,7 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>

From 47ab09b285826ef1015fa971403799012b4d9622 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 14:32:23 +0530
Subject: [PATCH 109/452] [IMP]purchase_requisition: add state at topbar

bzr revid: kjo@tinyerp.com-20120426090223-w0hz301bd4h1nyyg
---
 .../purchase_requisition_view.xml             | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index c03afa7b544..93fefe79c65 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -46,7 +46,17 @@
         <field name="type">form</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <form string="Purchase Requisition">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                <button name="tender_in_progress" states="draft" string="Start" 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" />
+                <div class="oe_right">
+                    <field name="state" nolabel="1" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
+                </div>
+            </div>
+            <sheet string="Purchase Requisition" layout="auto">
                 <group colspan="4" col="6">
                     <field name="name"/>
                     <field name="user_id"/>
@@ -73,14 +83,6 @@
                             </form>
 
                         </field>
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
-                        <field name="state" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
-                        <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
-                        <button name="tender_in_progress" states="draft" string="Start" 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" />
-                    </group>
                     </page>
                     <page string="Quotations">
                         <field colspan="4" name="purchase_ids" nolabel="1" mode="tree,form">
@@ -109,6 +111,7 @@
                         <field name="description" colspan="4" nolabel="1"/>
                     </page>
                 </notebook>
+            </sheet>
             </form>
         </field>
     </record>

From 85fa10c7633aabce77abde37ffad5c49a80a3d9c Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 14:58:07 +0530
Subject: [PATCH 110/452] [IMP] crm_fundraising:improved view

bzr revid: tpa@tinyerp.com-20120426092807-zex30x0effj3lyku
---
 .../crm_fundraising/crm_fundraising_view.xml  | 39 +++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 48eb1aa3072..1bef2520f91 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -77,8 +77,20 @@
             <field name="model">crm.fundraising</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Funds Form">
-                    <group colspan="4" col="6">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
+                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close" />
+                    <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" groups="base.group_extended" icon="gtk-go-up" />
+                    <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" />
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Funds Form" layout="auto">
+                    <group colspan="4" col="6" class="oe_form_header">
                         <field name="name" select="1" string="Name"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="user_id" string="Responsible"/>
@@ -103,28 +115,6 @@
                             </group>
                             <separator colspan="4" string="Notes"/>
                                 <field name="description" nolabel="1" colspan="4"/>
-                            <separator colspan="4"/>
-                            <group col="8" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                                <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_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_close" string="Done"
-                                    states="open,draft,pending" type="object"
-                                    icon="gtk-close" />
-                                <button name="case_reset"
-                                    string="Reset to Draft" states="done,cancel"
-                                    type="object" icon="gtk-convert" />
-                            </group>
                         </page>
                         <page string="Communication &amp; History">
                             <group colspan="4">
@@ -170,6 +160,7 @@
                             </group>
                         </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>

From 78f95b113a55d4d548743cf1696b88b0dc71f4d1 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 15:12:17 +0530
Subject: [PATCH 111/452] [IMP] survey: improved view

bzr revid: tpa@tinyerp.com-20120426094217-sxiquslhetn5kzy5
---
 addons/survey/survey_view.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 36a15948b5a..7ced238b9b2 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -18,7 +18,16 @@
             <field name="model">survey</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Survey">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="survey_open" string="Open" states="cancel,close" 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"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,close"/>
+                    </div>
+                </div>
+                <sheet string="Survey" layout="auto">
                     <field name="title" select="1"/>
                     <group col="6" colspan="6">
                         <field name="responsible_id"/>
@@ -180,16 +189,6 @@
                                     </field>
                                 </form>
                             </field>
-                            <group col="9" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="open,close"/>
-                                <button name="survey_cancel"
-                                    string="Cancel" states="open" type="object" icon="gtk-cancel"/>
-                                <button name="survey_open"
-                                    string="Open" states="cancel,close" type="object"
-                                    icon="gtk-go-forward"/>
-                                <button name="survey_close"
-                                    string="Close" states="open" type="object" icon="gtk-close"/>
-                            </group>
                         </page>
                         <page string="Other">
                             <group colspan="6" col='4'>
@@ -223,6 +222,7 @@
                                </field>
                            </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>

From 24d5c94bb9635feddab4d876835ae781a922762c Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 15:22:54 +0530
Subject: [PATCH 112/452] [IMP] improved view of registation

bzr revid: tpa@tinyerp.com-20120426095254-swrl3mlrgyrwyxhn
---
 addons/event/event_view.xml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index b8ccf0e720e..60a85a19582 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -160,9 +160,9 @@
                 </tree>
             </field>
         </record>
-        
+
         <!-- Event Kanban View -->
-	
+
 	<record model="ir.ui.view" id="view_event_kanban">
             <field name="name">event.event.kanban</field>
             <field name="model">event.event</field>
@@ -357,7 +357,17 @@
             <field name="model">event.registration</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Registration">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                    <button name="button_reg_close" string="Attended" states="open" type="object" icon="gtk-apply"/>
+                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
+                    </div>
+                </div>
+                <sheet string="Registration" layout="auto">
                     <group col="6" colspan="4">
                         <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
                         <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
@@ -380,15 +390,6 @@
                                 <field name="event_begin_date" />
                                 <field name="event_end_date" />
                             </group>
-
-                            <separator string="" colspan="4"/>
-                            <group col="8" colspan="4">
-                                <field name="state" select="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
-                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                <button name="button_reg_close" string="Attended" states="open" type="object" icon="gtk-apply"/>
-                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                            </group>
                         </page>
                         <page string="Emails">
 <!--
@@ -410,6 +411,7 @@
                            </page>
 
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>

From 2591fa5e1e03e1d3ec32f27b23abf22567e269a5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Apr 2012 12:29:49 +0200
Subject: [PATCH 113/452] [FIX] missing state propagation in searchview
 initialization, test defaults calling on fields

bzr revid: xmo@openerp.com-20120426102949-xtv3inug3sue0h6a
---
 addons/web/static/src/js/search.js | 17 +++++-
 addons/web/static/test/search.js   | 89 ++++++++++++++++++++++++++++++
 addons/web/static/test/test.html   |  2 +-
 3 files changed, 106 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 4c1862365ca..6f02a8d9934 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -38,6 +38,18 @@ my.Facet = Backbone.Model.extend({
             return Backbone.Model.prototype.set.call(this, key, value);
         }
         this.values.reset(value);
+    },
+    toJSON: function () {
+        var out = {};
+        var attrs = this.attributes;
+        for(var att in attrs) {
+            if (!attrs.hasOwnProperty(att) || att === 'field') {
+                continue;
+            }
+            out[att] = attrs[att];
+        }
+        out.values = this.values.toJSON();
+        return out;
     }
 });
 my.SearchQuery = Backbone.Collection.extend({
@@ -215,7 +227,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
 
             $.when(load_view, filters)
                 .pipe(function (load) { return load[0]; })
-                .then(this.on_loaded);
+                .pipe(this.on_loaded)
+                .fail(function () {
+                    self.ready.reject.apply(null, arguments);
+                });
         }
 
         this.$element.on('click', '.oe_searchview_unfold_drawer', function () {
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 7403afb5d0d..f53e4cd294a 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -1,4 +1,9 @@
 $(document).ready(function () {
+    var xhr = QWeb2.Engine.prototype.get_xhr();
+    xhr.open('GET', '/web/static/src/xml/base.xml', false);
+    xhr.send(null);
+    var doc = xhr.responseXML;
+
     var instance;
     module('query', {
         setup: function () {
@@ -140,4 +145,88 @@ $(document).ready(function () {
             {label: 'V2', value: 1}
         ])
     });
+
+    module('defaults', {
+        setup: function () {
+            instance = window.openerp.init([]);
+            window.openerp.web.corelib(instance);
+            window.openerp.web.coresetup(instance);
+            window.openerp.web.chrome(instance);
+            window.openerp.web.data(instance);
+            window.openerp.web.search(instance);
+
+            instance.web.qweb.add_template(doc);
+
+            instance.connection.responses = {};
+            instance.connection.rpc_function = function (url, payload) {
+                if (!(url.url in this.responses)) {
+                    return $.Deferred().reject(
+                        {}, 'failed',
+                        _.str.sprintf("Url %s not found in mock responses",
+                                      url.url)).promise();
+                }
+                return $.when(this.responses[url.url](payload));
+            };
+        }
+    });
+    asyncTest('defaults calling', 2, function () {
+        var defaults_called = false;
+
+        instance.web.search.fields.add(
+            'dummy', 'instance.dummy.DummyWidget');
+        instance.dummy = {};
+        instance.dummy.DummyWidget = instance.web.search.Field.extend({
+            facet_for_defaults: function (defaults) {
+                defaults_called = true;
+                return $.when({
+                    field: this,
+                    category: 'Dummy',
+                    values: [{label: 'dummy', value: defaults.dummy}]
+                });
+            }
+        });
+        instance.connection.responses['/web/searchview/load'] = function () {
+            return {result: {fields_view: {
+                type: 'search',
+                fields: {
+                    dummy: {type: 'char'}
+                },
+                arch: {
+                    tag: 'search',
+                    attrs: {},
+                    children: [{
+                        tag: 'field',
+                        attrs: {
+                            name: 'dummy',
+                            widget: 'dummy'
+                        },
+                        children: []
+                    }]
+                }
+            }}};
+        };
+        instance.connection.responses['/web/searchview/get_filters'] = function () {
+            return [];
+        };
+        instance.connection.responses['/web/searchview/fields_get'] = function () {
+            return {result: {fields: {
+                dummy: {type: 'char'}
+            }}};
+        };
+
+        var dataset = {model: 'dummy.model', get_context: function () { return {}; }};
+        var view = new instance.web.SearchView(null, dataset, false, {dummy: 42});
+        view.appendTo($('#qunit-fixture'))
+            .always(start)
+            .then(function () {
+                ok(defaults_called, "should have called defaults");
+                deepEqual(
+                    view.query.toJSON(),
+                    [{category: 'Dummy', values: [{label: 'dummy', value: 42}]}],
+                    "should have generated a facet with the default value");
+                }, function (error) {
+                ok(false, error.message);
+            });
+    });
+    // TODO: test defaults for various built-in widgets?
 });
diff --git a/addons/web/static/test/test.html b/addons/web/static/test/test.html
index cc1916399f3..e352f63c17c 100644
--- a/addons/web/static/test/test.html
+++ b/addons/web/static/test/test.html
@@ -13,7 +13,7 @@
     <script src="/web/static/lib/backbone/backbone.js" type="text/javascript"></script>
 
     <!-- jquery -->
-    <script src="/web/static/lib/jquery/jquery-1.6.4.js"></script>
+    <script src="/web/static/lib/jquery/jquery-1.7.2b1.js"></script>
     <script src="/web/static/lib/jquery.ui/js/jquery-ui-1.8.17.custom.min.js"></script>
     <script src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
     

From 46d2109198ceb3fda4b8633893345d87ffe96704 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 16:01:12 +0530
Subject: [PATCH 114/452] [IMP] improved view

bzr revid: tpa@tinyerp.com-20120426103112-4tj65nqfpokwn4kh
---
 addons/account/project/project_view.xml       |  6 +++++-
 .../hr_timesheet_invoice_view.xml             | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 648af6dda4c..e7886702971 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -80,7 +80,10 @@
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Analytic account">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                </div>
+                <sheet string="Analytic account" layout="auto">
                     <group colspan="4" col="6">
                         <field name="name" colspan="4"/>
                         <field name="code"/>
@@ -106,6 +109,7 @@
                             <field colspan="4" name="description" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 2f5c8d24d79..edd4d17ceab 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -21,16 +21,17 @@
                         <separator colspan="4" string="Invoicing Statistics"/>
                         <field name="amount_invoiced"/>
                     </group>
-                    <separator colspan="4"/>
-                    <group col="9" colspan="8">
-                        <field name="state" readonly="1" widget="statusbar"
-                            statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
-                        <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
-                        <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
-                        <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-                        <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
-                    </group>
                 </group>
+                <xpath expr="/form/div" position='inside'>
+                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
+                    <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
+                    <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
+                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" readonly="1" widget="statusbar" nolabel="1"
+                        statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
+                    </div>
+                </xpath>
             </field>
         </record>
 

From d9c305ef068242cc5e2c1d998d19ed82418130a4 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 26 Apr 2012 16:01:33 +0530
Subject: [PATCH 115/452] [ADD,IMP] sale,crm: added:   sale/res_partner.py  
 sale/res_partner_view.xml modified:   crm/res_partner.py  
 crm/res_partner_view.xml   sale/__init__.py   sale/__openerp__.py  
 stock/product.py   stock/product_view.xml   stock/static/src/css/stock.css
 For set links off quatations,opportunity and meeting

bzr revid: dbr@tinyerp.com-20120426103133-l0uc091e9r7mbu9b
---
 addons/crm/res_partner.py             | 52 +++++++++++++++++++
 addons/crm/res_partner_view.xml       | 29 +++++++++++
 addons/sale/__init__.py               |  1 +
 addons/sale/__openerp__.py            |  1 +
 addons/sale/res_partner.py            | 42 +++++++++++++++
 addons/sale/res_partner_view.xml      | 25 +++++++++
 addons/stock/product.py               | 73 +++++++++++++++++++++++++++
 addons/stock/product_view.xml         | 16 ++++++
 addons/stock/static/src/css/stock.css |  8 +--
 9 files changed, 243 insertions(+), 4 deletions(-)
 create mode 100644 addons/sale/res_partner.py
 create mode 100644 addons/sale/res_partner_view.xml

diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index 3d43bc76022..af56afd2577 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -20,10 +20,29 @@
 ##############################################################################
 
 from osv import fields,osv
+from tools.translate import _
 
 class res_partner(osv.osv):
     """ Inherits partner and adds CRM information in the partner form """
     _inherit = 'res.partner'
+    
+    def _total_oppo(self, cr, uid, ids, field_name, arg, context=None):
+        total_oppo={}
+        oppo_pool=self.pool.get('crm.lead')
+        for id in ids:
+            oppo_ids = oppo_pool.search(cr, uid, [('partner_id', '=', id)])
+            total_oppo[id] = len(oppo_ids)
+        return total_oppo
+
+    def _total_meeting(self, cr, uid, ids, field_name, arg, context=None):
+        total_meeting={}
+        meeting_pool=self.pool.get('crm.meeting')
+        for id in ids:
+            meeting_ids = meeting_pool.search(cr, uid, [('partner_id', '=', id)])
+            total_meeting[id] = len(meeting_ids)
+        return total_meeting
+    
+    
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
@@ -32,6 +51,13 @@ class res_partner(osv.osv):
             'Meetings'),
         'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
             'Phonecalls'),
+        'total_oppo': fields.function(_total_oppo , type='integer',string="Total Opportunity"),
+        'total_meeting': fields.function(_total_meeting , type='integer',string="Total Meeting"),
+    }
+
+    _defaults = {
+        'total_oppo': 0,
+        'total_meeting': 0,
     }
 
     def redirect_partner_form(self, cr, uid, partner_id, context=None):
@@ -49,6 +75,32 @@ class res_partner(osv.osv):
         }
         return value
 
+    def get_opportunity(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        models_data = self.pool.get('ir.model.data')
+
+        form_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_form_view_oppor')
+        tree_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+        search_view = models_data.get_object_reference(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+        partner_id = self.browse(cr, uid, ids[0], context=context)
+        domain =[('partner_id', '=', partner_id.id)]
+
+        return {
+                'name': _('Opportunity'),
+                'view_type': 'form',
+                'view_mode': 'tree, form',
+                'res_model': 'crm.lead',
+                'domain': domain,
+                'view_id': False,
+                'views': [(tree_view and tree_view[1] or False, 'tree'),
+                          (form_view and form_view[1] or False, 'form'),
+                          (False, 'calendar'), (False, 'graph')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': search_view and search_view[1] or False,
+                'nodestroy': True,
+        }
+
     def make_opportunity(self, cr, uid, ids, opportunity_summary, planned_revenue=0.0, probability=0.0, partner_id=None, context=None):
         categ_obj = self.pool.get('crm.case.categ')
         categ_ids = categ_obj.search(cr, uid, [('object_id.model','=','crm.lead')])
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 6926464cd93..d9f63276eca 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -42,6 +42,35 @@
                 </field>
         </record>
 
+       <!-- Partner kanban view inherte -->
+
+        <record model="ir.ui.view" id="crm_lead_partner_kanban_view">
+            <field name="name">res.partner.kanban.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">kanban</field>
+            <field name="inherit_id" ref="base.res_partner_kanban_view"/>
+            <field name="arch" type="xml">
+                <field name="mobile" position="after">
+                    <field name="opportunity_ids"/>
+                    <field name="meeting_ids"/>
+                    <field name="total_oppo"/>
+                    <field name="total_meeting"/>
+                </field>
+                 <xpath expr="//div[@class='oe_partner_desc']//h4[@class='oe_partner_heading']" position="after">
+                        <a name="get_opportunity" type="object">
+                            (<t t-esc="record.total_oppo.value"/>)
+                            <t t-if="record.total_oppo.value &lt;= 1">Opportunity</t>
+                            <t t-if="record.total_oppo.value > 1"> Opportunities</t>
+                        </a>
+                        <a name="%(crm.crm_case_categ_meet)d" type="action">
+                            (<t t-esc="record.total_meeting.value"/>)
+                            <t t-if="record.total_meeting.value &lt;= 1">Meeting</t>
+                            <t t-if="record.total_meeting.value > 1">Meetings</t>
+                        </a>
+                </xpath>
+            </field>
+        </record>
+
         <!-- Add History tabs to res.partner form -->
         <record id="view_crm_partner_info_form1" model="ir.ui.view">
             <field name="name">res.partner.crm.info.inherit1</field>
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index 2688b61ddd9..fe19b7fa609 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -25,6 +25,7 @@
 
 import sale
 import stock
+import res_partner
 import wizard
 import report
 import company
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 8a2686cca83..992a96f261d 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -80,6 +80,7 @@ Dashboard for Sales Manager that includes:
         'sale_report.xml',
         'sale_data.xml',
         'sale_view.xml',
+        'res_partner_view.xml',
         'report/sale_report_view.xml',
         'stock_view.xml',
         'process/sale_process.xml',
diff --git a/addons/sale/res_partner.py b/addons/sale/res_partner.py
new file mode 100644
index 00000000000..20c47909ba6
--- /dev/null
+++ b/addons/sale/res_partner.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields,osv
+from tools.translate import _
+
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+    
+    def _total_sale(self, cr, uid, ids, field_name, arg, context=None):
+        total_sale={}
+        sale_pool=self.pool.get('sale.order')
+        for id in ids:
+            sale_ids = sale_pool.search(cr, uid, [('partner_id', '=', id)])
+            total_sale[id] = len(sale_ids)
+        return total_sale
+    
+    _columns = {
+        'total_sale': fields.function(_total_sale , type='integer',string="Total Sale"),
+    }
+    _defaults = {
+        'total_sale': 0,
+    }
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
new file mode 100644
index 00000000000..a13ecf29db8
--- /dev/null
+++ b/addons/sale/res_partner_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+       <!-- Partner kanban view inherte -->
+        <record model="ir.ui.view" id="crm_lead_partner_kanban_view">
+            <field name="name">res.partner.kanban.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">kanban</field>
+            <field name="inherit_id" ref="base.res_partner_kanban_view"/>
+            <field name="arch" type="xml">
+            	<field name="mobile" position="after">
+                    <field name="total_sale"/>
+                </field>
+                <xpath expr="//div[@class='oe_partner_desc']//h4[@class='oe_partner_heading']" position="after">
+                    <a name="%(sale.act_res_partner_2_sale_order)d" type="action">
+                        (<t t-esc="record.total_sale.value" />)
+                        <t t-if="record.total_sale.value &lt;= 1">Quatation</t>
+                        <t t-if="record.total_sale.value > 1">Quatations</t>
+                    </a>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
+
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 304fa8dcd87..37d26e3d23f 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -26,6 +26,22 @@ import decimal_precision as dp
 class product_product(osv.osv):
     _inherit = "product.product"
 
+    def _get_reception(self, cr, uid, ids, field_name, arg, context=None):
+        total_reception={}
+        reception_pool=self.pool.get('stock.picking')
+        for id in ids:
+            reception_ids = reception_pool.search(cr, uid, [('move_lines.product_id','=',id),('type','=','in')])
+            total_reception[id] = len(reception_ids)
+        return total_reception
+
+    def _total_delivery(self, cr, uid, ids, field_name, arg, context=None):
+        total_delivery={}
+        delivery_pool=self.pool.get('stock.picking')
+        for id in ids:
+            delivery_ids = delivery_pool.search(cr, uid, [('move_lines.product_id', '=', id),('type','=','out')])
+            total_delivery[id] = len(delivery_ids)
+        return total_delivery
+
     def get_product_accounts(self, cr, uid, product_id, context=None):
         """ To get the stock input account, stock output account and stock journal related to product.
         @param product_id: product id
@@ -331,6 +347,8 @@ class product_product(osv.osv):
         return res
 
     _columns = {
+        'total_reception': fields.function(_get_reception , type='integer',string="Total Reception"),
+        'total_delivery': fields.function(_total_delivery , type='integer',string="Total Delivery"),
         'qty_available': fields.function(_product_available, multi='qty_available',
             type='float',  digits_compute=dp.get_precision('Product UoM'),
             string='Quantity On Hand',
@@ -446,6 +464,61 @@ class product_product(osv.osv):
                     if fields.get('qty_available'):
                         res['fields']['qty_available']['string'] = _('Produced Qty')
         return res
+    def get_receptions(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        models_data = self.pool.get('ir.model.data')
+
+        form_view = models_data.get_object_reference(cr, uid, 'stock', 'view_picking_in_form')
+        tree_view = models_data.get_object_reference(cr, uid, 'stock', 'view_picking_in_tree')
+        search_view = models_data.get_object_reference(cr, uid, 'stock', 'view_picking_internal_search')
+        product_id = self.browse(cr, uid, ids[0], context=context)
+        domain =[('move_lines.product_id', '=', product_id.id),('type','=','in')]
+        context.update({'default_type': 'internal', 'contact_display': 'partner_address', 'search_default_available': 1})
+
+        return {
+                'name': _('Receptions'),
+                'view_type': 'form',
+                'view_mode': 'tree, form',
+                'res_model': 'stock.picking',
+                'domain': domain,
+                'view_id': False,
+                'views': [(tree_view and tree_view[1] or False, 'tree'),
+                          (form_view and form_view[1] or False, 'form'),
+                          (False, 'calendar'), (False, 'graph')],
+                'type': 'ir.actions.act_window',
+                'context': context,
+                'search_view_id': search_view and search_view[1] or False,
+                'nodestroy': True,
+        }
+
+    def get_deliveries(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        models_data = self.pool.get('ir.model.data')
+
+        form_view = models_data.get_object_reference(cr, uid, 'stock', 'view_picking_out_form')
+        tree_view = models_data.get_object_reference(cr, uid, 'stock', 'view_picking_out_tree')
+        search_view = models_data.get_object_reference(cr, uid, 'stock', 'view_picking_out_search')
+        product_id = self.browse(cr, uid, ids[0], context=context)
+        domain =[('move_lines.product_id', '=', product_id.id),('type','=','out')]
+        context.update({'default_type': 'out', 'contact_display': 'partner_address'})
+
+        return {
+                'name': _('Deliveries'),
+                'view_type': 'form',
+                'view_mode': 'tree, form',
+                'res_model': 'stock.picking',
+                'domain': domain,
+                'view_id': False,
+                'views': [(tree_view and tree_view[1] or False, 'tree'),
+                          (form_view and form_view[1] or False, 'form'),
+                          (False, 'calendar'), (False, 'graph')],
+                'type': 'ir.actions.act_window',
+                'context':context,
+                'search_view_id': search_view and search_view[1] or False,
+                'nodestroy': True,
+        }
 
 product_product()
 
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 5af954a023a..e5d070507e7 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -136,6 +136,8 @@
                     <field name="type"/>
                     <field name="product_image"/>
                     <field name="list_price"/>
+                    <field name="total_reception"/>
+                    <field name="total_delivery"/>
                     <templates>
                         <t t-name="kanban-box">
                             <div class="oe_product_vignette">
@@ -150,6 +152,20 @@
                                         <li>Price: <field name="lst_price"></field></li>
                                         <li>Cost: <field name="standard_price"></field></li>
                                     </ul>
+                                    <t t-if="record.total_reception.raw_value">
+                                        <a name="get_receptions" type="object">
+                                            (<t t-esc="record.total_reception.value"/>)
+                                            <t t-if="record.total_reception.raw_value &lt;= 1">Reception</t>
+                                            <t t-if="record.total_reception.raw_value > 1"> Receptions</t>
+                                        </a>
+                                    </t>
+                                    <t t-if="record.total_delivery.raw_value">
+                                        <a name="get_deliveries" type="object">
+                                            (<t t-esc="record.total_delivery.value"/>)
+                                            <t t-if="record.total_delivery.raw_value &lt;= 1">Delivery</t>
+                                            <t t-if="record.total_delivery.raw_value > 1">Deliveries</t>
+                                        </a>
+                                    </t>
                                 </div>
                             </div>
                             <script>
diff --git a/addons/stock/static/src/css/stock.css b/addons/stock/static/src/css/stock.css
index 6b84cd7a5b6..449c1102fce 100644
--- a/addons/stock/static/src/css/stock.css
+++ b/addons/stock/static/src/css/stock.css
@@ -9,8 +9,8 @@
 }
 
 .oe_product_img {
-    width: 100px;
-    height: 100px;
+    width: 150px;
+    height: 150px;
     text-align: center;
     overflow: hidden;
     -moz-border-radius: 3px;
@@ -25,13 +25,13 @@
 }
 
 .oe_product_photo {
-    width: 100px;
+    width: 150px;
     height: auto;
     clip: rect(5px, 100px, 105px, 0px);
 }
 
 .oe_product_photo_wide {
-    height: 100px;
+    height: 150px;
     width: auto;
     clip: rect(0px, 110px, 100px, 10px);
 }

From f87fd6990b9cddd6c531bf65f2eda70f4d3e5cb9 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 16:23:43 +0530
Subject: [PATCH 116/452] [IMP]stock: add state at topbar

bzr revid: kjo@tinyerp.com-20120426105343-8pslees62jtjx1oi
---
 addons/stock/stock_view.xml | 130 +++++++++++++++++++++---------------
 1 file changed, 75 insertions(+), 55 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 95d0acd853d..a25d10b2016 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -691,7 +691,20 @@
             <field name="type">form</field>
             <field eval="12" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Internal Picking List">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
+                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
+                    <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_process" states="assigned" string="Process"  groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
+                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl" />
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Internal Picking List" layout="auto">
                     <group colspan="4" col="6">
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
@@ -795,16 +808,6 @@
                                     </group>
                                 </form>
                             </field>
-                            <group col="10" colspan="4">
-                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
-                                <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
-                                <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
-                                <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_process" states="assigned" string="Process"  groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
-                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl" />
-                            </group>
                         </page>
                         <page string="Additional info">
                             <field name="auto_picking"/>
@@ -817,6 +820,7 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>
@@ -881,7 +885,21 @@
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Delivery Orders">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
+                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
+                    <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_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
+                    <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
+                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl"/>
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Delivery Orders" layout="auto">
                     <group col="6" colspan="4">
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
@@ -984,17 +1002,6 @@
                                     </group>
                                 </form>
                             </field>
-                            <group col="12" colspan="4">
-                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
-                                <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
-                                <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
-                                <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_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
-                                <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
-                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl"/>
-                            </group>
                         </page>
                         <page string="Additional info">
                             <field name="auto_picking"/>
@@ -1007,7 +1014,10 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>
@@ -1100,7 +1110,21 @@
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Input Picking List">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
+                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
+                    <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_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
+                    <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
+                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Input Picking List" layout="auto">
                     <group colspan="4" col="6">
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
@@ -1201,17 +1225,6 @@
                                     </group>
                                 </form>
                             </field>
-                            <group col="10" colspan="4">
-                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
-                                <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
-                                <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
-                                <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_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
-                                <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
-                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
-                            </group>
                         </page>
                         <page string="Additional Info">
                             <field name="type"/>
@@ -1221,7 +1234,10 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>
@@ -1401,7 +1417,17 @@
             <field name="type">form</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Stock Moves">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                        <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
+                        <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
+                        <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
+                        <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Stock Moves" layout="auto">
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -1452,15 +1478,7 @@
                               states="draft,waiting,confirmed,assigned"
                               string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
                     </group>
-
-                    <separator colspan="4"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
-                    <group col="4" colspan="2">
-                        <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
-                        <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
-                        <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                        <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>
@@ -1587,7 +1605,17 @@
             <field name="type">form</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Receive Products">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
+                    <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
+                    <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" icon="gtk-go-forward"/>
+                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Receive Products" layout="auto">
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -1638,15 +1666,7 @@
                               states="draft,waiting,confirmed,assigned,done"
                               string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
                     </group>
-
-                    <separator colspan="4"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
-                    <group col="5" colspan="2">
-                        <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
-                        <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
-                        <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                        <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" icon="gtk-go-forward"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>

From 4694dcf00de6e0f7203a9b9eda8bf1c2ef10a491 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Apr 2012 13:04:34 +0200
Subject: [PATCH 117/452] [TEST] search view asking inputs for completion

bzr revid: xmo@openerp.com-20120426110434-pobw0xp1f5szvdcx
---
 addons/web/static/test/search.js | 68 ++++++++++++++++++++++++--------
 1 file changed, 52 insertions(+), 16 deletions(-)

diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index f53e4cd294a..57ec2bd51f1 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -169,22 +169,13 @@ $(document).ready(function () {
             };
         }
     });
-    asyncTest('defaults calling', 2, function () {
-        var defaults_called = false;
 
+    function makeSearchView(dummy_widget_attributes) {
         instance.web.search.fields.add(
             'dummy', 'instance.dummy.DummyWidget');
         instance.dummy = {};
-        instance.dummy.DummyWidget = instance.web.search.Field.extend({
-            facet_for_defaults: function (defaults) {
-                defaults_called = true;
-                return $.when({
-                    field: this,
-                    category: 'Dummy',
-                    values: [{label: 'dummy', value: defaults.dummy}]
-                });
-            }
-        });
+        instance.dummy.DummyWidget = instance.web.search.Field.extend(
+            dummy_widget_attributes);
         instance.connection.responses['/web/searchview/load'] = function () {
             return {result: {fields_view: {
                 type: 'search',
@@ -215,18 +206,63 @@ $(document).ready(function () {
         };
 
         var dataset = {model: 'dummy.model', get_context: function () { return {}; }};
-        var view = new instance.web.SearchView(null, dataset, false, {dummy: 42});
+        return new instance.web.SearchView(null, dataset, false, {dummy: 42});
+    }
+    asyncTest('defaults calling', 2, function () {
+        var defaults_called = false;
+
+        var view = makeSearchView({
+            facet_for_defaults: function (defaults) {
+                defaults_called = true;
+                return $.when({
+                    field: this,
+                    category: 'Dummy',
+                    values: [{label: 'dummy', value: defaults.dummy}]
+                });
+            }
+        });
         view.appendTo($('#qunit-fixture'))
             .always(start)
-            .then(function () {
+            .fail(function (error) { ok(false, error.message); })
+            .done(function () {
                 ok(defaults_called, "should have called defaults");
                 deepEqual(
                     view.query.toJSON(),
                     [{category: 'Dummy', values: [{label: 'dummy', value: 42}]}],
                     "should have generated a facet with the default value");
-                }, function (error) {
-                ok(false, error.message);
             });
     });
     // TODO: test defaults for various built-in widgets?
+    asyncTest('completion calling', 4, function () {
+        var view = makeSearchView({
+            complete: function () {
+                return $.when({
+                    label: "Dummy",
+                    facet: {
+                        field: this,
+                        category: 'Dummy',
+                        values: [{label: 'dummy', value: 42}]
+                    }
+                });
+            }
+        });
+        view.appendTo($('#qunit-fixture'))
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function () {
+                stop();
+                view.complete_global_search({term: "dum"}, function (completions) {
+                    start();
+                    equal(completions.length, 1, "should have a single completion");
+                    var completion = completions[0];
+                    equal(completion.label, "Dummy",
+                          "should have provided label");
+                    equal(completion.facet.category, "Dummy",
+                          "should have provided category");
+                    deepEqual(completion.facet.values,
+                              [{label: 'dummy', value: 42}],
+                              "should have provided values");
+                });
+            });
+    });
 });

From 1bedaf8b57bafabff55183ecf8bb6db3b9937336 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 16:37:55 +0530
Subject: [PATCH 118/452] [IMP] improved sequence of the button

bzr revid: tpa@tinyerp.com-20120426110755-ryx8eox3b8p12u6y
---
 addons/hr_recruitment/hr_recruitment_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 1adc30daa28..4041dc69698 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -76,11 +76,11 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                 <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
                 <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
+                <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
                 <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
+                <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                 <div class="oe_right">
                     <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </div>

From d6cd590ba82e4cd775ab8b74913083231056682f Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 26 Apr 2012 16:40:29 +0530
Subject: [PATCH 119/452] [IMP]sale: Improve button sequence

bzr revid: mma@tinyerp.com-20120426111029-tab0zmiwugbiru3r
---
 addons/sale/sale_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 278f21cafc2..4e4c4d7c27e 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -99,20 +99,20 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
+                    <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
+                    <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
+                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
                     <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                     <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
                     <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
                     <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
-                    <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
                     <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
-                    <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" 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"/>
                     <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
                     <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
-                    <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
-                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
+                    <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
+                    <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>

From ddfefd355eeefb261ce9ddf7c0a674e1ada6ff53 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 17:16:30 +0530
Subject: [PATCH 120/452] [IMP]stock: rearrage the state button

bzr revid: kjo@tinyerp.com-20120426114630-h0jdyq86xhlppzwr
---
 addons/stock/stock_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a25d10b2016..680d15a55ee 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -693,8 +693,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
                     <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
+                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
                     <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_process" states="assigned" string="Process"  groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
@@ -887,8 +887,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                     <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
+                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                     <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_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
@@ -1112,8 +1112,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                     <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
+                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                     <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_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
@@ -1419,9 +1419,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
+                        <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
                         <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
                         <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                        <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
                         <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>

From eb989f68a80640bef55a74bee9e64f3bf013d0ea Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Apr 2012 14:12:10 +0200
Subject: [PATCH 121/452] [TEST] behavior when selecting a given completion,
 fix handler

bzr revid: xmo@openerp.com-20120426121210-012l0doboktnic8s
---
 addons/web/static/src/js/search.js |  3 +-
 addons/web/static/test/search.js   | 67 ++++++++++++++++++++++++++++--
 2 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 6f02a8d9934..f94cad0dc10 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -381,8 +381,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
     select_completion: function (e, ui) {
         e.preventDefault();
 
-        // FIXME: could have multiple values, shitty API
-        this.query.add_value(ui.item.category, ui.item.values[0]);
+        this.query.add(ui.item.facet);
     },
     renderFacets: function () {
         var self = this;
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 57ec2bd51f1..40496c7d7eb 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -146,7 +146,7 @@ $(document).ready(function () {
         ])
     });
 
-    module('defaults', {
+    module('inputs', {
         setup: function () {
             instance = window.openerp.init([]);
             window.openerp.web.corelib(instance);
@@ -170,7 +170,7 @@ $(document).ready(function () {
         }
     });
 
-    function makeSearchView(dummy_widget_attributes) {
+    function makeSearchView(dummy_widget_attributes, defaults) {
         instance.web.search.fields.add(
             'dummy', 'instance.dummy.DummyWidget');
         instance.dummy = {};
@@ -206,7 +206,7 @@ $(document).ready(function () {
         };
 
         var dataset = {model: 'dummy.model', get_context: function () { return {}; }};
-        return new instance.web.SearchView(null, dataset, false, {dummy: 42});
+        return new instance.web.SearchView(null, dataset, false, defaults);
     }
     asyncTest('defaults calling', 2, function () {
         var defaults_called = false;
@@ -220,7 +220,7 @@ $(document).ready(function () {
                     values: [{label: 'dummy', value: defaults.dummy}]
                 });
             }
-        });
+        }, {dummy: 42});
         view.appendTo($('#qunit-fixture'))
             .always(start)
             .fail(function (error) { ok(false, error.message); })
@@ -265,4 +265,63 @@ $(document).ready(function () {
                 });
             });
     });
+    // TODO: test completions for various built-in widgets?
+    asyncTest('completion facet selection', 2, function () {
+        var completion = {
+            label: "Dummy",
+            facet: {
+                field: {},
+                category: 'Dummy',
+                values: [{label: 'dummy', value: 42}]
+            }
+        };
+
+        var view = makeSearchView({});
+        view.appendTo($('#qunit-fixture'))
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function () {
+                view.select_completion(
+                    {preventDefault: function () {}},
+                    {item: completion});
+                equal(view.query.length, 1, "should have one facet in the query");
+                deepEqual(
+                    view.query.at(0).toJSON(),
+                    {category: 'Dummy', values: [{label: 'dummy', value: 42}]},
+                    "should have the right facet in the query");
+            });
+    });
+    asyncTest('completion facet selection: new value existing facet', 3, function () {
+        var field = {};
+        var completion = {
+            label: "Dummy",
+            facet: {
+                field: field,
+                category: 'Dummy',
+                values: [{label: 'dummy', value: 42}]
+            }
+        };
+
+        var view = makeSearchView({});
+        view.appendTo($('#qunit-fixture'))
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function () {
+                view.query.add({field: field, category: 'Dummy',
+                                values: [{label: 'previous', value: 41}]});
+                equal(view.query.length, 1, 'should have newly added facet');
+                view.select_completion(
+                    {preventDefault: function () {}},
+                    {item: completion});
+                equal(view.query.length, 1, "should still have only one facet");
+                var facet = view.query.at(0);
+                deepEqual(
+                    facet.get('values'),
+                    [{label: 'previous', value: 41}, {label: 'dummy', value: 42}],
+                    "should have added selected value to old one");
+            });
+    });
+
+    // TODO: test drawer rendering
+    // TODO: UI tests?
 });

From fa5ae7744e35d3198fbe9b3ad195934a5a05c377 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 17:51:11 +0530
Subject: [PATCH 122/452] [IMP] improved view of invoice and supplier invoice

bzr revid: tpa@tinyerp.com-20120426122111-7k31tnypw4rem64j
---
 addons/account/account_invoice_view.xml | 54 ++++++++++++++++---------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 462e7d56937..3a5c9c24466 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -144,8 +144,19 @@
             <field name="type">form</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <form string="Supplier Invoice">
-                    <group col="8" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
+                    <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' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Supplier Invoice" layout="auto">
+                    <group col="8" colspan="4" class="oe_form_header">
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
@@ -205,13 +216,6 @@
                                 <field name="amount_total"/>
                                 <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
-                                <group col="6" colspan="4">
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
-                                    <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' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
-                                </group>
                             </group>
                         </page>
                         <page string="Other Info">
@@ -243,7 +247,10 @@
                             </field>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>
@@ -253,8 +260,21 @@
             <field name="model">account.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invoice">
-                    <group colspan="4" col="8">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_proforma_invoices"/>
+                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
+                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
+                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
+                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Invoice" layout="auto">
+                    <group colspan="4" col="8" class="oe_form_header">
                     <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
                     <field name="number"/>
                     <field name="type" invisible="1"/>
@@ -299,15 +319,6 @@
                                 <field name="amount_total"/>
                                 <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
-                                <group col="8" colspan="4" groups="base.group_user">
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
-                                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_proforma_invoices"/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
-                                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
-                                </group>
                             </group>
                         </page>
                         <page string="Other Info">
@@ -338,7 +349,10 @@
                             </field>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>

From acf348f6748d5d172e2257c60bb5a118734d9b2c Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 17:56:42 +0530
Subject: [PATCH 123/452] [IMP] improved view of bank statement

bzr revid: tpa@tinyerp.com-20120426122642-uq65dee10v41jhod
---
 addons/account/account_view.xml | 41 +++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7829dc91e03..8f5212122f3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -592,8 +592,17 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bank Statement">
-                    <group col="7" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <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"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                    </div>
+                </div>
+                <sheet string="Bank Statement" layout="auto">
+                    <group col="7" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name="date" select="1" on_change="onchange_date(date, company_id)"/>
                         <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" select="1" widget="selection"/>
@@ -637,13 +646,7 @@
                             <field colspan="4" name="move_line_ids" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
-                        <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"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>
@@ -2611,8 +2614,17 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Statement">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <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="gtk-go-forward" type="object"/>
+                    <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                    </div>
+                </div>
+                <sheet string="Statement" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1" widget="selection"/>
@@ -2701,12 +2713,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             <field name="balance_end_cash"/>
                         </group>
                     </group>
-                    <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm" colspan="4"/>
-                        <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object"/>
-                        <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="gtk-go-forward" type="object"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>

From e278002b6d9920074c95985f2d5e2c96150834c9 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 18:06:23 +0530
Subject: [PATCH 124/452] [FIX] account_cancel:improved view.

bzr revid: tpa@tinyerp.com-20120426123623-sffejafuv92d8boh
---
 addons/account_cancel/account_cancel_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/account_cancel_view.xml
index 72517c9d090..65bca70565f 100644
--- a/addons/account_cancel/account_cancel_view.xml
+++ b/addons/account_cancel/account_cancel_view.xml
@@ -19,7 +19,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+                <xpath expr="/form/div/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
                 </xpath>
             </field>
@@ -31,7 +31,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+                <xpath expr="/form/div/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
                 </xpath>
             </field>

From 22ad2bd78a2d38e93f75da18e6d284f4b045779f Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 26 Apr 2012 18:12:22 +0530
Subject: [PATCH 125/452] [IMP]sale: Improvement is done

bzr revid: mma@tinyerp.com-20120426124222-4rdsjmk7nsjeci07
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4e4c4d7c27e..04da8fb2065 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -101,7 +101,6 @@
                 <div class="oe_form_topbar">
                     <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
                     <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
-                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
                     <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                     <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
                     <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
@@ -111,6 +110,7 @@
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                     <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
                     <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
+                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
                     <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
                     <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
                     <div class="oe_right">

From ad0c747046f1bf96617fe25a93bcd8310bf0f328 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 18:48:27 +0530
Subject: [PATCH 126/452] [IMP] improved code

bzr revid: tpa@tinyerp.com-20120426131827-xnfvmb2fmdes6xum
---
 addons/account_cancel/account_cancel_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/account_cancel_view.xml
index 65bca70565f..ccb54634db3 100644
--- a/addons/account_cancel/account_cancel_view.xml
+++ b/addons/account_cancel/account_cancel_view.xml
@@ -19,7 +19,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/div/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+                <xpath expr="/form/div/button[@name='invoice_cancel']" position="replace">
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
                 </xpath>
             </field>
@@ -31,7 +31,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/div/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+                <xpath expr="/form/div/button[@name='invoice_cancel']" position="replace">
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
                 </xpath>
             </field>

From 6d02c640bfc52c1543187c27287b6840af179309 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Apr 2012 15:58:17 +0200
Subject: [PATCH 127/452] [TEST] defaults handling for selection & m2o fields,
 fix bugs in them

bzr revid: xmo@openerp.com-20120426135817-wesh3nkytuieilky
---
 addons/web/static/src/js/search.js |  16 +++-
 addons/web/static/test/search.js   | 141 +++++++++++++++++++++++++++++
 2 files changed, 152 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index f94cad0dc10..a75dd6f584d 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -864,9 +864,13 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
         return $.when(null);
     },
     facet_for_defaults: function (defaults) {
-        var fs = _(this.filters).filter(function (f) {
-            return f.attrs && f.attrs.name && !!defaults[f.attrs.name];
-        });
+        var fs = _(this.filters).chain()
+            .filter(function (f) {
+                return f.attrs && f.attrs.name && !!defaults[f.attrs.name];
+            }).map(function (f) {
+                return {label: f.attrs.string || f.attrs.name,
+                        value: f};
+            }).value();
         if (_.isEmpty(fs)) { return $.when(null); }
         return $.when({
             category: _t("Filter"),
@@ -1001,6 +1005,7 @@ instance.web.search.Field = instance.web.search.Input.extend( /** @lends instanc
     },
     facet_for: function (value) {
         return $.when({
+            field: this,
             category: this.attrs.string || this.attrs.name,
             values: [{label: String(value), value: value}]
         });
@@ -1172,7 +1177,7 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends
         if (!match) { return $.when(null); }
         return $.when({
             category: this.attrs.string,
-            value: match[1],
+            field: this,
             values: [{label: match[1], value: match[0]}]
         });
     },
@@ -1275,9 +1280,10 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
             });
         }
         return this.model.call('name_get', [value], {}).pipe(function (names) {
+            if (_(names).isEmpty()) { return null; }
             return {
                 category: self.attrs.string,
-                value: names[0][1],
+                field: self,
                 values: [{label: names[0][1], value: names[0][0]}]
             };
         })
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 40496c7d7eb..8f15b86b2e7 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -232,6 +232,147 @@ $(document).ready(function () {
                     "should have generated a facet with the default value");
             });
     });
+    asyncTest('FilterGroup defaults', 3, function () {
+        var view = {inputs: []};
+        var filter_a = new instance.web.search.Filter(
+            {attrs: {name: 'a'}}, view);
+        var filter_b = new instance.web.search.Filter(
+            {attrs: {name: 'b'}}, view);
+        var group = new instance.web.search.FilterGroup(
+            [filter_a, filter_b], view);
+        group.facet_for_defaults({a: true, b: true})
+            .always(start)
+            .fail(function (error) { ok(false, error && error.message); })
+            .done(function (facet) {
+                var model = facet;
+                if (!(model instanceof instance.web.search.Facet)) {
+                    model = new instance.web.search.Facet(facet);
+                }
+                var values = model.values;
+                equal(values.length, 2, 'facet should have two values');
+                strictEqual(values.at(0).get('value'), filter_a);
+                strictEqual(values.at(1).get('value'), filter_b);
+            });
+    });
+    asyncTest('Field default', 4, function () {
+        var view = {inputs: []};
+        var f = new instance.web.search.Field(
+            {attrs: {string: 'Dummy', name: 'dummy'}}, {}, view);
+        f.facet_for_defaults({dummy: 42})
+            .always(start)
+            .fail(function (error) { ok(false, error && error.message); })
+            .done(function (facet) {
+                var model = facet;
+                if (!(model instanceof instance.web.search.Facet)) {
+                    model = new instance.web.search.Facet(facet);
+                }
+                strictEqual(
+                    model.get('category'),
+                    f.attrs.string,
+                    "facet category should be field label");
+                strictEqual(
+                    model.get('field'), f,
+                    "facet field should be field which created default");
+                equal(model.values.length, 1, "facet should have a single value");
+                deepEqual(
+                    model.values.toJSON(),
+                    [{label: '42', value: 42}],
+                    "facet value should match provided default");
+                });
+    });
+    asyncTest('Selection default: valid value', 4, function () {
+        var view = {inputs: []};
+        var f = new instance.web.search.SelectionField(
+            {attrs: {name: 'dummy', string: 'Dummy'}},
+            {selection: [[1, "Foo"], [2, "Bar"], [3, "Baz"], [4, "Qux"]]},
+            view);
+        f.facet_for_defaults({dummy: 3})
+            .always(start)
+            .fail(function (error) { ok(false, error && error.message); })
+            .done(function (facet) {
+                var model = facet;
+                if (!(model instanceof instance.web.search.Facet)) {
+                    model = new instance.web.search.Facet(facet);
+                }
+                strictEqual(
+                    model.get('category'),
+                    f.attrs.string,
+                    "facet category should be field label");
+                strictEqual(
+                    model.get('field'), f,
+                    "facet field should be field which created default");
+                equal(model.values.length, 1, "facet should have a single value");
+                deepEqual(
+                    model.values.toJSON(),
+                    [{label: 'Baz', value: 3}],
+                    "facet value should match provided default's selection");
+            });
+    });
+    asyncTest('Selection default: invalid value', 1, function () {
+        var view = {inputs: []};
+        var f = new instance.web.search.SelectionField(
+            {attrs: {name: 'dummy', string: 'Dummy'}},
+            {selection: [[1, "Foo"], [2, "Bar"], [3, "Baz"], [4, "Qux"]]},
+            view);
+        f.facet_for_defaults({dummy: 42})
+            .always(start)
+            .fail(function (error) { ok(false, error && error.message); })
+            .done(function (facet) {
+                ok(!facet, "an invalid value should result in a not-facet");
+            });
+    });
+    asyncTest("M2O default: valid value", 7, function () {
+        var view = {inputs: []}, id = 4;
+        var f = new instance.web.search.ManyToOneField(
+            {attrs: {name: 'dummy', string: 'Dummy'}},
+            {relation: 'dummy.model.name'},
+            view);
+        instance.connection.responses['/web/dataset/call_kw'] = function (req) {
+            equal(req.params.method, 'name_get',
+                  "m2o should resolve default id");
+            equal(req.params.model, f.attrs.relation,
+                  "query model should match m2o relation");
+            equal(req.params.args[0], id);
+            return {result: [[id, "DumDumDum"]]};
+        };
+        f.facet_for_defaults({dummy: id})
+            .always(start)
+            .fail(function (error) { ok(false, error && error.message); })
+            .done(function (facet) {
+                var model = facet;
+                if (!(model instanceof instance.web.search.Facet)) {
+                    model = new instance.web.search.Facet(facet);
+                }
+                strictEqual(
+                    model.get('category'),
+                    f.attrs.string,
+                    "facet category should be field label");
+                strictEqual(
+                    model.get('field'), f,
+                    "facet field should be field which created default");
+                equal(model.values.length, 1, "facet should have a single value");
+                deepEqual(
+                    model.values.toJSON(),
+                    [{label: 'DumDumDum', value: id}],
+                    "facet value should match provided default's selection");
+            });
+    });
+    asyncTest("M2O default: invalid value", 1, function () {
+        var view = {inputs: []}, id = 4;
+        var f = new instance.web.search.ManyToOneField(
+            {attrs: {name: 'dummy', string: 'Dummy'}},
+            {relation: 'dummy.model.name'},
+            view);
+        instance.connection.responses['/web/dataset/call_kw'] = function (req) {
+           return {result: []};
+        };
+        f.facet_for_defaults({dummy: id})
+            .always(start)
+            .fail(function (error) { ok(false, error && error.message); })
+            .done(function (facet) {
+                ok(!facet, "an invalid m2o default should yield a non-facet");
+            });
+    });
     // TODO: test defaults for various built-in widgets?
     asyncTest('completion calling', 4, function () {
         var view = makeSearchView({

From 19e771dd9f43f9ff1b5c50e1181a8ef9244f4afc Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Apr 2012 16:10:33 +0200
Subject: [PATCH 128/452] [IMP] remove redundancy in creating a facet from a
 default value in m2o fields

bzr revid: xmo@openerp.com-20120426141033-5blb5ifdfnzeea03
---
 addons/web/static/src/js/search.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index a75dd6f584d..5ef6db42f2b 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1271,21 +1271,17 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
         });
     },
     facet_for: function (value) {
-        var self = this;
+        var self = this, fromPair = function (a) { return {
+            category: self.attrs.string,
+            field: self,
+            values: [{label: a[1], value: a[0]}]
+        } };
         if (value instanceof Array) {
-            return $.when({
-                category: this.attrs.string,
-                value: value[1],
-                values: [{label: value[1], value: value[0]}]
-            });
+            return $.when(fromPair(value));
         }
         return this.model.call('name_get', [value], {}).pipe(function (names) {
             if (_(names).isEmpty()) { return null; }
-            return {
-                category: self.attrs.string,
-                field: self,
-                values: [{label: names[0][1], value: names[0][0]}]
-            };
+            return fromPair(names[0]);
         })
     },
     make_domain: function (name, operator, facet) {

From 24179320955d3b306038bbcc7fb562461c5a6a93 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 27 Apr 2012 10:30:27 +0530
Subject: [PATCH 129/452] [IMP]account_voucher: Move state and button on top
 bar and added sheet teg

bzr revid: mma@tinyerp.com-20120427050027-9nxro5jg0nusoqg1
---
 .../account_voucher/account_voucher_view.xml  | 22 ++++---
 .../voucher_payment_receipt_view.xml          | 44 ++++++++------
 .../voucher_sales_purchase_view.xml           | 59 +++++++++++--------
 3 files changed, 73 insertions(+), 52 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index e519d23b09e..a98c72fe414 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -40,8 +40,18 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Accounting Voucher">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                  <div class="oe_form_topbar">
+                        <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
+                        <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="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                  <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                  </div>
+                  </div>
+                  <sheet string="Accounting Voucher" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
                         <field name="journal_id" widget="selection" select="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
@@ -101,13 +111,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <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"/>
-                    </group>
+                   </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index b422c0dbe73..a20eb3b6bf1 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -143,8 +143,18 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bill Payment">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
+                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
+                <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </div>
+                </div>
+                <sheet string="Bill Payment" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
                         <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         <field name="journal_id"
@@ -249,13 +259,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
-                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -292,8 +296,18 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Customer Payment">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
+                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
+                <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </div>
+                </div>
+                <sheet string="Customer Payment" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
                         <field name="currency_id" invisible="1"/>
                         <field name="amount"
@@ -401,13 +415,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
-                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile and cancel this record ?"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 162605be36c..75161eec3e4 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -80,8 +80,22 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Receipt">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
+                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
+                           <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
+                        </group>
+                        <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="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </div>
+                </div>
+                <sheet string="Sales Receipt" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
                         <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                         <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
@@ -148,16 +162,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <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"/>
-                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
-                           <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                        </group>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -206,8 +211,22 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Supplier Voucher">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
+                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
+                            <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|', ('state','!=','posted'), ('paid','=',True)]}"/>
+                        </group>
+                        <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 ?"/>
+                        <field name="pay_now" invisible="1"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </div>
+                </div>
+                <sheet string="Supplier Voucher" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
                         <field name="date" string="Bill Date" select="1" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                         <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
@@ -268,17 +287,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <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 ?"/>
-                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
-                            <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                        </group>
-                        <field name="pay_now" invisible="1"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From dc908ca7de2a1615df86942d700875af9ed14b12 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 11:00:42 +0530
Subject: [PATCH 130/452] [FIX] account_voucher: improved view.

bzr revid: tpa@tinyerp.com-20120427053042-4qh89baq4fbo50ej
---
 addons/account_voucher/account_voucher_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index e519d23b09e..5b1850f472c 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -218,7 +218,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+                <xpath expr="/form/sheet/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
                     <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>
@@ -230,7 +230,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='sequence']" position="before">
+                <xpath expr="/form/sheet/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='sequence']" position="before">
                     <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>
@@ -241,7 +241,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+                <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
                     <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>
@@ -253,7 +253,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='amount']" position="after">
+                <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/form/field[@name='amount']" position="after">
                     <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>

From 944cde2aef70c70aea1d697d6f79e60b08abc716 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 11:11:24 +0530
Subject: [PATCH 131/452] [FIX] mrp_operation: improved view

bzr revid: tpa@tinyerp.com-20120427054124-dkr0zaa4tt3ddxjf
---
 addons/mrp_operations/mrp_operations_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index ec2ef72d40d..0fbcdbe6391 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -29,7 +29,7 @@
         <field name="type">form</field>
         <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">
+           <xpath expr="/form/sheet/notebook/page/field[@name='workcenter_lines']/tree/field[@name='hour']" position="after">
                 <field name="state"/>
                 <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"/>

From a615218123c8352c8e9f11b1bd1049224731c9c9 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 11:18:18 +0530
Subject: [PATCH 132/452] [FIX] analytic_journal_billing_rate: improved view.

bzr revid: tpa@tinyerp.com-20120427054818-l20avyc6laelqr5j
---
 .../analytic_journal_billing_rate_view.xml                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
index f2a366558ec..f275583826a 100644
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
+++ b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
@@ -47,7 +47,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
                     <field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount, journal_id)"/>
                 </xpath>
             </field>

From d80130dad3469be437675cf9762cb45d46f344d5 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 27 Apr 2012 11:26:35 +0530
Subject: [PATCH 133/452] [IMP]crm : Remove crm board action from sales menu

bzr revid: dbr@tinyerp.com-20120427055635-ol5hpbd0n3waao2x
---
 addons/crm/board_crm_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index bc0b41b24b9..a1509ef3fb4 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -120,7 +120,6 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_crm_form"/>
         </record>
-        <menuitem id="base.menu_base_partner"
-            action="open_board_crm"/>
+       
     </data>
 </openerp>

From dabd5685ba457bafc549628e6bc54c11a5e6d247 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 11:48:34 +0530
Subject: [PATCH 134/452] [FIX] delivery: improved view

bzr revid: tpa@tinyerp.com-20120427061834-5fpkqyz5e5a11ba3
---
 addons/delivery/delivery_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index f39e8a59f39..8ec3c144eee 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -247,7 +247,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_in_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
+                <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
                     <field name="weight"/>
                     <field name="weight_net"/>
                 </xpath>
@@ -260,7 +260,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
+                <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
                     <field name="weight"/>
                     <field name="weight_net"/>
                 </xpath>

From fc1827cdd569c754de44e6148bfcc96894a41d25 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 11:50:03 +0530
Subject: [PATCH 135/452] [FIX]sale:improved code

bzr revid: tpa@tinyerp.com-20120427062003-whk674fro6st1vas
---
 addons/sale/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 578a6fb5802..a4198432ded 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -19,7 +19,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                 <xpath expr="/form/group/field[@name='tracking_id']"  position="before">
+                 <xpath expr="/form/sheet/group/field[@name='tracking_id']"  position="before">
                     <field name="sale_line_id" colspan="2"/>
                 </xpath>
             </field>

From 0960f9b10580faaea9bb3f84f41153aac5b5a7b3 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 12:13:50 +0530
Subject: [PATCH 136/452] [FIX] analytic_user_function: improved code

bzr revid: tpa@tinyerp.com-20120427064350-2uulr9e0b0jhekte
---
 addons/analytic_user_function/analytic_user_function_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 763b3115814..a3995d33808 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -50,7 +50,7 @@
             <field name="priority" eval="18"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
                     <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)"/>
                 </xpath>
             </field>
@@ -64,7 +64,7 @@
             <field name="priority" eval="19"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/form/field[@name='account_id']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='timesheet_ids']/form/field[@name='account_id']" position="replace">
                     <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)"/>
                 </xpath>
             </field>

From f435b7b5aad9aed49b09292cb449dc651ed58613 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 12:21:44 +0530
Subject: [PATCH 137/452] [FIX] mrp_operation: improved code

bzr revid: tpa@tinyerp.com-20120427065144-1btngvw0swcge2et
---
 addons/mrp_operations/mrp_operations_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 0fbcdbe6391..843acd313bc 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -8,7 +8,7 @@
 	    <field name="type">form</field>
 	    <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
 	    <field name="arch" type="xml">
-	       <xpath expr="/form/notebook/page/field[@name='workcenter_lines']/form/field[@name='hour']" position="after">
+	       <xpath expr="/form/sheet/notebook/page/field[@name='workcenter_lines']/form/field[@name='hour']" position="after">
 	           <group colspan="8" col="8">
 	               <separator colspan="8"/>
                    <field name="state"/>

From 668a212dda4d7b102de2c280e36f554fa6cb07d8 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 12:39:21 +0530
Subject: [PATCH 138/452] [FIX] purchase: improved code

bzr revid: tpa@tinyerp.com-20120427070921-jwr0ruao8kuj3oz1
---
 addons/purchase/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index f29783c67ae..55204af6dde 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                 <xpath expr="/form/group/field[@name='tracking_id']" position="before">
+                 <xpath expr="/form/sheet/group/field[@name='tracking_id']" position="before">
                     <field name="purchase_line_id" colspan="2" />
                 </xpath>
             </field>

From 9f8b0715ab4158bcbdf878bec07a80caeaa5ef9a Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 13:04:43 +0530
Subject: [PATCH 139/452] [FIX] sale_mrp: improved code

bzr revid: tpa@tinyerp.com-20120427073443-m1k1h7uf1e1lro2m
---
 addons/sale_mrp/sale_mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_mrp/sale_mrp_view.xml b/addons/sale_mrp/sale_mrp_view.xml
index d4d2c153d76..18014c01ae9 100644
--- a/addons/sale_mrp/sale_mrp_view.xml
+++ b/addons/sale_mrp/sale_mrp_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='move_prod_id']" position="after">
+                <xpath expr="/form/sheet/notebook/page/field[@name='move_prod_id']" position="after">
                     <field name="sale_name"/>
                     <field name="sale_ref"/>
                 </xpath>

From 8f5a591ab08ee430fbdfd53c56eddcaee31cba16 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 27 Apr 2012 10:06:07 +0200
Subject: [PATCH 140/452] [TESTS] completion call on various widgets, fixed
 corresponding implementations

bzr revid: xmo@openerp.com-20120427080607-1bw1jpmu7h6zxdin
---
 addons/web/static/src/js/search.js |  44 +++++----
 addons/web/static/test/search.js   | 142 ++++++++++++++++++++++++++++-
 2 files changed, 167 insertions(+), 19 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 5ef6db42f2b..8780e1cbd81 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1076,9 +1076,12 @@ instance.web.search.CharField = instance.web.search.Field.extend( /** @lends ins
                 field: '<em>' + this.attrs.string + '</em>',
                 value: '<strong>' + _.str.escapeHTML(value) + '</strong>'});
         return $.when([{
-            category: this.attrs.string,
             label: label,
-            value: [{label: label, value: value}]
+            facet: {
+                category: this.attrs.string,
+                field: this,
+                values: [{label: value, value: value}]
+            }
         }]);
     }
 });
@@ -1158,16 +1161,18 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends
                 return label.toLowerCase().indexOf(needle.toLowerCase()) !== -1;
             })
             .map(function (sel) {
-                // FIXME fucking repetition man, find something better
                 return {
-                    category: self.attrs.string,
-                    value: sel[1],
-                    values: [{value: sel[0], label: sel[1]}]
+                    label: sel[1],
+                    facet: {
+                        category: self.attrs.string,
+                        field: self,
+                        values: [{value: sel[0], label: sel[1]}]
+                    }
                 };
             }).value();
         if (_.isEmpty(results)) { return $.when(null); }
-        return $.when.apply(null, [{
-            category: this.attrs.string
+        return $.when.call(null, [{
+            label: this.attrs.string
         }].concat(results));
     },
     facet_for: function (value) {
@@ -1216,16 +1221,18 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst
     complete: function (needle) {
         var d = Date.parse(needle);
         if (!d) { return $.when(null); }
-        var value = instance.web.format_value(d, this.attrs);
+        var date_string = instance.web.format_value(d, this.attrs);
         var label = _.str.sprintf(_.str.escapeHTML(
             _t("Search %(field)s at: %(value)s")), {
                 field: '<em>' + this.attrs.string + '</em>',
-                value: '<strong>' + value + '</strong>'});
+                value: '<strong>' + date_string + '</strong>'});
         return $.when([{
-            category: this.attrs.string,
             label: label,
-            // FIXME: brain broken
-            values: [{label: value, value: d}]
+            facet: {
+                category: this.attrs.string,
+                field: this,
+                values: [{label: date_string, value: d}]
+            }
         }]);
     }
 });
@@ -1260,12 +1267,15 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
             context: {}
         }).pipe(function (results) {
             if (_.isEmpty(results)) { return null; }
-            return [{category: self.attrs.string}].concat(
+            return [{label: self.attrs.string}].concat(
                 _(results).map(function (result) {
                     return {
-                        category: self.attrs.string,
-                        value: result[1],
-                        values: [{label: result[1], value: result[0]}]
+                        label: result[1],
+                        facet: {
+                            category: self.attrs.string,
+                            field: self,
+                            values: [{label: result[1], value: result[0]}]
+                        }
                     };
                 }));
         });
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 8f15b86b2e7..53f32e875d2 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -153,6 +153,8 @@ $(document).ready(function () {
             window.openerp.web.coresetup(instance);
             window.openerp.web.chrome(instance);
             window.openerp.web.data(instance);
+            // date complete
+            window.openerp.web.formats(instance);
             window.openerp.web.search(instance);
 
             instance.web.qweb.add_template(doc);
@@ -373,7 +375,6 @@ $(document).ready(function () {
                 ok(!facet, "an invalid m2o default should yield a non-facet");
             });
     });
-    // TODO: test defaults for various built-in widgets?
     asyncTest('completion calling', 4, function () {
         var view = makeSearchView({
             complete: function () {
@@ -406,7 +407,7 @@ $(document).ready(function () {
                 });
             });
     });
-    // TODO: test completions for various built-in widgets?
+
     asyncTest('completion facet selection', 2, function () {
         var completion = {
             label: "Dummy",
@@ -462,6 +463,143 @@ $(document).ready(function () {
                     "should have added selected value to old one");
             });
     });
+    asyncTest('Field completion', 1, function () {
+        var view = {inputs: []};
+        var f = new instance.web.search.Field({attrs: {}}, {}, view);
+        f.complete('foo')
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function (completions) {
+                ok(_(completions).isEmpty(), "field should not provide any completion");
+            });
+    });
+    asyncTest('CharField completion', 6, function () {
+        var view = {inputs: []};
+        var f = new instance.web.search.CharField(
+            {attrs: {string: "Dummy"}}, {}, view);
+        f.complete('foo<')
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function (completions) {
+                equal(completions.length, 1, "should provide a single completion");
+                var c = completions[0];
+                equal(c.label, "Search <em>Dummy</em> for: <strong>foo&lt;</strong>",
+                      "should propose a fuzzy matching/searching, with the" +
+                      " value escaped");
+                ok(c.facet, "completion should contain a facet proposition");
+                var facet = new instance.web.search.Facet(c.facet);
+                equal(facet.get('category'), f.attrs.string,
+                      "completion facet should bear the field's name");
+                strictEqual(facet.get('field'), f,
+                            "completion facet should yield the field");
+                deepEqual(facet.values.toJSON(), [{label: 'foo<', value: 'foo<'}],
+                          "facet should have single value using completion item");
+            });
+    });
+    asyncTest('Selection completion: match found', 14, function () {
+        var view = {inputs: []};
+        var f = new instance.web.search.SelectionField(
+            {attrs: {string: "Dummy"}},
+            {selection: [[1, "Foo"], [2, "Bar"], [3, "Baz"], [4, "Bazador"]]},
+            view);
+        f.complete("ba")
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function (completions) {
+                equal(completions.length, 4,
+                    "should provide two completions and a section title");
+                deepEqual(completions[0], {label: "Dummy"});
+
+                var c1 = completions[1];
+                equal(c1.label, "Bar");
+                equal(c1.facet.category, f.attrs.string);
+                strictEqual(c1.facet.field, f);
+                deepEqual(c1.facet.values, [{label: "Bar", value: 2}]);
+
+                var c2 = completions[2];
+                equal(c2.label, "Baz");
+                equal(c2.facet.category, f.attrs.string);
+                strictEqual(c2.facet.field, f);
+                deepEqual(c2.facet.values, [{label: "Baz", value: 3}]);
+
+                var c3 = completions[3];
+                equal(c3.label, "Bazador");
+                equal(c3.facet.category, f.attrs.string);
+                strictEqual(c3.facet.field, f);
+                deepEqual(c3.facet.values, [{label: "Bazador", value: 4}]);
+            });
+    });
+    asyncTest('Selection completion: no match', 1, function () {
+        var view = {inputs: []};
+        var f = new instance.web.search.SelectionField(
+            {attrs: {string: "Dummy"}},
+            {selection: [[1, "Foo"], [2, "Bar"], [3, "Baz"], [4, "Bazador"]]},
+            view);
+        f.complete("qux")
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function (completions) {
+                ok(!completions, "if no value matches the needle, no completion shall be provided");
+            });
+    });
+    asyncTest('Date completion', 6, function () {
+        instance.web._t.database.parameters = {
+            date_format: '%Y-%m-%d',
+            time_format: '%H:%M:%S'
+        };
+        var view = {inputs: []};
+        var f = new instance.web.search.DateField(
+            {attrs: {string: "Dummy"}}, {type: 'datetime'}, view);
+        f.complete('2012-05-21T21:21:21')
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function (completions) {
+                equal(completions.length, 1, "should provide a single completion");
+                var c = completions[0];
+                equal(c.label, "Search <em>Dummy</em> at: <strong>2012-05-21 21:21:21</strong>");
+                var facet = new instance.web.search.Facet(c.facet);
+                equal(facet.get('category'), f.attrs.string);
+                equal(facet.get('field'), f);
+                var value = facet.values.at(0);
+                equal(value.get('label'), "2012-05-21 21:21:21");
+                equal(value.get('value').getTime(),
+                      new Date(2012, 4, 21, 21, 21, 21).getTime());
+            });
+    });
+    asyncTest("M2O completion", 15, function () {
+        instance.connection.responses['/web/dataset/call_kw'] = function (req) {
+            equal(req.params.method, "name_search");
+            equal(req.params.model, "dummy.model");
+            deepEqual(req.params.args, []);
+            deepEqual(req.params.kwargs.name, 'bob');
+            return {result: [[42, "choice 1"], [43, "choice @"]]}
+        };
+
+        var view = {inputs: []};
+        var f = new instance.web.search.ManyToOneField(
+            {attrs: {string: 'Dummy'}}, {relation: 'dummy.model'}, view);
+        f.complete("bob")
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function (c) {
+                equal(c.length, 3, "should return results + title");
+                var title = c[0];
+                equal(title.label, f.attrs.string, "title should match field name");
+                ok(!title.facet, "title should not have a facet");
+
+                var f1 = new instance.web.search.Facet(c[1].facet);
+                equal(c[1].label, "choice 1");
+                equal(f1.get('category'), f.attrs.string);
+                equal(f1.get('field'), f);
+                deepEqual(f1.values.toJSON(), [{label: 'choice 1', value: 42}]);
+
+                var f2 = new instance.web.search.Facet(c[2].facet);
+                equal(c[2].label, "choice @");
+                equal(f2.get('category'), f.attrs.string);
+                equal(f2.get('field'), f);
+                deepEqual(f2.values.toJSON(), [{label: 'choice @', value: 43}]);
+            });
+    });
 
     // TODO: test drawer rendering
     // TODO: UI tests?

From ad21cdbffc101fb194790bbb994244a771b7cd75 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 27 Apr 2012 10:09:11 +0200
Subject: [PATCH 141/452] [IMP] split defaults testing and completions testing
 in two separate modules

bzr revid: xmo@openerp.com-20120427080911-1n3jpygur493ea29
---
 addons/web/static/test/search.js | 63 ++++++++++++++++++++++----------
 1 file changed, 43 insertions(+), 20 deletions(-)

diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 53f32e875d2..276ff3d21b2 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -146,15 +146,13 @@ $(document).ready(function () {
         ])
     });
 
-    module('inputs', {
+    module('defaults', {
         setup: function () {
             instance = window.openerp.init([]);
             window.openerp.web.corelib(instance);
             window.openerp.web.coresetup(instance);
             window.openerp.web.chrome(instance);
             window.openerp.web.data(instance);
-            // date complete
-            window.openerp.web.formats(instance);
             window.openerp.web.search(instance);
 
             instance.web.qweb.add_template(doc);
@@ -210,7 +208,7 @@ $(document).ready(function () {
         var dataset = {model: 'dummy.model', get_context: function () { return {}; }};
         return new instance.web.SearchView(null, dataset, false, defaults);
     }
-    asyncTest('defaults calling', 2, function () {
+    asyncTest('calling', 2, function () {
         var defaults_called = false;
 
         var view = makeSearchView({
@@ -234,7 +232,7 @@ $(document).ready(function () {
                     "should have generated a facet with the default value");
             });
     });
-    asyncTest('FilterGroup defaults', 3, function () {
+    asyncTest('FilterGroup', 3, function () {
         var view = {inputs: []};
         var filter_a = new instance.web.search.Filter(
             {attrs: {name: 'a'}}, view);
@@ -256,7 +254,7 @@ $(document).ready(function () {
                 strictEqual(values.at(1).get('value'), filter_b);
             });
     });
-    asyncTest('Field default', 4, function () {
+    asyncTest('Field', 4, function () {
         var view = {inputs: []};
         var f = new instance.web.search.Field(
             {attrs: {string: 'Dummy', name: 'dummy'}}, {}, view);
@@ -282,7 +280,7 @@ $(document).ready(function () {
                     "facet value should match provided default");
                 });
     });
-    asyncTest('Selection default: valid value', 4, function () {
+    asyncTest('Selection: valid value', 4, function () {
         var view = {inputs: []};
         var f = new instance.web.search.SelectionField(
             {attrs: {name: 'dummy', string: 'Dummy'}},
@@ -310,7 +308,7 @@ $(document).ready(function () {
                     "facet value should match provided default's selection");
             });
     });
-    asyncTest('Selection default: invalid value', 1, function () {
+    asyncTest('Selection: invalid value', 1, function () {
         var view = {inputs: []};
         var f = new instance.web.search.SelectionField(
             {attrs: {name: 'dummy', string: 'Dummy'}},
@@ -323,7 +321,7 @@ $(document).ready(function () {
                 ok(!facet, "an invalid value should result in a not-facet");
             });
     });
-    asyncTest("M2O default: valid value", 7, function () {
+    asyncTest("M2O default: value", 7, function () {
         var view = {inputs: []}, id = 4;
         var f = new instance.web.search.ManyToOneField(
             {attrs: {name: 'dummy', string: 'Dummy'}},
@@ -359,7 +357,7 @@ $(document).ready(function () {
                     "facet value should match provided default's selection");
             });
     });
-    asyncTest("M2O default: invalid value", 1, function () {
+    asyncTest("M2O default: value", 1, function () {
         var view = {inputs: []}, id = 4;
         var f = new instance.web.search.ManyToOneField(
             {attrs: {name: 'dummy', string: 'Dummy'}},
@@ -375,7 +373,33 @@ $(document).ready(function () {
                 ok(!facet, "an invalid m2o default should yield a non-facet");
             });
     });
-    asyncTest('completion calling', 4, function () {
+
+    module('completions', {
+        setup: function () {
+            instance = window.openerp.init([]);
+            window.openerp.web.corelib(instance);
+            window.openerp.web.coresetup(instance);
+            window.openerp.web.chrome(instance);
+            window.openerp.web.data(instance);
+            // date complete
+            window.openerp.web.formats(instance);
+            window.openerp.web.search(instance);
+
+            instance.web.qweb.add_template(doc);
+
+            instance.connection.responses = {};
+            instance.connection.rpc_function = function (url, payload) {
+                if (!(url.url in this.responses)) {
+                    return $.Deferred().reject(
+                        {}, 'failed',
+                        _.str.sprintf("Url %s not found in mock responses",
+                                      url.url)).promise();
+                }
+                return $.when(this.responses[url.url](payload));
+            };
+        }
+    });
+    asyncTest('calling', 4, function () {
         var view = makeSearchView({
             complete: function () {
                 return $.when({
@@ -407,8 +431,7 @@ $(document).ready(function () {
                 });
             });
     });
-
-    asyncTest('completion facet selection', 2, function () {
+    asyncTest('facet selection', 2, function () {
         var completion = {
             label: "Dummy",
             facet: {
@@ -433,7 +456,7 @@ $(document).ready(function () {
                     "should have the right facet in the query");
             });
     });
-    asyncTest('completion facet selection: new value existing facet', 3, function () {
+    asyncTest('facet selection: new value existing facet', 3, function () {
         var field = {};
         var completion = {
             label: "Dummy",
@@ -463,7 +486,7 @@ $(document).ready(function () {
                     "should have added selected value to old one");
             });
     });
-    asyncTest('Field completion', 1, function () {
+    asyncTest('Field', 1, function () {
         var view = {inputs: []};
         var f = new instance.web.search.Field({attrs: {}}, {}, view);
         f.complete('foo')
@@ -473,7 +496,7 @@ $(document).ready(function () {
                 ok(_(completions).isEmpty(), "field should not provide any completion");
             });
     });
-    asyncTest('CharField completion', 6, function () {
+    asyncTest('CharField', 6, function () {
         var view = {inputs: []};
         var f = new instance.web.search.CharField(
             {attrs: {string: "Dummy"}}, {}, view);
@@ -496,7 +519,7 @@ $(document).ready(function () {
                           "facet should have single value using completion item");
             });
     });
-    asyncTest('Selection completion: match found', 14, function () {
+    asyncTest('Selection: match found', 14, function () {
         var view = {inputs: []};
         var f = new instance.web.search.SelectionField(
             {attrs: {string: "Dummy"}},
@@ -529,7 +552,7 @@ $(document).ready(function () {
                 deepEqual(c3.facet.values, [{label: "Bazador", value: 4}]);
             });
     });
-    asyncTest('Selection completion: no match', 1, function () {
+    asyncTest('Selection: no match', 1, function () {
         var view = {inputs: []};
         var f = new instance.web.search.SelectionField(
             {attrs: {string: "Dummy"}},
@@ -542,7 +565,7 @@ $(document).ready(function () {
                 ok(!completions, "if no value matches the needle, no completion shall be provided");
             });
     });
-    asyncTest('Date completion', 6, function () {
+    asyncTest('Date', 6, function () {
         instance.web._t.database.parameters = {
             date_format: '%Y-%m-%d',
             time_format: '%H:%M:%S'
@@ -566,7 +589,7 @@ $(document).ready(function () {
                       new Date(2012, 4, 21, 21, 21, 21).getTime());
             });
     });
-    asyncTest("M2O completion", 15, function () {
+    asyncTest("M2O", 15, function () {
         instance.connection.responses['/web/dataset/call_kw'] = function (req) {
             equal(req.params.method, "name_search");
             equal(req.params.model, "dummy.model");

From da37acedf62940c5f074822f10e52520e10a43cf Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 27 Apr 2012 10:11:14 +0200
Subject: [PATCH 142/452] [TESTS] m2o completion with no match on name_search

bzr revid: xmo@openerp.com-20120427081114-8tn0x6xaky2ivqwm
---
 addons/web/static/test/search.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 276ff3d21b2..ec93f1a6707 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -623,6 +623,24 @@ $(document).ready(function () {
                 deepEqual(f2.values.toJSON(), [{label: 'choice @', value: 43}]);
             });
     });
+    asyncTest("M2O no match", 5, function () {
+        instance.connection.responses['/web/dataset/call_kw'] = function (req) {
+            equal(req.params.method, "name_search");
+            equal(req.params.model, "dummy.model");
+            deepEqual(req.params.args, []);
+            deepEqual(req.params.kwargs.name, 'bob');
+            return {result: []}
+        };
+        var view = {inputs: []};
+        var f = new instance.web.search.ManyToOneField(
+            {attrs: {string: 'Dummy'}}, {relation: 'dummy.model'}, view);
+        f.complete("bob")
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function (c) {
+                ok(!c, "no match should yield no completion");
+            });
+    });
 
     // TODO: test drawer rendering
     // TODO: UI tests?

From 661eddb330afae1dc0b642ab517abe2cb5365942 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 27 Apr 2012 10:30:24 +0200
Subject: [PATCH 143/452] [REF] extract building of a facet descriptor from
 m2o/selection pairs into a function

bzr revid: xmo@openerp.com-20120427083024-zqq9hs203uaywlbr
---
 addons/web/static/src/js/search.js | 44 +++++++++++++++---------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 8780e1cbd81..830253e0622 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1129,6 +1129,22 @@ instance.web.search.FloatField = instance.web.search.NumberField.extend(/** @len
         }
     }
 });
+
+/**
+ * Utility function for m2o & selection fields taking a selection/name_get pair
+ * (value, name) and converting it to a Facet descriptor
+ *
+ * @param {instance.web.search.Field} field holder field
+ * @param {Array} pair pair value to convert
+ */
+function facet_from(field, pair) {
+    return {
+        field: field,
+        category: field['attrs'].string,
+        values: [{label: pair[1], value: pair[0]}]
+    };
+}
+
 /**
  * @class
  * @extends instance.web.search.Field
@@ -1163,11 +1179,7 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends
             .map(function (sel) {
                 return {
                     label: sel[1],
-                    facet: {
-                        category: self.attrs.string,
-                        field: self,
-                        values: [{value: sel[0], label: sel[1]}]
-                    }
+                    facet: facet_from(self, sel)
                 };
             }).value();
         if (_.isEmpty(results)) { return $.when(null); }
@@ -1180,11 +1192,7 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends
             return sel[0] === value;
         });
         if (!match) { return $.when(null); }
-        return $.when({
-            category: this.attrs.string,
-            field: this,
-            values: [{label: match[1], value: match[0]}]
-        });
+        return $.when(facet_from(this, match));
     },
     get_value: function (facet) {
         return facet.get('values');
@@ -1271,27 +1279,19 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
                 _(results).map(function (result) {
                     return {
                         label: result[1],
-                        facet: {
-                            category: self.attrs.string,
-                            field: self,
-                            values: [{label: result[1], value: result[0]}]
-                        }
+                        facet: facet_from(self, result)
                     };
                 }));
         });
     },
     facet_for: function (value) {
-        var self = this, fromPair = function (a) { return {
-            category: self.attrs.string,
-            field: self,
-            values: [{label: a[1], value: a[0]}]
-        } };
+        var self = this;
         if (value instanceof Array) {
-            return $.when(fromPair(value));
+            return $.when(facet_from(this, value));
         }
         return this.model.call('name_get', [value], {}).pipe(function (names) {
             if (_(names).isEmpty()) { return null; }
-            return fromPair(names[0]);
+            return facet_from(self, names[0]);
         })
     },
     make_domain: function (name, operator, facet) {

From 2b04f2f32051b8656f75abc14e898d98d4d7c997 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 14:45:00 +0530
Subject: [PATCH 144/452] [IMP]:crm:Buttons of records must match to the order
 of the status bar. from left to right.

bzr revid: apa@tinyerp.com-20120427091500-w02yddph6z1yhep5
---
 addons/crm/crm.py                               | 5 +++--
 addons/crm/crm_lead_view.xml                    | 6 +++---
 addons/crm/crm_phonecall.py                     | 4 ++--
 addons/crm/crm_phonecall_view.xml               | 2 +-
 addons/crm_claim/crm_claim_view.xml             | 2 +-
 addons/crm_fundraising/crm_fundraising_view.xml | 2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml       | 2 +-
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 467ea64e633..2b0dccd275a 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -31,9 +31,10 @@ MAX_LEVEL = 15
 AVAILABLE_STATES = [
     ('draft', 'New'),
     ('open', 'In Progress'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
     ('pending', 'Pending'),
+    ('done', 'Closed'),
+    ('cancel', 'Cancelled'),
+    
 ]
 
 AVAILABLE_PRIORITIES = [
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index d915c73ac09..d85b4b2e4b5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -53,11 +53,11 @@
         <field name="arch" type="xml">
             <form string="Leads Form" layout="manual">
                 <div class="oe_form_topbar">
+                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
-                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
                     <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
+                    <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" />
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
@@ -401,8 +401,8 @@
         <field name="arch" type="xml">
             <form string="Opportunities" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
                     <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index e869c2a890a..2b8eb9d1435 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -51,9 +51,9 @@ class crm_phonecall(crm_base, osv.osv):
         'state': fields.selection([
                                     ('draft', 'Draft'),
                                     ('open', 'Todo'),
-                                    ('cancel', 'Cancelled'),
-                                    ('done', 'Held'),
                                     ('pending', 'Not Held'),
+                                    ('done', 'Held'),
+                                    ('cancel', 'Cancelled'),
                                 ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Todo\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 9e4280f1e64..ef334522821 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -60,9 +60,9 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
+                <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to" />
                 <button name="case_open" string="Todo" states="pending" type="object" icon="gtk-go-forward" />
                 <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause" />
-                <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to" />
                 <button name="case_reset" string="Reset to Todo" states="cancel" type="object" icon="gtk-convert" />
                 <button name="case_cancel" string="Cancel" states="open,pending" type="object" icon="gtk-cancel" />
                 <div class="oe_right">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 60d5379787f..d8a95a6315a 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -68,8 +68,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_close" string="Done" states="open,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_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <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" />
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 1bef2520f91..f82485b0244 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -79,8 +79,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
+                    <button name="case_close" string="Done" states="open,pending" type="object" icon="gtk-close" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close" />
                     <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" groups="base.group_extended" icon="gtk-go-up" />
                     <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 aa0500ad0ff..6a04fdb4f93 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -30,9 +30,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
+                    <button name="case_close" states="open,pending" string="Close" type="object" icon="gtk-jump-to" />
                     <button name="case_open" states="draft,pending" string="Open" type="object" icon="gtk-go-forward" />
                     <button name="case_pending" states="draft,open" string="Pending" type="object" icon="gtk-media-pause" />
-                    <button name="case_close" states="open,draft,pending" string="Close" type="object" icon="gtk-jump-to" />
                     <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
                     <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" icon="gtk-go-up" />
                     <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" />

From fa10c5cec773a0b68d52522ec500c3e87d35d76e Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 27 Apr 2012 15:02:42 +0530
Subject: [PATCH 145/452] [imp] change the event view.

bzr revid: nco@tinyerp.com-20120427093242-o9srduq715lbqt8t
---
 addons/event/__openerp__.py           |   2 +-
 addons/event/event.py                 |   5 +-
 addons/event/event_view.xml           | 119 ++++++++++++++++++++++----
 addons/event/static/src/css/event.css |  36 +++++++-
 addons/event_sale/__openerp__.py      |   5 +-
 addons/event_sale/event_sale.py       |  51 +++++++++--
 addons/event_sale/event_sale_view.xml |  92 +++++++++++---------
 7 files changed, 238 insertions(+), 72 deletions(-)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index ea0e4316ef5..6de6d2c62c1 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -53,7 +53,7 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
-    'css': ['static/src/css/event.css'],
+    'css': ['static/src/css/*.css'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event.py b/addons/event/event.py
index a633dc41961..7eacad489ff 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -220,6 +220,8 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
+        'location_id': fields.many2one('res.company','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+        
     }
 
     _defaults = {
@@ -408,6 +410,5 @@ class event_registration(osv.osv):
         return {'value': data}
 
 event_registration()
-
-
+    
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index a9dbca304f4..efa5eb68384 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -45,6 +45,39 @@
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
 
+
+		<!-- Event Item Tree view-->
+    	<record model="ir.ui.view" id="view_event_items_tree">
+            <field name="name">Event Items Tree</field>
+            <field name="model">event.items</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Event Items">
+                    <field name="product_id"  string="Ticket Type" />
+                    <field name="uom_id"/>
+                    <field name="sales_end_date"/>
+                    <field name="price"/>
+                    <field name="qty"/>
+                </tree>
+            </field>
+        </record>
+        <!-- Event Item Form View -->
+        <record model="ir.ui.view" id="view_event_items_form">
+            <field name="name">Event Items Form</field>
+            <field name="model">event.items</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Event Items">
+                    <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                    <field name="price"/>
+                    <field name="qty"/>
+                    <field name="uom_id"/>
+                    <field name="discount"/>
+                    <field name="sales_end_date"/>
+                </form>
+            </field>
+        </record>
+
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
         <record model="ir.ui.view" id="view_event_form">
@@ -52,20 +85,75 @@
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events">
-                    <group col="6" colspan="4">
-                        <field name="name"/>
-                        <field name="date_begin"/>
-                        <field name="date_end"/>
-                        <field name="type" on_change="onchange_event_type(type,context)"/>
-                        <field name="user_id"/>
-                        <field name="address_id" />
-                    </group>
+                <form string="Events"  layout="manual">
+                <div class="oe_form_topbar">
+                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+               		<div class="oe_right">
+                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+               		</div>
+            	</div>
+            	<sheet string="Event Form" layout="auto">
+            		<group col="2">
+            			<group col="2">
+		                	<div class="oe_event_title">
+		                    	<field name="name" nolabel="1"/>
+		                    </div>
+		                    <newline/>
+		                    <group colspan="4" string="vanue">
+                            	<div class="sub1"> Venue   : </div> <separator orientation="vertical"/>
+                            	<field name="location_id" nolabel="1"/> 
+                        	</group>
+			             </group>	
+			             <group>
+			             	<div class="mapbox"> </div><newline/>
+		                    <!--table>
+		                        <tr>
+		                        <td width="70px" style="text-align:top;"  class="oe_td_border">
+		                            Where
+		                        </td>
+		                        <td width="150px">
+		                            <field name="address_id" nolabel="1"/>
+		                                
+		                        </td>
+		                        <td width="150px">
+									<span width="15px"> Start</span> <field name="date_begin" nolabel="1"/>   
+									<span width="15px"> End</span> <field name="date_end" nolabel="1"/>    
+		                        </td>
+		                        </tr>
+		                   </table-->   
+		                   <table>
+		                   	<tr>
+		                    	<td width="70px" class="oe_td_border">
+		                            Where
+		                        </td>
+		                        <td width="150px">
+		                            <field name="address_id" nolabel="1"/>
+		                        </td>
+		                        <td width="auto">
+                             		<table>
+										<tr>
+											<td class="oe_td_date_border">Start</td><td><field name="date_begin" nolabel="1"/></td>
+										</tr>
+										<tr>
+											<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
+										</tr>
+									</table>
+                                 
+		                        </td>
+		                     </tr>
+		                   </table>   
+		                      <!--field name="date_end" label="To" string="end"/-->
+					       
+			             </group>
+                    </group>	
                     <notebook colspan="4">
                     <page string="Event">
                         <separator string="Description" colspan="4"/>
                         <field name="note" colspan="4" nolabel="1"/>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
                                 <field name="email" />
@@ -98,13 +186,7 @@
                                     </group>
                             </form>
                             </field>
-                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                        <group col="4" colspan="2">
-                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        </group>
+                        
                     </page>
                     <page string="Speakers" groups="base.group_extended">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
@@ -112,7 +194,7 @@
                         <separator string="Other Speakers" colspan="4"/>
                         <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Extra Info">
+                    <page string="Extra Info" groups="event.group_event_manager">
                         <group col="2" colspan="2">
                             <separator string="Registrations" colspan="2"/>
                             <field name="register_min"/>
@@ -129,6 +211,7 @@
                         </group>
                     </page>
                     </notebook>
+                    </sheet>
             </form>
             </field>
         </record>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 0d0282826b7..f8fe5c04c86 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -64,6 +64,7 @@ div.oe_fold_column{
     -webkit-font-smoothing: antialiased;
     outline: none;
 }
+
 .oe_event_button_unsubscribe {
   display: inline-block;
     border: 1px solid #AAA;
@@ -116,7 +117,36 @@ div.oe_fold_column{
    background-color: #DC5F59;
  }
  .no_of_seats{
-    width:25px;
-    
+    width:25px;    
  }
-
+.oe_event_title{
+  font-size: 25px;
+}
+.sub1
+{
+    float:left;
+}
+.sub2
+{
+    padding-left:50px;
+    text-align:left;
+}
+.mapbox
+{ 
+    width:380px;
+    height:200px;
+    border:1px; 
+    margin-left:auto; 
+    margin-right:auto; 
+    border:solid #677933;
+}
+.oe_td_border
+{
+	width: 5em;
+	padding: 2px;
+	border-right: 1px solid black;
+}
+.oe_td_date_border
+{
+	border-right:1px solid black;
+}
\ No newline at end of file
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index d8f689986e2..be60ed3fdf6 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -34,12 +34,15 @@ This module allows you to automatize and connect your registration creation with
 It defines a new kind of service products that offers you the possibility to choose an event category associated with it. When you encode a sale order for that product, you will be able to choose an existing event of that category and when you confirm your sale order it will automatically create a registration for this event.
 """,
     'author': 'OpenERP SA',
-    'depends': ['event','sale','sale_crm'],
+    'depends': ['event','sale','sale_crm','portal'],
     'update_xml': [
         'event_sale_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
+    'js': ['static/src/js/*.js'],
+    'html': ['static/*.html'],
     'test':['test/confirm.yml'],
+    'css': ['static/src/css/*.css'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 0208714b083..93be776d336 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import time
 from osv import fields, osv
 from tools.translate import _
 
@@ -92,13 +93,53 @@ class sale_order_line(osv.osv):
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.log(cr, uid, registration_id, message)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
-    
+  
 class event_event(osv.osv):
     _inherit = 'event.event'
     _columns = {
-        'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
-    }
-    
+                    'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
+                }
+
+    def make_order(self, cr, uid, ids, partner_id, context=None):
+        sale_order = self.pool.get('sale.order')
+        sale_order_line_obj = self.pool.get('sale.order.line')
+        res_partner_obj = self.pool.get('res.partner')
+        prod_pricelist_obj = self.pool.get('product.pricelist')
+        res_users_obj = self.pool.get('res.users')
+        customer = res_partner_obj.browse(cr, uid, partner_id, context=context)
+        partner_id = res_users_obj.browse(cr, uid, uid, context=context).partner_id.id
+        if not partner_id:
+            user_name = res_users_obj.browse(cr, uid, uid, context=context).name
+            partner_id =  res_partner_obj.create(cr, uid, {'name': user_name})
+        
+        price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
+        
+        for order_lines in self.browse(cr, uid, ids, context=context):
+            if order_lines.event_item_ids:
+                product = order_lines.id
+                sale_id = sale_order.create(cr, uid, {
+                            'partner_id': partner_id,
+                            'pricelist_id': price_list,
+                            'partner_invoice_id': partner_id,
+                            'partner_shipping_id': partner_id,
+                            'date_order': order_lines.date_begin
+                })
+            
+                for line in order_lines.event_item_ids:
+                    
+                    sale_order_line_obj.create(cr, uid, {
+                        'order_id': sale_id,
+                        'name': order_lines.name,
+                        'product_uom_qty': line.qty,
+                        'product_id': product,
+                        'product_uom': line.uom_id.id,
+                        'price_unit': line.price,
+                        'date_planned': line.sales_end_date,
+                    }, context=context)
+            self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
+        return True
+
+
 class event_items(osv.osv):
     _name = "event.items"
     _columns = {
@@ -110,7 +151,7 @@ class event_items(osv.osv):
         'event_id': fields.many2one('event.event', 'Event'),
         'sales_end_date': fields.date('Sales End')
         }
-    
+   
     def onchange_product_id(self, cr, uid, ids, product, context=None):
         product_obj = self.pool.get('product.product')
         data = {}
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 1eb15e944a9..ff0ead161d5 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -30,49 +30,57 @@
              </field>
         </record>
         
-        <record model="ir.ui.view" id="view_event_form_inherit">
-            <field name="name">Events Inherit</field>
-            <field name="model">event.event</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="event.view_event_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//notebook[last()]" position="inside">
-                    <page string="Event Items">
-                        <field name="event_item_ids" nolabel="1"/>
-                    </page>
-                </xpath>                
-            </field>
-        </record>
+		<record model="ir.ui.view" id="view_event_form_inherit">
+			<field name="name">Events Inherit</field>
+			<field name="model">event.event</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="event.view_event_form"/>
+			<field name="arch" type="xml">
+				<xpath expr="//group[@string='vanue']" position="after">
+						<field name="event_item_ids" nolabel="1"/><newline/>
+						<div class="oe_right">
+							<button string="Order Now" name="make_order" help="Order Event" type="object" icon="gtk-ok" attrs="{'invisible':[('state','=','confirm')]}"/>
+						</div>
+				</xpath>
+				<xpath expr="//group[@string='vanue']" position="attributes">
+                    <attribute name="string"></attribute>
+                </xpath>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_event_items_tree">
+			 <field name="name">Event Items Tree</field>
+			 <field name="model">event.items</field>
+			 <field name="type">tree</field>
+			 <field name="arch" type="xml">
+				 <tree string="Event Items">
+					 <field name="product_id"/>
+					 <field name="price"/>
+					 <field name="qty"/>
+					 <field name="uom_id"/>
+					 <field name="discount"/>
+					 <field name="sales_end_date"/>
+				 </tree>
+			 </field>
+		 </record>
+
+
+		<record model="ir.ui.view" id="view_event_items_form">
+			 <field name="name">Event Items Form</field>
+			 <field name="model">event.items</field>
+			 <field name="type">form</field>
+		 	 <field name="arch" type="xml">
+			 	 <form string="Event Items">
+			   	 	<field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
+			        <field name="price"/>
+			        <field name="qty"/>
+					<field name="uom_id"/>
+					<field name="discount"/>
+					<field name="sales_end_date"/>
+				</form>
+		 	</field>
+		</record>
         
-        <record model="ir.ui.view" id="view_event_items_tree">
-            <field name="name">Event Items Tree</field>
-            <field name="model">event.items</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Event Items">
-                    <field name="product_id"/>
-                    <field name="price"/>
-                    <field name="uom_id"/>
-                    <field name="discount"/>                  
-                    <field name="sales_end_date"/>
-                </tree>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="view_event_items_form">
-            <field name="name">Event Items Form</field>
-            <field name="model">event.items</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Event Items">
-                    <field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
-                    <field name="price"/>
-                    <field name="uom_id"/>
-                    <field name="discount"/>
-                    <field name="sales_end_date"/>
-                </form>
-            </field>
-        </record>
         
     </data>
 </openerp>

From 66814b5501edfc5aab0dd54eb161e488b8d23462 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 27 Apr 2012 15:16:34 +0530
Subject: [PATCH 146/452] [imp] event : remove unused code.

bzr revid: nco@tinyerp.com-20120427094634-foba34c88a4mn2ja
---
 addons/event/event.py                 |  2 +-
 addons/event/event_view.xml           | 63 ++++++++++-----------------
 addons/event/static/src/css/event.css |  9 +---
 addons/event_sale/__openerp__.py      |  3 --
 4 files changed, 26 insertions(+), 51 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 7eacad489ff..5e948c1a59b 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -220,7 +220,7 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
-        'location_id': fields.many2one('res.company','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+        'location_id': fields.many2one('res.company','Organization Address', readonly=False, states={'done': [('readonly', True)]}),
         
     }
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index efa5eb68384..4e61844db80 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -103,50 +103,33 @@
 		                    </div>
 		                    <newline/>
 		                    <group colspan="4" string="vanue">
-                            	<div class="sub1"> Venue   : </div> <separator orientation="vertical"/>
+                            	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
                             	<field name="location_id" nolabel="1"/> 
                         	</group>
 			             </group>	
 			             <group>
-			             	<div class="mapbox"> </div><newline/>
-		                    <!--table>
-		                        <tr>
-		                        <td width="70px" style="text-align:top;"  class="oe_td_border">
-		                            Where
-		                        </td>
-		                        <td width="150px">
-		                            <field name="address_id" nolabel="1"/>
-		                                
-		                        </td>
-		                        <td width="150px">
-									<span width="15px"> Start</span> <field name="date_begin" nolabel="1"/>   
-									<span width="15px"> End</span> <field name="date_end" nolabel="1"/>    
-		                        </td>
-		                        </tr>
-		                   </table-->   
-		                   <table>
-		                   	<tr>
-		                    	<td width="70px" class="oe_td_border">
-		                            Where
-		                        </td>
-		                        <td width="150px">
-		                            <field name="address_id" nolabel="1"/>
-		                        </td>
-		                        <td width="auto">
-                             		<table>
-										<tr>
-											<td class="oe_td_date_border">Start</td><td><field name="date_begin" nolabel="1"/></td>
-										</tr>
-										<tr>
-											<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
-										</tr>
-									</table>
-                                 
-		                        </td>
-		                     </tr>
-		                   </table>   
-		                      <!--field name="date_end" label="To" string="end"/-->
-					       
+			             	<div class="oe_mapbox"> </div><newline/>
+		                    <table>
+			                   	<tr>
+			                    	<td width="70px" class="oe_td_border">
+			                            Where
+			                        </td>
+			                        <td width="150px">
+			                            <field name="address_id" nolabel="1"/>
+			                        </td>
+			                        <td width="auto">
+	                             		<table>
+											<tr>
+												<td class="oe_td_date_border">Start</td><td><field name="date_begin" nolabel="1"/></td>
+											</tr>
+											<tr>
+												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
+											</tr>
+										</table>
+	                                 
+			                        </td>
+			                     </tr>
+		                     </table>   
 			             </group>
                     </group>	
                     <notebook colspan="4">
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index f8fe5c04c86..d89131fe82f 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -122,16 +122,11 @@ div.oe_fold_column{
 .oe_event_title{
   font-size: 25px;
 }
-.sub1
+.oe_sub1
 {
     float:left;
 }
-.sub2
-{
-    padding-left:50px;
-    text-align:left;
-}
-.mapbox
+.oe_mapbox
 { 
     width:380px;
     height:200px;
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index be60ed3fdf6..fb7134f6070 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -39,10 +39,7 @@ It defines a new kind of service products that offers you the possibility to cho
         'event_sale_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
-    'js': ['static/src/js/*.js'],
-    'html': ['static/*.html'],
     'test':['test/confirm.yml'],
-    'css': ['static/src/css/*.css'],
     'installable': True,
     'active': False,
 }

From 8d3365c1bab2a33fa8dcdc828deef832e947fc8e Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 15:21:37 +0530
Subject: [PATCH 147/452] [IMP]

bzr revid: apa@tinyerp.com-20120427095137-5v5dnze0jokg7u3f
---
 addons/crm/crm.py                             | 2 +-
 addons/crm/crm_phonecall.py                   | 2 +-
 addons/hr/hr.py                               | 2 +-
 addons/hr_evaluation/hr_evaluation.py         | 2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   | 2 +-
 addons/hr_expense/hr_expense.py               | 5 +++--
 addons/hr_expense/hr_expense_view.xml         | 2 +-
 addons/hr_recruitment/hr_recruitment.py       | 4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 2b0dccd275a..2c2a53bd557 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -32,8 +32,8 @@ AVAILABLE_STATES = [
     ('draft', 'New'),
     ('open', 'In Progress'),
     ('pending', 'Pending'),
-    ('done', 'Closed'),
     ('cancel', 'Cancelled'),
+    ('done', 'Closed'),
     
 ]
 
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 2b8eb9d1435..c641aced9e8 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -52,8 +52,8 @@ class crm_phonecall(crm_base, osv.osv):
                                     ('draft', 'Draft'),
                                     ('open', 'Todo'),
                                     ('pending', 'Not Held'),
-                                    ('done', 'Held'),
                                     ('cancel', 'Cancelled'),
+                                    ('done', 'Held'),
                                 ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Todo\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index bd0c730d92d..030cafcbb45 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -110,7 +110,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', 'In Position'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', readonly=True, required=True),
+        'state': fields.selection([('open', 'In Position'),('recruit', 'In Recruitement'),('old', 'Old')], 'State', readonly=True, required=True),
     }
     _defaults = {
         'expected_employees': 1,
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 6e1983d7a11..c409ad19496 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -163,8 +163,8 @@ class hr_evaluation(osv.osv):
             ('draft','New'),
             ('wait','Plan In Progress'),
             ('progress','Waiting Appreciation'),
-            ('done','Done'),
             ('cancel','Cancelled'),
+            ('done','Done'),
         ], 'State', required=True, readonly=True),
         'date_close': fields.date('Ending Date', select=True),
         'progress': fields.float("Progress"),
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 2c192513ed4..5b4d04923de 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -162,7 +162,7 @@
                     <button name="button_draft" string="Reset to Draft" states="cancel" type="object" icon="terp-stock_effects-object-colorize"/>
                     <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object" icon="gtk-cancel"/>
                     <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,wait,done" statusbar_colors='{"progress":"blue"}'/>
                     </div>
                 </div>
                 <sheet string="Appraisal" layout="auto">
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 6e7db83bbb7..71b8b2f0bef 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -80,10 +80,11 @@ class hr_expense_expense(osv.osv):
         'state': fields.selection([
             ('draft', 'New'),
             ('confirm', 'Waiting Approval'),
+            ('cancelled', 'Refused'),
             ('accepted', 'Approved'),
             ('invoiced', 'Invoiced'),
-            ('paid', 'Reimbursed'),
-            ('cancelled', 'Refused')],
+            ('paid', 'Reimbursed')
+            ],
             'State', readonly=True, help='When the expense request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Confirmation\'.\
             \nIf the admin accepts it, the state is \'Accepted\'.\n If an invoice is made for the expense request, the state is \'Invoiced\'.\n If the expense is paid to user, the state is \'Reimbursed\'.'),
     }
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index a8500bc7c35..1e1687025d1 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -73,7 +73,7 @@
                     <button name="invoice" states="accepted" string="Invoice" type="object" icon="gtk-go-forward" groups="base.group_hr_user"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
                     <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,accepted,invoiced" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                     </div>
                 </div>
                 <sheet string="Expenses Sheet" layout="auto">
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 17a2d11fd0e..69b25798864 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -36,9 +36,9 @@ wizard.mail_compose_message.SUPPORTED_MODELS.append('hr.applicant')
 AVAILABLE_STATES = [
     ('draft', 'New'),
     ('open', 'In Progress'),
+    ('pending', 'Pending'),
     ('cancel', 'Refused'),
-    ('done', 'Hired'),
-    ('pending', 'Pending')
+    ('done', 'Hired')
 ]
 
 AVAILABLE_PRIORITIES = [
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 4041dc69698..f089acac180 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -76,8 +76,8 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
                 <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
+                <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
                 <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
                 <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
                 <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>

From e793701fd590cbdc3f4e9d6acc35310248e645bb Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 27 Apr 2012 15:23:04 +0530
Subject: [PATCH 148/452] [IMP] sale,crm : Improvetypo and ser brackets after
 string

bzr revid: dbr@tinyerp.com-20120427095304-6g9i9hw3uge2wiaw
---
 addons/crm/res_partner_view.xml  | 4 ++--
 addons/sale/res_partner_view.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index d9f63276eca..eb455b41abe 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -58,14 +58,14 @@
                 </field>
                  <xpath expr="//div[@class='oe_partner_desc']//h4[@class='oe_partner_heading']" position="after">
                         <a name="get_opportunity" type="object">
-                            (<t t-esc="record.total_oppo.value"/>)
                             <t t-if="record.total_oppo.value &lt;= 1">Opportunity</t>
                             <t t-if="record.total_oppo.value > 1"> Opportunities</t>
+                            (<t t-esc="record.total_oppo.value"/>)
                         </a>
                         <a name="%(crm.crm_case_categ_meet)d" type="action">
-                            (<t t-esc="record.total_meeting.value"/>)
                             <t t-if="record.total_meeting.value &lt;= 1">Meeting</t>
                             <t t-if="record.total_meeting.value > 1">Meetings</t>
+                            (<t t-esc="record.total_meeting.value"/>)
                         </a>
                 </xpath>
             </field>
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index a13ecf29db8..b8e94c67271 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -13,9 +13,9 @@
                 </field>
                 <xpath expr="//div[@class='oe_partner_desc']//h4[@class='oe_partner_heading']" position="after">
                     <a name="%(sale.act_res_partner_2_sale_order)d" type="action">
+                        <t t-if="record.total_sale.value &lt;= 1">Quotation</t>
+                        <t t-if="record.total_sale.value > 1">Quotations</t>
                         (<t t-esc="record.total_sale.value" />)
-                        <t t-if="record.total_sale.value &lt;= 1">Quatation</t>
-                        <t t-if="record.total_sale.value > 1">Quatations</t>
                     </a>
                 </xpath>
             </field>

From 43bbbb1fac3bc36ce6f31d7074bfc7feee0ac904 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 16:11:53 +0530
Subject: [PATCH 149/452] [IMP]

bzr revid: apa@tinyerp.com-20120427104153-6tfztt9atl6d618s
---
 addons/sale/sale.py         | 2 +-
 addons/stock/stock.py       | 2 +-
 addons/stock/stock_view.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 9caaa86878c..76980dd068f 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -209,8 +209,8 @@ class sale_order(osv.osv):
             ('progress', 'In Progress'),
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
+            ('cancel', 'Cancelled'),
             ('done', 'Done'),
-            ('cancel', 'Cancelled')
             ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
         'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index dee8e2a6c25..087a9b4f166 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -632,8 +632,8 @@ class stock_picking(osv.osv):
             ('auto', 'Waiting Another Operation'),
             ('confirmed', 'Waiting Availability'),
             ('assigned', 'Ready to Process'),
-            ('done', 'Done'),
             ('cancel', 'Cancelled'),
+            ('done', 'Done'),
             ], 'State', readonly=True, select=True,
             help="* Draft: not confirmed yet and will not be scheduled until confirmed\n"\
                  "* Confirmed: still waiting for the availability of products\n"\
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2e68e5a9282..8d439a6ea40 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -701,7 +701,7 @@
                     <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl" />
                     <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                     <div class="oe_right">
-                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                     </div>
                 </div>
                 <sheet string="Internal Picking List" layout="auto">

From db1bc82390a4392d3cd111476b4840af9b629016 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 16:14:54 +0530
Subject: [PATCH 150/452] [IMP]

bzr revid: apa@tinyerp.com-20120427104454-m070c4w0ia6m4knx
---
 addons/sale/sale.py   | 2 +-
 addons/stock/stock.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 9caaa86878c..76980dd068f 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -209,8 +209,8 @@ class sale_order(osv.osv):
             ('progress', 'In Progress'),
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
+            ('cancel', 'Cancelled'),
             ('done', 'Done'),
-            ('cancel', 'Cancelled')
             ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
         'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index dee8e2a6c25..087a9b4f166 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -632,8 +632,8 @@ class stock_picking(osv.osv):
             ('auto', 'Waiting Another Operation'),
             ('confirmed', 'Waiting Availability'),
             ('assigned', 'Ready to Process'),
-            ('done', 'Done'),
             ('cancel', 'Cancelled'),
+            ('done', 'Done'),
             ], 'State', readonly=True, select=True,
             help="* Draft: not confirmed yet and will not be scheduled until confirmed\n"\
                  "* Confirmed: still waiting for the availability of products\n"\

From e5c291267fee9a76da47bc12d2b9d000cbf87a22 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 16:21:08 +0530
Subject: [PATCH 151/452] [IMP]:set state buttons order in project

bzr revid: apa@tinyerp.com-20120427105108-hydokesdp8olv3df
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f0a123c4af6..bc4c4c5f725 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,10 +20,10 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
+                    <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
                     <button name="set_open" string="Re-open 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_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
                     <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
                     <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>

From 24cdaa4360df2dad00359fdb27e0d88f7896a54b Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 16:30:53 +0530
Subject: [PATCH 152/452] [IMP]

bzr revid: apa@tinyerp.com-20120427110053-49i5uw7sfyyu4l1e
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8d439a6ea40..2e68e5a9282 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -701,7 +701,7 @@
                     <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl" />
                     <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                     <div class="oe_right">
-                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                     </div>
                 </div>
                 <sheet string="Internal Picking List" layout="auto">

From 58e27785a12464eead4e659b6191ccccb411cccf Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 16:34:10 +0530
Subject: [PATCH 153/452] set order in task form

bzr revid: apa@tinyerp.com-20120427110410-5fu5ux7auae0ao0p
---
 addons/project/project.py       | 2 +-
 addons/project/project_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 0335b7cb540..9d62a66b653 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -662,7 +662,7 @@ class task(osv.osv):
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
         'type_id': fields.many2one('project.task.type', 'Stage'),
-        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'),('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State',
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index bc4c4c5f725..7cfdeffd2ec 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -224,12 +224,12 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                     <div class="oe_form_topbar">
-                        <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
+                        <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
                         <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
                         <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 name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
                         <button name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
-                        <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"/>
                         <div class="oe_right">
                             <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>

From c94ded86597d4d4791c72dead2d437867809ed06 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 16:40:56 +0530
Subject: [PATCH 154/452] set order in stock and purchase

bzr revid: apa@tinyerp.com-20120427111056-w9miufobwy56ipq7
---
 addons/purchase/purchase.py | 5 +++--
 addons/stock/stock.py       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 687221f371b..002be4aa055 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -148,8 +148,9 @@ class purchase_order(osv.osv):
         ('approved', 'Approved'),
         ('except_picking', 'Shipping Exception'),
         ('except_invoice', 'Invoice Exception'),
-        ('done', 'Done'),
-        ('cancel', 'Cancelled')
+        ('cancel', 'Cancelled'),
+        ('done', 'Done')
+        
     ]
 
     _columns = {
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 087a9b4f166..a17bfd10b24 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1630,7 +1630,7 @@ class stock_move(osv.osv):
         'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'),
         'picking_id': fields.many2one('stock.picking', 'Reference', select=True,states={'done': [('readonly', True)]}),
         'note': fields.text('Notes'),
-        'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
+        'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'),('cancel', 'Cancelled'),('done', 'Done')], 'State', readonly=True, select=True,
               help='When the stock move is created it is in the \'Draft\' state.\n After that, it is set to \'Not Available\' state if the scheduler did not find the products.\n When products are reserved it is set to \'Available\'.\n When the picking is done the state is \'Done\'.\
               \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),

From 75c07062f9521c3cded53b5aae7290f7b1f6cf52 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 27 Apr 2012 18:00:09 +0530
Subject: [PATCH 155/452] [IMP]sale, crm, stock: set link as a string and
 brackets at end for product kanaban view

bzr revid: dbr@tinyerp.com-20120427123009-cy4jbia0chiljvjj
---
 addons/crm/res_partner_view.xml  | 11 +++++------
 addons/sale/res_partner_view.xml |  5 ++---
 addons/stock/product.py          |  6 ++++--
 addons/stock/product_view.xml    | 22 ++++++++--------------
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index eb455b41abe..d041d54cdfa 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -58,14 +58,13 @@
                 </field>
                  <xpath expr="//div[@class='oe_partner_desc']//h4[@class='oe_partner_heading']" position="after">
                         <a name="get_opportunity" type="object">
-                            <t t-if="record.total_oppo.value &lt;= 1">Opportunity</t>
-                            <t t-if="record.total_oppo.value > 1"> Opportunities</t>
-                            (<t t-esc="record.total_oppo.value"/>)
+                            <t t-if="record.total_oppo.value &lt;= 1">Opportunity(<t t-esc="record.total_oppo.value"/>)</t>
+                            <t t-if="record.total_oppo.value > 1">Opportunities(<t t-esc="record.total_oppo.value"/>)</t>
                         </a>
                         <a name="%(crm.crm_case_categ_meet)d" type="action">
-                            <t t-if="record.total_meeting.value &lt;= 1">Meeting</t>
-                            <t t-if="record.total_meeting.value > 1">Meetings</t>
-                            (<t t-esc="record.total_meeting.value"/>)
+                            <t t-if="record.total_meeting.value &lt;= 1">Meeting(<t t-esc="record.total_meeting.value"/>)</t>
+                            <t t-if="record.total_meeting.value > 1">Meetings(<t t-esc="record.total_meeting.value"/>)</t>
+                            
                         </a>
                 </xpath>
             </field>
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index b8e94c67271..4e4605ecbfb 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -13,9 +13,8 @@
                 </field>
                 <xpath expr="//div[@class='oe_partner_desc']//h4[@class='oe_partner_heading']" position="after">
                     <a name="%(sale.act_res_partner_2_sale_order)d" type="action">
-                        <t t-if="record.total_sale.value &lt;= 1">Quotation</t>
-                        <t t-if="record.total_sale.value > 1">Quotations</t>
-                        (<t t-esc="record.total_sale.value" />)
+                        <t t-if="record.total_sale.value &lt;= 1">Quotation(<t t-esc="record.total_sale.value" />)</t>
+                        <t t-if="record.total_sale.value > 1">Quotations(<t t-esc="record.total_sale.value" />)</t>
                     </a>
                 </xpath>
             </field>
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 37d26e3d23f..fed6666e354 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -26,7 +26,7 @@ import decimal_precision as dp
 class product_product(osv.osv):
     _inherit = "product.product"
 
-    def _get_reception(self, cr, uid, ids, field_name, arg, context=None):
+    def _total_reception(self, cr, uid, ids, field_name, arg, context=None):
         total_reception={}
         reception_pool=self.pool.get('stock.picking')
         for id in ids:
@@ -347,7 +347,7 @@ class product_product(osv.osv):
         return res
 
     _columns = {
-        'total_reception': fields.function(_get_reception , type='integer',string="Total Reception"),
+        'total_reception': fields.function(_total_reception , type='integer',string="Total Reception"),
         'total_delivery': fields.function(_total_delivery , type='integer',string="Total Delivery"),
         'qty_available': fields.function(_product_available, multi='qty_available',
             type='float',  digits_compute=dp.get_precision('Product UoM'),
@@ -420,6 +420,8 @@ class product_product(osv.osv):
 
     _defaults = {
         'valuation': 'manual_periodic',
+        'total_reception': 0,
+        'total_delivery': 0,
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index e5d070507e7..6bead678640 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -152,20 +152,14 @@
                                         <li>Price: <field name="lst_price"></field></li>
                                         <li>Cost: <field name="standard_price"></field></li>
                                     </ul>
-                                    <t t-if="record.total_reception.raw_value">
-                                        <a name="get_receptions" type="object">
-                                            (<t t-esc="record.total_reception.value"/>)
-                                            <t t-if="record.total_reception.raw_value &lt;= 1">Reception</t>
-                                            <t t-if="record.total_reception.raw_value > 1"> Receptions</t>
-                                        </a>
-                                    </t>
-                                    <t t-if="record.total_delivery.raw_value">
-                                        <a name="get_deliveries" type="object">
-                                            (<t t-esc="record.total_delivery.value"/>)
-                                            <t t-if="record.total_delivery.raw_value &lt;= 1">Delivery</t>
-                                            <t t-if="record.total_delivery.raw_value > 1">Deliveries</t>
-                                        </a>
-                                    </t>
+                                    <a name="get_receptions" type="object">
+                                        <t t-if="record.total_reception.raw_value &lt;= 1">Reception(<t t-esc="record.total_reception.value"/>)</t>
+                                        <t t-if="record.total_reception.raw_value > 1">Receptions(<t t-esc="record.total_reception.value"/>)</t>
+                                    </a>
+                                    <a name="get_deliveries" type="object">
+                                        <t t-if="record.total_delivery.raw_value &lt;= 1">Delivery(<t t-esc="record.total_delivery.value"/>)</t>
+                                        <t t-if="record.total_delivery.raw_value > 1">Deliveries(<t t-esc="record.total_delivery.value"/>)</t>
+                                    </a>
                                 </div>
                             </div>
                             <script>

From f2f366a123d50788ffae58e69a830f93bf3f8b75 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 18:17:19 +0530
Subject: [PATCH 156/452] [IMP] Improved code.

bzr revid: tpa@tinyerp.com-20120427124719-l96vi2e11s7fpwmh
---
 addons/account/account_invoice_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 3a5c9c24466..a4f94c94520 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -214,7 +214,6 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
                             </group>
                         </page>
@@ -317,7 +316,6 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
                             </group>
                         </page>

From cd297a6d2b314895990a8a540f662005d971bbf0 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 18:27:45 +0530
Subject: [PATCH 157/452] [FIX] sale_analytic_plans: improved code.

bzr revid: tpa@tinyerp.com-20120427125745-5ldqocen20cu8gd7
---
 addons/sale_analytic_plans/sale_analytic_plans_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index 743bbcb48d9..2d4ff082288 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -18,7 +18,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-           <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='delay']" position="after">
+           <xpath expr="/form/sheet/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='delay']" position="after">
                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
            </xpath>
         </field>

From c8f02f8003145aff3c0e3fa3f6378ba65802962e Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 18:29:48 +0530
Subject: [PATCH 158/452] [IMP]

bzr revid: apa@tinyerp.com-20120427125948-mbunkhlgxqufh7up
---
 addons/stock/stock_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2e68e5a9282..7f84ced4e92 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -693,8 +693,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                     <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
+                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                     <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_process" states="assigned" string="Process"  groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
@@ -887,8 +887,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
                     <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
+                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
                     <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_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
@@ -1112,8 +1112,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                     <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
+                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                     <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_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
@@ -1121,7 +1121,7 @@
                     <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                     <div class="oe_right">
-                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                     </div>
                 </div>
                 <sheet string="Input Picking List" layout="auto">
@@ -1419,8 +1419,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                        <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
                         <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
+                        <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
                         <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                         <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                     <div class="oe_right">

From 2a6e0c0d8875f2f47e663cddf1f1e31d18a01d56 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 18:35:08 +0530
Subject: [PATCH 159/452] [FIX] account_analytic_plans: improved code

bzr revid: tpa@tinyerp.com-20120427130508-j3dqzyal0ghudgsa
---
 addons/account_analytic_plans/account_analytic_plans_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 8282461e512..ae4db10803e 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -303,10 +303,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='analytic_account_id']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/tree/field[@name='analytic_account_id']" position="replace">
                     <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
                 </xpath>
-                <xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='analytic_account_id']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/form/field[@name='analytic_account_id']" position="replace">
                     <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
                 </xpath>
             </field>

From 3a44d34d13f3054508fb493b5d3d1e78c632c7a6 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 18:39:46 +0530
Subject: [PATCH 160/452] [FIX] account_bank_statement_extensions: improved
 code.

bzr revid: tpa@tinyerp.com-20120427130946-iwjv1dxrenf247du
---
 .../account_bank_statement_view.xml                       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index ebf58d774d9..7988edf3ba3 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -42,17 +42,17 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <data>
-          <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='date']" position="after">
+          <xpath expr="/form/sheet/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='date']" position="after">
             <field name="val_date"/>
           </xpath>
-          <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+          <xpath expr="/form/sheet/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
             <field name="globalisation_id" string="Glob. Id"/>
             <field name="state" invisible="1"/>
           </xpath>
-          <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='date']" position="after">
+          <xpath expr="/form/sheet/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='date']" position="after">
             <field name="val_date"/>
           </xpath>
-          <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='amount']" position="after">
+          <xpath expr="/form/sheet/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='amount']" position="after">
             <field name="globalisation_id"/>
             <field name="state" invisible="1"/>
           </xpath>

From 3dd970b49820f7c787674a8dc60bcc61deeba393 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 18:43:45 +0530
Subject: [PATCH 161/452] [FIX] account_invoice_layout: improved code

bzr revid: tpa@tinyerp.com-20120427131345-7q8fxia5irfrc112
---
 addons/account_invoice_layout/account_invoice_layout_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index f51120aa9da..2dd962b180d 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -47,7 +47,7 @@
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='invoice_line']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='invoice_line']" position="replace">
                     <!-- keep the original fields, because other views position on that, too -->
                     <field name="invoice_line" invisible="True"/>
                     <field name="abstract_line_ids" colspan="4" nolabel="1"/>

From 1f0b1673e22c1c40a2e94ac69269611de22a7d01 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 27 Apr 2012 17:04:36 +0200
Subject: [PATCH 162/452] [TEST] rendering of drawer

bzr revid: xmo@openerp.com-20120427150436-3wxgyyp59l5vefr5
---
 addons/web/static/src/js/search.js | 157 ++++++++++++++++-------------
 addons/web/static/src/xml/base.xml |   5 +
 addons/web/static/test/search.js   |  52 +++++++++-
 doc/search-view.rst                |  16 ++-
 4 files changed, 154 insertions(+), 76 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 830253e0622..d6ec3bc981f 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -249,69 +249,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
     /**
      * Sets up thingie where all the mess is put?
      */
-    setup_stuff_drawer: function () {
-        var self = this;
-        $('<div class="oe_searchview_unfold_drawer">').appendTo(this.$element);
-        var $drawer = $('<div class="oe_searchview_drawer">').appendTo(this.$element);
-        var $filters = $('<div class="oe_searchview_filters">').appendTo($drawer);
-
-        var running_count = 0;
-        // get total filters count
-        var is_group = function (i) { return i instanceof instance.web.search.FilterGroup; };
-        var filters_count = _(this.controls).chain()
-            .flatten()
-            .filter(is_group)
-            .map(function (i) { return i.filters.length; })
-            .sum()
-            .value();
-
-        var col1 = [], col2 = _(this.controls).map(function (inputs, group) {
-            var filters = _(inputs).filter(is_group);
-            return {
-                name: group === 'null' ? _t("Filters") : group,
-                filters: filters,
-                length: _(filters).chain().map(function (i) {
-                    return i.filters.length; }).sum().value()
-            };
+    select_for_drawer: function () {
+        return _(this.inputs).filter(function (input) {
+            return input.in_drawer();
         });
-
-        while (col2.length) {
-            // col1 + group should be smaller than col2 + group
-            if ((running_count + col2[0].length) <= (filters_count - running_count)) {
-                running_count += col2[0].length;
-                col1.push(col2.shift());
-            } else {
-                break;
-            }
-        }
-
-        // Create a Custom Filter FilterGroup for each custom filter read from
-        // the db, add all of this as a group in the smallest column
-        [].push.call(col1.length <= col2.length ? col1 : col2, {
-            name: _t("Custom Filters"),
-            filters: _.map(this.custom_filters, function (filter) {
-                // FIXME: handling of ``disabled`` being set
-                var f = new instance.web.search.Filter({attrs: {
-                    string: filter.name,
-                    context: filter.context,
-                    domain: filter.domain
-                }}, self);
-                return new instance.web.search.FilterGroup([f], self);
-            }),
-            length: 3
-        });
-
-        return $.when(
-            this.render_column(col1, $('<div>').appendTo($filters)),
-            this.render_column(col2, $('<div>').appendTo($filters)),
-            (new instance.web.search.Advanced(this).appendTo($drawer)));
-    },
-    render_column: function (column, $el) {
-        return $.when.apply(null, _(column).map(function (group) {
-            $('<h3>').text(group.name).appendTo($el);
-            return $.when.apply(null,
-                _(group.filters).invoke('appendTo', $el));
-        }));
     },
     /**
      * Sets up search view's view-wide auto-completion widget
@@ -479,14 +420,24 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
             data.fields_view['arch'].children,
             data.fields_view.fields);
 
+        // add Filters to this.inputs, need view.controls filled
+        var filters = new instance.web.search.Filters(this);
+        // add Advanced to this.inputs
+        var advanced = new instance.web.search.Advanced(this);
+
+        // build drawer
+        var drawer_started = $.when.apply(
+            null, _(this.select_for_drawer()).invoke(
+                'appendTo', this.$element.find('.oe_searchview_drawer')));
+
         // load defaults
-        return $.when(
-                this.setup_stuff_drawer(),
-                $.when.apply(null, _(this.inputs).invoke('facet_for_defaults', this.defaults))
-                    .then(function () {
-                        self.query.reset(_(arguments).compact(), {silent: true});
-                        self.renderFacets();
-                    }))
+        var defaults_fetched = $.when.apply(null, _(this.inputs).invoke(
+            'facet_for_defaults', this.defaults)).then(function () {
+                self.query.reset(_(arguments).compact(), {silent: true});
+                self.renderFacets();
+            });
+
+        return $.when(drawer_started, defaults_fetched)
             .then(function () { self.ready.resolve(); })
     },
     /**
@@ -779,6 +730,7 @@ instance.web.search.Group = instance.web.search.Widget.extend({
 });
 
 instance.web.search.Input = instance.web.search.Widget.extend( /** @lends instance.web.search.Input# */{
+    _in_drawer: false,
     /**
      * @constructs instance.web.search.Input
      * @extends instance.web.search.Widget
@@ -820,6 +772,9 @@ instance.web.search.Input = instance.web.search.Widget.extend( /** @lends instan
         }
         return this.facet_for(defaults[this.attrs.name]);
     },
+    in_drawer: function () {
+        return !!this._in_drawer;
+    },
     get_context: function () {
         throw new Error(
             "get_context not implemented for widget " + this.attrs.type);
@@ -937,6 +892,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
         var self = this, fs;
         var facet = this.view.query.detect(function (f) {
             return f.get('field') === self; });
+        // just toggle the bloody thing
         if (facet) {
             fs = facet.get('values');
 
@@ -1304,8 +1260,71 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
     }
 });
 
+instance.web.search.Filters = instance.web.search.Input.extend({
+    template: 'SearchView.Filters',
+    _in_drawer: true,
+    start: function () {
+        var self = this;
+        var running_count = 0;
+        // get total filters count
+        var is_group = function (i) { return i instanceof instance.web.search.FilterGroup; };
+        var filters_count = _(this.view.controls).chain()
+            .flatten()
+            .filter(is_group)
+            .map(function (i) { return i.filters.length; })
+            .sum()
+            .value();
+
+        var col1 = [], col2 = _(this.view.controls).map(function (inputs, group) {
+            var filters = _(inputs).filter(is_group);
+            return {
+                name: group === 'null' ? _t("Filters") : group,
+                filters: filters,
+                length: _(filters).chain().map(function (i) {
+                    return i.filters.length; }).sum().value()
+            };
+        });
+
+        while (col2.length) {
+            // col1 + group should be smaller than col2 + group
+            if ((running_count + col2[0].length) <= (filters_count - running_count)) {
+                running_count += col2[0].length;
+                col1.push(col2.shift());
+            } else {
+                break;
+            }
+        }
+
+        // Create a Custom Filter FilterGroup for each custom filter read from
+        // the db, add all of this as a group in the smallest column
+        (col1.length <= col2.length ? col1 : col2).push({
+            name: _t("Custom Filters"),
+            filters: _.map(this.view.custom_filters, function (filter) {
+                // FIXME: handling of ``disabled`` being set
+                var f = new instance.web.search.Filter({attrs: {
+                    string: filter.name,
+                    context: filter.context,
+                    domain: filter.domain
+                }}, self.view);
+                return new instance.web.search.FilterGroup([f], self.view);
+            }),
+            length: this.view.custom_filters.length
+        });
+        return $.when(
+            this.render_column(col1, $('<div>').appendTo(this.$element)),
+            this.render_column(col2, $('<div>').appendTo(this.$element)));
+    },
+    render_column: function (column, $el) {
+        return $.when.apply(null, _(column).map(function (group) {
+            $('<h3>').text(group.name).appendTo($el);
+            return $.when.apply(null,
+                _(group.filters).invoke('appendTo', $el));
+        }));
+    }
+});
 instance.web.search.Advanced = instance.web.search.Input.extend({
     template: 'SearchView.advanced',
+    _in_drawer: true,
     start: function () {
         var self = this;
         this.$element
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fcdf68a12ca..c275903c4a3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1291,6 +1291,8 @@
 
 <div t-name="SearchView" class="oe_searchview">
     <div class="oe_searchview_facets"/>
+    <div class="oe_searchview_unfold_drawer"/>
+    <div class="oe_searchview_drawer"/>
 </div>
 
 <div t-name="SearchView.InputView"
@@ -1458,6 +1460,9 @@
         </t>
     </t>
 </t>
+<div t-name="SearchView.Filters" class="oe_searchview_filters">
+
+</div>
 <div t-name="SearchView.advanced" class="oe_searchview_advanced">
     <h4>Advanced Search...</h4>
     <form>
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index ec93f1a6707..9e4c0b72747 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -170,12 +170,24 @@ $(document).ready(function () {
         }
     });
 
+    /**
+     * Builds a basic search view with a single "dummy" field. The dummy
+     * extends `instance.web.search.Field`, it does not add any (class)
+     * attributes beyond what is provided through ``dummy_widget_attributes``.
+     *
+     * The view is returned un-started, it is the caller's role to start it
+     * (or use DOM-insertion methods to start it indirectly).
+     *
+     * @param [dummy_widget_attributes={}]
+     * @param [defaults={}]
+     * @return {instance.web.SearchView}
+     */
     function makeSearchView(dummy_widget_attributes, defaults) {
         instance.web.search.fields.add(
             'dummy', 'instance.dummy.DummyWidget');
         instance.dummy = {};
         instance.dummy.DummyWidget = instance.web.search.Field.extend(
-            dummy_widget_attributes);
+            dummy_widget_attributes || {});
         instance.connection.responses['/web/searchview/load'] = function () {
             return {result: {fields_view: {
                 type: 'search',
@@ -642,6 +654,42 @@ $(document).ready(function () {
             });
     });
 
-    // TODO: test drawer rendering
+    module('drawer', {
+        setup: function () {
+            instance = window.openerp.init([]);
+            window.openerp.web.corelib(instance);
+            window.openerp.web.coresetup(instance);
+            window.openerp.web.chrome(instance);
+            window.openerp.web.data(instance);
+            window.openerp.web.search(instance);
+
+            instance.web.qweb.add_template(doc);
+
+            instance.connection.responses = {};
+            instance.connection.rpc_function = function (url, payload) {
+                if (!(url.url in this.responses)) {
+                    return $.Deferred().reject(
+                        {}, 'failed',
+                        _.str.sprintf("Url %s not found in mock responses",
+                                      url.url)).promise();
+                }
+                return $.when(this.responses[url.url](payload));
+            };
+        }
+    });
+    asyncTest('is-drawn', 2, function () {
+        var view = makeSearchView();
+        var $fix = $('#qunit-fixture');
+        view.appendTo($fix)
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function () {
+                ok($fix.find('.oe_searchview_filters').length,
+                   "filters drawer control has been drawn");
+                ok($fix.find('.oe_searchview_advanced').length,
+                   "filters advanced search has been drawn");
+            });
+    });
+
     // TODO: UI tests?
 });
diff --git a/doc/search-view.rst b/doc/search-view.rst
index 9d5944d41d6..a7fbb77f51b 100644
--- a/doc/search-view.rst
+++ b/doc/search-view.rst
@@ -122,12 +122,18 @@ rendered inside the drawer.
    second more usual calendar widget in the drawer for more
    obvious/precise interactions)
 
-Any input can note its desire to be rendered in the drawer by setting
-its :js:attr:`~openerp.web.search.Input.in_drawer` attribute to
-``true``, either on its class or on its instance.
+Any input can note its desire to be rendered in the drawer by
+returning a truthy value from
+:js:func:`~openerp.web.search.Input.in_drawer`.
 
-It will be rendered in the full width of the drawer, and instantiated
-only once.
+By default, :js:func:`~openerp.web.search.Input.in_drawer` returns the
+value of :js:attr:`~openerp.web.search.Input._in_drawer`, which is
+``false``. The behavior can be toggled either by redefining the
+attribute to ``true`` (either on the class or on the input), or by
+overriding :js:func:`~openerp.web.search.Input.in_drawer` itself.
+
+The input will be rendered in the full width of the drawer, it will be
+started only once (per view).
 
 .. todo:: drawer API (if a widget wants to close the drawer in some
           way), part of the low-level SearchView API/interactions?

From 7dd114798d105466ece62b35d4238a50321f6894 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 27 Apr 2012 17:36:38 +0200
Subject: [PATCH 163/452] [TEST] toggling of filters within a group

bzr revid: xmo@openerp.com-20120427153638-bkm6x2dfqf4tnjw9
---
 addons/web/static/src/js/search.js |  31 +-----
 addons/web/static/test/search.js   | 165 +++++++++++++++++++++++++----
 2 files changed, 147 insertions(+), 49 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index d6ec3bc981f..39d67a08f7d 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -888,35 +888,10 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
         this.toggle(this.filters[$(e.target).index()]);
     },
     toggle: function (filter) {
-        // FIXME: oh god, my eyes, they hurt
-        var self = this, fs;
-        var facet = this.view.query.detect(function (f) {
-            return f.get('field') === self; });
-        // just toggle the bloody thing
-        if (facet) {
-            fs = facet.get('values');
-
-            if (_.include(fs, filter)) {
-                fs = _.without(fs, filter);
-            } else {
-                fs.push(filter);
-            }
-            if (_(fs).isEmpty()) {
-                this.view.query.remove(facet, {trigger_search: true});
-            } else {
-                facet.set({
-                    values: fs
-                });
-            }
-            return;
-        } else {
-            fs = [filter];
-        }
-
-        this.view.query.add({
+        this.view.query.toggle({
             category: _t("Filter"),
-            values: fs,
-            field: this
+            field: this,
+            values: [{label: filter.attrs.string, value: filter}]
         });
     }
 });
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 9e4c0b72747..1dcf03f90bd 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -188,28 +188,30 @@ $(document).ready(function () {
         instance.dummy = {};
         instance.dummy.DummyWidget = instance.web.search.Field.extend(
             dummy_widget_attributes || {});
-        instance.connection.responses['/web/searchview/load'] = function () {
-            return {result: {fields_view: {
-                type: 'search',
-                fields: {
-                    dummy: {type: 'char'}
-                },
-                arch: {
-                    tag: 'search',
-                    attrs: {},
-                    children: [{
-                        tag: 'field',
-                        attrs: {
-                            name: 'dummy',
-                            widget: 'dummy'
-                        },
-                        children: []
-                    }]
-                }
-            }}};
-        };
+        if (!('/web/searchview/load' in instance.connection.responses)) {
+            instance.connection.responses['/web/searchview/load'] = function () {
+                return {result: {fields_view: {
+                    type: 'search',
+                    fields: {
+                        dummy: {type: 'char'}
+                    },
+                    arch: {
+                        tag: 'search',
+                        attrs: {},
+                        children: [{
+                            tag: 'field',
+                            attrs: {
+                                name: 'dummy',
+                                widget: 'dummy'
+                            },
+                            children: []
+                        }]
+                    }
+                }}};
+            };
+        }
         instance.connection.responses['/web/searchview/get_filters'] = function () {
-            return [];
+            return {result: []};
         };
         instance.connection.responses['/web/searchview/fields_get'] = function () {
             return {result: {fields: {
@@ -691,5 +693,126 @@ $(document).ready(function () {
             });
     });
 
+    module('filters', {
+        setup: function () {
+            instance = window.openerp.init([]);
+            window.openerp.web.corelib(instance);
+            window.openerp.web.coresetup(instance);
+            window.openerp.web.chrome(instance);
+            window.openerp.web.data(instance);
+            window.openerp.web.search(instance);
+
+            instance.web.qweb.add_template(doc);
+
+            instance.connection.responses = {};
+            instance.connection.rpc_function = function (url, payload) {
+                if (!(url.url in this.responses)) {
+                    return $.Deferred().reject(
+                        {}, 'failed',
+                        _.str.sprintf("Url %s not found in mock responses",
+                                      url.url)).promise();
+                }
+                return $.when(this.responses[url.url](payload));
+            };
+            instance.connection.responses['/web/searchview/load'] = function () {
+                // view with a single group of filters
+                return {result: {fields_view: {
+                    type: 'search',
+                    fields: {},
+                    arch: {
+                        tag: 'search',
+                        attrs: {},
+                        children: [{
+                            tag: 'filter',
+                            attrs: { string: "Foo1", domain: [ ['foo', '=', '1'] ] },
+                            children: []
+                        }, {
+                            tag: 'filter',
+                            attrs: {
+                                name: 'foo2',
+                                string: "Foo2",
+                                domain: [ ['foo', '=', '2'] ] },
+                            children: []
+                        }, {
+                            tag: 'filter',
+                            attrs: { string: "Foo3", domain: [ ['foo', '=', '3'] ] },
+                            children: []
+                        }]
+                    }
+                }}};
+            };
+        }
+    });
+    asyncTest('drawn', 3, function () {
+        var view = makeSearchView();
+        var $fix = $('#qunit-fixture');
+        view.appendTo($fix)
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function () {
+                var $fs = $fix.find('.oe_searchview_filters ul');
+                // 3 filters, 1 filtergroup, 1 advanced and 1 Filters widget
+                equal(view.inputs.length, 6,
+                      'view should have 6 inputs total');
+                equal($fs.children().length, 3,
+                      "drawer should have a filter group with 3 filters");
+                equal(_.str.strip($fs.children().eq(0).text()), "Foo1",
+                      "Text content of first filter option should match filter string");
+            });
+    });
+    asyncTest('click adding from empty query', 4, function () {
+        var view = makeSearchView();
+        var $fix = $('#qunit-fixture');
+        view.appendTo($fix)
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function () {
+                var $fs = $fix.find('.oe_searchview_filters ul');
+                $fs.children(':eq(2)').trigger('click');
+                equal(view.query.length, 1, "click should have added a facet");
+                var facet = view.query.at(0);
+                equal(facet.values.length, 1, "facet should have a single value");
+                var value = facet.values.at(0);
+                ok(value.get('value') instanceof instance.web.search.Filter,
+                   "value should be a filter");
+                equal(value.get('label'), "Foo3",
+                      "value should be third filter");
+            });
+    });
+    asyncTest('click adding from existing query', 4, function () {
+        var view = makeSearchView({}, {foo2: true});
+        var $fix = $('#qunit-fixture');
+        view.appendTo($fix)
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function () {
+                var $fs = $fix.find('.oe_searchview_filters ul');
+                $fs.children(':eq(2)').trigger('click');
+                equal(view.query.length, 1, "click should not have changed facet count");
+                var facet = view.query.at(0);
+                equal(facet.values.length, 2, "facet should have a second value");
+                var v1 = facet.values.at(0);
+                equal(v1.get('label'), "Foo2",
+                      "first value should be default");
+                var v2 = facet.values.at(1);
+                equal(v2.get('label'), "Foo3",
+                      "second value should be clicked filter");
+            });
+    });
+    asyncTest('click removing from query', 2, function () {
+        var view = makeSearchView({}, {foo2: true});
+        var $fix = $('#qunit-fixture');
+        view.appendTo($fix)
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function () {
+                var $fs = $fix.find('.oe_searchview_filters ul');
+                // sanity check
+                equal(view.query.length, 1, "query should have default facet");
+                $fs.children(':eq(1)').trigger('click');
+                equal(view.query.length, 0, "click should have removed facet");
+            });
+    });
+
     // TODO: UI tests?
 });

From 15cf79717f0410c13773918bd6cdd99f1e55b5c1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 27 Apr 2012 17:37:58 +0200
Subject: [PATCH 164/452] [FIX] label of async DropMisordered tests

bzr revid: xmo@openerp.com-20120427153758-tj7rp5grryx680f9
---
 addons/web/static/test/rpc.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/test/rpc.js b/addons/web/static/test/rpc.js
index 8a49a48685f..fbe7147f2e6 100644
--- a/addons/web/static/test/rpc.js
+++ b/addons/web/static/test/rpc.js
@@ -66,7 +66,7 @@ $(document).ready(function () {
         ok(!fail2);
     });
 
-    asyncTest('Resolve all correctly ordered, sync', 1, function () {
+    asyncTest('Resolve all correctly ordered, async', 1, function () {
         var dm = new openerp.web.DropMisordered();
 
         var d1 = $.Deferred(), d2 = $.Deferred(),
@@ -80,7 +80,7 @@ $(document).ready(function () {
             ok(true);
         });
     });
-    asyncTest("Don't resolve mis-ordered, sync", 4, function () {
+    asyncTest("Don't resolve mis-ordered, async", 4, function () {
         var dm = new openerp.web.DropMisordered(),
             done1 = false, done2 = false,
             fail1 = false, fail2 = false;
@@ -104,7 +104,7 @@ $(document).ready(function () {
             ok(!fail2);
         }, 400);
     });
-    asyncTest('Fail mis-ordered flag, sync', 4, function () {
+    asyncTest('Fail mis-ordered flag, async', 4, function () {
         var dm = new openerp.web.DropMisordered(true),
             done1 = false, done2 = false,
             fail1 = false, fail2 = false;

From 24e104fcbe4b263a7f522c0a41649890373bca0d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 27 Apr 2012 17:46:14 +0200
Subject: [PATCH 165/452] [IMP] alias backbone to ensure searchview doesn't
 care about POS stomping an old-as-shit backbone on top of the more recent one
 bundled with core

bzr revid: xmo@openerp.com-20120427154614-otxpbsc9lio9azko
---
 addons/web/static/src/js/search.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 39d67a08f7d..24d3212f9a4 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -9,18 +9,19 @@ _.mixin({
 /** @namespace */
 var my = instance.web.search = {};
 
-my.FacetValue = Backbone.Model.extend({
+var B = Backbone;
+my.FacetValue = B.Model.extend({
 
 });
-my.FacetValues = Backbone.Collection.extend({
+my.FacetValues = B.Collection.extend({
     model: my.FacetValue
 });
-my.Facet = Backbone.Model.extend({
+my.Facet = B.Model.extend({
     initialize: function (attrs) {
         var values = attrs.values;
         delete attrs.values;
 
-        Backbone.Model.prototype.initialize.apply(this, arguments);
+        B.Model.prototype.initialize.apply(this, arguments);
 
         this.values = new my.FacetValues(values || []);
         this.values.on('add remove change reset', function () {
@@ -29,13 +30,13 @@ my.Facet = Backbone.Model.extend({
     },
     get: function (key) {
         if (key !== 'values') {
-            return Backbone.Model.prototype.get.call(this, key);
+            return B.Model.prototype.get.call(this, key);
         }
         return this.values.toJSON();
     },
     set: function (key, value) {
         if (key !== 'values') {
-            return Backbone.Model.prototype.set.call(this, key, value);
+            return B.Model.prototype.set.call(this, key, value);
         }
         this.values.reset(value);
     },
@@ -52,10 +53,10 @@ my.Facet = Backbone.Model.extend({
         return out;
     }
 });
-my.SearchQuery = Backbone.Collection.extend({
+my.SearchQuery = B.Collection.extend({
     model: my.Facet,
     initialize: function () {
-        Backbone.Collection.prototype.initialize.apply(
+        B.Collection.prototype.initialize.apply(
             this, arguments);
         this.on('change', function (facet) {
             if(!facet.values.isEmpty()) { return; }
@@ -79,7 +80,7 @@ my.SearchQuery = Backbone.Collection.extend({
                 previous.values.add(model.get('values'));
                 return;
             }
-            Backbone.Collection.prototype.add.call(this, model, options);
+            B.Collection.prototype.add.call(this, model, options);
         }, this);
         return this;
     },

From 10804bea3e5294cb67f54a3c19689bb90fd3311d Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 30 Apr 2012 10:34:37 +0530
Subject: [PATCH 166/452] [FIX] event_moodle: improved code

bzr revid: tpa@tinyerp.com-20120430050437-c1sr7vy9t8o2tkl4
---
 addons/event_moodle/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event_moodle/event_view.xml b/addons/event_moodle/event_view.xml
index f19d29e7b77..6d7c615a45e 100644
--- a/addons/event_moodle/event_view.xml
+++ b/addons/event_moodle/event_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="event.view_event_registration_form" />
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Emails']" position="after">
+                <xpath expr="/form/sheet/notebook/page[@string='Emails']" position="after">
                     <page string="Moodle">
                         <field name="moodle_user_password" readonly='1' colspan="2"/>
                         <field name="moodle_uid" readonly="1"/>

From b4f4ce5d8c2d3262fb1e2a152e31bb4982bda508 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 30 Apr 2012 11:46:55 +0530
Subject: [PATCH 167/452] [FIX] project_issue_sheet: improved code

bzr revid: tpa@tinyerp.com-20120430061655-z1a7yphklav6oosn
---
 addons/project_issue_sheet/project_issue_sheet_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index ac2f2990717..4ad7285b1e0 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -10,7 +10,7 @@
                 <field name="project_id" position="attributes">
                     <attribute name="on_change">on_change_project(project_id)</attribute>
                 </field>
-                <xpath expr="/form/notebook" position="before">
+                <xpath expr="/form/sheet/notebook" position="before">
                     <field name="analytic_account_id"
                         domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
                         on_change='on_change_account_id(analytic_account_id)'/>

From efccfbc143bb26aa67c4097bea7c87b1e951b769 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 30 Apr 2012 12:45:42 +0530
Subject: [PATCH 168/452] [IMP] Improved code.

bzr revid: tpa@tinyerp.com-20120430071542-gockdwuv70ok2vp3
---
 addons/account/project/project_view.xml        |  2 --
 .../hr_timesheet_invoice_view.xml              | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e7886702971..ee8ea3dbf87 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -81,8 +81,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
-                </div>
                 <sheet string="Analytic account" layout="auto">
                     <group colspan="4" col="6">
                         <field name="name" colspan="4"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index edd4d17ceab..12b782f239c 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -22,14 +22,16 @@
                         <field name="amount_invoiced"/>
                     </group>
                 </group>
-                <xpath expr="/form/div" position='inside'>
-                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
-                    <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
-                    <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
-                    <div class="oe_right">
-                        <field name="state" readonly="1" widget="statusbar" nolabel="1"
-                        statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
+                <xpath expr="/form/sheet" position='before'>
+                    <div class="oe_form_topbar">
+                        <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
+                        <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
+                        <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
+                        <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+                        <div class="oe_right">
+                            <field name="state" readonly="1" widget="statusbar" nolabel="1"
+                            statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
+                        </div>
                     </div>
                 </xpath>
             </field>

From 8d91d9a580d9a3333e09220cada6ecd4ed01fbce Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 30 Apr 2012 13:09:03 +0530
Subject: [PATCH 169/452] [IMP]: Improve code . remove unused code.

bzr revid: atp@tinyerp.com-20120430073903-52rcd0khdkcyx292
---
 addons/event/event_view.xml                   |  2 +-
 addons/event_sale/event_sale.py               | 23 ++++---
 addons/event_sale/event_sale_view.xml         |  9 +--
 addons/portal_event/__init__.py               | 22 ++++++
 addons/portal_event/__openerp__.py            | 40 +++++++++++
 addons/portal_event/portal_event.py           | 69 +++++++++++++++++++
 .../portal_event/security/ir.model.access.csv |  4 ++
 .../security/portal_event_security.xml        | 33 +++++++++
 8 files changed, 184 insertions(+), 18 deletions(-)
 create mode 100644 addons/portal_event/__init__.py
 create mode 100644 addons/portal_event/__openerp__.py
 create mode 100644 addons/portal_event/portal_event.py
 create mode 100644 addons/portal_event/security/ir.model.access.csv
 create mode 100644 addons/portal_event/security/portal_event_security.xml

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index c6cf379ffb7..92e850c011e 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -102,7 +102,7 @@
 		                    	<field name="name" nolabel="1"/>
 		                    </div>
 		                    <newline/>
-		                    <group colspan="4" string="vanue">
+		                    <group colspan="4" name="venue">
                             	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
                             	<field name="location_id" nolabel="1"/> 
                         	</group>
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 1e0e745edce..911d316cca8 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -35,15 +35,6 @@ class product(osv.osv):
 
 product()
 
-class sale_order(osv.osv):
-    _inherit = 'sale.order'
-    _columns = {
-    'partner_id': fields.many2one('res.partner', 'Customer', readonly=False, states={'draft': [('readonly', False)]}, required=False, change_default=True, select=True),
-    'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=False, required=False, states={'draft': [('readonly', False)]}, help="Invoice address for current sales order."),
-    'partner_shipping_id': fields.many2one('res.partner', 'Shipping Address', readonly=False, required=False, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."),
-    }
-    
-
 class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
     _columns = {
@@ -108,13 +99,20 @@ class event_event(osv.osv):
                     'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
                 }
 
-    def open_qoutation(self, cr, uid, ids, partner_id, context=None):
+    def make_quotation(self, cr, uid, ids, context=None):
         res = {}
         event_pool = self.pool.get('event.event')
         register_pool = self.pool.get('event.registration')
         sale_order_line_pool = self.pool.get('sale.order.line')
         sale_order = self.pool.get('sale.order')
         user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
+        partner_pool = self.pool.get("res.partner")
+        new_partner_id = False
+        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
+        if not partner_ids:
+            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
+            partner_invoice_id = self.pool.get('res.partner').address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+            partner_shipping_id = self.pool.get('res.partner').address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
         for event_id in self.browse(cr, uid, ids, context=context):
             prod_pricelist_obj = self.pool.get('product.pricelist')
             sale_order_lines = []
@@ -122,6 +120,9 @@ class event_event(osv.osv):
             new_sale_id = sale_order.create(cr, uid, {
                 'date_order': event_id.date_begin,
                 'pricelist_id': price_list,
+                 'partner_id': new_partner_id, 
+                  'partner_invoice_id': partner_invoice_id,
+                 'partner_shipping_id': partner_shipping_id
                 })            
             if event_id.event_item_ids:
                 for items in event_id.event_item_ids:
@@ -145,7 +146,7 @@ class event_event(osv.osv):
                         'nodestroy': True,
                         'target': 'new',
                 }
-                self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
+               # self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
         return res
 
 class event_items(osv.osv):
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 52a0723f950..7f1504b7b69 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -36,15 +36,12 @@
 			<field name="type">form</field>
 			<field name="inherit_id" ref="event.view_event_form"/>
 			<field name="arch" type="xml">
-				<xpath expr="//group[@string='vanue']" position="after">
+				<xpath expr="//group[@name='venue']" position="after">
 						<field name="event_item_ids" nolabel="1"/><newline/>
 						<div class="oe_right">
-							<button string="Order Now" name="open_qoutation" help="Order Event" type="object" icon="gtk-ok" attrs="{'invisible':[('state','=','confirm')]}"/>
+							<button string="Order Now" name="make_quotation" help="Order Event" type="object" icon="gtk-ok" attrs="{'invisible':[('state','=','confirm')]}"/>
 						</div>
 				</xpath>
-				<xpath expr="//group[@string='vanue']" position="attributes">
-                    <attribute name="string"></attribute>
-                </xpath>
 			</field>
 		</record>
 
@@ -53,7 +50,7 @@
 			 <field name="model">event.items</field>
 			 <field name="type">tree</field>
 			 <field name="arch" type="xml">
-				 <tree string="Event Items">
+				 <tree editable="top" string="Event Items">
 					 <field name="product_id"/>
 					 <field name="price"/>
 					 <field name="qty"/>
diff --git a/addons/portal_event/__init__.py b/addons/portal_event/__init__.py
new file mode 100644
index 00000000000..70c078b769d
--- /dev/null
+++ b/addons/portal_event/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 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 portal_event
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/portal_event/__openerp__.py b/addons/portal_event/__openerp__.py
new file mode 100644
index 00000000000..88ca9815323
--- /dev/null
+++ b/addons/portal_event/__openerp__.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 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/>.
+#
+##############################################################################
+
+{
+    'name' : "Portal Event",
+    'version' : "1.0",
+    'depends' : ["portal", "event_sale"],
+    'author' : "OpenERP SA",
+    'category': 'Portal',
+    'description': """
+This module defines 'portals' to customize the access to your OpenERP database
+for external users.
+    """,
+    'update_xml': [
+        'security/portal_event_security.xml',
+        'security/ir.model.access.csv',
+    ],    
+    'website': 'http://www.openerp.com',
+    'installable': True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/portal_event/portal_event.py b/addons/portal_event/portal_event.py
new file mode 100644
index 00000000000..41a7d81bcc5
--- /dev/null
+++ b/addons/portal_event/portal_event.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from osv import fields, osv
+from tools.translate import _
+
+class event_event(osv.osv):
+    _inherit = 'event.event'
+
+    def make_quotation(self, cr, uid, ids, partner_id, context=None):
+        event_pool = self.pool.get('event.event')
+        register_pool = self.pool.get('event.registration')
+        sale_order_line_pool = self.pool.get('sale.order.line')
+        sale_order = self.pool.get('sale.order')
+        res_partner_obj = self.pool.get('res.partner')
+        prod_pricelist_obj = self.pool.get('product.pricelist')
+        res_users_obj = self.pool.get('res.users')
+        customer = res_partner_obj.browse(cr, uid, partner_id, context=context)
+        
+        partner_id = res_users_obj.browse(cr, uid, uid, context=context).partner_id.id
+        if not partner_id:
+              raise osv.except_osv(_('Error !'),
+                                    _('There is no Partner defined ' \
+                                            'for this event:'))
+        
+        user_name = res_users_obj.browse(cr, uid, uid, context=context).name
+        price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
+        for event_id in self.browse(cr, uid, ids, context=context):
+            sale_order_lines = []
+            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
+            new_sale_id = sale_order.create(cr, uid, {
+                            'partner_id': partner_id,
+                            'pricelist_id': price_list,
+                            'partner_invoice_id': partner_id,
+                            'partner_shipping_id': partner_id,
+                            'date_order': event_id.date_begin
+                })            
+            if event_id.event_item_ids:
+                for items in event_id.event_item_ids:
+                    product = items.product_id.id
+                    sale_order_line = sale_order_line_pool.create(cr, uid, {
+                        'order_id': new_sale_id,                                
+                        'name': items.product_id.name,
+                        'product_uom_qty': items.qty,
+                        'product_id': items.product_id.id,
+                        'product_uom': items.uom_id.id,
+                        'price_unit': items.price,
+                        'date_planned': items.sales_end_date,
+                    }, context=context)
+        return True
diff --git a/addons/portal_event/security/ir.model.access.csv b/addons/portal_event/security/ir.model.access.csv
new file mode 100644
index 00000000000..2ca1e3def91
--- /dev/null
+++ b/addons/portal_event/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_event,event,event.model_event_event,portal_event.group_event_portal,1,0,0,0
+access_registration,registration,event.model_event_registration,portal_event.group_event_portal,1,0,0,0
+access_event_items,event.items,event.model_event_event,portal_event.group_event_portal,1,1,1,0
\ No newline at end of file
diff --git a/addons/portal_event/security/portal_event_security.xml b/addons/portal_event/security/portal_event_security.xml
new file mode 100644
index 00000000000..64c077c7bb9
--- /dev/null
+++ b/addons/portal_event/security/portal_event_security.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+        <!-- Creating Portal Group -->
+        
+        <record id="group_event_portal" model="res.groups">
+            <field name="name">Portal User</field>
+            <field ref="event.module_category_event_management" name="category_id"/>
+        </record>
+        
+        <record id="portal_event" model="res.portal">
+            <field name="name">Events Portal</field>
+            <field name="group_id" ref="group_event_portal"/>
+        </record>
+            
+        <!-- Sale Portal Access Rules -->
+        <record id="portal_event_rule" model="ir.rule">
+            <field name="name">Personal Events</field>
+            <field ref="event.model_event_event" name="model_id"/>
+            <field name="domain_force">[]</field>
+            <field name="groups" eval="[(4, ref('group_event_portal'))]"/>
+        </record>
+        
+        <record id="portal_registration_rule" model="ir.rule">
+            <field name="name">Personal Registrations</field>
+            <field ref="event.model_event_registration" name="model_id"/>
+            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
+            <field name="groups" eval="[(4, ref('group_event_portal'))]"/>
+        </record>        
+        
+    </data>
+</openerp>
\ No newline at end of file

From 43d0476172444dbee7c61a67a48f99bbe842a940 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 30 Apr 2012 14:46:38 +0530
Subject: [PATCH 170/452] [FIX] delivery: improved code

bzr revid: tpa@tinyerp.com-20120430091638-onnnbxvw2mkks63h
---
 addons/delivery/delivery_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 8ec3c144eee..db46a4ba7e7 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -316,7 +316,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Products']/group/button[@string='Create Invoice']" position="after">
+                <xpath expr="/form/sheet/notebook/page[@string='Products']/group/button[@string='Create Invoice']" position="after">
                     <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
                 </xpath>
             </field>

From 4443f39f3854ce511dfe68a6f7660c97513dea84 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 30 Apr 2012 15:14:54 +0530
Subject: [PATCH 171/452] [FIX]: Fix some code error. add security rules for
 event module

bzr revid: atp@tinyerp.com-20120430094454-hcz6w2xvllg7g2b7
---
 addons/event_sale/event_sale.py               | 81 +++++++++++--------
 addons/portal_event/portal_event.py           | 42 +++-------
 .../portal_event/security/ir.model.access.csv |  4 +-
 .../security/portal_event_security.xml        |  4 +-
 4 files changed, 61 insertions(+), 70 deletions(-)

diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 911d316cca8..ee48956324f 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -105,48 +105,59 @@ class event_event(osv.osv):
         register_pool = self.pool.get('event.registration')
         sale_order_line_pool = self.pool.get('sale.order.line')
         sale_order = self.pool.get('sale.order')
-        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
         partner_pool = self.pool.get("res.partner")
-        new_partner_id = False
+        prod_pricelist_obj = self.pool.get('product.pricelist')
+        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
         partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
         if not partner_ids:
             new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
-            partner_invoice_id = self.pool.get('res.partner').address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-            partner_shipping_id = self.pool.get('res.partner').address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
+            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
+        else:
+            new_partner_id = partner_ids[0]
+            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']     
         for event_id in self.browse(cr, uid, ids, context=context):
-            prod_pricelist_obj = self.pool.get('product.pricelist')
             sale_order_lines = []
             price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-            new_sale_id = sale_order.create(cr, uid, {
-                'date_order': event_id.date_begin,
-                'pricelist_id': price_list,
-                 'partner_id': new_partner_id, 
-                  'partner_invoice_id': partner_invoice_id,
-                 'partner_shipping_id': partner_shipping_id
-                })            
-            if event_id.event_item_ids:
-                for items in event_id.event_item_ids:
-                    product = items.product_id.id
-                    sale_order_line = sale_order_line_pool.create(cr, uid, {
-                        'order_id': new_sale_id,                                
-                        'name': items.product_id.name,
-                        'product_uom_qty': items.qty,
-                        'product_id': items.product_id.id,
-                        'product_uom': items.uom_id.id,
-                        'price_unit': items.price,
-                        'date_planned': items.sales_end_date,
-                    }, context=context)
-                res = {
-                        'name': _('Quotation'),
-                        'view_type': 'form',
-                        'view_mode': 'form',
-                        'res_model': 'sale.order',
-                        'res_id': new_sale_id,
-                        'type': 'ir.actions.act_window',
-                        'nodestroy': True,
-                        'target': 'new',
-                }
-               # self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
+            sale_ids = sale_order.search(cr, uid, [('date_order', '=', event_id.date_begin), ('partner_id', '=', new_partner_id)])
+            if not sale_ids:
+#                    raise osv.except_osv(_('Error !'),
+#                        _('sale order is already Exists for this event:'))
+#            else:          
+                new_sale_id = sale_order.create(cr, uid, {
+                    'date_order': event_id.date_begin,
+                    'pricelist_id': price_list,
+                     'partner_id': new_partner_id, 
+                      'partner_invoice_id': partner_invoice_id,
+                     'partner_shipping_id': partner_shipping_id
+                    })            
+                if event_id.event_item_ids:
+                    for items in event_id.event_item_ids:
+                        product = items.product_id.id
+                        sale_order_line = sale_order_line_pool.create(cr, uid, {
+                            'order_id': new_sale_id,                                
+                            'name': items.product_id.name,
+                            'product_uom_qty': items.qty,
+                            'product_id': items.product_id.id,
+                            'product_uom': items.uom_id.id,
+                            'price_unit': items.price,
+                            'date_planned': items.sales_end_date,
+                        }, context=context)
+                    view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
+                    if view_id:
+                        res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+                    res = {
+                            'name': _('Quotation'),
+                            'view_type': 'form',
+                            'view_mode': 'form',
+                            'res_model': 'sale.order',
+                            'res_id': new_sale_id,
+                            'views':[(res_id,'form'), (False, 'tree')],
+                            'type': 'ir.actions.act_window',
+                            'nodestroy': True,
+                            'target': 'current',
+                    }
         return res
 
 class event_items(osv.osv):
diff --git a/addons/portal_event/portal_event.py b/addons/portal_event/portal_event.py
index 41a7d81bcc5..570bd3131b6 100644
--- a/addons/portal_event/portal_event.py
+++ b/addons/portal_event/portal_event.py
@@ -26,44 +26,22 @@ from tools.translate import _
 class event_event(osv.osv):
     _inherit = 'event.event'
 
-    def make_quotation(self, cr, uid, ids, partner_id, context=None):
+    def make_quotation(self, cr, uid, ids, context=None):
         event_pool = self.pool.get('event.event')
         register_pool = self.pool.get('event.registration')
         sale_order_line_pool = self.pool.get('sale.order.line')
         sale_order = self.pool.get('sale.order')
-        res_partner_obj = self.pool.get('res.partner')
+        partner_pool = self.pool.get('res.partner')
         prod_pricelist_obj = self.pool.get('product.pricelist')
         res_users_obj = self.pool.get('res.users')
-        customer = res_partner_obj.browse(cr, uid, partner_id, context=context)
-        
-        partner_id = res_users_obj.browse(cr, uid, uid, context=context).partner_id.id
-        if not partner_id:
+        user = res_users_obj.browse(cr, uid, uid, context=context)
+        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
+        if partner_ids:
+            res_users_obj.write(cr, uid, user.id, {'partner_id': partner_ids[0]})        
+        if not partner_ids:
               raise osv.except_osv(_('Error !'),
                                     _('There is no Partner defined ' \
                                             'for this event:'))
-        
-        user_name = res_users_obj.browse(cr, uid, uid, context=context).name
-        price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-        for event_id in self.browse(cr, uid, ids, context=context):
-            sale_order_lines = []
-            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-            new_sale_id = sale_order.create(cr, uid, {
-                            'partner_id': partner_id,
-                            'pricelist_id': price_list,
-                            'partner_invoice_id': partner_id,
-                            'partner_shipping_id': partner_id,
-                            'date_order': event_id.date_begin
-                })            
-            if event_id.event_item_ids:
-                for items in event_id.event_item_ids:
-                    product = items.product_id.id
-                    sale_order_line = sale_order_line_pool.create(cr, uid, {
-                        'order_id': new_sale_id,                                
-                        'name': items.product_id.name,
-                        'product_uom_qty': items.qty,
-                        'product_id': items.product_id.id,
-                        'product_uom': items.uom_id.id,
-                        'price_unit': items.price,
-                        'date_planned': items.sales_end_date,
-                    }, context=context)
-        return True
+        res = super(event_event,self).make_quotation(cr, uid, ids, context)              
+
+        return res
diff --git a/addons/portal_event/security/ir.model.access.csv b/addons/portal_event/security/ir.model.access.csv
index 2ca1e3def91..0b3dfe5f3b2 100644
--- a/addons/portal_event/security/ir.model.access.csv
+++ b/addons/portal_event/security/ir.model.access.csv
@@ -1,4 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_event,event,event.model_event_event,portal_event.group_event_portal,1,0,0,0
 access_registration,registration,event.model_event_registration,portal_event.group_event_portal,1,0,0,0
-access_event_items,event.items,event.model_event_event,portal_event.group_event_portal,1,1,1,0
\ No newline at end of file
+access_event_items,event.items,event.model_event_event,portal_event.group_event_portal,1,1,1,0
+access_product_product,product.product,product.model_product_product,portal_event.group_event_portal,1,0,0,0
+access_product_uom,product.uom,product.model_product_uom,portal_event.group_event_portal,1,0,0,0
\ No newline at end of file
diff --git a/addons/portal_event/security/portal_event_security.xml b/addons/portal_event/security/portal_event_security.xml
index 64c077c7bb9..1202fcce3f5 100644
--- a/addons/portal_event/security/portal_event_security.xml
+++ b/addons/portal_event/security/portal_event_security.xml
@@ -5,12 +5,12 @@
         <!-- Creating Portal Group -->
         
         <record id="group_event_portal" model="res.groups">
-            <field name="name">Portal User</field>
+            <field name="name">Event Portal Groups</field>
             <field ref="event.module_category_event_management" name="category_id"/>
         </record>
         
         <record id="portal_event" model="res.portal">
-            <field name="name">Events Portal</field>
+            <field name="name">Portal User</field>
             <field name="group_id" ref="group_event_portal"/>
         </record>
             

From 250cafb5d0a9b2b4bb5af8ff452fa91bc40c0de7 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 30 Apr 2012 17:15:24 +0530
Subject: [PATCH 172/452] [IMP]analytic_user_function: improve xpath and button
 order

bzr revid: mma@tinyerp.com-20120430114524-221jqy196nwwf0fw
---
 addons/analytic_user_function/analytic_user_function_view.xml | 2 +-
 addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index a3995d33808..791e9deddf5 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -34,7 +34,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page" position="after">
+                <xpath expr="/form/sheet/notebook/page" position="after">
                     <page string="Users/Products Rel.">
                         <field name="user_product_ids" colspan="4" nolabel="1"/>
                     </page>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 12b782f239c..5565c730c30 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -24,9 +24,9 @@
                 </group>
                 <xpath expr="/form/sheet" position='before'>
                     <div class="oe_form_topbar">
+                        <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
                         <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
                         <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
-                        <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
                         <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                         <div class="oe_right">
                             <field name="state" readonly="1" widget="statusbar" nolabel="1"

From 96c07f7f4d2f57c99e0b094c3ce7327fd3bf98be Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 30 Apr 2012 18:04:06 +0530
Subject: [PATCH 173/452] [IMP]

bzr revid: apa@tinyerp.com-20120430123406-urpsmdbnbe9mnuro
---
 addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 12b782f239c..5565c730c30 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -24,9 +24,9 @@
                 </group>
                 <xpath expr="/form/sheet" position='before'>
                     <div class="oe_form_topbar">
+                        <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
                         <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
                         <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
-                        <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
                         <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                         <div class="oe_right">
                             <field name="state" readonly="1" widget="statusbar" nolabel="1"

From 57a769f38b51d507edf9a1a504e4d36c30668196 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 30 Apr 2012 18:44:04 +0530
Subject: [PATCH 174/452] [IMP]

bzr revid: apa@tinyerp.com-20120430131404-u9jp6pgt3o9tc2e9
---
 addons/event/event.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 6bf1ea24786..32106925e1d 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -186,8 +186,8 @@ class event_event(osv.osv):
         'state': fields.selection([
             ('draft', 'Unconfirmed'),
             ('confirm', 'Confirmed'),
-            ('done', 'Done'),
-            ('cancel', 'Cancelled')],
+            ('cancel', 'Cancelled'),
+            ('done', 'Done')],
             'State', readonly=True, required=True,
             help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'),
         'email_registration_id' : fields.many2one('email.template','Registration Confirmation Email', help='This field contains the template of the mail that will be automatically sent each time a registration for this event is confirmed.'),

From 1ea40241bf450eeb05270d8d30328ebcd44ad6da Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 30 Apr 2012 18:56:08 +0530
Subject: [PATCH 175/452] [IMP]

bzr revid: apa@tinyerp.com-20120430132608-eknktjtxgofd6lrl
---
 addons/project_issue/project_issue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index e61af235d42..a2f41404323 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -179,7 +179,7 @@ class project_issue(crm.crm_case, osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner', select=1),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
-        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('cancel', 'Cancelled'), ('done', 'Done'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
+        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'),('pending', 'Pending'),('cancel', 'Cancelled'), ('done', 'Done') ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\

From b7626a59c36113eb655172780693fb5d27ce8b1c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 30 Apr 2012 16:39:07 +0200
Subject: [PATCH 176/452] [IMP] style search view/query

bzr revid: xmo@openerp.com-20120430143907-xqqyvtgazos70knw
---
 addons/web/static/src/css/base.css  | 151 +++++++++++++-------------
 addons/web/static/src/css/base.sass | 159 +++++++++++++---------------
 addons/web/static/src/js/search.js  |   2 +-
 addons/web/static/src/xml/base.xml  |  11 +-
 4 files changed, 154 insertions(+), 169 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 1a5136f93e4..ee6009f349a 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1049,45 +1049,61 @@
   position: relative;
   float: right;
   padding-right: 20px;
-  background: white;
-}
-.openerp .oe_searchview .VS-search .VS-search-box {
-  min-height: 0;
-  border-width: 1px;
-  padding: 0;
   width: 410px;
+  border: 1px solid #ababab;
+  background: white;
+  -moz-border-radius: 1em;
+  -webkit-border-radius: 1em;
+  border-radius: 1em;
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
 }
-.openerp .oe_searchview .VS-search .VS-icon {
-  top: 5px;
+.openerp .oe_searchview:before {
+  color: #cccccc;
+  font-family: "mnmliconsRegular";
+  content: "r";
+  font-size: 150%;
+  padding: 0 1px 0 3px;
+  display: inline;
 }
-.openerp .oe_searchview .VS-search .VS-icon-search {
-  left: 5px;
+.openerp .oe_searchview .oe_searchview_clear {
+  cursor: pointer;
+  position: absolute;
+  top: 0;
+  right: 22px;
+  width: 15px;
+  height: 100%;
+  background: url(../img/attachments-close.png) center center no-repeat;
 }
-.openerp .oe_searchview .VS-search .VS-search-inner {
-  margin: 0 40px 0 17px;
-  font-size: 13px;
+.openerp .oe_searchview .oe_searchview_unfold_drawer {
+  position: absolute;
+  top: 0;
+  right: 0;
+  height: 100%;
+  line-height: 2em;
+  padding: 0 7px 0 4px;
+  color: #cccccc;
+  cursor: pointer;
 }
-.openerp .oe_searchview .VS-search .VS-search-inner input {
-  font-size: inherit;
-  line-height: inherit;
-  height: auto;
-  padding: 0;
+.openerp .oe_searchview .oe_searchview_unfold_drawer:hover {
+  color: #999999;
 }
-.openerp .oe_searchview .VS-search .VS-search-inner .VS-input-width-tester {
-  font-size: inherit;
-  padding: 0;
+.openerp .oe_searchview .oe_searchview_unfold_drawer:before {
+  content: "▾";
 }
-.openerp .oe_searchview .VS-search .VS-search-inner .search_input {
-  margin-left: 0;
-  height: 22px;
+.openerp .oe_searchview .oe_searchview_facets {
+  display: inline-block;
 }
-.openerp .oe_searchview .VS-search .VS-search-inner .search_input input, .openerp .oe_searchview .VS-search .VS-search-inner .search_input .VS-input-width-tester {
-  padding: 0 2px;
-  height: inherit;
-  margin: 0;
+.openerp .oe_searchview .oe_searchview_input {
+  height: 2em;
+  min-width: 5px;
+  display: inline-block;
 }
-.openerp .oe_searchview .VS-search .VS-search-inner .search_facet {
-  padding: 0;
+.openerp .oe_searchview .oe_searchview_facet {
+  position: relative;
+  cursor: pointer;
+  display: inline-block;
   margin: 1px 0;
   border: 1px solid #afafb6;
   -moz-border-radius: 3px;
@@ -1095,59 +1111,40 @@
   border-radius: 3px;
   background: #f0f0fa;
   height: 18px;
+  line-height: 18px;
 }
-.openerp .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected {
+.openerp .oe_searchview .oe_searchview_facet span {
+  display: inline-block;
+  height: 18px;
+}
+.openerp .oe_searchview .oe_searchview_facet span span {
+  border-left: 1px solid #afafb6;
+  padding: 0 4px;
+}
+.openerp .oe_searchview .oe_searchview_facet .oe_facet_remove {
+  position: absolute;
+  top: 0;
+  left: 2px;
+  color: white;
+}
+.openerp .oe_searchview .oe_searchview_facet .oe_facet_remove:hover {
+  color: #cccccc;
+}
+.openerp .oe_searchview .oe_searchview_facet .oe_facet_category {
+  padding: 0 4px 0 14px;
+  color: white;
+  background: #8786b7;
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4);
+}
+.openerp .oe_searchview .oe_searchview_facet.oe_is_selected {
   border-color: #a6a6fe;
   -moz-box-shadow: 0 0 3px 1px #a6a6fe;
   -webkit-box-shadow: 0 0 3px 1px #a6a6fe;
   -box-shadow: 0 0 3px 1px #a6a6fe;
 }
-.openerp .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected .category {
+.openerp .oe_searchview .oe_searchview_facet.oe_is_selected .oe_facet_category {
   margin-left: 0;
 }
-.openerp .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected .VS-icon-cancel {
-  filter: alpha(opacity=100);
-  opacity: 1;
-  background-position: center 0;
-}
-.openerp .oe_searchview .VS-search .VS-search-inner .search_facet .category {
-  padding: 0 4px 0 14px;
-  color: white;
-  background: #8786b7;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4);
-  font-weight: normal;
-  text-transform: none;
-  height: 18px;
-  line-height: 18px;
-  font-size: inherit;
-}
-.openerp .oe_searchview .VS-search .VS-search-inner .search_facet .search_facet_input_container {
-  border-left: 1px solid #afafb6;
-  height: 18px;
-  line-height: 18px;
-  padding: 0 4px;
-  cursor: pointer;
-}
-.openerp .oe_searchview .VS-search .VS-search-inner .search_facet .search_facet_remove {
-  left: 1px;
-  top: 3px;
-}
-.openerp .oe_searchview .VS-search .VS-icon-cancel {
-  right: 24px;
-}
-.openerp .oe_searchview .oe_searchview_unfold_drawer {
-  position: absolute;
-  top: 0;
-  right: 0;
-  height: 100%;
-  line-height: 23px;
-  padding: 0 7px 0 4px;
-  color: #cccccc;
-  cursor: pointer;
-}
-.openerp .oe_searchview .oe_searchview_unfold_drawer:before {
-  content: "▾";
-}
 .openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer {
   display: block;
 }
@@ -1200,7 +1197,7 @@
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4:before {
   content: "▸ ";
 }
-.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced div {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced form {
   display: none;
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced button.oe_add_condition:before {
@@ -1220,7 +1217,7 @@
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened h4:before {
   content: "▾ ";
 }
-.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened div {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened form {
   display: block;
 }
 .openerp .oe_view_topbar {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index ee38da2cc56..8aa40b6dae8 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -822,106 +822,91 @@ $colour4: #8a89ba
         position: relative
         float: right
         padding-right: 20px
+        width: 410px
+        border: 1px solid #ababab
         background: white
-        .VS-search
-            .VS-search-box
-                min-height: 0
-                border-width: 1px
-                padding: 0
-                width: 410px
-                //border: 1px solid #ababab
-                //margin-top: 0
-                //margin-bottom: 0
-                //padding: 4px 19px
-                //font-size: 13px
-                //background: url('../img/search.png') no-repeat 5px
-                //background-color: white
-                //@include radius(13px)
-                //@include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset)
-            .VS-icon
-                top: 5px
+        @include radius(1em)
+        @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset)
 
-            .VS-icon-search
-                left: 5px
+        &:before
+            color: #ccc
+            font-family: "mnmliconsRegular"
+            content: "r"
+            font-size: 150%
+            padding: 0 1px 0 3px
+            display: inline
 
-            .VS-search-inner
-                margin: 0 40px 0 17px
-                font-size: 13px
-
-                input
-                    font-size: inherit
-                    line-height: inherit
-                    height: auto
-                    padding: 0
-
-                .VS-input-width-tester
-                    font-size: inherit
-                    padding: 0
-
-                .search_input
-                    margin-left: 0
-                    height: 22px
-                    input, .VS-input-width-tester
-                        padding: 0 2px
-                        height: inherit
-                        margin: 0
-
-                .search_facet
-                    padding: 0
-                    margin: 1px 0
-                    border: 1px solid $facets-border
-                    @include radius(3px)
-                    background: #f0f0fa
-                    height: 18px
-
-                    &.is_selected
-                        border-color: $facets-border-selected
-                        @include box-shadow(0 0 3px 1px $facets-border-selected)
-
-                        .category
-                            margin-left: 0
-                        .VS-icon-cancel
-                            // don't change the icon on selection
-                            @include opacity(1.0)
-                            background-position: center 0
-
-                    .category
-                        padding: 0 4px 0 14px
-                        color: white
-                        background: #8786b7
-                        text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4)
-                        font-weight: normal
-                        text-transform: none
-                        height: 18px
-                        line-height: 18px
-                        font-size: inherit
-
-                    .search_facet_input_container
-                        border-left: 1px solid $facets-border
-                        height: 18px
-                        line-height: 18px
-                        padding: 0 4px
-                        cursor: pointer
-
-                    .search_facet_remove
-                        left: 1px
-                        top: 3px
-
-            .VS-icon-cancel
-                right: 24px
+        .oe_searchview_clear
+            cursor: pointer
+            position: absolute
+            top: 0
+            right: 22px
+            width: 15px
+            height: 100%
+            background: url(../img/attachments-close.png) center center no-repeat
 
         .oe_searchview_unfold_drawer
             position: absolute
             top: 0
             right: 0
             height: 100%
-            line-height: 23px
+            line-height: 2em
             padding: 0 7px 0 4px
             color: #ccc
             cursor: pointer
+            &:hover
+                color: #999
             &:before
                 content: "▾"
 
+        .oe_searchview_facets
+            display: inline-block
+
+        .oe_searchview_input
+            height: 2em
+            min-width: 5px
+            display: inline-block
+
+        .oe_searchview_facet
+            position: relative
+            cursor: pointer
+            display: inline-block
+            margin: 1px 0
+            border: 1px solid $facets-border
+            @include radius(3px)
+            background: #f0f0fa
+            height: 18px
+            line-height: 18px
+
+            span
+                display: inline-block
+                height: 18px
+                span
+                    border-left: 1px solid $facets-border
+                    padding: 0 4px
+
+            .oe_facet_remove
+                position: absolute
+                top: 0
+                left: 2px
+                color: white
+
+                &:hover
+                    color: #ccc
+
+            .oe_facet_category
+                padding: 0 4px 0 14px
+                color: white
+                background: #8786b7
+                text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4)
+
+            &.oe_is_selected
+                border-color: $facets-border-selected
+                @include box-shadow(0 0 3px 1px $facets-border-selected)
+
+                .oe_facet_category
+                    margin-left: 0
+
         &.oe_searchview_open_drawer
             .oe_searchview_drawer
                 display: block
@@ -974,7 +959,7 @@ $colour4: #8a89ba
                 h4:before
                     content: "▸ "
 
-                div
+                form
                     display: none
 
                 button.oe_add_condition:before
@@ -992,7 +977,7 @@ $colour4: #8a89ba
                 &.oe_opened
                     h4:before
                         content: "▾ "
-                    div
+                    form
                         display: block
     // }}}
     // View.topbar {{{
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 24d3212f9a4..e4ba54c9b9b 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -133,7 +133,7 @@ my.FacetView = instance.web.Widget.extend({
     },
     start: function () {
         var self = this;
-        var $e = self.$element.find('span');
+        var $e = self.$element.find('> span:last-child');
         var q = $.when(this._super());
         return q.pipe(function () {
             var values = self.model.values.map(function (value) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c275903c4a3..66502ea033c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1291,18 +1291,21 @@
 
 <div t-name="SearchView" class="oe_searchview">
     <div class="oe_searchview_facets"/>
+    <div class="oe_searchview_clear"/>
     <div class="oe_searchview_unfold_drawer"/>
     <div class="oe_searchview_drawer"/>
 </div>
 
 <div t-name="SearchView.InputView"
      class="oe_searchview_input"
-     style="height: 2em; min-width: 1em; display: inline-block;"
      contenteditable="true"/>
 <div t-name="SearchView.FacetView"
-     class="oe_searchview_facet"
-     style="outline: 1px solid black; min-width: 40px; height: 2em; display: inline-block">
-    <t t-esc="widget.model.get('category')"/>: <span/>
+     class="oe_searchview_facet">
+    <span class="oe_facet_remove">✖</span>
+    <span class="oe_facet_category">
+        <t t-esc="widget.model.get('category')"/>
+        <!--  -->
+    </span ><span/>
 </div>
 <span t-name="SearchView.FacetView.Value">
     <t t-esc="widget.model.get('label')"/>

From 8be95a554916bab47f3a86e235d0644b1577c357 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 30 Apr 2012 17:03:30 +0200
Subject: [PATCH 177/452] [ADD] facet removal

bzr revid: xmo@openerp.com-20120430150330-qdypxzwvrd4x4hkz
---
 addons/web/static/src/js/search.js | 8 ++++++++
 addons/web/static/src/xml/base.xml | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index e4ba54c9b9b..df92ecbb014 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -237,6 +237,14 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         this.$element.on('click', '.oe_searchview_unfold_drawer', function () {
             self.$element.toggleClass('oe_searchview_open_drawer');
         });
+        this.$element.on('click', '.oe_facet_remove', function () {
+            // get index of clicked facet: number of preceding facet siblings
+            var index = $(this).closest('.oe_searchview_facet')
+                   .prevAll('.oe_searchview_facet')
+                   .length;
+            self.query.remove(
+                self.query.at(index), {trigger_search: true});
+        });
 
         return $.when(p, this.ready);
     },
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 66502ea033c..43078730337 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1304,7 +1304,6 @@
     <span class="oe_facet_remove">✖</span>
     <span class="oe_facet_category">
         <t t-esc="widget.model.get('category')"/>
-        <!--  -->
     </span ><span/>
 </div>
 <span t-name="SearchView.FacetView.Value">

From 7064a5b85e3bde77701e268789352a9ff8a3cd39 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 30 Apr 2012 17:06:13 +0200
Subject: [PATCH 178/452] [FIX] filter name fallback if there is no string on
 the filter

bzr revid: xmo@openerp.com-20120430150613-ifvar5ncjtakzpki
---
 addons/web/static/src/js/search.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index df92ecbb014..1b83a0ec380 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -900,7 +900,10 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
         this.view.query.toggle({
             category: _t("Filter"),
             field: this,
-            values: [{label: filter.attrs.string, value: filter}]
+            values: [{
+                label: filter.attrs.string || filter.attrs.name,
+                value: filter
+            }]
         });
     }
 });

From a4918562a05094fb11cf24ca969df619aff8453c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 30 Apr 2012 17:59:12 +0200
Subject: [PATCH 179/452] [ADD] selection/deselection of facets

bzr revid: xmo@openerp.com-20120430155912-c6tbyaqul6jc329u
---
 addons/web/static/src/css/base.css  |  9 ++++++---
 addons/web/static/src/css/base.sass |  6 ++++--
 addons/web/static/src/js/search.js  | 23 +++++++++++++++++++++--
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ee6009f349a..d8b91b2ff8b 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1097,9 +1097,12 @@
 }
 .openerp .oe_searchview .oe_searchview_input {
   height: 2em;
-  min-width: 5px;
+  padding: 0 3px;
   display: inline-block;
 }
+.openerp .oe_searchview .oe_searchview_input:focus {
+  outline: none;
+}
 .openerp .oe_searchview .oe_searchview_facet {
   position: relative;
   cursor: pointer;
@@ -1136,13 +1139,13 @@
   background: #8786b7;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4);
 }
-.openerp .oe_searchview .oe_searchview_facet.oe_is_selected {
+.openerp .oe_searchview .oe_searchview_facet.oe_selected {
   border-color: #a6a6fe;
   -moz-box-shadow: 0 0 3px 1px #a6a6fe;
   -webkit-box-shadow: 0 0 3px 1px #a6a6fe;
   -box-shadow: 0 0 3px 1px #a6a6fe;
 }
-.openerp .oe_searchview .oe_searchview_facet.oe_is_selected .oe_facet_category {
+.openerp .oe_searchview .oe_searchview_facet.oe_selected .oe_facet_category {
   margin-left: 0;
 }
 .openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 8aa40b6dae8..b32f1d597c5 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -864,8 +864,10 @@ $colour4: #8a89ba
 
         .oe_searchview_input
             height: 2em
-            min-width: 5px
+            padding: 0 3px
             display: inline-block
+            &:focus
+                outline: none
 
         .oe_searchview_facet
             position: relative
@@ -900,7 +902,7 @@ $colour4: #8a89ba
                 background: #8786b7
                 text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4)
 
-            &.oe_is_selected
+            &.oe_selected
                 border-color: $facets-border-selected
                 @include box-shadow(0 0 3px 1px $facets-border-selected)
 
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 1b83a0ec380..c617c5e579b 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -118,7 +118,15 @@ my.SearchQuery = B.Collection.extend({
 });
 
 my.InputView = instance.web.Widget.extend({
-    template: 'SearchView.InputView'
+    template: 'SearchView.InputView',
+    start: function () {
+        var self = this;
+        var p = this._super.apply(this, arguments);
+        this.$element.on('focus', function () {
+            self.$element.siblings().trigger('deselect');
+        });
+        return p;
+    }
 });
 my.FacetView = instance.web.Widget.extend({
     template: 'SearchView.FacetView',
@@ -133,6 +141,16 @@ my.FacetView = instance.web.Widget.extend({
     },
     start: function () {
         var self = this;
+        this.$element.on('deselect', function () {
+            self.$element.removeClass('oe_selected');
+        });
+        this.$element.on('click', function (e) {
+            if ($(e.target).is('.oe_facet_remove')) {
+                return;
+            }
+            self.$element.siblings().trigger('deselect');
+            self.$element.addClass('oe_selected');
+        });
         var $e = self.$element.find('> span:last-child');
         var q = $.when(this._super());
         return q.pipe(function () {
@@ -237,7 +255,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         this.$element.on('click', '.oe_searchview_unfold_drawer', function () {
             self.$element.toggleClass('oe_searchview_open_drawer');
         });
-        this.$element.on('click', '.oe_facet_remove', function () {
+        this.$element.on('click', '.oe_facet_remove', function (e) {
+            e.stopImmediatePropagation();
             // get index of clicked facet: number of preceding facet siblings
             var index = $(this).closest('.oe_searchview_facet')
                    .prevAll('.oe_searchview_facet')

From 9704684ab00117cd7ad4f77f3a62a5450cadf14e Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 16:41:34 +0530
Subject: [PATCH 180/452] [IMP]

bzr revid: apa@tinyerp.com-20120501111134-y0t7kk8yqo8r0l3o
---
 addons/crm/crm.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 2c2a53bd557..16469bf6363 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -30,11 +30,10 @@ from tools.translate import _
 MAX_LEVEL = 15
 AVAILABLE_STATES = [
     ('draft', 'New'),
+    ('cancel', 'Cancelled'),
     ('open', 'In Progress'),
     ('pending', 'Pending'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    
+    ('done', 'Closed')
 ]
 
 AVAILABLE_PRIORITIES = [

From 23ddb7fa8d0b02519bdaec7eaba60f1179269955 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 17:26:37 +0530
Subject: [PATCH 181/452] [IMP]

bzr revid: apa@tinyerp.com-20120501115637-k00l6a8u2acrbkm8
---
 addons/account/account_invoice.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index d06ba70bf02..6aca3bb99c5 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -201,11 +201,11 @@ class account_invoice(osv.osv):
 
         'state': fields.selection([
             ('draft','Draft'),
+            ('cancel','Cancelled'),
             ('proforma','Pro-forma'),
             ('proforma2','Pro-forma'),
             ('open','Open'),
-            ('paid','Paid'),
-            ('cancel','Cancelled')
+            ('paid','Paid')
             ],'State', select=True, readonly=True,
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Invoice. \
             \n* The \'Pro-forma\' when invoice is in Pro-forma state,invoice does not have an invoice number. \

From 18ed1b88a112280a7d059931bedb47939feb2236 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 17:29:57 +0530
Subject: [PATCH 182/452] [IMP]

bzr revid: apa@tinyerp.com-20120501115957-h5kecpnuierfk4ul
---
 addons/account/account_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index ea8c0c49d04..9be10ce5cd8 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -264,9 +264,9 @@
                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_proforma_invoices"/>
                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>

From 5e0f08319942f2f3a45e9effd7d50d8d31c3c943 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 17:34:18 +0530
Subject: [PATCH 183/452] [IMP]

bzr revid: apa@tinyerp.com-20120501120418-nj1fx1mliqnksm4e
---
 addons/account_voucher/account_voucher.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 0191f5866ba..7c4df846b80 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -275,9 +275,9 @@ class account_voucher(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state':fields.selection(
             [('draft','Draft'),
+             ('cancel','Cancelled'),
              ('proforma','Pro-forma'),
-             ('posted','Posted'),
-             ('cancel','Cancelled')
+             ('posted','Posted')
             ], 'State', readonly=True, size=32,
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \
                         \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \

From d1147c51e9365f4a231f77aaad71b1652c4317f8 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 18:04:46 +0530
Subject: [PATCH 184/452] [IMP]

bzr revid: apa@tinyerp.com-20120501123446-kykbs2zi3pj0kq9u
---
 addons/hr_evaluation/hr_evaluation.py           | 2 +-
 addons/hr_expense/hr_expense.py                 | 2 +-
 addons/hr_holidays/hr_holidays.py               | 4 ++--
 addons/marketing_campaign/marketing_campaign.py | 6 ++++--
 addons/mrp/mrp.py                               | 2 +-
 addons/project/project.py                       | 4 ++--
 addons/project_issue/project_issue.py           | 2 +-
 addons/project_long_term/project_long_term.py   | 2 +-
 addons/project_planning/project_planning.py     | 2 +-
 addons/project_scrum/project_scrum.py           | 2 +-
 addons/purchase/purchase.py                     | 2 +-
 addons/sale/sale.py                             | 2 +-
 addons/stock/stock.py                           | 4 ++--
 13 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index c409ad19496..3924aeaecbf 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -161,9 +161,9 @@ class hr_evaluation(osv.osv):
         'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', required=True),
         'state': fields.selection([
             ('draft','New'),
+            ('cancel','Cancelled'),
             ('wait','Plan In Progress'),
             ('progress','Waiting Appreciation'),
-            ('cancel','Cancelled'),
             ('done','Done'),
         ], 'State', required=True, readonly=True),
         'date_close': fields.date('Ending Date', select=True),
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 71b8b2f0bef..af688db0773 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -79,8 +79,8 @@ class hr_expense_expense(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'state': fields.selection([
             ('draft', 'New'),
-            ('confirm', 'Waiting Approval'),
             ('cancelled', 'Refused'),
+            ('confirm', 'Waiting Approval'),
             ('accepted', 'Approved'),
             ('invoiced', 'Invoiced'),
             ('paid', 'Reimbursed')
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 7331a6bded9..08f4904a2ce 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -112,8 +112,8 @@ class hr_holidays(osv.osv):
 
     _columns = {
         'name': fields.char('Description', required=True, size=64),
-        'state': fields.selection([('draft', 'New'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
-            ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')],
+        'state': fields.selection([('draft', 'New'), ('cancel', 'Cancelled'),('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
+            ('validate1', 'Waiting Second Approval'), ('validate', 'Approved')],
             'State', readonly=True, help='The state is set to \'Draft\', when a holiday request is created.\
             \nThe state is \'Waiting Approval\', when holiday request is confirmed by user.\
             \nThe state is \'Refused\', when holiday request is refused by manager.\
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index ae9b531eb62..38e7da645be 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -648,8 +648,10 @@ class marketing_campaign_workitem(osv.osv):
         'res_name': fields.function(_res_name_get, string='Resource Name', fnct_search=_resource_search, type="char", size=64),
         'date': fields.datetime('Execution Date', help='If date is not set, this workitem has to be run manually', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', select=1, readonly=True),
-        'state': fields.selection([('todo', 'To Do'),
-                                   ('exception', 'Exception'), ('cancelled', 'Cancelled'),('done', 'Done'),
+        'state': fields.selection([ ('todo', 'To Do'),
+                                    ('cancelled', 'Cancelled'),
+                                    ('exception', 'Exception'),
+                                    ('done', 'Done'),
                                    ], 'State', readonly=True),
 
         'error_msg' : fields.text('Error Message', readonly=True)
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 88908884b26..fbff180ee53 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -481,7 +481,7 @@ class mrp_production(osv.osv):
         'move_created_ids2': fields.one2many('stock.move', 'production_id', 'Produced Products', domain=[('state','in', ('done', 'cancel'))]),
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation'),
-        'state': fields.selection([('draft','New'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','Production Started'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
+        'state': fields.selection([('draft','New'),('cancel','Cancelled'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','Production Started'),('done','Done')],'State', readonly=True,
                                     help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Picking Exception\'.\
                                     \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production gets started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
         'hour_total': fields.function(_production_calc, type='float', string='Total Hours', multi='workorder', store=True),
diff --git a/addons/project/project.py b/addons/project/project.py
index 9d62a66b653..476a62ca33a 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -662,7 +662,7 @@ class task(osv.osv):
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
         'type_id': fields.many2one('project.task.type', 'Stage'),
-        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'),('done', 'Done')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'),('cancelled', 'Cancelled'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State',
@@ -1291,7 +1291,7 @@ class project_task_history(osv.osv):
     _columns = {
         'task_id': fields.many2one('project.task', 'Task', ondelete='cascade', required=True, select=True),
         'type_id': fields.many2one('project.task.type', 'Stage'),
-        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'State'),
+        'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done')], 'State'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State', required=False),
         'date': fields.date('Date', select=True),
         'end_date': fields.function(_get_date, string='End Date', type="date", store={
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index a2f41404323..628bf316739 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -179,7 +179,7 @@ class project_issue(crm.crm_case, osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner', select=1),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
-        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'),('pending', 'Pending'),('cancel', 'Cancelled'), ('done', 'Done') ], 'State', size=16, readonly=True,
+        'state': fields.selection([('draft', 'New'), ('cancel', 'Cancelled'), ('open', 'In Progress'),('pending', 'Pending'),('done', 'Done') ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 612bd784bb0..9de76097c9c 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -115,7 +115,7 @@ class project_phase(osv.osv):
         'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'),
         'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
             help="The ressources on the project can be computed automatically by the scheduler"),
-        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'), ('pending', 'Pending'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.'),
         'progress': fields.function(_compute_progress, string='Progress', help="Computed based on related tasks"),
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 4787aa2603b..bb587218c91 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -128,7 +128,7 @@ class report_account_analytic_planning(osv.osv):
         'date_to':fields.date('End Date', required=True, states={'done':[('readonly', True)]}),
         'line_ids': fields.one2many('report_account_analytic.planning.line', 'planning_id', 'Planning lines', states={'done':[('readonly', True)]}),
         'stat_ids': fields.one2many('report_account_analytic.planning.stat', 'planning_id', 'Planning analysis', readonly=True),
-        'state': fields.selection([('draft', 'Draft'), ('open', 'Open'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', required=True),
+        'state': fields.selection([('draft', 'Draft'), ('cancel', 'Cancelled'), ('open', 'Open'), ('done', 'Done')], 'Status', required=True),
         'business_days': fields.integer('Business Days', required=True, states={'done':[('readonly', True)]}, help='Set here the number of working days within this planning for one person full time'),
         'planning_user_ids': one2many_mod3('report_account_analytic.planning.user', 'planning_id', 'Planning By User'),
         'planning_account': fields.one2many('report_account_analytic.planning.account', 'planning_id', 'Planning By Account'),
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 85eba636b90..93d2380edf4 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -109,7 +109,7 @@ class project_scrum_sprint(osv.osv):
         'progress': fields.function(_compute, group_operator="avg", type='float', multi="progress", string='Progress (0-100)', help="Computed as: Time Spent / Total Time."),
         'effective_hours': fields.function(_compute, multi="effective_hours", string='Effective hours', help="Computed using the sum of the task work done."),
         'expected_hours': fields.function(_compute, multi="expected_hours", string='Planned Hours', help='Estimated time to do the task.'),
-        'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('cancel','Cancelled'),('done','Done')], 'State', required=True),
+        'state': fields.selection([('draft','Draft'),('cancel','Cancelled'),('open','Open'),('pending','Pending'),('done','Done')], 'State', required=True),
     }
     _defaults = {
         'state': 'draft',
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 002be4aa055..6b2f515547c 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -143,12 +143,12 @@ class purchase_order(osv.osv):
 
     STATE_SELECTION = [
         ('draft', 'Request for Quotation'),
+        ('cancel', 'Cancelled'),
         ('wait', 'Waiting'),
         ('confirmed', 'Waiting Approval'),
         ('approved', 'Approved'),
         ('except_picking', 'Shipping Exception'),
         ('except_invoice', 'Invoice Exception'),
-        ('cancel', 'Cancelled'),
         ('done', 'Done')
         
     ]
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 1fc507538e1..fb6da4cf8e2 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -204,12 +204,12 @@ class sale_order(osv.osv):
         'client_order_ref': fields.char('Customer Reference', size=64),
         'state': fields.selection([
             ('draft', 'Quotation'),
+            ('cancel', 'Cancelled'),
             ('waiting_date', 'Waiting Schedule'),
             ('manual', 'To Invoice'),
             ('progress', 'In Progress'),
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
-            ('cancel', 'Cancelled'),
             ('done', 'Done'),
             ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
         'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index a17bfd10b24..c62a512d92d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -629,10 +629,10 @@ class stock_picking(osv.osv):
         'move_type': fields.selection([('direct', 'Partial Delivery'), ('one', 'All at once')], 'Delivery Method', required=True, help="It specifies goods to be delivered all at once or by direct delivery"),
         'state': fields.selection([
             ('draft', 'New'),
+            ('cancel', 'Cancelled'),
             ('auto', 'Waiting Another Operation'),
             ('confirmed', 'Waiting Availability'),
             ('assigned', 'Ready to Process'),
-            ('cancel', 'Cancelled'),
             ('done', 'Done'),
             ], 'State', readonly=True, select=True,
             help="* Draft: not confirmed yet and will not be scheduled until confirmed\n"\
@@ -1630,7 +1630,7 @@ class stock_move(osv.osv):
         'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'),
         'picking_id': fields.many2one('stock.picking', 'Reference', select=True,states={'done': [('readonly', True)]}),
         'note': fields.text('Notes'),
-        'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'),('cancel', 'Cancelled'),('done', 'Done')], 'State', readonly=True, select=True,
+        'state': fields.selection([('draft', 'New'),('cancel', 'Cancelled'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'),('done', 'Done')], 'State', readonly=True, select=True,
               help='When the stock move is created it is in the \'Draft\' state.\n After that, it is set to \'Not Available\' state if the scheduler did not find the products.\n When products are reserved it is set to \'Available\'.\n When the picking is done the state is \'Done\'.\
               \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),

From 3ea68e75f4de62e61339cb39a4349a5a1d192fe9 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 18:05:47 +0530
Subject: [PATCH 185/452] [IMP]

bzr revid: apa@tinyerp.com-20120501123547-ev91ud3e5e5zkf6x
---
 addons/analytic/analytic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 6e800247cb5..b8f8382da59 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -169,7 +169,7 @@ class account_analytic_account(osv.osv):
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End', select=True),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
-        'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed')], 'State', required=True,
+        'state': fields.selection([('template', 'Template'),('draft','New'),('cancelled', 'Cancelled'),('open','Open'), ('pending','Pending'),('close','Closed')], 'State', required=True,
                                   help='* When an account is created its in \'Draft\' state.\
                                   \n* If any associated partner is there, it can be in \'Open\' state.\
                                   \n* If any pending balance is there it can be in \'Pending\'. \

From 5336d4058caf6c52266eae456cfc46614b083977 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 18:12:43 +0530
Subject: [PATCH 186/452] [IMP]

bzr revid: apa@tinyerp.com-20120501124243-lndw06pcxthmeo8u
---
 addons/analytic/analytic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index b8f8382da59..848bfa243d7 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -169,7 +169,7 @@ class account_analytic_account(osv.osv):
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End', select=True),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
-        'state': fields.selection([('template', 'Template'),('draft','New'),('cancelled', 'Cancelled'),('open','Open'), ('pending','Pending'),('close','Closed')], 'State', required=True,
+        'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'State', required=True,
                                   help='* When an account is created its in \'Draft\' state.\
                                   \n* If any associated partner is there, it can be in \'Open\' state.\
                                   \n* If any pending balance is there it can be in \'Pending\'. \

From 3f6ea8e83ee6256a2884a1d4396f26f89c1bf636 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 18:26:41 +0530
Subject: [PATCH 187/452] [IMP]

bzr revid: apa@tinyerp.com-20120501125641-6i920a816xweb51k
---
 addons/hr_recruitment/hr_recruitment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 69b25798864..46ddd96fe86 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -35,9 +35,9 @@ wizard.mail_compose_message.SUPPORTED_MODELS.append('hr.applicant')
 
 AVAILABLE_STATES = [
     ('draft', 'New'),
+    ('cancel', 'Refused'),
     ('open', 'In Progress'),
     ('pending', 'Pending'),
-    ('cancel', 'Refused'),
     ('done', 'Hired')
 ]
 

From e08419164c3e9790f77606021bd1ff7c573792d0 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 18:48:22 +0530
Subject: [PATCH 188/452] improve event

bzr revid: apa@tinyerp.com-20120501131822-07yqsoq3zbo6t1ap
---
 addons/event/event.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 32106925e1d..34131cbe1b1 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -185,8 +185,8 @@ class event_event(osv.osv):
         'date_end': fields.datetime('End Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection([
             ('draft', 'Unconfirmed'),
-            ('confirm', 'Confirmed'),
             ('cancel', 'Cancelled'),
+            ('confirm', 'Confirmed'),
             ('done', 'Done')],
             'State', readonly=True, required=True,
             help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'),
@@ -271,8 +271,8 @@ class event_registration(osv.osv):
         'user_id': fields.many2one('res.users', 'Attendee', states={'done': [('readonly', True)]}),
         'company_id': fields.related('event_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Unconfirmed'),
-                                    ('open', 'Confirmed'),
                                     ('cancel', 'Cancelled'),
+                                    ('open', 'Confirmed'),
                                     ('done', 'Attended')], 'State',
                                     size=16, readonly=True),
     }

From b86bdabfe92a66e6f5df68065353f4164bd22e2d Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 1 May 2012 18:50:24 +0530
Subject: [PATCH 189/452] [IMP]sale,crm,stock : Remove comments and improve
 kanaban view link with action

bzr revid: dbr@tinyerp.com-20120501132024-krm37io0uwrlcljb
---
 addons/account/board_account_view.xml   |  2 -
 addons/board/board_data_admin.xml       |  3 --
 addons/crm/crm_lead_view.xml            |  2 +-
 addons/crm/crm_meeting_view.xml         |  1 +
 addons/crm/res_partner.py               | 65 ++++++++-----------------
 addons/crm/res_partner_view.xml         | 33 +++++++++----
 addons/document/board_document_view.xml |  3 --
 addons/hr/hr_board.xml                  |  2 -
 addons/mrp/board_manufacturing_view.xml |  4 --
 addons/project/board_project_view.xml   |  4 --
 addons/purchase/board_purchase_view.xml |  3 --
 addons/sale/board_sale_view.xml         |  4 --
 addons/sale/res_partner.py              | 18 +++----
 addons/sale/res_partner_view.xml        |  5 +-
 addons/stock/board_warehouse_view.xml   |  1 -
 15 files changed, 55 insertions(+), 95 deletions(-)

diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 85ba366027f..3037c9d3b0d 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -63,8 +63,6 @@
 
         <menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_reporting_dashboard" groups="group_account_user,group_account_manager"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
-       <!-- <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="14" action="open_board_account"/>-->
-
 
     </data>
 </openerp>
diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml
index e052a1d8af8..0804f65276d 100644
--- a/addons/board/board_data_admin.xml
+++ b/addons/board/board_data_admin.xml
@@ -52,9 +52,6 @@
             <field name="view_id" ref="board_administration_form"/>
         </record>
 
-        <!-- bind adminitration dashboard to the root administration -->
-       <!-- <menuitem id="base.menu_administration" icon="terp-administration"  name="Settings" sequence="50" action="open_board_administration_form"/> -->
-
         <!-- add a menu item in adminitration/reporting/dashboards -->
         <menuitem id="base.menu_reporting_admin" name="Administration" parent="base.menu_reporting_dashboard" groups="base.group_system"/>
         <menuitem id="base.menu_reporting_admin_dashboard" parent="base.menu_reporting_admin" action="open_board_administration_form"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a867777cb5b..969962a4e20 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -607,7 +607,7 @@
                         domain="[]"
                         help="Show Sales Team"/>
                 </field>
-
+				<field name="partner_id"/>
                 <newline/>
                 <group expand="0" string="Group By..." colspan="16">
                     <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index bdad98592b0..73f998db706 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -282,6 +282,7 @@
                                    domain="[('user_id','=',uid)]"
                                    help="My Meetings" />
                            </field>
+                           <field name="partner_id"/>
                            <field name="section_id" widget="selection">
                                <filter icon="terp-personal+"
                                    domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index af56afd2577..2094276dbef 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -25,24 +25,23 @@ from tools.translate import _
 class res_partner(osv.osv):
     """ Inherits partner and adds CRM information in the partner form """
     _inherit = 'res.partner'
-    
-    def _total_oppo(self, cr, uid, ids, field_name, arg, context=None):
-        total_oppo={}
-        oppo_pool=self.pool.get('crm.lead')
-        for id in ids:
-            oppo_ids = oppo_pool.search(cr, uid, [('partner_id', '=', id)])
-            total_oppo[id] = len(oppo_ids)
-        return total_oppo
 
-    def _total_meeting(self, cr, uid, ids, field_name, arg, context=None):
-        total_meeting={}
+    def _opportunity_count(self, cr, uid, ids, field_name, arg, context=None):
+        count = dict.fromkeys(ids, 0)
+        opportunity_pool=self.pool.get('crm.lead')
+        opportunity_ids = opportunity_pool.search(cr, uid, [('partner_id', 'in', ids)])
+        for opportunity in opportunity_pool.browse(cr, uid, opportunity_ids):
+            count[opportunity.partner_id.id] += 1
+        return count
+
+    def _meeting_count(self, cr, uid, ids, field_name, arg, context=None):
+        count = dict.fromkeys(ids, 0)
         meeting_pool=self.pool.get('crm.meeting')
-        for id in ids:
-            meeting_ids = meeting_pool.search(cr, uid, [('partner_id', '=', id)])
-            total_meeting[id] = len(meeting_ids)
-        return total_meeting
-    
-    
+        meeting_ids = meeting_pool.search(cr, uid, [('partner_id', 'in', ids)])
+        for meeting in meeting_pool.browse(cr, uid, meeting_ids):
+            count[meeting.partner_id.id] += 1
+        return count
+
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
@@ -51,13 +50,13 @@ class res_partner(osv.osv):
             'Meetings'),
         'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
             'Phonecalls'),
-        'total_oppo': fields.function(_total_oppo , type='integer',string="Total Opportunity"),
-        'total_meeting': fields.function(_total_meeting , type='integer',string="Total Meeting"),
+        'opportunity_count': fields.function(_opportunity_count , type='integer',string="Opportunity"),
+        'meeting_count': fields.function(_meeting_count , type='integer',string="Meeting"),
     }
 
     _defaults = {
-        'total_oppo': 0,
-        'total_meeting': 0,
+        'opportunity_count': 0,
+        'meeting_count': 0,
     }
 
     def redirect_partner_form(self, cr, uid, partner_id, context=None):
@@ -75,32 +74,6 @@ class res_partner(osv.osv):
         }
         return value
 
-    def get_opportunity(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        models_data = self.pool.get('ir.model.data')
-
-        form_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_form_view_oppor')
-        tree_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_tree_view_oppor')
-        search_view = models_data.get_object_reference(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-        partner_id = self.browse(cr, uid, ids[0], context=context)
-        domain =[('partner_id', '=', partner_id.id)]
-
-        return {
-                'name': _('Opportunity'),
-                'view_type': 'form',
-                'view_mode': 'tree, form',
-                'res_model': 'crm.lead',
-                'domain': domain,
-                'view_id': False,
-                'views': [(tree_view and tree_view[1] or False, 'tree'),
-                          (form_view and form_view[1] or False, 'form'),
-                          (False, 'calendar'), (False, 'graph')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': search_view and search_view[1] or False,
-                'nodestroy': True,
-        }
-
     def make_opportunity(self, cr, uid, ids, opportunity_summary, planned_revenue=0.0, probability=0.0, partner_id=None, context=None):
         categ_obj = self.pool.get('crm.case.categ')
         categ_ids = categ_obj.search(cr, uid, [('object_id.model','=','crm.lead')])
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index d041d54cdfa..3c9f76480c3 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -42,8 +42,24 @@
                 </field>
         </record>
 
-       <!-- Partner kanban view inherte -->
+		<act_window
+        id="crm_meeting_partner"
+        name="Meetings"
+        res_model="crm.meeting"
+        src_model="res.partner"
+        view_mode="calendar,tree,form,gantt"
+        context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
+    />
+        <act_window
+            context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
+            id="act_res_partner_2_opportunity"
+            name="Opportunity"
+            view_mode="tree,form,graph,calendar"
+            domain="[('type','=','opportunity')]"
+            res_model="crm.lead"
+            src_model="res.partner"/>
 
+		<!-- Partner kanban view inherte -->
         <record model="ir.ui.view" id="crm_lead_partner_kanban_view">
             <field name="name">res.partner.kanban.inherit</field>
             <field name="model">res.partner</field>
@@ -53,18 +69,15 @@
                 <field name="mobile" position="after">
                     <field name="opportunity_ids"/>
                     <field name="meeting_ids"/>
-                    <field name="total_oppo"/>
-                    <field name="total_meeting"/>
+                    <field name="opportunity_count"/>
+                    <field name="meeting_count"/>
                 </field>
                  <xpath expr="//div[@class='oe_partner_desc']//h4[@class='oe_partner_heading']" position="after">
-                        <a name="get_opportunity" type="object">
-                            <t t-if="record.total_oppo.value &lt;= 1">Opportunity(<t t-esc="record.total_oppo.value"/>)</t>
-                            <t t-if="record.total_oppo.value > 1">Opportunities(<t t-esc="record.total_oppo.value"/>)</t>
+                        <a name="%(act_res_partner_2_opportunity)d" type="action">
+                            <t t-if="record.opportunity_count.value">Opportunities(<t t-esc="record.opportunity_count.value"/>)</t>
                         </a>
-                        <a name="%(crm.crm_case_categ_meet)d" type="action">
-                            <t t-if="record.total_meeting.value &lt;= 1">Meeting(<t t-esc="record.total_meeting.value"/>)</t>
-                            <t t-if="record.total_meeting.value > 1">Meetings(<t t-esc="record.total_meeting.value"/>)</t>
-                            
+                        <a name="%(crm_meeting_partner)d" type="action">
+                            <t t-if="record.meeting_count.value">Meetings(<t t-esc="record.meeting_count.value"/>)</t>
                         </a>
                 </xpath>
             </field>
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index b1a0fd876a0..acfcf4cb63a 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -49,9 +49,6 @@
             id="menu_reports_document_manager"
             icon="terp-graph"/>
 
-       <!--  <menuitem name="Knowledge" icon="terp-stock" id="knowledge.menu_document"
-            sequence="19" groups="base.group_system,base.group_document_user" action="open_board_document_manager"/> -->
-
         <record model="ir.ui.view" id="board_document_manager_form1">
             <field name="name">board.document.manager.form1</field>
              <field name="model">board.board</field>
diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml
index 582d6175d8b..e665c5067eb 100644
--- a/addons/hr/hr_board.xml
+++ b/addons/hr/hr_board.xml
@@ -51,7 +51,5 @@
         <field name="view_id" ref="board_hr_manager_form"/>
     </record>
 
-    <!--<menuitem id="menu_hr_dashboard_manager" parent="menu_hr_dashboard" icon="terp-graph" action="open_board_hr_manager" groups="base.group_hr_manager" sequence="5"/>-->
-
 </data>
 </openerp>
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index f34e38c23dd..c3cc21ce893 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -35,9 +35,5 @@
             id="menu_board_manufacturing" parent="menus_dash_mrp"
             sequence="1"/>
 
-      <!--  <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" sequence="8"
-            action="open_board_manufacturing"/> -->
-
-
     </data>
 </openerp>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 2c2d31a8ca4..fa6816ebbf7 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -117,9 +117,5 @@
             parent="menu_project_dashboard"
             sequence="1"/>
 
-     <!--   <menuitem
-            icon="terp-project" id="base.menu_main_pm"
-            name="Project" sequence="10" action="open_board_project"/> -->
-
     </data>
 </openerp>
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 42753515ab7..a7753fe33b4 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -116,8 +116,5 @@
             parent="menu_purchase_deshboard"
             sequence="4"/>
 
-      <!--  <menuitem icon="terp-purchase" id="base.menu_purchase_root" action="open_board_purchase" name="Purchases"/> -->
-
-
     </data>
 </openerp>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index af9d9966767..dd81256b08a 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -124,9 +124,5 @@
             <field name="view_id" ref="board_sales_form"/>
         </record>
 
-       <!-- <menuitem
-            id="base.menu_base_partner" action="open_board_sales"
-            name="Sales"/> -->
-
     </data>
 </openerp>
diff --git a/addons/sale/res_partner.py b/addons/sale/res_partner.py
index 20c47909ba6..f508f4218f0 100644
--- a/addons/sale/res_partner.py
+++ b/addons/sale/res_partner.py
@@ -25,18 +25,18 @@ from tools.translate import _
 class res_partner(osv.osv):
     _inherit = 'res.partner'
     
-    def _total_sale(self, cr, uid, ids, field_name, arg, context=None):
-        total_sale={}
-        sale_pool=self.pool.get('sale.order')
-        for id in ids:
-            sale_ids = sale_pool.search(cr, uid, [('partner_id', '=', id)])
-            total_sale[id] = len(sale_ids)
-        return total_sale
+    def _sale_order_count(self, cr, uid, ids, field_name, arg, context=None):
+        count = dict.fromkeys(ids, 0)
+        sale_order_pool=self.pool.get('sale.order')
+        sale_order_ids = sale_order_pool.search(cr, uid, [('partner_id', 'in', ids)])
+        for sale_order in sale_order_pool.browse(cr, uid, sale_order_ids):
+            count[sale_order.partner_id.id] += 1
+        return count
     
     _columns = {
-        'total_sale': fields.function(_total_sale , type='integer',string="Total Sale"),
+        'sale_order_count': fields.function(_sale_order_count , type='integer',string="Sale Order"),
     }
     _defaults = {
-        'total_sale': 0,
+        'sale_order_count': 0,
     }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 4e4605ecbfb..549f9ddf3f7 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -9,12 +9,11 @@
             <field name="inherit_id" ref="base.res_partner_kanban_view"/>
             <field name="arch" type="xml">
             	<field name="mobile" position="after">
-                    <field name="total_sale"/>
+                    <field name="sale_order_count"/>
                 </field>
                 <xpath expr="//div[@class='oe_partner_desc']//h4[@class='oe_partner_heading']" position="after">
                     <a name="%(sale.act_res_partner_2_sale_order)d" type="action">
-                        <t t-if="record.total_sale.value &lt;= 1">Quotation(<t t-esc="record.total_sale.value" />)</t>
-                        <t t-if="record.total_sale.value > 1">Quotations(<t t-esc="record.total_sale.value" />)</t>
+                        <t t-if="record.sale_order_count.value">Quotations(<t t-esc="record.sale_order_count.value" />)</t>
                     </a>
                 </xpath>
             </field>
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index d1cb5773bf8..50384f3ea44 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -70,7 +70,6 @@
 
         <menuitem id="menu_dashboard_stock" name="Warehouse"  sequence="10" parent="base.menu_reporting_dashboard"/>
         <menuitem action="open_board_warehouse" icon="terp-graph"  groups="group_stock_manager"  id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
-      <!--  <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"  groups="group_stock_manager" action="open_board_warehouse"/>-->
 
     </data>
 </openerp>

From 70c7252b2c69dc7c7aee57b02b55222a557c25bd Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 2 May 2012 11:20:06 +0530
Subject: [PATCH 190/452] [IMP]

bzr revid: apa@tinyerp.com-20120502055006-yhsd5qwpc0asfn7b
---
 addons/marketing_campaign/marketing_campaign.py | 2 +-
 addons/point_of_sale/point_of_sale_view.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 38e7da645be..c99ad22e714 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -269,8 +269,8 @@ class marketing_campaign_segment(osv.osv):
                                            'If the campaign has a "unique field" set, "no duplicates" will also prevent selecting records which have '\
                                            'the same value for the unique field as other records that already entered the campaign.'),
         'state': fields.selection([('draft', 'New'),
-                                   ('running', 'Running'),
                                    ('cancelled', 'Cancelled'),
+                                   ('running', 'Running'),
                                    ('done', 'Done')],
                                    'State',),
         'date_run': fields.datetime('Launch Date', help="Initial start date of this segment."),
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 3b938c6ad4e..bbde9998755 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -19,9 +19,9 @@
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <button name="%(action_pos_payment)d" string="Payment" icon="gtk-apply" type="action" states="draft"/>
+                    <button name="%(action_report_pos_receipt)d" string="Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
                     <button name="refund" string="Return Products" type="object" icon="gtk-ok"
                         attrs="{'invisible':[('state','=','draft')]}"/>
-                    <button name="%(action_report_pos_receipt)d" string="Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
                     </div>

From 1064ec73b4686ef469766bf05ce198930b629c12 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 2 May 2012 11:37:49 +0530
Subject: [PATCH 191/452] [IMP]stock: Improve a product kanban links with
 actions(without specific product domain)

bzr revid: dbr@tinyerp.com-20120502060749-sphn88ybq5gfvzg9
---
 addons/stock/product.py       | 33 ++++++++++++++-------------------
 addons/stock/product_view.xml | 14 ++++++--------
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index fed6666e354..df8a57cc647 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -26,21 +26,16 @@ import decimal_precision as dp
 class product_product(osv.osv):
     _inherit = "product.product"
 
-    def _total_reception(self, cr, uid, ids, field_name, arg, context=None):
-        total_reception={}
-        reception_pool=self.pool.get('stock.picking')
-        for id in ids:
-            reception_ids = reception_pool.search(cr, uid, [('move_lines.product_id','=',id),('type','=','in')])
-            total_reception[id] = len(reception_ids)
-        return total_reception
-
-    def _total_delivery(self, cr, uid, ids, field_name, arg, context=None):
-        total_delivery={}
-        delivery_pool=self.pool.get('stock.picking')
-        for id in ids:
-            delivery_ids = delivery_pool.search(cr, uid, [('move_lines.product_id', '=', id),('type','=','out')])
-            total_delivery[id] = len(delivery_ids)
-        return total_delivery
+    def _stock_picking_count(self, cr, uid, ids, field_name, arg, context=None):
+        count = dict.fromkeys(ids, 0)
+        stock_picking_pool=self.pool.get('stock.picking')
+        if field_name == 'reception_count':
+        	stock_picking_ids = stock_picking_pool.search(cr, uid, [('move_lines.product_id','=',ids),('type','=','in')])
+        else:
+        	stock_picking_ids = stock_picking_pool.search(cr, uid, [('move_lines.product_id','=',ids),('type','=','out')])
+        for stock_picking in stock_picking_pool.browse(cr, uid, stock_picking_ids):
+            count[stock_picking.move_lines[0].product_id.id] += 1
+        return count
 
     def get_product_accounts(self, cr, uid, product_id, context=None):
         """ To get the stock input account, stock output account and stock journal related to product.
@@ -347,8 +342,8 @@ class product_product(osv.osv):
         return res
 
     _columns = {
-        'total_reception': fields.function(_total_reception , type='integer',string="Total Reception"),
-        'total_delivery': fields.function(_total_delivery , type='integer',string="Total Delivery"),
+        'reception_count': fields.function(_stock_picking_count , type='integer',string="Total Reception"),
+        'delivery_count': fields.function(_stock_picking_count , type='integer',string="Total Delivery"),
         'qty_available': fields.function(_product_available, multi='qty_available',
             type='float',  digits_compute=dp.get_precision('Product UoM'),
             string='Quantity On Hand',
@@ -420,8 +415,8 @@ class product_product(osv.osv):
 
     _defaults = {
         'valuation': 'manual_periodic',
-        'total_reception': 0,
-        'total_delivery': 0,
+        'reception_count': 0,
+        'delivery_count': 0,
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 6bead678640..aeda470740a 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -136,8 +136,8 @@
                     <field name="type"/>
                     <field name="product_image"/>
                     <field name="list_price"/>
-                    <field name="total_reception"/>
-                    <field name="total_delivery"/>
+                    <field name="reception_count"/>
+                    <field name="delivery_count"/>
                     <templates>
                         <t t-name="kanban-box">
                             <div class="oe_product_vignette">
@@ -152,13 +152,11 @@
                                         <li>Price: <field name="lst_price"></field></li>
                                         <li>Cost: <field name="standard_price"></field></li>
                                     </ul>
-                                    <a name="get_receptions" type="object">
-                                        <t t-if="record.total_reception.raw_value &lt;= 1">Reception(<t t-esc="record.total_reception.value"/>)</t>
-                                        <t t-if="record.total_reception.raw_value > 1">Receptions(<t t-esc="record.total_reception.value"/>)</t>
+                                    <a name="%(stock.action_picking_tree4)d" type="action">
+                                        <t t-if="record.reception_count.value">Receptions(<t t-esc="record.reception_count.value"/>)</t>
                                     </a>
-                                    <a name="get_deliveries" type="object">
-                                        <t t-if="record.total_delivery.raw_value &lt;= 1">Delivery(<t t-esc="record.total_delivery.value"/>)</t>
-                                        <t t-if="record.total_delivery.raw_value > 1">Deliveries(<t t-esc="record.total_delivery.value"/>)</t>
+                                    <a name="%(stock.action_out_picking_move)d" type="action">
+                                        <t t-if="record.delivery_count.value">Deliveries(<t t-esc="record.delivery_count.value"/>)</t>
                                     </a>
                                 </div>
                             </div>

From 2d6fba0621c1cbd5e1a6d52e3e71adbc3208b628 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 2 May 2012 12:37:22 +0530
Subject: [PATCH 192/452] [ADD]: Add event_items one2many fields into event
 form view.

bzr revid: atp@tinyerp.com-20120502070722-3twkfw14q89nznuo
---
 addons/event/event.py                 |   2 -
 addons/event/event_view.xml           | 152 ++++++++++++++++++++------
 addons/event/static/src/css/event.css |   3 +-
 addons/event_sale/event_sale.py       | 124 ++++++++++-----------
 addons/event_sale/event_sale_view.xml |  17 +--
 5 files changed, 184 insertions(+), 114 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 5b14f25d733..62b1d79f969 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -221,7 +221,6 @@ class event_event(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
         'location_id': fields.many2one('res.partner','Organization Address', readonly=False, states={'done': [('readonly', True)]}),
-        
     }
 
     _defaults = {
@@ -259,7 +258,6 @@ class event_event(osv.osv):
     _constraints = [
         (_check_closing_date, 'Error ! Closing Date cannot be set before Beginning Date.', ['date_end']),
     ]
-
     def onchange_event_type(self, cr, uid, ids, type_event, context=None):
         if type_event:
             type_info =  self.pool.get('event.type').browse(cr,uid,type_event,context)
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 92e850c011e..5b9dfe41d09 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -45,42 +45,124 @@
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
 
-
-		<!-- Event Item Tree view-->
-    	<record model="ir.ui.view" id="view_event_items_tree">
-            <field name="name">Event Items Tree</field>
-            <field name="model">event.items</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Event Items">
-                    <field name="product_id"  string="Ticket Type" />
-                    <field name="uom_id"/>
-                    <field name="sales_end_date"/>
-                    <field name="price"/>
-                    <field name="qty"/>
-                </tree>
-            </field>
-        </record>
-        <!-- Event Item Form View -->
-        <record model="ir.ui.view" id="view_event_items_form">
-            <field name="name">Event Items Form</field>
-            <field name="model">event.items</field>
+    <!-- Events Organisation/CONFIGURATION/EVENTS -->
+    
+        <record model="ir.ui.view" id="view_event_form">
+            <field name="name">Events</field>
+            <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Event Items">
-                    <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                    <field name="price"/>
-                    <field name="qty"/>
-                    <field name="uom_id"/>
-                    <field name="discount"/>
-                    <field name="sales_end_date"/>
-                </form>
+ 			 <form string="Events"  layout="manual">
+                <div class="oe_form_topbar">
+                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+               		<div class="oe_right">
+                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+               		</div>
+            	</div>
+             <sheet string="Event Form" layout="auto">
+            	<group  colspan="4">
+            	     <group colspan="2">
+                        <field name="name"/>
+						 <field name="type" on_change="onchange_event_type(type,context)"/>
+						<field name="user_id"/>
+                        </group>
+			             <group colspan="2">
+			             	<div class="oe_mapbox oe_right"> </div><newline/>
+		                    <table align="right">
+			                   	<tr>
+			                    	<td width="70px" class="oe_td_border">
+			                            Where
+			                        </td>
+			                        <td width="150px">
+			                            <field name="address_id" nolabel="1"/>
+			                        </td>
+			                        <td width="auto">
+	                             		<table>
+											<tr>
+												<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1"/></td>
+											</tr>
+											<tr>
+												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
+											</tr>
+										</table>
+			                        </td>
+			                     </tr>
+		                     </table>   
+			             </group>  
+			         </group>
+                    <notebook colspan="4">
+                    <page string="Event">
+                        <separator string="Description" colspan="4"/>
+                        <field name="note" colspan="4" nolabel="1"/>
+                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                            <tree string="Registration" editable="top">
+                                <field name="name" />
+                                <field name="email" />
+                                <field name="phone"/>
+                                <field name="nb_register" />
+                                <field name="state"/>
+                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                            </tree>
+                            <form string="Registration">
+                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
+                                <field name="name"/>
+                                <group colspan="4" col="4">
+                                <field name="email"/>
+                                <field name="phone"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                    <field name="nb_register"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                </group>
+                                    <group col="8" colspan="4">
+                                        <separator string="" colspan="4"/>
+                                        <newline/>
+                                        <field name="state" select="1" colspan="2"/>
+                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                    </group>
+                            </form>
+                            </field>
+                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                    </page>
+                    <page string="Speakers">
+                        <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
+                        <field name="speaker_confirmed"/>
+                        <separator string="Other Speakers" colspan="4"/>
+                        <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Extra Info">
+                        <group col="2" colspan="2">
+                            <separator string="Registrations" colspan="2"/>
+                            <field name="register_min"/>
+                            <field name="register_max"/>
+                            <field name="register_prospect"/>
+                            <field name="register_current"/>
+                            <field name="register_attended"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator string="Emails" colspan="2"/>
+                            <field name="reply_to"/>
+                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
+                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
+                        </group>
+                    </page>
+                    </notebook>
+                    </sheet>
+            </form>
             </field>
         </record>
-
-    <!-- Events Organisation/CONFIGURATION/EVENTS -->
-
-        <record model="ir.ui.view" id="view_event_form">
+        
+       <!--  Event Page view -->
+       
+        <record model="ir.ui.view" id="view_event_page">
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="type">form</field>
@@ -126,7 +208,6 @@
 												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
 											</tr>
 										</table>
-	                                 
 			                        </td>
 			                     </tr>
 		                     </table>   
@@ -169,7 +250,6 @@
                                     </group>
                             </form>
                             </field>
-                        
                     </page>
                     <page string="Speakers" groups="base.group_extended">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
@@ -198,8 +278,8 @@
             </form>
             </field>
         </record>
-
-        <!-- Event tree view -->
+        
+       <!-- Event tree view -->
 
         <record model="ir.ui.view" id="view_event_tree">
             <field name="name">event.event.tree</field>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 7cf87ffc38c..cebf155081b 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -133,13 +133,14 @@ div.oe_fold_column{
     border:1px solid black; 
     margin-left:auto; 
     margin-right:auto; 
-    
+    text-align: right;
 }
 .oe_td_border
 {
 	width: 5em;
 	padding: 2px;
 	border-right: 1px solid black;
+	text-align: center;
 }
 .oe_td_date_border
 {
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index ee48956324f..81b69babebf 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -35,6 +35,7 @@ class product(osv.osv):
 
 product()
 
+
 class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
     _columns = {
@@ -98,75 +99,70 @@ class event_event(osv.osv):
     _columns = {
                     'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
                 }
-
-    def make_quotation(self, cr, uid, ids, context=None):
-        res = {}
-        event_pool = self.pool.get('event.event')
-        register_pool = self.pool.get('event.registration')
-        sale_order_line_pool = self.pool.get('sale.order.line')
-        sale_order = self.pool.get('sale.order')
-        partner_pool = self.pool.get("res.partner")
-        prod_pricelist_obj = self.pool.get('product.pricelist')
-        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
-        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
-        if not partner_ids:
-            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
-            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
-        else:
-            new_partner_id = partner_ids[0]
-            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']     
-        for event_id in self.browse(cr, uid, ids, context=context):
-            sale_order_lines = []
-            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-            sale_ids = sale_order.search(cr, uid, [('date_order', '=', event_id.date_begin), ('partner_id', '=', new_partner_id)])
-            if not sale_ids:
-#                    raise osv.except_osv(_('Error !'),
-#                        _('sale order is already Exists for this event:'))
-#            else:          
-                new_sale_id = sale_order.create(cr, uid, {
-                    'date_order': event_id.date_begin,
-                    'pricelist_id': price_list,
-                     'partner_id': new_partner_id, 
-                      'partner_invoice_id': partner_invoice_id,
-                     'partner_shipping_id': partner_shipping_id
-                    })            
-                if event_id.event_item_ids:
-                    for items in event_id.event_item_ids:
-                        product = items.product_id.id
-                        sale_order_line = sale_order_line_pool.create(cr, uid, {
-                            'order_id': new_sale_id,                                
-                            'name': items.product_id.name,
-                            'product_uom_qty': items.qty,
-                            'product_id': items.product_id.id,
-                            'product_uom': items.uom_id.id,
-                            'price_unit': items.price,
-                            'date_planned': items.sales_end_date,
-                        }, context=context)
-                    view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
-                    if view_id:
-                        res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
-                    res = {
-                            'name': _('Quotation'),
-                            'view_type': 'form',
-                            'view_mode': 'form',
-                            'res_model': 'sale.order',
-                            'res_id': new_sale_id,
-                            'views':[(res_id,'form'), (False, 'tree')],
-                            'type': 'ir.actions.act_window',
-                            'nodestroy': True,
-                            'target': 'current',
-                    }
-        return res
-
+#    def subscribe_to_event(self, cr, uid, ids, context=None):
+#        res = {}
+#        event_pool = self.pool.get('event.event')
+#        register_pool = self.pool.get('event.registration')
+#        sale_order_line_pool = self.pool.get('sale.order.line')
+#        sale_order = self.pool.get('sale.order')
+#        partner_pool = self.pool.get("res.partner")
+#        data_obj = self.pool.get("ir.model.data")
+#        prod_pricelist_obj = self.pool.get('product.pricelist')
+#        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
+#        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
+#        if not partner_ids:
+#            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
+#            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+#            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
+#        else:
+#            new_partner_id = partner_ids[0]
+#            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+#            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']     
+#        for event_id in self.browse(cr, uid, ids, context=context):
+#            sale_order_lines = []
+#            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
+#            new_sale_id = sale_order.create(cr, uid, {
+#                'date_order': event_id.date_begin,
+#                'pricelist_id': price_list,
+#                 'partner_id': new_partner_id, 
+#                  'partner_invoice_id': partner_invoice_id,
+#                 'partner_shipping_id': partner_shipping_id
+#                })  
+#            if event_id.event_item_ids:
+#                for items in event_id.event_item_ids:
+#                    product = items.product_id.id
+#                    sale_order_line = sale_order_line_pool.create(cr, uid, {
+#                        'order_id': new_sale_id,                                
+#                        'name': items.product_id.name,
+#                        'product_uom_qty': items.qty,
+#                        'product_id': items.product_id.id,
+#                        'price_unit': items.price,
+#                        'date_planned': items.sales_end_date,
+#                    }, context=context)
+#            view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
+#            if view_id:
+#                res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+#            res = {
+#                    'name': _('Quotation'),
+#                    'view_type': 'form',
+#                    'view_mode': 'form',
+#                    'res_model': 'sale.order',
+#                    'res_id': new_sale_id,
+#                    'views':[(res_id,'form'), (False, 'tree')],
+#                    'type': 'ir.actions.act_window',
+#                    'nodestroy': True,
+#                    'target': 'current',
+#            }
+#        return res
+    
 class event_items(osv.osv):
     _name = "event.items"
     _columns = {
         'product_id': fields.many2one('product.product', 'Product', required=True),
-        'qty': fields.integer('Quantity'),
         'price': fields.integer('Price'),
-        'uom_id': fields.many2one('product.uom', 'Unit of Measure'),
+         'qty': fields.integer('QTY'),
+       # 'qty': fields.selection(_max_register, 'QTY'),
+        'uom_id': fields.many2one('product.uom', 'UoM'),
         'discount': fields.integer('Discount'),
         'event_id': fields.many2one('event.event', 'Event'),
         'sales_end_date': fields.date('Sales End')
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 7f1504b7b69..2176affac40 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -36,11 +36,10 @@
 			<field name="type">form</field>
 			<field name="inherit_id" ref="event.view_event_form"/>
 			<field name="arch" type="xml">
-				<xpath expr="//group[@name='venue']" position="after">
-						<field name="event_item_ids" nolabel="1"/><newline/>
-						<div class="oe_right">
-							<button string="Order Now" name="make_quotation" help="Order Event" type="object" icon="gtk-ok" attrs="{'invisible':[('state','=','confirm')]}"/>
-						</div>
+				<xpath expr="//notebook/page[@string='Extra Info']" position="after">
+                    <page string="Event Items">
+                    <field name="event_item_ids" nolabel="1"/>
+                   </page>
 				</xpath>
 			</field>
 		</record>
@@ -51,17 +50,16 @@
 			 <field name="type">tree</field>
 			 <field name="arch" type="xml">
 				 <tree editable="top" string="Event Items">
-					 <field name="product_id"/>
+					 <field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
 					 <field name="price"/>
+					 <field name="uom_id" invisible="1"/>
 					 <field name="qty"/>
-					 <field name="uom_id"/>
 					 <field name="discount"/>
 					 <field name="sales_end_date"/>
 				 </tree>
 			 </field>
 		 </record>
 
-
 		<record model="ir.ui.view" id="view_event_items_form">
 			 <field name="name">Event Items Form</field>
 			 <field name="model">event.items</field>
@@ -71,13 +69,10 @@
 			   	 	<field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
 			        <field name="price"/>
 			        <field name="qty"/>
-					<field name="uom_id"/>
 					<field name="discount"/>
 					<field name="sales_end_date"/>
 				</form>
 		 	</field>
 		</record>
-        
-        
     </data>
 </openerp>

From 09dc29291da30ed5de8825412c9d4a2bd668a72a Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Wed, 2 May 2012 12:45:35 +0530
Subject: [PATCH 193/452] [IMP]impelment map widget.

bzr revid: vme@tinyerp.com-20120502071535-5h213fx2p5s0tlqi
---
 addons/event/__openerp__.py           |   1 +
 addons/event/event_view.xml           | 158 +++++++-------------------
 addons/event/static/src/css/event.css |   1 -
 addons/event/static/src/js/event.js   |  52 +++++++++
 4 files changed, 92 insertions(+), 120 deletions(-)
 create mode 100644 addons/event/static/src/js/event.js

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 6de6d2c62c1..85eb78f32f1 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -54,6 +54,7 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/*.css'],
+    'js': ['static/src/js/event.js'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 9276f77ed9d..87e29a641f2 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -45,124 +45,42 @@
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
 
-    <!-- Events Organisation/CONFIGURATION/EVENTS -->
-    
-        <record model="ir.ui.view" id="view_event_form">
-            <field name="name">Events</field>
-            <field name="model">event.event</field>
-            <field name="type">form</field>
+
+		<!-- Event Item Tree view-->
+    	<record model="ir.ui.view" id="view_event_items_tree">
+            <field name="name">Event Items Tree</field>
+            <field name="model">event.items</field>
+            <field name="type">tree</field>
             <field name="arch" type="xml">
- 			 <form string="Events"  layout="manual">
-                <div class="oe_form_topbar">
-                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-               		<div class="oe_right">
-                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-               		</div>
-            	</div>
-             <sheet string="Event Form" layout="auto">
-            	<group  colspan="4">
-            	     <group colspan="2">
-                        <field name="name"/>
-						 <field name="type" on_change="onchange_event_type(type,context)"/>
-						<field name="user_id"/>
-                        </group>
-			             <group colspan="2">
-			             	<div class="oe_mapbox oe_right"> </div><newline/>
-		                    <table align="right">
-			                   	<tr>
-			                    	<td width="70px" class="oe_td_border">
-			                            Where
-			                        </td>
-			                        <td width="150px">
-			                            <field name="address_id" nolabel="1"/>
-			                        </td>
-			                        <td width="auto">
-	                             		<table>
-											<tr>
-												<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1"/></td>
-											</tr>
-											<tr>
-												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
-											</tr>
-										</table>
-			                        </td>
-			                     </tr>
-		                     </table>   
-			             </group>  
-			         </group>
-                    <notebook colspan="4">
-                    <page string="Event">
-                        <separator string="Description" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
-                            <tree string="Registration" editable="top">
-                                <field name="name" />
-                                <field name="email" />
-                                <field name="phone"/>
-                                <field name="nb_register" />
-                                <field name="state"/>
-                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            </tree>
-                            <form string="Registration">
-                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
-                                <field name="name"/>
-                                <group colspan="4" col="4">
-                                <field name="email"/>
-                                <field name="phone"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                    <field name="nb_register"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                </group>
-                                    <group col="8" colspan="4">
-                                        <separator string="" colspan="4"/>
-                                        <newline/>
-                                        <field name="state" select="1" colspan="2"/>
-                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                    </group>
-                            </form>
-                            </field>
-                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                    </page>
-                    <page string="Speakers">
-                        <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
-                        <field name="speaker_confirmed"/>
-                        <separator string="Other Speakers" colspan="4"/>
-                        <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
-                    </page>
-                    <page string="Extra Info">
-                        <group col="2" colspan="2">
-                            <separator string="Registrations" colspan="2"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                            <field name="register_prospect"/>
-                            <field name="register_current"/>
-                            <field name="register_attended"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator string="Emails" colspan="2"/>
-                            <field name="reply_to"/>
-                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
-                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
-                        </group>
-                    </page>
-                    </notebook>
-                    </sheet>
-            </form>
+                <tree string="Event Items">
+                    <field name="product_id"  string="Ticket Type" />
+                    <field name="uom_id"/>
+                    <field name="sales_end_date"/>
+                    <field name="price"/>
+                    <field name="qty"/>
+                </tree>
             </field>
         </record>
-        
-       <!--  Event Page view -->
-       
-        <record model="ir.ui.view" id="view_event_page">
+        <!-- Event Item Form View -->
+        <record model="ir.ui.view" id="view_event_items_form">
+            <field name="name">Event Items Form</field>
+            <field name="model">event.items</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Event Items">
+                    <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                    <field name="price"/>
+                    <field name="qty"/>
+                    <field name="uom_id"/>
+                    <field name="discount"/>
+                    <field name="sales_end_date"/>
+                </form>
+            </field>
+        </record>
+
+    <!-- Events Organisation/CONFIGURATION/EVENTS -->
+
+        <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="type">form</field>
@@ -190,14 +108,14 @@
                         	</group>
 			             </group>	
 			             <group>
-			             	<div class="oe_mapbox"> </div><newline/>
+			             	<div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
 		                    <table>
 			                   	<tr>
 			                    	<td width="70px" class="oe_td_border">
 			                            Where
 			                        </td>
 			                        <td width="150px">
-			                            <field name="address_id" nolabel="1"/>
+			                            <field name="address_id" widget = "geo_address" nolabel="1"/>
 			                        </td>
 			                        <td width="auto">
 	                             		<table>
@@ -208,6 +126,7 @@
 												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
 											</tr>
 										</table>
+	                                 
 			                        </td>
 			                     </tr>
 		                     </table>   
@@ -250,6 +169,7 @@
                                     </group>
                             </form>
                             </field>
+                        
                     </page>
                     <page string="Speakers">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
@@ -278,8 +198,8 @@
             </form>
             </field>
         </record>
-        
-       <!-- Event tree view -->
+
+        <!-- Event tree view -->
 
         <record model="ir.ui.view" id="view_event_tree">
             <field name="name">event.event.tree</field>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index cebf155081b..c9f9084a583 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -130,7 +130,6 @@ div.oe_fold_column{
 { 
     width:380px;
     height:200px;
-    border:1px solid black; 
     margin-left:auto; 
     margin-right:auto; 
     text-align: right;
diff --git a/addons/event/static/src/js/event.js b/addons/event/static/src/js/event.js
new file mode 100644
index 00000000000..6081533397a
--- /dev/null
+++ b/addons/event/static/src/js/event.js
@@ -0,0 +1,52 @@
+openerp.event = function(instance){
+	instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
+	instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, {
+
+		init : function(){
+			this._super.apply(this,arguments);
+		},
+
+		start:function(){
+		},
+		
+	 	set_input_id:function(id){
+	 	},
+	 	set_value:function(value){
+	 		var self = this;
+			this.get_address(value).done(function(value){
+				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
+				return self.list_addresses(address);
+			});
+			
+	 	},
+	 	get_address:function(value){
+	 		if (!value || value.length == 0){
+	 			return $.Deferred().reject();
+	 		}
+			return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
+	 	},
+
+	 	list_addresses: function(address){
+	 		var geocoder = new google.maps.Geocoder();
+			geocoder.geocode( { 'address': address}, function(results, status) 
+			{
+			if (status == google.maps.GeocoderStatus.OK){
+				var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
+				var myOptions = {       
+					zoom: 17,       
+					center:  new google.maps.LatLng(lat,lng),       
+					mapTypeId: google.maps.MapTypeId.ROADMAP     
+				}
+		    	return new google.maps.Marker({
+				    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
+				    position: new google.maps.LatLng(lat,lng)
+			 	 });
+	 		}
+			});
+			
+	 	},
+	 	get_value:function(){
+	 	}
+		
+	}));
+};
\ No newline at end of file

From d28498ffb17920532c0a8d8f48b7378527d289c7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 2 May 2012 12:58:47 +0200
Subject: [PATCH 194/452] [IMP] wrapping of facets by moving the spyglass icon
 thing in the facets container

bzr revid: xmo@openerp.com-20120502105847-4d95n628c6ituyp0
---
 addons/web/static/src/css/base.css  | 16 ++++++++--------
 addons/web/static/src/css/base.sass | 15 +++++++--------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index d8b91b2ff8b..20b4cb92ff4 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1059,14 +1059,6 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
   -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
 }
-.openerp .oe_searchview:before {
-  color: #cccccc;
-  font-family: "mnmliconsRegular";
-  content: "r";
-  font-size: 150%;
-  padding: 0 1px 0 3px;
-  display: inline;
-}
 .openerp .oe_searchview .oe_searchview_clear {
   cursor: pointer;
   position: absolute;
@@ -1095,6 +1087,14 @@
 .openerp .oe_searchview .oe_searchview_facets {
   display: inline-block;
 }
+.openerp .oe_searchview .oe_searchview_facets:before {
+  color: #cccccc;
+  font-family: "mnmliconsRegular";
+  content: "r";
+  font-size: 150%;
+  padding: 0 1px 0 3px;
+  display: inline;
+}
 .openerp .oe_searchview .oe_searchview_input {
   height: 2em;
   padding: 0 3px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b32f1d597c5..eabcae107b7 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -828,14 +828,6 @@ $colour4: #8a89ba
         @include radius(1em)
         @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset)
 
-        &:before
-            color: #ccc
-            font-family: "mnmliconsRegular"
-            content: "r"
-            font-size: 150%
-            padding: 0 1px 0 3px
-            display: inline
-
         .oe_searchview_clear
             cursor: pointer
             position: absolute
@@ -861,6 +853,13 @@ $colour4: #8a89ba
 
         .oe_searchview_facets
             display: inline-block
+            &:before
+                color: #ccc
+                font-family: "mnmliconsRegular"
+                content: "r"
+                font-size: 150%
+                padding: 0 1px 0 3px
+                display: inline
 
         .oe_searchview_input
             height: 2em

From 25a30ad0ced6075ea770da1c59b1f078b407dc9c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 2 May 2012 15:12:26 +0200
Subject: [PATCH 195/452] [ADD] autocompletion correctly using input values

bzr revid: xmo@openerp.com-20120502131226-w4agkq7qq5ni8nwl
---
 addons/web/static/src/js/search.js | 33 ++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index c617c5e579b..93e1caec290 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -286,13 +286,23 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
      * Sets up search view's view-wide auto-completion widget
      */
     setup_global_completion: function () {
-        // Prevent keydown from within a facet's input from reaching the
-        // auto-completion widget and opening the completion list
-        this.$element.on('keydown', '.search_facet input', function (e) {
-            e.stopImmediatePropagation();
+        var self = this;
+
+        // autocomplete only correctly handles being initialized on the actual
+        // editable element (and only an element with a @value in 1.8 e.g.
+        // input or textarea), cheat by setting val() on $element
+        this.$element.on('keydown', function () {
+            // keydown is triggered *before* the element's value is set, so
+            // delay this. Pray that setTimeout are executed in FIFO (if they
+            // have the same delay) as autocomplete uses the exact same trick.
+            // FIXME: brittle as fuck
+            setTimeout(function () {
+                self.$element.val(self.currentInputValue());
+            }, 0);
+
         });
 
-        this.$element.autocomplete({
+        var completer = this.$element.autocomplete({
             source: this.proxy('complete_global_search'),
             select: this.proxy('select_completion'),
             focus: function (e) { e.preventDefault(); },
@@ -305,14 +315,14 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                 .data( "item.autocomplete", item )
                 .appendTo( ul );
 
-            if (item.value !== undefined) {
+            if (item.facet !== undefined) {
                 // regular completion item
                 return $item.append(
                     (item.label)
                         ? $('<a>').html(item.label)
                         : $('<a>').text(item.value));
             }
-            return $item.text(item.category)
+            return $item.text(item.label)
                 .css({
                     borderTop: '1px solid #cccccc',
                     margin: 0,
@@ -322,7 +332,14 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                     clear: 'left',
                     width: '100%'
                 });
-        }
+        };
+    },
+    /**
+     * Gets value out of the currently focused "input" (a
+     * div[contenteditable].oe_searchview_input)
+     */
+    currentInputValue: function () {
+        return this.$element.find('div.oe_searchview_input:focus').text();
     },
     /**
      * Provide auto-completion result for req.term (an array to `resp`)

From a40e410d1afdddd0f266af338a674fd1670fd74a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 2 May 2012 15:27:43 +0200
Subject: [PATCH 196/452] [ADD] correct handling of input blurring

bzr revid: xmo@openerp.com-20120502132743-dr29i2fvrpo6tute
---
 addons/web/static/src/js/search.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 93e1caec290..21cb4a71196 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -122,10 +122,17 @@ my.InputView = instance.web.Widget.extend({
     start: function () {
         var self = this;
         var p = this._super.apply(this, arguments);
-        this.$element.on('focus', function () {
-            self.$element.siblings().trigger('deselect');
-        });
+        this.$element.on('focus', this.proxy('onFocus'));
+        this.$element.on('blur', this.proxy('onBlur'));
         return p;
+    },
+    onFocus: function () {
+        this.$element.siblings().trigger('deselect');
+        this.getParent().$element.trigger('focus');
+    },
+    onBlur: function () {
+        this.$element.text('');
+        this.getParent().$element.trigger('blur');
     }
 });
 my.FacetView = instance.web.Widget.extend({
@@ -302,7 +309,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
 
         });
 
-        var completer = this.$element.autocomplete({
+        this.$element.autocomplete({
             source: this.proxy('complete_global_search'),
             select: this.proxy('select_completion'),
             focus: function (e) { e.preventDefault(); },

From f009c765984eb8b409dc42f7bb601acf14e6b577 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 2 May 2012 15:43:12 +0200
Subject: [PATCH 197/452] [ADD] focus last input if the user clicks somewhere
 in the search view, outside of a search view control

bzr revid: xmo@openerp.com-20120502134312-0tuspwcmtlw5el3o
---
 addons/web/static/src/css/base.css  |  7 +++++++
 addons/web/static/src/css/base.sass |  5 +++++
 addons/web/static/src/js/search.js  | 17 ++++++++++++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 20b4cb92ff4..6788c532d9d 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1046,6 +1046,7 @@
   white-space: nowrap;
 }
 .openerp .oe_searchview {
+  cursor: text;
   position: relative;
   float: right;
   padding-right: 20px;
@@ -1059,6 +1060,12 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
   -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
 }
+.openerp .oe_searchview.oe_focused {
+  border-color: #a6a6fe;
+  -moz-box-shadow: 0 1px 2px #a6a6fe inset;
+  -webkit-box-shadow: 0 1px 2px #a6a6fe inset;
+  -box-shadow: 0 1px 2px #a6a6fe inset;
+}
 .openerp .oe_searchview .oe_searchview_clear {
   cursor: pointer;
   position: absolute;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index eabcae107b7..0f420b1aea3 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -819,6 +819,7 @@ $colour4: #8a89ba
     // }}}
     // SearchView xmo {{{
     .oe_searchview
+        cursor: text
         position: relative
         float: right
         padding-right: 20px
@@ -828,6 +829,10 @@ $colour4: #8a89ba
         @include radius(1em)
         @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset)
 
+        &.oe_focused
+            border-color: $facets-border-selected
+            @include box-shadow(0 1px 2px $facets-border-selected inset)
+
         .oe_searchview_clear
             cursor: pointer
             position: absolute
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 21cb4a71196..72b05df1317 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -155,6 +155,7 @@ my.FacetView = instance.web.Widget.extend({
             if ($(e.target).is('.oe_facet_remove')) {
                 return;
             }
+            e.stopPropagation();
             self.$element.siblings().trigger('deselect');
             self.$element.addClass('oe_selected');
         });
@@ -259,7 +260,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                 });
         }
 
-        this.$element.on('click', '.oe_searchview_unfold_drawer', function () {
+        this.$element.on('click', '.oe_searchview_unfold_drawer', function (e) {
+            e.stopImmediatePropagation();
             self.$element.toggleClass('oe_searchview_open_drawer');
         });
         this.$element.on('click', '.oe_facet_remove', function (e) {
@@ -271,6 +273,19 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
             self.query.remove(
                 self.query.at(index), {trigger_search: true});
         });
+        this.$element.on('click', function (e) {
+            // Focus last input if the view itself is clicked (but not one of
+            // its children, that would be weird)
+            if (e.target === self.$element[0]) {
+                self.$element.find('.oe_searchview_input:last').focus();
+            }
+        });
+        this.$element.on('focus', function () {
+            self.$element.addClass('oe_focused');
+        });
+        this.$element.on('blur', function () {
+            self.$element.removeClass('oe_focused');
+        });
 
         return $.when(p, this.ready);
     },

From dce41d8aeaf9e4449ca56d51fbe82b103b04643e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 2 May 2012 17:08:08 +0200
Subject: [PATCH 198/452] [ADD] automatic selection of first completion item in
 the list

bzr revid: xmo@openerp.com-20120502150808-jpqiq63574ds2c1g
---
 addons/web/static/src/js/search.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 72b05df1317..eea51b1861b 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -286,6 +286,15 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         this.$element.on('blur', function () {
             self.$element.removeClass('oe_focused');
         });
+        // when the completion list opens/refreshes, automatically select the
+        // first completion item so if the user just hits [RETURN] or [TAB] it
+        // automatically selects it
+        this.$element.on('autocompleteopen', function () {
+            var menu = self.$element.data('autocomplete').menu;
+            menu.activate(
+                $.Event({ type: "mouseenter" }),
+                menu.element.children().first());
+        });
 
         return $.when(p, this.ready);
     },

From f04eb6a29ded59f7bbc05f850a34f856dfe5e9c7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 2 May 2012 17:10:11 +0200
Subject: [PATCH 199/452] [IMP] comments for event bindings

bzr revid: xmo@openerp.com-20120502151011-4j8t9wworl7frndh
---
 addons/web/static/src/js/search.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index eea51b1861b..3fe216e70ba 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -273,13 +273,13 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
             self.query.remove(
                 self.query.at(index), {trigger_search: true});
         });
+        // Focus last input if the view itself is clicked
         this.$element.on('click', function (e) {
-            // Focus last input if the view itself is clicked (but not one of
-            // its children, that would be weird)
             if (e.target === self.$element[0]) {
                 self.$element.find('.oe_searchview_input:last').focus();
             }
         });
+        // focusing class on whole searchview, :focus is not transitive
         this.$element.on('focus', function () {
             self.$element.addClass('oe_focused');
         });

From 23ef3f9b963de4d17f617f7a284c2fe0fb2af0d8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 2 May 2012 17:34:39 +0200
Subject: [PATCH 200/452] [ADD] correct focus of facets in input sequence,
 ability to remove facet via backspace/delete

bzr revid: xmo@openerp.com-20120502153439-0374v3dqz5fbe1ju
---
 addons/web/static/src/css/base.css  | 10 ++++++++--
 addons/web/static/src/css/base.sass |  6 +++++-
 addons/web/static/src/js/search.js  | 17 +++++++++++------
 addons/web/static/src/xml/base.xml  |  5 +++--
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6788c532d9d..8ebac64ea6d 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1115,6 +1115,11 @@
   cursor: pointer;
   display: inline-block;
   margin: 1px 0;
+  padding: 0;
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+  -box-shadow: none;
+  text-align: left;
   border: 1px solid #afafb6;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -1122,6 +1127,7 @@
   background: #f0f0fa;
   height: 18px;
   line-height: 18px;
+  -webkit-font-smoothing: auto;
 }
 .openerp .oe_searchview .oe_searchview_facet span {
   display: inline-block;
@@ -1146,13 +1152,13 @@
   background: #8786b7;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4);
 }
-.openerp .oe_searchview .oe_searchview_facet.oe_selected {
+.openerp .oe_searchview .oe_searchview_facet:focus {
   border-color: #a6a6fe;
   -moz-box-shadow: 0 0 3px 1px #a6a6fe;
   -webkit-box-shadow: 0 0 3px 1px #a6a6fe;
   -box-shadow: 0 0 3px 1px #a6a6fe;
 }
-.openerp .oe_searchview .oe_searchview_facet.oe_selected .oe_facet_category {
+.openerp .oe_searchview .oe_searchview_facet:focus .oe_facet_category {
   margin-left: 0;
 }
 .openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 0f420b1aea3..0fd7b5658c9 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -878,11 +878,15 @@ $colour4: #8a89ba
             cursor: pointer
             display: inline-block
             margin: 1px 0
+            padding: 0
+            @include box-shadow(none)
+            text-align: left
             border: 1px solid $facets-border
             @include radius(3px)
             background: #f0f0fa
             height: 18px
             line-height: 18px
+            -webkit-font-smoothing: auto
 
             span
                 display: inline-block
@@ -906,7 +910,7 @@ $colour4: #8a89ba
                 background: #8786b7
                 text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4)
 
-            &.oe_selected
+            &:focus
                 border-color: $facets-border-selected
                 @include box-shadow(0 0 3px 1px $facets-border-selected)
 
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 3fe216e70ba..eb2ad5bc84d 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -127,7 +127,6 @@ my.InputView = instance.web.Widget.extend({
         return p;
     },
     onFocus: function () {
-        this.$element.siblings().trigger('deselect');
         this.getParent().$element.trigger('focus');
     },
     onBlur: function () {
@@ -148,16 +147,22 @@ my.FacetView = instance.web.Widget.extend({
     },
     start: function () {
         var self = this;
-        this.$element.on('deselect', function () {
-            self.$element.removeClass('oe_selected');
-        });
         this.$element.on('click', function (e) {
             if ($(e.target).is('.oe_facet_remove')) {
                 return;
             }
+            self.$element.focus();
             e.stopPropagation();
-            self.$element.siblings().trigger('deselect');
-            self.$element.addClass('oe_selected');
+        });
+        this.$element.on('keydown', function (e) {
+            var keys = $.ui.keyCode;
+            switch (e.which) {
+            case keys.BACKSPACE:
+            case keys.DELETE:
+                self.getParent().query.remove(
+                    self.model, {trigger_search: true});
+                return false;
+            }
         });
         var $e = self.$element.find('> span:last-child');
         var q = $.when(this._super());
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 43078730337..bec0c1c5fb0 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1299,13 +1299,14 @@
 <div t-name="SearchView.InputView"
      class="oe_searchview_input"
      contenteditable="true"/>
-<div t-name="SearchView.FacetView"
+<button t-name="SearchView.FacetView"
+     type="button"
      class="oe_searchview_facet">
     <span class="oe_facet_remove">✖</span>
     <span class="oe_facet_category">
         <t t-esc="widget.model.get('category')"/>
     </span ><span/>
-</div>
+</button>
 <span t-name="SearchView.FacetView.Value">
     <t t-esc="widget.model.get('label')"/>
 </span>

From 5ed1a8f646acab52d31ca59a4eef1b2a3916f5e5 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 3 May 2012 10:44:53 +0530
Subject: [PATCH 201/452] [IMP]stock: set act_windoe for reception and delivery
 links of product kanban view

bzr revid: dbr@tinyerp.com-20120503051453-aay4p6ss3t3f52xz
---
 addons/crm/res_partner_view.xml | 17 +++++++++--------
 addons/stock/product_view.xml   | 25 +++++++++++++++++++++++--
 addons/stock/stock.py           |  1 +
 addons/stock/stock_view.xml     |  7 ++++++-
 4 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 3c9f76480c3..9436ec7269a 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -50,14 +50,15 @@
         view_mode="calendar,tree,form,gantt"
         context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
     />
-        <act_window
-            context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
-            id="act_res_partner_2_opportunity"
-            name="Opportunity"
-            view_mode="tree,form,graph,calendar"
-            domain="[('type','=','opportunity')]"
-            res_model="crm.lead"
-            src_model="res.partner"/>
+    	<act_window
+        id="act_res_partner_2_opportunity"
+        name="Opportunity"
+        res_model="crm.lead"
+        src_model="res.partner"
+        view_mode="tree,form,graph,calendar"
+        domain="[('type','=','opportunity')]"
+        context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
+        />
 
 		<!-- Partner kanban view inherte -->
         <record model="ir.ui.view" id="crm_lead_partner_kanban_view">
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index aeda470740a..cfb7f282373 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -126,6 +126,27 @@
             </field>
         </record>
 
+        <act_window
+            id="act_product_2_reception"
+            name="Receptions"
+            view_mode="tree,form,calendar"
+            res_model="stock.picking"
+            src_model="product.product"
+            context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
+            domain="[('type','=','in')]"
+            />
+
+        <act_window
+            id="act_product_2_delivery"
+            name="Deliveries"
+            view_mode="tree,form"
+            res_model="stock.picking"
+            src_model="product.product"
+            context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
+            domain="[('type', '=', 'out')]"
+            />
+		
+
         <record model="ir.ui.view" id="product.product_kanban_view">
             <field name="name">Product Kanban</field>
             <field name="model">product.product</field>
@@ -152,10 +173,10 @@
                                         <li>Price: <field name="lst_price"></field></li>
                                         <li>Cost: <field name="standard_price"></field></li>
                                     </ul>
-                                    <a name="%(stock.action_picking_tree4)d" type="action">
+                                    <a name="%(act_product_2_reception)d" type="action">
                                         <t t-if="record.reception_count.value">Receptions(<t t-esc="record.reception_count.value"/>)</t>
                                     </a>
-                                    <a name="%(stock.action_out_picking_move)d" type="action">
+                                    <a name="%(act_product_2_delivery)d" type="action">
                                         <t t-if="record.delivery_count.value">Deliveries(<t t-esc="record.delivery_count.value"/>)</t>
                                     </a>
                                 </div>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index dee8e2a6c25..678cf4403c3 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -648,6 +648,7 @@ class stock_picking(osv.osv):
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  store=True, type='datetime', string='Max. Expected Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
+        'product_id': fields.related('move_lines','product_id', type='many2one', relation='product.product', string='Product',store=True),
         'auto_picking': fields.boolean('Auto-Picking'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'invoice_state': fields.selection([
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 14bb43a1edd..2aabf695bcb 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -838,6 +838,7 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="partner_id"/>
+                        <field name="product_id"/>
                         <field name="stock_journal_id" widget="selection"/>
                     </group>
                     <newline/>
@@ -1029,6 +1030,7 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="origin"/>
+                        <field name="product_id"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -1105,7 +1107,7 @@
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
                             <field name="origin"/>
-                            <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4"/>
+                            <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4"/>
                             <field name="invoice_state" string="Invoice Control"/>
                             <field name="backorder_id" readonly="1"/>
                         </group>
@@ -1244,7 +1246,9 @@
                         <field name="origin"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company" />
+                        <field name="product_id"/>
                     </group>
+                    
                     <newline/>
                     <group expand="0" string="Group By...">
                         <separator orientation="vertical" />
@@ -1302,6 +1306,7 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="origin"/>
+                        <field name="product_id"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection"/>
                     </group>

From bbf00f1aa57d0b7ceff9bb880c244ec4c571a8ee Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 3 May 2012 10:55:17 +0530
Subject: [PATCH 202/452] [IMP]stock:remove extra def

bzr revid: dbr@tinyerp.com-20120503052517-9bk8uha3rajbtupi
---
 addons/stock/product.py | 59 ++---------------------------------------
 1 file changed, 2 insertions(+), 57 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index df8a57cc647..46f636a4adc 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -342,8 +342,8 @@ class product_product(osv.osv):
         return res
 
     _columns = {
-        'reception_count': fields.function(_stock_picking_count , type='integer',string="Total Reception"),
-        'delivery_count': fields.function(_stock_picking_count , type='integer',string="Total Delivery"),
+        'reception_count': fields.function(_stock_picking_count , type='integer',string="Reception"),
+        'delivery_count': fields.function(_stock_picking_count , type='integer',string="Delivery"),
         'qty_available': fields.function(_product_available, multi='qty_available',
             type='float',  digits_compute=dp.get_precision('Product UoM'),
             string='Quantity On Hand',
@@ -461,61 +461,6 @@ class product_product(osv.osv):
                     if fields.get('qty_available'):
                         res['fields']['qty_available']['string'] = _('Produced Qty')
         return res
-    def get_receptions(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        models_data = self.pool.get('ir.model.data')
-
-        form_view = models_data.get_object_reference(cr, uid, 'stock', 'view_picking_in_form')
-        tree_view = models_data.get_object_reference(cr, uid, 'stock', 'view_picking_in_tree')
-        search_view = models_data.get_object_reference(cr, uid, 'stock', 'view_picking_internal_search')
-        product_id = self.browse(cr, uid, ids[0], context=context)
-        domain =[('move_lines.product_id', '=', product_id.id),('type','=','in')]
-        context.update({'default_type': 'internal', 'contact_display': 'partner_address', 'search_default_available': 1})
-
-        return {
-                'name': _('Receptions'),
-                'view_type': 'form',
-                'view_mode': 'tree, form',
-                'res_model': 'stock.picking',
-                'domain': domain,
-                'view_id': False,
-                'views': [(tree_view and tree_view[1] or False, 'tree'),
-                          (form_view and form_view[1] or False, 'form'),
-                          (False, 'calendar'), (False, 'graph')],
-                'type': 'ir.actions.act_window',
-                'context': context,
-                'search_view_id': search_view and search_view[1] or False,
-                'nodestroy': True,
-        }
-
-    def get_deliveries(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        models_data = self.pool.get('ir.model.data')
-
-        form_view = models_data.get_object_reference(cr, uid, 'stock', 'view_picking_out_form')
-        tree_view = models_data.get_object_reference(cr, uid, 'stock', 'view_picking_out_tree')
-        search_view = models_data.get_object_reference(cr, uid, 'stock', 'view_picking_out_search')
-        product_id = self.browse(cr, uid, ids[0], context=context)
-        domain =[('move_lines.product_id', '=', product_id.id),('type','=','out')]
-        context.update({'default_type': 'out', 'contact_display': 'partner_address'})
-
-        return {
-                'name': _('Deliveries'),
-                'view_type': 'form',
-                'view_mode': 'tree, form',
-                'res_model': 'stock.picking',
-                'domain': domain,
-                'view_id': False,
-                'views': [(tree_view and tree_view[1] or False, 'tree'),
-                          (form_view and form_view[1] or False, 'form'),
-                          (False, 'calendar'), (False, 'graph')],
-                'type': 'ir.actions.act_window',
-                'context':context,
-                'search_view_id': search_view and search_view[1] or False,
-                'nodestroy': True,
-        }
 
 product_product()
 

From c5184a19a9f6a9d359149d7b9d676b2bc233ac5c Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 3 May 2012 11:14:29 +0530
Subject: [PATCH 203/452] [IMP]stock: Improve domain

bzr revid: dbr@tinyerp.com-20120503054429-yxo4t5busz293hn6
---
 addons/stock/product.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 46f636a4adc..58d0ca869df 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -30,9 +30,9 @@ class product_product(osv.osv):
         count = dict.fromkeys(ids, 0)
         stock_picking_pool=self.pool.get('stock.picking')
         if field_name == 'reception_count':
-        	stock_picking_ids = stock_picking_pool.search(cr, uid, [('move_lines.product_id','=',ids),('type','=','in')])
+        	stock_picking_ids = stock_picking_pool.search(cr, uid, [('move_lines.product_id','in',ids),('type','=','in')])
         else:
-        	stock_picking_ids = stock_picking_pool.search(cr, uid, [('move_lines.product_id','=',ids),('type','=','out')])
+        	stock_picking_ids = stock_picking_pool.search(cr, uid, [('move_lines.product_id','in',ids),('type','=','out')])
         for stock_picking in stock_picking_pool.browse(cr, uid, stock_picking_ids):
             count[stock_picking.move_lines[0].product_id.id] += 1
         return count

From 69af9da2c8f5800e07005ea7a8d5ed8b34089af0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 3 May 2012 10:07:23 +0200
Subject: [PATCH 204/452] [IMP] change minLength condition to 1 for completion

0 allows opening a completion list with nothing, but that turns out not to be very useful and it interacts weirdly with tabbing between search inputs

bzr revid: xmo@openerp.com-20120503080723-i4u9vl91rhlfhmg8
---
 addons/web/static/src/js/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index eb2ad5bc84d..6842571c5f7 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -343,7 +343,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
             select: this.proxy('select_completion'),
             focus: function (e) { e.preventDefault(); },
             html: true,
-            minLength: 0,
+            minLength: 1,
             delay: 0
         }).data('autocomplete')._renderItem = function (ul, item) {
             // item of completion list

From 9483a836a9dce15ddea620e58372a7e890fff115 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 3 May 2012 17:08:55 +0530
Subject: [PATCH 205/452] [IMP]mrp_repair : Added state and buttons on top bar

bzr revid: mma@tinyerp.com-20120503113855-pwk5plarj5iajvef
---
 addons/mrp_repair/mrp_repair.py       |  2 +-
 addons/mrp_repair/mrp_repair_view.xml | 37 +++++++++++++++------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 4a0085e3db9..619df6d540c 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -123,8 +123,8 @@ class mrp_repair(osv.osv):
         'state': fields.selection([
             ('draft','Quotation'),
             ('confirmed','Confirmed'),
-            ('ready','Ready to Repair'),
             ('under_repair','Under Repair'),
+            ('ready','Ready to Repair'),
             ('2binvoiced','To be Invoiced'),
             ('invoice_except','Invoice Exception'),
             ('done','Done'),
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 6af1dc702fa..5361b3544d9 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -27,8 +27,25 @@
         <field name="model">mrp.repair</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Repairs order">
-                <group col="6" colspan="4">
+            <form layout="manual">
+               <div class="oe_form_topbar">
+                     <button name="repair_confirm" states="draft" string="Confirm Repair" icon="terp-camera_test"/>
+                     <button name="repair_ready" states="confirmed" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
+                     <button name="action_repair_start" states="ready" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
+                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                     <button name="action_repair_end" states="under_repair" string="End Repair" icon="terp-dialog-close"/>
+                     <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" icon="terp-dolar"/>
+                     <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="terp-dolar"/>
+                     <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="terp-emblem-important"/>
+                     <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action" icon="gtk-stop"/>
+                     <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" icon="gtk-stop"/>
+                     <button name="cancel" states="draft" string="Cancel Repair" icon="gtk-stop"/>
+               <div class="oe_right">
+                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed,ready" />
+               </div>
+               </div>
+               <sheet string="Repairs order" layout="auto">
+                <group col="6" colspan="4" class="oe_form_header">
                     <field name="name"/>
                     <field name="product_id" select="1"  on_change="onchange_product_id(product_id)"/>
                     <field name="deliver_bool"/>
@@ -99,21 +116,6 @@
                             <field name="amount_total" sum="Total amount"/>
                             <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
                         </group>
-                        <separator string="" colspan="4"/>
-                        <group col="13" colspan="4">
-                            <field name="state"/>
-                            <button name="cancel" states="draft" string="Cancel Repair" icon="gtk-stop"/>
-                            <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action" icon="gtk-stop"/>
-                            <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" icon="gtk-stop"/>
-                            <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                            <button name="repair_confirm" states="draft" string="Confirm Repair" icon="terp-camera_test"/>
-                            <button name="repair_ready" states="confirmed" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
-                            <button name="action_repair_start" states="ready" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
-                            <button name="action_repair_end" states="under_repair" string="End Repair" icon="terp-dialog-close"/>
-                            <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="terp-dolar"/>
-                            <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="terp-emblem-important"/>
-                            <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" icon="terp-dolar"/>
-                        </group>
                     </page>
                     <page string="Invoicing">
                         <field name="invoice_method" colspan="4"/>
@@ -171,6 +173,7 @@
                         <field colspan="4" name="quotation_notes" nolabel="1"/>
                     </page>
                 </notebook>
+                </sheet>
             </form>
         </field>
     </record>

From 836dfa6aa8b8abd62c16abb86ea04cdd0d76a932 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 3 May 2012 13:56:08 +0200
Subject: [PATCH 206/452] [IMP] move responsibility for facet removal (on
 click) to the facet's view, use Model#destroy for facet removal instead of a
 convoluted route through SearchView#query

bzr revid: xmo@openerp.com-20120503115608-7dwyj5j9mq82gv73
---
 addons/web/static/src/js/search.js | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 6842571c5f7..2227aa52465 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -149,7 +149,8 @@ my.FacetView = instance.web.Widget.extend({
         var self = this;
         this.$element.on('click', function (e) {
             if ($(e.target).is('.oe_facet_remove')) {
-                return;
+                self.model.destroy();
+                return false;
             }
             self.$element.focus();
             e.stopPropagation();
@@ -159,8 +160,7 @@ my.FacetView = instance.web.Widget.extend({
             switch (e.which) {
             case keys.BACKSPACE:
             case keys.DELETE:
-                self.getParent().query.remove(
-                    self.model, {trigger_search: true});
+                self.model.destroy();
                 return false;
             }
         });
@@ -233,14 +233,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
 
         this.setup_global_completion();
         this.query = new my.SearchQuery()
-                .on('add change reset', this.proxy('do_search'))
-                .on('add change reset', this.proxy('renderFacets'))
-                .on('remove', function (record, collection, options) {
-            self.renderFacets();
-            if (options.trigger_search) {
-                self.do_search();
-            }
-        });
+                .on('add change reset remove', this.proxy('do_search'))
+                .on('add change reset remove', this.proxy('renderFacets'));
 
         if (this.hidden) {
             this.$element.hide();
@@ -269,15 +263,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
             e.stopImmediatePropagation();
             self.$element.toggleClass('oe_searchview_open_drawer');
         });
-        this.$element.on('click', '.oe_facet_remove', function (e) {
-            e.stopImmediatePropagation();
-            // get index of clicked facet: number of preceding facet siblings
-            var index = $(this).closest('.oe_searchview_facet')
-                   .prevAll('.oe_searchview_facet')
-                   .length;
-            self.query.remove(
-                self.query.at(index), {trigger_search: true});
-        });
         // Focus last input if the view itself is clicked
         this.$element.on('click', function (e) {
             if (e.target === self.$element[0]) {

From a7bd8efb9fb2eecfeeff510a7584bb6dd6f2e278 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 3 May 2012 17:52:39 +0530
Subject: [PATCH 207/452] [IMP]project_scrum : Added state and buttons on top
 bar

bzr revid: mma@tinyerp.com-20120503122239-6feyr2lnsu4gythv
---
 addons/project_scrum/project_scrum.py       |  4 +-
 addons/project_scrum/project_scrum_view.xml | 52 ++++++++++++---------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 93d2380edf4..e11345c3172 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -109,7 +109,7 @@ class project_scrum_sprint(osv.osv):
         'progress': fields.function(_compute, group_operator="avg", type='float', multi="progress", string='Progress (0-100)', help="Computed as: Time Spent / Total Time."),
         'effective_hours': fields.function(_compute, multi="effective_hours", string='Effective hours', help="Computed using the sum of the task work done."),
         'expected_hours': fields.function(_compute, multi="expected_hours", string='Planned Hours', help='Estimated time to do the task.'),
-        'state': fields.selection([('draft','Draft'),('cancel','Cancelled'),('open','Open'),('pending','Pending'),('done','Done')], 'State', required=True),
+        'state': fields.selection([('draft','Draft'),('pending','Pending'),('open','Open'),('done','Done'),('cancel','Cancelled')], 'State', required=True),
     }
     _defaults = {
         'state': 'draft',
@@ -229,7 +229,7 @@ class project_scrum_product_backlog(osv.osv):
         'sprint_id': fields.many2one('project.scrum.sprint', 'Sprint'),
         'sequence' : fields.integer('Sequence', help="Gives the sequence order when displaying a list of product backlog."),
         'tasks_id': fields.one2many('project.task', 'product_backlog_id', 'Tasks Details'),
-        'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('done','Done'),('cancel','Cancelled')], 'State', required=True),
+        'state': fields.selection([('draft','Draft'),('pending','Pending'),('open','Open'),('done','Done'),('cancel','Cancelled')], 'State', required=True),
         'progress': fields.function(_compute, multi="progress", group_operator="avg", type='float', string='Progress', help="Computed as: Time Spent / Total Time."),
         'effective_hours': fields.function(_compute, multi="effective_hours", string='Spent Hours', help="Computed using the sum of the time spent on every related tasks", store=True),
         'expected_hours': fields.float('Planned Hours', help='Estimated total time to do the Backlog'),
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 0f33ded8523..21bdedf3efe 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -56,8 +56,20 @@
             <field name="model">project.scrum.product.backlog</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Product backlog">
-                    <group colspan="4" col="8">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
+                    <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
+                    <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
+                    <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
+                    <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="draft,open,pending" icon="gtk-stop"/>
+                <div class="oe_right">
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+                </div>
+                </div>
+                <sheet string="Product backlog" layout="auto">
+                    <group colspan="4" col="8" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name="project_id" select="1"/>
                         <field domain="[('project_id','=',project_id), ('state','in', ['draft','open'])]" name="sprint_id" select="1"/>
@@ -109,15 +121,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="8" colspan="4">
-                        <field name="state" select="1" readonly="1"/>
-                        <button type="object" string="Cancel" name="button_cancel" states="draft,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"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -232,8 +236,20 @@
             <field name="model">project.scrum.sprint</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Scrum Sprint">
-                    <group colspan="4" col="6">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                     <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
+                     <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
+                     <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
+                     <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
+                                    string="Burndown Chart" type="action" icon="gtk-print"/>
+                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
+                <div class="oe_right">
+                    <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+                </div>
+                </div>
+                <sheet string="Scrum Sprint" layout="auto">
+                    <group colspan="4" col="6" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name="project_id" on_change="onchange_project_id(project_id)"/>
                     </group>
@@ -298,15 +314,7 @@
                             <field colspan="4" name="retrospective" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="8" colspan="4">
-                        <field name="state" readonly="1"/>
-                        <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
-                                    string="Burndown Chart" type="action" icon="gtk-print"/>
-                        <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
-                        <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"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From 99c3d81f153f6ec6596a469253790cb3a04d5ad5 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 3 May 2012 18:14:08 +0530
Subject: [PATCH 208/452] [IMP]account_payment : Added state and buttons on top
 bar

bzr revid: mma@tinyerp.com-20120503124408-emij8pwmtqbky2k4
---
 .../account_payment/account_payment_view.xml  | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 71856dcf703..751b4027941 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -100,8 +100,18 @@
             <field name="model">payment.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payment order">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
+                    <button name="set_done" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
+                    <button name="set_to_draft" states="cancel" string="Set to draft" type="object" icon="gtk-convert"/>
+                    <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
+                <div class="oe_right">
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+                </div>
+                </div>
+                <sheet string="Payment order" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                       <field name="reference"/>
                       <field name="mode" widget='selection'/>
                       <field name="user_id"/>
@@ -162,13 +172,7 @@
                     </field>
                     <field name="date_created"/>
                     <field name="date_done"/>
-                    <field name="state" readonly="1" select="1"/>
-                    <group col="4" colspan="2">
-                         <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
-                         <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
-                         <button name="set_done" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
-                         <button name="set_to_draft" states="cancel" string="Set to draft" type="object" icon="gtk-convert"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From 6d12c155a4fc36fc7d7906aaefcc9da8c0a6e48d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 3 May 2012 14:59:49 +0200
Subject: [PATCH 209/452] [TEST] serialization of search domains & contexts by
 the search view

bzr revid: xmo@openerp.com-20120503125949-2m8euott3xzyivdm
---
 addons/web/static/src/js/search.js |  21 ++-
 addons/web/static/test/search.js   | 235 ++++++++++++++++++++---------
 doc/search-view.rst                |  26 +++-
 3 files changed, 195 insertions(+), 87 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 2227aa52465..4417912b6d4 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -656,7 +656,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
     do_search: function () {
         var domains = [], contexts = [], groupbys = [], errors = [];
 
-        return this.on_search([], [], []);
         this.query.each(function (facet) {
             var field = facet.get('field');
             try {
@@ -902,12 +901,12 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
     /**
      * Fetches contexts for all enabled filters in the group
      *
-     * @param {VS.model.SearchFacet} facet
+     * @param {openerp.web.search.Facet} facet
      * @return {*} combined contexts of the enabled filters in this group
      */
     get_context: function (facet) {
-        var contexts = _(facet.get('values')).chain()
-            .map(function (filter) { return filter.attrs.context; })
+        var contexts = _(facet.values).chain()
+            .map(function (f) { return f.get('value').attrs.context; })
             .reject(_.isEmpty)
             .value();
 
@@ -924,8 +923,8 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
      * @return {Array} enabled filters in this group
      */
     get_groupby: function (facet) {
-        return  _(facet.get('values')).chain()
-            .map(function (filter) { return filter.attrs.context; })
+        return  _(facet.values).chain()
+            .map(function (f) { return f.get('value').attrs.context; })
             .reject(_.isEmpty)
             .value();
     },
@@ -936,8 +935,8 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
      * @return {*} combined domains of the enabled filters in this group
      */
     get_domain: function (facet) {
-        var domains = _(facet.get('values')).chain()
-            .map(function (filter) { return filter.attrs.domain; })
+        var domains = _(facet.values).chain()
+            .map(function (f) { return f.get('value').attrs.domain; })
             .reject(_.isEmpty)
             .value();
 
@@ -1014,14 +1013,14 @@ instance.web.search.Field = instance.web.search.Input.extend( /** @lends instanc
         return facet.value();
     },
     get_context: function (facet) {
-        var val = this.get_value(facet);
         // A field needs a value to be "active", and a context to send when
         // active
-        var has_value = (val !== null && val !== '');
         var context = this.attrs.context;
-        if (!(has_value && context)) {
+        if (!context) {
             return;
         }
+        var val = this.get_value(facet);
+        var has_value = (val !== null && val !== '');
         return new instance.web.CompoundContext(context)
                 .set_eval_context({self: val});
     },
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 1dcf03f90bd..17fdfc81749 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -4,6 +4,25 @@ $(document).ready(function () {
     xhr.send(null);
     var doc = xhr.responseXML;
 
+    var noop = function () {};
+    /**
+     * Make connection RPC responses mockable by setting keys on the
+     * Connection#responses object (key is the URL, value is the function to
+     * call with the RPC request payload)
+     *
+     * @param {openerp.web.Connection} connection connection instance to mockify
+     * @param {Object} [responses] url:function mapping to seed the mock connection
+     */
+    var mockifyRPC = function (connection, responses) {
+        connection.responses = responses || {};
+        connection.rpc_function = function (url, payload) {
+            if (!(url.url in this.responses)) {
+                return $.Deferred().reject({}, 'failed', _.str.sprintf("Url %s not found in mock responses", url.url)).promise();
+            }
+            return $.when(this.responses[url.url](payload));
+        };
+    };
+
     var instance;
     module('query', {
         setup: function () {
@@ -157,16 +176,7 @@ $(document).ready(function () {
 
             instance.web.qweb.add_template(doc);
 
-            instance.connection.responses = {};
-            instance.connection.rpc_function = function (url, payload) {
-                if (!(url.url in this.responses)) {
-                    return $.Deferred().reject(
-                        {}, 'failed',
-                        _.str.sprintf("Url %s not found in mock responses",
-                                      url.url)).promise();
-                }
-                return $.when(this.responses[url.url](payload));
-            };
+            mockifyRPC(instance.connection);
         }
     });
 
@@ -220,7 +230,11 @@ $(document).ready(function () {
         };
 
         var dataset = {model: 'dummy.model', get_context: function () { return {}; }};
-        return new instance.web.SearchView(null, dataset, false, defaults);
+        var view = new instance.web.SearchView(null, dataset, false, defaults);
+        view.on_invalid.add(function () {
+            ok(false, JSON.stringify([].slice(arguments)));
+        });
+        return view;
     }
     asyncTest('calling', 2, function () {
         var defaults_called = false;
@@ -401,16 +415,7 @@ $(document).ready(function () {
 
             instance.web.qweb.add_template(doc);
 
-            instance.connection.responses = {};
-            instance.connection.rpc_function = function (url, payload) {
-                if (!(url.url in this.responses)) {
-                    return $.Deferred().reject(
-                        {}, 'failed',
-                        _.str.sprintf("Url %s not found in mock responses",
-                                      url.url)).promise();
-                }
-                return $.when(this.responses[url.url](payload));
-            };
+            mockifyRPC(instance.connection);
         }
     });
     asyncTest('calling', 4, function () {
@@ -449,7 +454,7 @@ $(document).ready(function () {
         var completion = {
             label: "Dummy",
             facet: {
-                field: {},
+                field: {get_domain: noop, get_context: noop, get_groupby: noop},
                 category: 'Dummy',
                 values: [{label: 'dummy', value: 42}]
             }
@@ -471,7 +476,7 @@ $(document).ready(function () {
             });
     });
     asyncTest('facet selection: new value existing facet', 3, function () {
-        var field = {};
+        var field = {get_domain: noop, get_context: noop, get_groupby: noop};
         var completion = {
             label: "Dummy",
             facet: {
@@ -656,6 +661,115 @@ $(document).ready(function () {
             });
     });
 
+    module('search-serialization', {
+        setup: function () {
+            instance = window.openerp.init([]);
+            window.openerp.web.corelib(instance);
+            window.openerp.web.coresetup(instance);
+            window.openerp.web.chrome(instance);
+            window.openerp.web.data(instance);
+            window.openerp.web.search(instance);
+
+            instance.web.qweb.add_template(doc);
+
+            mockifyRPC(instance.connection);
+        }
+    });
+    asyncTest('No facet, no call', 6, function () {
+        var got_domain = false, got_context = false, got_groupby = false;
+        var $fix = $('#qunit-fixture');
+        var view = makeSearchView({
+            get_domain: function () {
+                got_domain = true;
+                return null;
+            },
+            get_context: function () {
+                got_context = true;
+                return null;
+            },
+            get_groupby: function () {
+                got_groupby = true;
+                return null;
+            }
+        });
+        var ds, cs, gs;
+        view.on_search.add(function (d, c, g) {
+            ds = d, cs = c, gs = g;
+        });
+        view.appendTo($fix)
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function () {
+                view.do_search();
+                ok(!got_domain, "no facet, should not have fetched domain");
+                ok(_(ds).isEmpty(), "domains list should be empty");
+
+                ok(!got_context, "no facet, should not have fetched context");
+                ok(_(cs).isEmpty(), "contexts list should be empty");
+
+                ok(!got_groupby, "no facet, should not have fetched groupby");
+                ok(_(gs).isEmpty(), "groupby list should be empty");
+            })
+    });
+    asyncTest('London, calling', 8, function () {
+        var got_domain = false, got_context = false, got_groupby = false;
+        var $fix = $('#qunit-fixture');
+        var view = makeSearchView({
+            get_domain: function (facet) {
+                equal(facet.get('category'), "dummy");
+                deepEqual(facet.values.toJSON(), [{label: "42", value: 42}]);
+                got_domain = true;
+                return null;
+            },
+            get_context: function () {
+                got_context = true;
+                return null;
+            },
+            get_groupby: function () {
+                got_groupby = true;
+                return null;
+            }
+        }, {dummy: 42});
+        var ds, cs, gs;
+        view.on_search.add(function (d, c, g) {
+            ds = d, cs = c, gs = g;
+        });
+        view.appendTo($fix)
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function () {
+                view.do_search();
+                ok(got_domain, "should have fetched domain");
+                ok(_(ds).isEmpty(), "domains list should be empty");
+
+                ok(got_context, "should have fetched context");
+                ok(_(cs).isEmpty(), "contexts list should be empty");
+
+                ok(got_groupby, "should have fetched groupby");
+                ok(_(gs).isEmpty(), "groupby list should be empty");
+            })
+    });
+    asyncTest('Generate domains', 1, function () {
+        var $fix = $('#qunit-fixture');
+        var view = makeSearchView({
+            get_domain: function (facet) {
+                return facet.values.map(function (value) {
+                    return ['win', '4', value.get('value')];
+                });
+            }
+        }, {dummy: 42});
+        var ds;
+        view.on_search.add(function (d) { ds = d; });
+        view.appendTo($fix)
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function () {
+                view.do_search();
+                deepEqual(ds, [[['win', '4', 42]]],
+                    "search should yield an array of contexts");
+            });
+    });
+
     module('drawer', {
         setup: function () {
             instance = window.openerp.init([]);
@@ -667,16 +781,7 @@ $(document).ready(function () {
 
             instance.web.qweb.add_template(doc);
 
-            instance.connection.responses = {};
-            instance.connection.rpc_function = function (url, payload) {
-                if (!(url.url in this.responses)) {
-                    return $.Deferred().reject(
-                        {}, 'failed',
-                        _.str.sprintf("Url %s not found in mock responses",
-                                      url.url)).promise();
-                }
-                return $.when(this.responses[url.url](payload));
-            };
+            mockifyRPC(instance.connection);
         }
     });
     asyncTest('is-drawn', 2, function () {
@@ -704,43 +809,35 @@ $(document).ready(function () {
 
             instance.web.qweb.add_template(doc);
 
-            instance.connection.responses = {};
-            instance.connection.rpc_function = function (url, payload) {
-                if (!(url.url in this.responses)) {
-                    return $.Deferred().reject(
-                        {}, 'failed',
-                        _.str.sprintf("Url %s not found in mock responses",
-                                      url.url)).promise();
+            mockifyRPC(instance.connection, {
+                '/web/searchview/load': function () {
+                    // view with a single group of filters
+                    return {result: {fields_view: {
+                        type: 'search',
+                        fields: {},
+                        arch: {
+                            tag: 'search',
+                            attrs: {},
+                            children: [{
+                                tag: 'filter',
+                                attrs: { string: "Foo1", domain: [ ['foo', '=', '1'] ] },
+                                children: []
+                            }, {
+                                tag: 'filter',
+                                attrs: {
+                                    name: 'foo2',
+                                    string: "Foo2",
+                                    domain: [ ['foo', '=', '2'] ] },
+                                children: []
+                            }, {
+                                tag: 'filter',
+                                attrs: { string: "Foo3", domain: [ ['foo', '=', '3'] ] },
+                                children: []
+                            }]
+                        }
+                    }}};
                 }
-                return $.when(this.responses[url.url](payload));
-            };
-            instance.connection.responses['/web/searchview/load'] = function () {
-                // view with a single group of filters
-                return {result: {fields_view: {
-                    type: 'search',
-                    fields: {},
-                    arch: {
-                        tag: 'search',
-                        attrs: {},
-                        children: [{
-                            tag: 'filter',
-                            attrs: { string: "Foo1", domain: [ ['foo', '=', '1'] ] },
-                            children: []
-                        }, {
-                            tag: 'filter',
-                            attrs: {
-                                name: 'foo2',
-                                string: "Foo2",
-                                domain: [ ['foo', '=', '2'] ] },
-                            children: []
-                        }, {
-                            tag: 'filter',
-                            attrs: { string: "Foo3", domain: [ ['foo', '=', '3'] ] },
-                            children: []
-                        }]
-                    }
-                }}};
-            };
+            });
         }
     });
     asyncTest('drawn', 3, function () {
diff --git a/doc/search-view.rst b/doc/search-view.rst
index a7fbb77f51b..3c13f6ae921 100644
--- a/doc/search-view.rst
+++ b/doc/search-view.rst
@@ -249,21 +249,33 @@ Converting from facet objects
 Ultimately, the point of the search view is to allow searching. In
 OpenERP this is done via :ref:`domains <openerpserver:domains>`. On
 the other hand, the OpenERP Web 7 search view's state is modelled
-after a collection of :js:class:`~VS.model.SearchFacet`, and each
+after a collection of :js:class:`~openerp.web.search.Facet`, and each
 field of a search view may have special requirements when it comes to
 the domains it produces [#]_.
 
 So there needs to be some way of mapping
-:js:class:`~VS.model.SearchFacet` objects to OpenERP search data.
+:js:class:`~openerp.web.search.Facet` objects to OpenERP search data.
 
 This is done via an input's
 :js:func:`~openerp.web.search.Input.get_domain` and
 :js:func:`~openerp.web.search.Input.get_context`. Each takes a
-:js:class:`~VS.model.SearchFacet` and returns whatever it's supposed
-to generate (a domain or a context, respectively). Either can return
-``null`` if the current value does not map to a domain or context, and
-can throw an :js:class:`~openerp.web.search.Invalid` exception if the
-value is not valid at all for the field.
+:js:class:`~openerp.web.search.Facet` and returns whatever it's
+supposed to generate (a domain or a context, respectively). Either can
+return ``null`` if the current value does not map to a domain or
+context, and can throw an :js:class:`~openerp.web.search.Invalid`
+exception if the value is not valid at all for the field.
+
+.. note::
+
+    The :js:class:`~openerp.web.search.Facet` object can have any
+    number of values (from 1 upwards)
+
+.. note::
+
+    There is a third conversion method,
+    :js:func:`~openerp.web.search.Input.get_groupby`, which returns an
+    ``Array`` of groupby domains rather than a single context. At this
+    point, it is only implemented on (and used by) filters.
 
 Converting to facet objects
 ---------------------------

From acfd8ab2555567df5b646f1a2a826306f71df37f Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 3 May 2012 18:50:18 +0530
Subject: [PATCH 210/452] [IMP]hr_payroll : Added state and buttons on top bar

bzr revid: mma@tinyerp.com-20120503132018-dohip75it2rwgqmm
---
 addons/hr_payroll/hr_payroll_view.xml | 45 ++++++++++++++++-----------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index b5ec2e679e3..21af96977e2 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -260,8 +260,19 @@
             <field name="model">hr.payslip</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payslip">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                     <button string="Confirm" icon="terp-camera_test" name="hr_verify_sheet" states="draft"/>
+                     <button string="Refund" icon="gtk-execute" name="refund_sheet" states="confirm,done" type='object'/>
+                     <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft" states="cancel"/>
+                     <button string="Compute Sheet" icon="terp-stock_format-scientific" name="compute_sheet" type="object" states="draft"/>
+                     <button string="Cancel" icon="terp-dialog-close" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </div>
+                </div>
+                <sheet string="Payslip" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
                         <field name="number"/>
                         <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
@@ -362,16 +373,8 @@
                             <separator colspan="4" string="Notes"/>
                             <field name="note" colspan="4" nolabel="1"/>
                        </page>
-
                     </notebook>
-                    <group col="10" colspan="4">
-                        <field name="state"/>
-                        <button string="Cancel" icon="terp-dialog-close" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
-                        <button string="Compute Sheet" icon="terp-stock_format-scientific" name="compute_sheet" type="object" states="draft"/>
-                        <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft" states="cancel"/>
-                        <button string="Refund" icon="gtk-execute" name="refund_sheet" states="confirm,done" type='object'/>
-                        <button string="Confirm" icon="terp-camera_test" name="hr_verify_sheet" states="draft"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -720,8 +723,17 @@
             <field name="model">hr.payslip.run</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payslips Batches">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="close_payslip_run" type="object" icon="terp-camera_test" string="Close" states="draft"/>
+                    <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" icon="gtk-execute" string="Generate Payslips" />
+                    <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft_payslip_run" type="object" states="close"/>
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1"/>
+                </div>
+                </div>
+                <sheet string="Payslips Batches" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" colspan="4"/>
                         <field name="credit_note"/>
                         <field name="date_start"/>
@@ -732,12 +744,7 @@
                             <field name="slip_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="6" colspan="4">
-                        <field name="state"/>
-                        <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" icon="gtk-execute" string="Generate Payslips" />
-                        <button name="close_payslip_run" type="object" icon="terp-camera_test" string="Close" states="draft"/>
-                        <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft_payslip_run" type="object" states="close"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From 0c99ac1333caa85ba61de4a36cf8576e7747568c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 3 May 2012 17:43:11 +0200
Subject: [PATCH 211/452] [FIX] domain and context generation from fields, also
 doc

bzr revid: xmo@openerp.com-20120503154311-4pg762pcgt83416c
---
 addons/web/static/src/js/search.js |  74 ++++++++++++-------
 addons/web/static/test/search.js   |  64 ++++++++++++++++
 doc/search-view.rst                | 114 ++++++++++++++++++++++++++---
 3 files changed, 213 insertions(+), 39 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 4417912b6d4..2a7de8d81d0 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1009,20 +1009,26 @@ instance.web.search.Field = instance.web.search.Input.extend( /** @lends instanc
             values: [{label: String(value), value: value}]
         });
     },
-    get_value: function (facet) {
-        return facet.value();
+    value_from: function (facetValue) {
+        return facetValue.get('value');
     },
     get_context: function (facet) {
-        // A field needs a value to be "active", and a context to send when
-        // active
+        var self = this;
+        // A field needs a context to send when active
         var context = this.attrs.context;
-        if (!context) {
+        if (!context || !facet.values.length) {
             return;
         }
-        var val = this.get_value(facet);
-        var has_value = (val !== null && val !== '');
-        return new instance.web.CompoundContext(context)
-                .set_eval_context({self: val});
+        var contexts = facet.values.map(function (facetValue) {
+            return new instance.web.CompoundContext(context)
+                .set_eval_context({self: self.value_from(facetValue)});
+        });
+
+        if (contexts.length === 1) { return contexts[0]; }
+
+        return _.extend(instance.web.CompoundContext, {
+            __contexts: contexts
+        });
     },
     get_groupby: function () { },
     /**
@@ -1037,23 +1043,37 @@ instance.web.search.Field = instance.web.search.Input.extend( /** @lends instanc
      * @returns {Array<Array>} domain to include in the resulting search
      */
     make_domain: function (name, operator, facet) {
-        return [[name, operator, this.get_value(facet)]];
+        return [[name, operator, this.value_from(facet)]];
     },
     get_domain: function (facet) {
-        var val = this.get_value(facet);
-        if (val === null || val === '') {
-            return;
+        if (!facet.values.length) { return; }
+
+        var value_to_domain;
+        var self = this;
+        var domain = this.attrs['filter_domain'];
+        if (domain) {
+            value_to_domain = function (facetValue) {
+                return new instance.web.CompoundDomain(domain)
+                    .set_eval_context({self: self.value_from(facetValue)});
+            };
+        } else {
+            value_to_domain = function (facetValue) {
+                return self.make_domain(
+                    self.attrs.name,
+                    self.attrs.operator || self.default_operator,
+                    facetValue);
+            };
+        }
+        var domains = facet.values.map(value_to_domain);
+
+        if (domains.length === 1) { return domains[0]; }
+        for (var i = domains.length; --i;) {
+            domains.unshift(['|']);
         }
 
-        var domain = this.attrs['filter_domain'];
-        if (!domain) {
-            return this.make_domain(
-                this.attrs.name,
-                this.attrs.operator || this.default_operator,
-                facet);
-        }
-        return new instance.web.CompoundDomain(domain)
-                .set_eval_context({self: val});
+        return _.extend(new instance.web.CompoundDomain, {
+            __domains: domains
+        });
     }
 });
 /**
@@ -1085,7 +1105,7 @@ instance.web.search.CharField = instance.web.search.Field.extend( /** @lends ins
     }
 });
 instance.web.search.NumberField = instance.web.search.Field.extend(/** @lends instance.web.search.NumberField# */{
-    get_value: function () {
+    value_from: function () {
         if (!this.$element.val()) {
             return null;
         }
@@ -1193,7 +1213,7 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends
         if (!match) { return $.when(null); }
         return $.when(facet_from(this, match));
     },
-    get_value: function (facet) {
+    value_from: function (facet) {
         return facet.get('values');
     }
 });
@@ -1209,7 +1229,7 @@ instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/**
             ['false', _t("No")]
         ];
     },
-    get_value: function (facet) {
+    value_from: function (facet) {
         switch (this._super(facet)) {
             case 'false': return false;
             case 'true': return true;
@@ -1222,7 +1242,7 @@ instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/**
  * @extends instance.web.search.DateField
  */
 instance.web.search.DateField = instance.web.search.Field.extend(/** @lends instance.web.search.DateField# */{
-    get_value: function (facet) {
+    value_from: function (facet) {
         return openerp.web.date_to_str(facet.get('values'));
     },
     complete: function (needle) {
@@ -1255,7 +1275,7 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst
  * @extends instance.web.DateField
  */
 instance.web.search.DateTimeField = instance.web.search.DateField.extend(/** @lends instance.web.search.DateTimeField# */{
-    get_value: function (facet) {
+    value_from: function (facet) {
         return openerp.web.datetime_to_str(facet.get('values'));
     }
 });
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 17fdfc81749..682cf27a7ab 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -770,6 +770,70 @@ $(document).ready(function () {
             });
     });
 
+    test('Field single value, default domain & context', function () {
+        var f = new instance.web.search.Field({}, {name: 'foo'}, {inputs: []});
+        var facet = new instance.web.search.Facet({
+            field: f,
+            values: [{value: 42}]
+        });
+
+        deepEqual(f.get_domain(facet), [['foo', '=', 42]],
+            "default field domain is a strict equality of name to facet's value");
+        equal(f.get_context(facet), null,
+            "default field context is null");
+    });
+    test('Field multiple values, default domain & context', function () {
+        var f = new instance.web.search.Field({}, {name: 'foo'}, {inputs: []});
+        var facet = new instance.web.search.Facet({
+            field: f,
+            values: [{value: 42}, {value: 68}, {value: 999}]
+        });
+
+        var actual_domain = f.get_domain(facet);
+        equal(actual_domain.__ref, "compound_domain",
+              "multiple value should yield compound domain");
+        deepEqual(actual_domain.__domains, [
+                    ['|'],
+                    ['|'],
+                    [['foo', '=', 42]],
+                    [['foo', '=', 68]],
+                    [['foo', '=', 999]]
+            ],
+            "domain should OR a default domain for each value");
+        equal(f.get_context(facet), null,
+            "default field context is null");
+    });
+    test('Field single value, custom domain & context', function () {
+        var f = new instance.web.search.Field({attrs:{
+            context: "{'bob': self}",
+            filter_domain: "[['edmund', 'is', self]]"
+        }}, {name: 'foo'}, {inputs: []});
+        var facet = new instance.web.search.Facet({
+            field: f,
+            values: [{value: "great"}]
+        });
+
+        var actual_domain = f.get_domain(facet);
+        equal(actual_domain.__ref, "compound_domain",
+              "@filter_domain should yield compound domain");
+        deepEqual(actual_domain.__domains, [
+            "[['edmund', 'is', self]]"
+        ], 'should hold unevaluated custom domain');
+        deepEqual(actual_domain.get_eval_context(), {
+            self: "great"
+        }, "evaluation context should hold facet value as self");
+
+        var actual_context = f.get_context(facet);
+        equal(actual_context.__ref, "compound_context",
+              "@context should yield compound context");
+        deepEqual(actual_context.__contexts, [
+            "{'bob': self}"
+        ], 'should hold unevaluated custom context');
+        deepEqual(actual_context.get_eval_context(), {
+            self: "great"
+        }, "evaluation context should hold facet value as self");
+    });
+
     module('drawer', {
         setup: function () {
             instance = window.openerp.init([]);
diff --git a/doc/search-view.rst b/doc/search-view.rst
index 3c13f6ae921..f8dce473382 100644
--- a/doc/search-view.rst
+++ b/doc/search-view.rst
@@ -277,6 +277,92 @@ exception if the value is not valid at all for the field.
     ``Array`` of groupby domains rather than a single context. At this
     point, it is only implemented on (and used by) filters.
 
+Field services
+++++++++++++++
+
+:js:class:`~openerp.web.search.Field` provides a default
+implementation of :js:func:`~openerp.web.search.Input.get_domain` and
+:js:func:`~openerp.web.search.Input.get_context` taking care of most
+of the peculiarities pertaining to OpenERP's handling of fields in
+search views. It also provides finer hooks to let developers of new
+fields and widgets customize the behavior they want without
+necessarily having to reimplement all of
+:js:func:`~openerp.web.search.Input.get_domain` or
+:js:func:`~openerp.web.search.Input.get_context`:
+
+.. js:function:: openerp.web.search.Field.get_context(facet)
+
+    If the field has no ``@context``, simply returns
+    ``null``. Otherwise, calls
+    :js:func:`~openerp.web.search.Field.value_from` once for each
+    :js:class:`~openerp.web.search.FacetValue` of the current
+    :js:class:`~openerp.web.search.Facet` (in order to extract the
+    basic javascript object from the
+    :js:class:`~openerp.web.search.FacetValue` then evaluates
+    ``@context`` with each of these values set as ``self``, and
+    returns the union of all these contexts.
+
+    :param facet:
+    :type facet: openerp.web.search.Facet
+    :returns: a context (literal or compound)
+
+.. js:function:: openerp.web.search.Field.get_domain(facet)
+
+    If the field has no ``@filter_domain``, calls
+    :js:func:`~openerp.web.search.Field.make_domain` once with each
+    :js:class:`~openerp.web.search.FacetValue` of the current
+    :js:class:`~openerp.web.search.Facet` as well as the field's
+    ``@name`` and either its ``@operator`` or
+    :js:attr:`~openerp.web.search.Field.default_operator`.
+
+    If the field has an ``@filter_value``, calls
+    :js:func:`~openerp.web.search.Field.value_from` once per
+    :js:class:`~openerp.web.search.FacetValue` and evaluates
+    ``@filter_value`` with each of these values set as ``self``.
+
+    In either case, "ors" all of the resulting domains (using ``|``)
+    if there is more than one
+    :js:class:`~openerp.web.search.FacetValue` and returns the union
+    of the result.
+
+    :param facet:
+    :type facet: openerp.web.search.Facet
+    :returns: a domain (literal or compound)
+
+.. js:function:: openerp.web.search.Field.make_domain(name, operator, facetValue)
+
+    Builds a literal domain from the provided data. Calls
+    :js:func:`~openerp.web.search.Field.value_from` on the
+    :js:class:`~openerp.web.search.FacetValue` and evaluates and sets
+    it as the domain's third value, uses the other two parameters as
+    the first two values.
+
+    Can be overridden to build more complex default domains.
+
+    :param String name: the field's name
+    :param String operator: the operator to use in the field's domain
+    :param facetValue:
+    :type facetValue: openerp.web.search.FacetValue
+    :returns: Array<(String, String, Object)>
+
+.. js:function:: openerp.web.search.Field.value_from(facetValue)
+
+    Extracts a "bare" javascript value from the provided
+    :js:class:`~openerp.web.search.FacetValue`, and returns it.
+
+    The default implementation will simply return the ``value``
+    backbone property of the argument.
+
+    :param facetValue:
+    :type facetValue: openerp.web.search.FacetValue
+    :returns: Object
+
+.. js:attribute:: openerp.web.search.Field.default_operator
+
+    Operator used to build a domain when a field has no ``@operator``
+    or ``@filter_domain``. ``"="`` for
+    :js:class:`~openerp.web.search.Field`
+
 Converting to facet objects
 ---------------------------
 
@@ -314,7 +400,7 @@ Widgets API
 
 * :js:func:`~openerp.web.search.Input.get_domain` and
   :js:func:`~openerp.web.search.Input.get_context` now take a
-  :js:class:`~VS.model.SearchFacet` as parameter, from which it's
+  :js:class:`~openerp.web.search.Facet` as parameter, from which it's
   their job to get whatever value they want
 
 * :js:func:`~openerp.web.search.Input.get_groupby` has been added. It returns
@@ -334,19 +420,16 @@ Filters
 Fields
 ++++++
 
-* ``get_value`` now takes a :js:class:`~VS.model.SearchFacet` (instead
-  of taking no argument).
-
-  A default implementation is provided as
-  :js:func:`openerp.web.search.Field.get_value` and simply calls
-  :js:func:`VS.model.SearchFacet.value`.
+* ``get_value`` has been replaced by
+  :js:func:`~openerp.web.search.Field.value_from` as it now takes a
+  :js:class:`~openerp.web.search.FacetValue` argument (instead of no
+  argument). It provides a default implementation returning the
+  ``value`` property of its argument.
 
 * The third argument to
-  :js:func:`~openerp.web.search.Field.make_domain` is now the
-  :js:class:`~VS.model.SearchFacet` received by
-  :js:func:`~openerp.web.search.Field.get_domain`, so child classes
-  have all the information they need to derive the "right" resulting
-  domain.
+  :js:func:`~openerp.web.search.Field.make_domain` is now a
+  :js:class:`~openerp.web.search.FacetValue` so child classes have all
+  the information they need to derive the "right" resulting domain.
 
 Custom filters
 ++++++++++++++
@@ -363,6 +446,13 @@ Many To One
   :js:func:`openerp.web.search.ManyToOneField.setup_autocomplete` has
   been removed.
 
+Advanced Search
++++++++++++++++
+
+The advanced search is now a more standard
+:js:class:`~openerp.web.search.Input` configured to be rendered in the
+drawer.
+
 .. [#] the original view was implemented on top of a monkey-patched
        VisualSearch, but as our needs diverged from VisualSearch's goal this
        made less and less sense ultimately leading to a clean-room

From aca54c981267df74e32fe981b1d0c62e84634fa6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 3 May 2012 17:47:51 +0200
Subject: [PATCH 212/452] [REM] pointless overrides to value_from and
 make_domain

- selection does not need to override get_value/value_from
- neither does boolean, its selection values can be correctly set from the start
- m2o can only facet correct values, not fuzzy, so the make_domain override is not useful

bzr revid: xmo@openerp.com-20120503154751-w5pojni831xwu6bv
---
 addons/web/static/src/js/search.js | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 2a7de8d81d0..2c31b5435be 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1212,9 +1212,6 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends
         });
         if (!match) { return $.when(null); }
         return $.when(facet_from(this, match));
-    },
-    value_from: function (facet) {
-        return facet.get('values');
     }
 });
 instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/** @lends instance.web.search.BooleanField# */{
@@ -1225,16 +1222,9 @@ instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/**
     init: function () {
         this._super.apply(this, arguments);
         this.attrs.selection = [
-            ['true', _t("Yes")],
-            ['false', _t("No")]
+            [true, _t("Yes")],
+            [false, _t("No")]
         ];
-    },
-    value_from: function (facet) {
-        switch (this._super(facet)) {
-            case 'false': return false;
-            case 'true': return true;
-            default: return null;
-        }
     }
 });
 /**
@@ -1242,8 +1232,8 @@ instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/**
  * @extends instance.web.search.DateField
  */
 instance.web.search.DateField = instance.web.search.Field.extend(/** @lends instance.web.search.DateField# */{
-    value_from: function (facet) {
-        return openerp.web.date_to_str(facet.get('values'));
+    value_from: function (facetValue) {
+        return openerp.web.date_to_str(facetValue.get('value'));
     },
     complete: function (needle) {
         var d = Date.parse(needle);
@@ -1275,8 +1265,8 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst
  * @extends instance.web.DateField
  */
 instance.web.search.DateTimeField = instance.web.search.DateField.extend(/** @lends instance.web.search.DateTimeField# */{
-    value_from: function (facet) {
-        return openerp.web.datetime_to_str(facet.get('values'));
+    value_from: function (facetValue) {
+        return openerp.web.datetime_to_str(facetValue.get('value'));
     }
 });
 instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
@@ -1312,14 +1302,6 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
             if (_(names).isEmpty()) { return null; }
             return facet_from(self, names[0]);
         })
-    },
-    make_domain: function (name, operator, facet) {
-        // ``json`` -> actual auto-completed id
-        if (facet.get('values')) {
-            return [[name, '=', facet.get('values')]];
-        }
-
-        return this._super(name, operator, facet);
     }
 });
 

From 5c4ac52291e4ec599da32f44281c310e93f3b5d1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 3 May 2012 17:55:32 +0200
Subject: [PATCH 213/452] [FIX] typo: remember to instantiate objects

bzr revid: xmo@openerp.com-20120503155532-q2es166215yfgn7g
---
 addons/web/static/src/js/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 2c31b5435be..196fdcac0cd 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1026,7 +1026,7 @@ instance.web.search.Field = instance.web.search.Input.extend( /** @lends instanc
 
         if (contexts.length === 1) { return contexts[0]; }
 
-        return _.extend(instance.web.CompoundContext, {
+        return _.extend(new instance.web.CompoundContext, {
             __contexts: contexts
         });
     },

From 64538c181e2eff7ab5dde0c4b01fcc4b204bf52f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 3 May 2012 18:37:09 +0200
Subject: [PATCH 214/452] [FIX] domain and context generation on m2o fields

by default, an m2o field should behave like a charfield (== use its
textual value), but if the domain is fully default (no filter_domain
and no custom operator) and the user explicitly selected an object
(which is the only thing he can do at this point in the new search
view), then we can generate a domain matching exactly the stored id.

bzr revid: xmo@openerp.com-20120503163709-odlnib513h3f84v6
---
 addons/web/static/src/js/search.js | 10 +++++++
 addons/web/static/test/search.js   | 47 ++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 196fdcac0cd..c0542585f40 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1270,6 +1270,7 @@ instance.web.search.DateTimeField = instance.web.search.DateField.extend(/** @le
     }
 });
 instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
+    default_operator: {},
     init: function (view_section, field, view) {
         this._super(view_section, field, view);
         this.model = new instance.web.Model(this.attrs.relation);
@@ -1302,6 +1303,15 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
             if (_(names).isEmpty()) { return null; }
             return facet_from(self, names[0]);
         })
+    },
+    value_from: function (facetValue) {
+        return facetValue.get('label');
+    },
+    make_domain: function (name, operator, facetValue) {
+        if (operator === this.default_operator) {
+            return [[name, '=', facetValue.get('value')]];
+        }
+        return this._super(name, operator, facetValue);
     }
 });
 
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 682cf27a7ab..9b0205c462a 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -833,6 +833,53 @@ $(document).ready(function () {
             self: "great"
         }, "evaluation context should hold facet value as self");
     });
+    test("M2O default", function () {
+        var f = new instance.web.search.ManyToOneField(
+            {}, {name: 'foo'}, {inputs: []});
+        var facet = new instance.web.search.Facet({
+            field: f,
+            values: [{label: "Foo", value: 42}]
+        });
+
+        deepEqual(f.get_domain(facet), [['foo', '=', 42]],
+            "m2o should use identity if default domain");
+    });
+    test("M2O custom operator", function () {
+        var f = new instance.web.search.ManyToOneField(
+            {attrs: {operator: 'boos'}}, {name: 'foo'}, {inputs: []});
+        var facet = new instance.web.search.Facet({
+            field: f,
+            values: [{label: "Foo", value: 42}]
+        });
+
+        deepEqual(f.get_domain(facet), [['foo', 'boos', 'Foo']],
+            "m2o should use label with custom operators");
+    });
+    test("M2O custom domain & context", function () {
+        var f = new instance.web.search.ManyToOneField({attrs: {
+            context: "{'whee': self}",
+            filter_domain: "[['filter', 'is', self]]"
+        }}, {name: 'foo'}, {inputs: []});
+        var facet = new instance.web.search.Facet({
+            field: f,
+            values: [{label: "Foo", value: 42}]
+        });
+
+        var domain = f.get_domain(facet);
+        deepEqual(domain.__domains, [
+            "[['filter', 'is', self]]"
+        ]);
+        deepEqual(domain.get_eval_context(), {
+            self: "Foo"
+        }, "custom domain's self should be label");
+        var context = f.get_context(facet);
+        deepEqual(context.__contexts, [
+            "{'whee': self}"
+        ]);
+        deepEqual(context.get_eval_context(), {
+            self: "Foo"
+        }, "custom context's self should be label");
+    });
 
     module('drawer', {
         setup: function () {

From 94624b74b0ab62497682013c5b6083c98ce2bc42 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 3 May 2012 21:26:45 +0200
Subject: [PATCH 215/452] [FIX] get_* methods on FilterGroup

bzr revid: xmo@openerp.com-20120503192645-8x63l5rnwz2vg2yp
---
 addons/web/static/src/js/search.js |  6 ++---
 addons/web/static/test/search.js   | 36 ++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index c0542585f40..780e096b34c 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -905,7 +905,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
      * @return {*} combined contexts of the enabled filters in this group
      */
     get_context: function (facet) {
-        var contexts = _(facet.values).chain()
+        var contexts = facet.values.chain()
             .map(function (f) { return f.get('value').attrs.context; })
             .reject(_.isEmpty)
             .value();
@@ -923,7 +923,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
      * @return {Array} enabled filters in this group
      */
     get_groupby: function (facet) {
-        return  _(facet.values).chain()
+        return  facet.values.chain()
             .map(function (f) { return f.get('value').attrs.context; })
             .reject(_.isEmpty)
             .value();
@@ -935,7 +935,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
      * @return {*} combined domains of the enabled filters in this group
      */
     get_domain: function (facet) {
-        var domains = _(facet.values).chain()
+        var domains = facet.values.chain()
             .map(function (f) { return f.get('value').attrs.domain; })
             .reject(_.isEmpty)
             .value();
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 9b0205c462a..ca34750ad1c 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -881,6 +881,42 @@ $(document).ready(function () {
         }, "custom context's self should be label");
     });
 
+    asyncTest('FilterGroup', 6, function () {
+        var view = {inputs: []};
+        var filter_a = new instance.web.search.Filter(
+            {attrs: {name: 'a', context: 'c1', domain: 'd1'}}, view);
+        var filter_b = new instance.web.search.Filter(
+            {attrs: {name: 'b', context: 'c2', domain: 'd2'}}, view);
+        var filter_c = new instance.web.search.Filter(
+            {attrs: {name: 'c', context: 'c3', domain: 'd3'}}, view);
+        var group = new instance.web.search.FilterGroup(
+            [filter_a, filter_b, filter_c], view);
+        group.facet_for_defaults({a: true, c: true})
+            .always(start)
+            .fail(function (error) { ok(false, error && error.message); })
+            .done(function (facet) {
+                var model = facet;
+                if (!(model instanceof instance.web.search.Facet)) {
+                    model = new instance.web.search.Facet(facet);
+                }
+
+                var domain = group.get_domain(model);
+                equal(domain.__ref, 'compound_domain',
+                    "domain should be compound");
+                deepEqual(domain.__domains, [
+                    ['|'], 'd1', 'd3'
+                ], "domain should OR filter domains");
+                ok(!domain.get_eval_context(), "domain should have no evaluation context");
+                var context = group.get_context(model);
+                equal(context.__ref, 'compound_context',
+                    "context should be compound");
+                deepEqual(context.__contexts, [
+                    'c1', 'c3'
+                ], "context should merge all filter contexts");
+                ok(!context.get_eval_context(), "context should have no evaluation context");
+            });
+    });
+
     module('drawer', {
         setup: function () {
             instance = window.openerp.init([]);

From d4a9e10308a7ba8e14ec4364ea5bb73c8d22c9ce Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 3 May 2012 21:31:10 +0200
Subject: [PATCH 216/452] [ADD] handling of reset button on searchview

bzr revid: xmo@openerp.com-20120503193110-aqmeo3dz94y49fg0
---
 addons/web/static/src/js/search.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 780e096b34c..a17839f5c1c 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -259,6 +259,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                 });
         }
 
+        this.$element.on('click', '.oe_searchview_clear', function (e) {
+            e.stopImmediatePropagation();
+            self.query.reset();
+        });
         this.$element.on('click', '.oe_searchview_unfold_drawer', function (e) {
             e.stopImmediatePropagation();
             self.$element.toggleClass('oe_searchview_open_drawer');

From 2251227058da557f51b9a3199135ac45503801dd Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 3 May 2012 21:36:45 +0200
Subject: [PATCH 217/452] [FIX] Advanced view adaptations to new facet & value
 shapes

bzr revid: xmo@openerp.com-20120503193645-ccap97ojw9cgre3y
---
 addons/web/static/src/js/search.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index a17839f5c1c..39a53cf603f 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1416,16 +1416,18 @@ instance.web.search.Advanced = instance.web.search.Input.extend({
         var children = this.getChildren(),
             domain = _.invoke(children, 'get_proposition');
         var filters = _(domain).map(function (section) {
-            return new instance.web.search.Filter({attrs: {
-                string: _.str.sprintf('%s(%s)%s',
-                    section[0], section[1], section[2]),
-                domain: [section]
-            }}, self.view);
+            return {
+                label: _.str.sprintf('%s(%s)%s',
+                        section[0], section[1], section[2]),
+                value: new instance.web.search.Filter({attrs: {
+                    domain: [section]
+                }}, self.view)
+            };
         });
         // Create Filter (& FilterGroup around it) with that domain
         var f = new instance.web.search.FilterGroup(filters, this.view);
         // add group to query
-        this.query.add({
+        this.view.query.add({
             category: _t("Advanced"),
             values: filters,
             field: f

From 974fc2c851a7a05870b9ead0901fa1c4bc8ed84a Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 11:16:32 +0530
Subject: [PATCH 218/452] [IMP]account : Added state and buttons on top bar in
 journal and period

bzr revid: mma@tinyerp.com-20120504054632-hlpiv8jdtl7uho3c
---
 addons/account/account_view.xml | 51 +++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c6d2c06a87d..919c9e1a45f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -11,8 +11,16 @@
             <field name="model">account.fiscalyear</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Fiscalyear">
-                    <group>
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="create_period" states="draft" string="Create Monthly Periods" type="object" icon="terp-document-new"/>
+                    <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" icon="terp-document-new"/>
+                <div class="oe_right">
+                    <field name="state" select="1" widget="statusbar" nolabel="1" />
+                </div>
+                </div>
+                <sheet string="Fiscalyear" layout="auto">
+                    <group class="oe_form_header">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="date_start"/>
@@ -31,11 +39,7 @@
                         </form>
                     </field>
                     <separator colspan="4" string="States"/>
-                    <group>
-                        <field name="state" select="1" readonly="1"/>
-                        <button name="create_period" states="draft" string="Create Monthly Periods" type="object" icon="terp-document-new"/>
-                        <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" icon="terp-document-new"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -92,7 +96,15 @@
             <field name="model">account.period</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Period">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" groups="account.group_account_manager"/>
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1"/>
+                </div>
+                </div>
+                <sheet string="Period" layout="auto">
+                <group class="oe_form_header">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="date_start"/>
@@ -100,9 +112,8 @@
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <field name="fiscalyear_id" widget="selection"/>
                     <field name="special"/>
-                    <separator colspan="4" string="States"/>
-                    <field name="state"/>
-                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" groups="account.group_account_manager"/>
+                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -1345,8 +1356,16 @@
             <field name="model">account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Journal Entries">
-                    <group colspan="4" col="6">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                      <button name="button_validate" states="draft" string="Post" type="object" icon="terp-camera_test"/>
+                      <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
+                <div class="oe_right">
+                     <field name="state" select="1" widget="statusbar" nolabel="1" />
+                </div>
+                </div>
+                <sheet string="Journal Entries" layout="auto">
+                    <group colspan="4" col="6" class="oe_form_header">
                         <field name="name" readonly="True"/>
                         <field name="ref"/>
                         <field name="to_check"/>
@@ -1455,13 +1474,9 @@
                             </field>
                             <separator colspan="4" string="Internal Note"/>
                             <field name="narration" colspan="4" nolabel="1" height="50"/>
-                            <group col="4" colspan="4">
-                                <field name="state" select="1"/>
-                                <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
-                                <button name="button_validate" states="draft" string="Post" type="object" icon="terp-camera_test"/>
-                            </group>
                         </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>

From 013650c1be97c2a0bdef77207abf6ecb84fdcd66 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 4 May 2012 11:37:23 +0530
Subject: [PATCH 219/452] [IMP]crm: ser partner_id in search view

bzr revid: dbr@tinyerp.com-20120504060723-6n6xjjffn4c6w974
---
 addons/crm/crm_lead_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 969962a4e20..0d89eb4198f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -353,6 +353,7 @@
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
                 </field>
+                <field name="partner_id"/>
                 <field name="subjects"/>
                 <field name="section_id" widget="selection"
                     context="{'invisible_section': False}">

From 22be12451adc332e13934b6953d4d0998a1e2cba Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 11:47:12 +0530
Subject: [PATCH 220/452] [IMP]mrp_operations : Added state and buttons on top
 bar

bzr revid: mma@tinyerp.com-20120504061712-k4k2opi9upwevq3s
---
 addons/mrp_operations/mrp_operations.py       |  2 +-
 addons/mrp_operations/mrp_operations_view.xml | 28 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 78deb68e5e7..0bec075869b 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -86,7 +86,7 @@ class mrp_production_workcenter_line(osv.osv):
     _order = "sequence, date_planned"
 
     _columns = {
-       'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pending'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True,
+       'state': fields.selection([('draft','Draft'),('pause','Pending'),('startworking', 'In Progress'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True,
                                  help="* When a work order is created it is set in 'Draft' state.\n" \
                                        "* When user sets work order in start mode that time it will be set in 'In Progress' state.\n" \
                                        "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pending' state.\n" \
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 843acd313bc..0fed0e58671 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -71,8 +71,20 @@
         <field name="type">form</field>
         <field name="inherit_id" eval="False"/>
         <field name="arch" type="xml">
-            <form string="Work Orders">
-                <group col="6" colspan="4">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                  <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_done" string="Finished" states="startworking" icon="terp-check"/>
+                  <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause"/>
+                  <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
+                  <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
+            <div class="oe_right">
+                 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,startworking"/>
+            </div>
+            </div>
+            <sheet string="Work Orders" layout="auto">
+                <group col="6" colspan="4" class="oe_form_header">
                     <field colspan="4" name="name" select="1"/>
                     <field name="workcenter_id" select="1" widget="selection"/>
                     <field name="production_id"/>
@@ -105,19 +117,9 @@
                         <field name="qty"/>
                         <field name="uom" widget="selection"/>
                     </group>
-
-                    <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_pause" string="Pending" states="startworking" icon="gtk-media-pause"/>
-                        <button name="button_done" string="Finished" states="startworking" icon="terp-check"/>
-                    </group>
                 </page>
                 </notebook>
+                </sheet>
                 <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
             </form>
         </field>

From d137f4f841d36fa41662c22d8a8f924eaa6b30e6 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 4 May 2012 11:52:19 +0530
Subject: [PATCH 221/452] [IMP]stock: set calendar view mode

bzr revid: dbr@tinyerp.com-20120504062219-azxqougv0f2tfxnc
---
 addons/stock/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index cfb7f282373..57f0fd89667 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -139,7 +139,7 @@
         <act_window
             id="act_product_2_delivery"
             name="Deliveries"
-            view_mode="tree,form"
+            view_mode="tree,form,calendar"
             res_model="stock.picking"
             src_model="product.product"
             context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"

From 341c2e708701e0dd4e129af5e37b505d5275d9ef Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 12:06:31 +0530
Subject: [PATCH 222/452] [IMP]stock : Added state and buttons on top bar in
 inventory

bzr revid: mma@tinyerp.com-20120504063631-x89r6ndlpljwy3h9
---
 addons/stock/stock.py       |  2 +-
 addons/stock/stock_view.xml | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c62a512d92d..9fe8ee97bed 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2656,7 +2656,7 @@ class stock_inventory(osv.osv):
         'date_done': fields.datetime('Date done'),
         'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', states={'done': [('readonly', True)]}),
         'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
-        'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('confirm','Confirmed'),('cancel','Cancelled')), 'State', readonly=True, select=True),
+        'state': fields.selection( (('draft', 'Draft'), ('confirm','Confirmed'), ('done', 'Done'), ('cancel','Cancelled')), 'State', readonly=True, select=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
 
     }
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 7f84ced4e92..a0d6b6ed89b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -108,7 +108,18 @@
             <field name="model">stock.inventory</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Physical Inventory">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                      <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
+                      <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
+                      <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                      <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
+                <div class="oe_right">
+                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </div>
+                </div>
+                <sheet string="Physical Inventory" layout="auto">
+                <group class="oe_form_header">
                     <field name="name"/>
                     <field name="date"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -167,15 +178,8 @@
                              </field>
                     </page>
                     </notebook>
-                    <group col="2" colspan="2">
-                     <field name="state"/>
-                    </group>
-                    <group col="3" colspan="2">
-                        <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
-                        <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
-                        <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
-                        <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From b749089fe7a581a21e54efb2e4e859752be3035c Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 12:23:47 +0530
Subject: [PATCH 223/452] [IMP]account_asset : Added state and buttons on top
 bar

bzr revid: mma@tinyerp.com-20120504065347-rijbugsd8h4qa9q0
---
 addons/account_asset/account_asset_view.xml | 22 +++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index f527498ae05..1ea667fddd2 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -78,8 +78,17 @@
         <field name="model">account.asset.asset</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-           <form string="Asset">
-              <group col="6" colspan="4">
+           <form layout="manual">
+           <div class="oe_form_topbar">
+                <button name="validate" states="draft" string="Confirm Asset" type="object" icon="terp-camera_test"/>
+                <button name="set_to_draft" states="open" string="Set to Draft" type="object" icon="gtk-convert"/> 
+                <button name="set_to_close" states="open" string="Set to Close" type="object" icon="gtk-close"/>
+           <div class="oe_right">
+                <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+           </div>
+           </div>
+           <sheet string="Asset" layout="auto">
+              <group col="6" colspan="4" class="oe_form_header">
                  <field name="name"/>
                  <field name="category_id" on_change="onchange_category_id(category_id)"/>
                  <field name="code"/>
@@ -111,14 +120,6 @@
                         <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
                         <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
                     </group>
-                    <newline/>
-                    <separator string="" colspan="4"/>
-                    <field name="state" readonly="1" colspan="2"/>
-                    <group colspan="2" col="4">
-                       <button name="validate" states="draft" string="Confirm Asset" type="object" icon="terp-camera_test"/>
-                       <button name="set_to_draft" states="open" string="Set to Draft" type="object" icon="gtk-convert"/> 
-                       <button name="set_to_close" states="open" string="Set to Close" type="object" icon="gtk-close"/>
-                    </group>
                  </page>
                  <page string="Depreciation Board">
                     <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph">
@@ -148,6 +149,7 @@
                     <field name="note" nolabel="1"/>
                  </page>
               </notebook>
+              </sheet>
            </form>
        </field>
     </record>

From 4f3869fe2d1c056596622120aa369aef823f7fed Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 12:45:03 +0530
Subject: [PATCH 224/452] [IMP]account : remove separator

bzr revid: mma@tinyerp.com-20120504071503-nzi4m03dia03hde3
---
 addons/account/account_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 919c9e1a45f..1c24a487676 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -38,7 +38,6 @@
                             <field name="special"/>
                         </form>
                     </field>
-                    <separator colspan="4" string="States"/>
                     </sheet>
                 </form>
             </field>

From 245dcd8cf2e577dd9c1fe8c707c401e2e3d11f66 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 14:05:07 +0530
Subject: [PATCH 225/452] [IMP]project_planning : Added state and buttons on
 top bar

bzr revid: mma@tinyerp.com-20120504083507-y6e8nxjz1kzayrci
---
 addons/project_planning/project_planning.py   |  2 +-
 .../project_planning_view.xml                 | 27 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index bb587218c91..4787aa2603b 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -128,7 +128,7 @@ class report_account_analytic_planning(osv.osv):
         'date_to':fields.date('End Date', required=True, states={'done':[('readonly', True)]}),
         'line_ids': fields.one2many('report_account_analytic.planning.line', 'planning_id', 'Planning lines', states={'done':[('readonly', True)]}),
         'stat_ids': fields.one2many('report_account_analytic.planning.stat', 'planning_id', 'Planning analysis', readonly=True),
-        'state': fields.selection([('draft', 'Draft'), ('cancel', 'Cancelled'), ('open', 'Open'), ('done', 'Done')], 'Status', required=True),
+        'state': fields.selection([('draft', 'Draft'), ('open', 'Open'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', required=True),
         'business_days': fields.integer('Business Days', required=True, states={'done':[('readonly', True)]}, help='Set here the number of working days within this planning for one person full time'),
         'planning_user_ids': one2many_mod3('report_account_analytic.planning.user', 'planning_id', 'Planning By User'),
         'planning_account': fields.one2many('report_account_analytic.planning.account', 'planning_id', 'Planning By Account'),
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 5e42c750634..4f10d270ac4 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -26,8 +26,18 @@
             <field name="model">report_account_analytic.planning</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Planning by Account">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                 <div class="oe_form_topbar">
+                    <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_draft" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
+                    <button name="action_cancel" states="draft,open" string="Cancel" type="object" icon="gtk-cancel" />
+                 <div class="oe_right">
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+                 </div>
+                 </div>
+                <sheet string="Planning by Account" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" select="1" />
                         <field name="code" select="1" />
                         <field name="user_id" select="1" />
@@ -134,18 +144,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <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_draft" states="done,cancel"
-                            string="Reset to Draft" type="object" icon="gtk-convert" />
-                    </group>
+                   </sheet>
                 </form>
             </field>
         </record>

From 7e0bd0103bda6ebd25ee0edfd239df889b79ccf7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 4 May 2012 11:43:06 +0200
Subject: [PATCH 226/452] [ADD] single-facet handling of groupby

bzr revid: xmo@openerp.com-20120504094306-dieslsoibjjbtcs5
---
 addons/web/static/src/js/search.js | 59 +++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 39a53cf603f..a9d26bf747b 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -880,6 +880,13 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
      * @param {instance.web.SearchView} view view in which the filters are contained
      */
     init: function (filters, view) {
+        // If all filters are group_by and we're not initializing a GroupbyGroup,
+        // create a GroupbyGroup instead of the current FilterGroup
+        if (!(this instanceof instance.web.search.GroupbyGroup) &&
+              _(filters).all(function (f) {
+                  return f.attrs.context && f.attrs.context.group_by; })) {
+            return new instance.web.search.GroupbyGroup(filters, view);
+        }
         this._super(view);
         this.filters = filters;
     },
@@ -887,6 +894,13 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
         this.$element.on('click', 'li', this.proxy('toggle_filter'));
         return $.when(null);
     },
+    make_facet: function (values) {
+        return {
+            category: _t("Filter"),
+            values: values,
+            field: this
+        }
+    },
     facet_for_defaults: function (defaults) {
         var fs = _(this.filters).chain()
             .filter(function (f) {
@@ -896,11 +910,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
                         value: f};
             }).value();
         if (_.isEmpty(fs)) { return $.when(null); }
-        return $.when({
-            category: _t("Filter"),
-            values: fs,
-            field: this
-        });
+        return $.when(this.make_facet(fs));
     },
     /**
      * Fetches contexts for all enabled filters in the group
@@ -957,14 +967,37 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
         this.toggle(this.filters[$(e.target).index()]);
     },
     toggle: function (filter) {
-        this.view.query.toggle({
-            category: _t("Filter"),
-            field: this,
-            values: [{
-                label: filter.attrs.string || filter.attrs.name,
-                value: filter
-            }]
-        });
+        this.view.query.toggle(this.make_facet([{
+            label: filter.attrs.string || filter.attrs.name,
+            value: filter
+        }]));
+    }
+});
+instance.web.search.GroupbyGroup = instance.web.search.FilterGroup.extend({
+    init: function (filters, view) {
+        this._super(filters, view);
+        // Not flanders: facet unicity is handled through the
+        // (category, field) pair of facet attributes. This is all well and
+        // good for regular filter groups where a group matche a facet, but for
+        // groupby we want a single facet. So cheat: add an attribute on the
+        // view which proxies to the first GroupbyGroup, so it can be used
+        // for every GroupbyGroup and still provides the various methods needed
+        // by the search view. Use weirdo name to avoid risks of conflicts
+        if (!this.getParent()._s_groupby) {
+            this.getParent()._s_groupby = {
+                help: "See GroupbyGroup#init",
+                get_context: this.proxy('get_context'),
+                get_domain: this.proxy('get_domain'),
+                get_groupby: this.proxy('get_groupby')
+            }
+        }
+    },
+    make_facet: function (values) {
+        return {
+            category: _t("GroupBy"),
+            values: values,
+            field: this.getParent()._s_groupby
+        };
     }
 });
 instance.web.search.Filter = instance.web.search.Input.extend(/** @lends instance.web.search.Filter# */{

From 84cae313d28cdaa2b18325729831af75eea6d73c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 4 May 2012 11:57:17 +0200
Subject: [PATCH 227/452] [ADD] icons instead of category names for filters
 (and groupby filters)

bzr revid: xmo@openerp.com-20120504095717-va123l3gz3wvhjd1
---
 addons/web/static/src/js/search.js |  4 ++++
 addons/web/static/src/xml/base.xml |  6 +++++-
 doc/search-view.rst                | 11 +++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index a9d26bf747b..b9d46201149 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -869,6 +869,7 @@ instance.web.search.Input = instance.web.search.Widget.extend( /** @lends instan
 });
 instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends instance.web.search.FilterGroup# */{
     template: 'SearchView.filters',
+    icon: 'q',
     /**
      * Inclusive group of filters, creates a continuous "button" with clickable
      * sections (the normal display for filters is to be a self-contained button)
@@ -897,6 +898,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
     make_facet: function (values) {
         return {
             category: _t("Filter"),
+            icon: this.icon,
             values: values,
             field: this
         }
@@ -974,6 +976,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
     }
 });
 instance.web.search.GroupbyGroup = instance.web.search.FilterGroup.extend({
+    icon: 'w',
     init: function (filters, view) {
         this._super(filters, view);
         // Not flanders: facet unicity is handled through the
@@ -995,6 +998,7 @@ instance.web.search.GroupbyGroup = instance.web.search.FilterGroup.extend({
     make_facet: function (values) {
         return {
             category: _t("GroupBy"),
+            icon: this.icon,
             values: values,
             field: this.getParent()._s_groupby
         };
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index bec0c1c5fb0..4b208a31b8f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1303,7 +1303,11 @@
      type="button"
      class="oe_searchview_facet">
     <span class="oe_facet_remove">✖</span>
-    <span class="oe_facet_category">
+
+    <span class="oe_facet_category oe_i" t-if="widget.model.has('icon')">
+        <t t-esc="widget.model.get('icon')"/>
+    </span
+    ><span class="oe_facet_category" t-if="!widget.model.has('icon')">
         <t t-esc="widget.model.get('category')"/>
     </span ><span/>
 </button>
diff --git a/doc/search-view.rst b/doc/search-view.rst
index f8dce473382..2acaea3c8ad 100644
--- a/doc/search-view.rst
+++ b/doc/search-view.rst
@@ -218,6 +218,17 @@ with directly by external objects or search view controls
         it serializes to and deserializes from javascript arrays (via
         ``Collection#toJSON`` and ``Collection#reset``).
 
+    .. js:attribute:: [icon]
+
+        optional, a single ASCII letter (a-z or A-Z) mapping to the
+        bundled mnmliconsRegular icon font.
+
+        When a facet with an ``icon`` attribute is rendered, the icon
+        is displayed (in the icon font) in the first section of the
+        facet instead of the ``category``.
+
+        By default, only filters make use of this facility.
+
 .. js:class:: openerp.web.search.FacetValues
 
     `Backbone collection`_ of

From 73faf3e136382759ba725380b17325c3dedb82e1 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 15:32:31 +0530
Subject: [PATCH 228/452] [IMP]stock_planning : Added state and buttons on top
 bar in sale_forecast & stock_period

bzr revid: mma@tinyerp.com-20120504100231-5fjr3jf1u7j19nir
---
 addons/stock_planning/stock_planning_view.xml | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index b29eb7baace..d20c147e308 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -12,17 +12,23 @@
             <field name="model">stock.period</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Periods">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="button_open" string="Open" icon="gtk-ok" states="draft" type="object"/>
+                    <button name="button_close" string="Close" icon="gtk-stop" states="open" type="object"/>
+                <div class="oe_right">
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+                </div>
+                </div>
+                <sheet string="Stock Periods" layout="auto">
+                <group class="oe_form_header">
                     <field name="name" colspan="2"/>
                     <newline/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
                     <separator string="State" colspan="4"/>
-                    <group col="4" colspan="4">
-                        <field name="state" select="1" readonly="1"/>
-                        <button name="button_open" string="Open" icon="gtk-ok" states="draft" type="object"/>
-                        <button name="button_close" string="Close" icon="gtk-stop" states="open" type="object"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -78,8 +84,15 @@
             <field name="model">stock.sale.forecast</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock and Sales Forecast">
-                    <group colspan = "4" col = "4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="action_validate" icon="gtk-apply" string="Approve" states="draft" type="object" />
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1"/>
+                </div>
+                </div>
+                <sheet string="Stock and Sales Forecast" layout="auto">
+                    <group colspan = "4" col = "4" class="oe_form_header">
                         <group colspan = "2" col="2" >
                             <field name="company_id" select="1"
                                         groups="base.group_multi_company"
@@ -99,10 +112,6 @@
                             <field name="user_id"/>
                             <field name="product_amt" on_change="product_amt_change(product_amt, product_uom, product_id)" />
                             <field name="product_qty"  />
-                            <field name="state"/>
-                            <label string = ""/>
-                            <button name="action_validate" icon="gtk-apply" string="Approve" states="draft" type="object" colspan = "1"/>
-
                         </group>
                     </group>
                     <separator colspan ="4" string="Sales history"/>
@@ -147,6 +156,7 @@
                         <button name="calculate_sales_history" icon="gtk-execute"
                                 string="Calculate Sales History" type="object" colspan = "1" states="draft" />
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From 1de84a98bcb693e5f13168fac82ab9161fa13b49 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 16:13:17 +0530
Subject: [PATCH 229/452] [IMP]procurement : Added state and buttons on top bar
 and sheet tag in inherited view

bzr revid: mma@tinyerp.com-20120504104317-xesuo9wje9eo6zoq
---
 addons/mrp/mrp_view.xml                       |  4 ++--
 addons/procurement/procurement_view.xml       | 22 +++++++++++--------
 addons/purchase/purchase_view.xml             |  2 +-
 .../purchase_requisition_view.xml             |  2 +-
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 86e8b655f95..59dc443f5fc 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -967,10 +967,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="/form/notebook/page/field[@name='move_id']" position="before">
+                <xpath expr="/form/sheet/notebook/page/field[@name='move_id']" position="before">
                     <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
                 </xpath>
-                <xpath expr="/form/notebook/page/field[@name='close_move']" position="after">
+                <xpath expr="/form/sheet/notebook/page/field[@name='close_move']" position="after">
                     <group colspan="4"  groups="product.group_mrp_properties">
                     <separator colspan="4" string="Properties" />
                     <field colspan="4" name="property_ids" nolabel="1"/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index b3e90ab4e6e..e859aeb98be 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -46,8 +46,18 @@
             <field name="model">procurement.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Procurement">
-                    <group col="2" colspan="2">
+                <form layout="manual">
+                    <div class="oe_form_topbar">
+                        <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
+                        <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
+                        <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
+                        <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed" />
+                    </div>
+                    </div>
+                <sheet string="Procurement" layout="auto">
+                    <group col="2" colspan="2" class="oe_form_header">
                         <separator colspan="2" string="References"/>
                         <field name="name" string="Procurement Reason"/>
                         <field name="origin"/>
@@ -72,13 +82,6 @@
 
                         <separator colspan="4" string="Status"/>
                         <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_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
-                        </group>
                     </page>
                     <page string="Extra Information">
                         <separator colspan="4" string="Details"/>
@@ -91,6 +94,7 @@
                         <field name="note" colspan="4" nolabel="1"/>
                     </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 483f090d4a7..83f5d52ec67 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -512,7 +512,7 @@
             <field name="inherit_id" ref="procurement.procurement_form_view"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='close_move']" position="before">
+                <xpath expr="/form/sheet/notebook/page/field[@name='close_move']" position="before">
                     <field name="purchase_id"/>
                 </xpath>
             </field>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 93fefe79c65..2855881cf36 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -200,7 +200,7 @@
         <field name="model">procurement.order</field>
         <field name="inherit_id" ref="procurement.procurement_form_view"/>
         <field name="arch" type="xml">
-             <xpath expr="/form/notebook/page/field[@name='close_move']" position="after">
+             <xpath expr="/form/sheet/notebook/page/field[@name='close_move']" position="after">
                 <field name="requisition_id"/>
             </xpath>
         </field>

From d8692a69aa19e5c753968d175ae4ee9c5f358f9f Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Fri, 4 May 2012 16:15:06 +0530
Subject: [PATCH 230/452] [IMP]:improved some titles as per requirement

bzr revid: ssu@tinyerp.com-20120504104506-2j2btsseva9de1xc
---
 addons/base_calendar/base_calendar_view.xml   |  2 +-
 addons/crm/crm_lead.py                        |  4 ++--
 addons/crm/crm_lead_view.xml                  |  2 +-
 addons/crm/crm_meeting_view.xml               | 10 +++++-----
 addons/hr_recruitment/hr_recruitment_menu.xml |  4 ++--
 addons/mrp_subproduct/mrp_subproduct.py       |  2 +-
 addons/product/product.py                     |  2 +-
 addons/project/project.py                     |  2 +-
 addons/purchase/stock_view.xml                |  2 +-
 addons/stock/stock_view.xml                   |  2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index b6d2136fc16..464290b9e46 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -350,7 +350,7 @@
                                 <field name="interval" />
 
 
-                                <separator string="End of recurrency" colspan="4"/>
+                                <separator string="End of Recurrence" colspan="4"/>
                                 <field name="end_type" />
                                 <label string=" " colspan="2" />
                                 <newline />
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 00f477a75d7..597eeb8709a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -177,14 +177,14 @@ class crm_lead(crm_case, osv.osv):
                                 multi='day_close', type="float", store=True),
         'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
-                                  \nIf the case is in progress the state is set to \'Open\'.\
+                                  \nIf the case is in progress the state is set to \'In progress\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
         'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'subjects': fields.function(_get_email_subject, fnct_search=_history_search, string='Subject of Email', type='char', size=64),
 
         # Only used for type opportunity
-        'probability': fields.float('Probability (%)',group_operator="avg"),
+        'probability': fields.float('Success Rate (%)',group_operator="avg"),
         'planned_revenue': fields.float('Expected Revenue'),
         'ref': fields.reference('Reference', selection=crm._links_get, size=128),
         'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a867777cb5b..5f3928b7c40 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -470,7 +470,7 @@
 
                     </group>
                     <group col="2" colspan="2">
-                        <separator colspan="2" string="Categorization"/>
+                        <separator colspan="2" string="Category"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="categ_id" select="1"
                         string="Category" widget="selection"
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index bdad98592b0..21e0d5b8041 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -27,7 +27,7 @@
         <field name="arch" type="xml">
             <form string="Meetings">
                 <group col="6" colspan="4">
-                    <field name="name" select="1" string="Summary"
+                    <field name="name" select="1" string="Title"
                            required="1" />
                     <field name="categ_id" widget="selection"
                         string="Meeting Type"
@@ -44,7 +44,7 @@
                     <field name="alarm_id" string="Reminder"
                         widget="selection" />
                     <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
-                           <field name="recurrency"/>
+                           <field name="recurrency" string="Recurrence"/>
                     </group>
                 </group>
                 <notebook colspan="4">
@@ -158,14 +158,14 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Recurrency Option" attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
+                    <page string="Recurrence Options" attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
-                                <field name="rrule_type" string="Recurrency period" />
+                                <field name="rrule_type" string=" Recurrence Pattern" />
                                 <field name="interval" />
 
 
-                                <separator string="End of recurrency" colspan="4"/>
+                                <separator string="End of Recurrence" colspan="4"/>
                                 <field name="end_type" />
                                 <label string=" " colspan="2" />
                                 <newline />
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 04d73dcd2a8..f8ee7895dac 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -4,7 +4,7 @@
 
         ######################## JOB OPPORTUNITIES (menu) ###########################
          <record model="ir.actions.act_window" id="crm_case_categ0_act_job">
-            <field name="name">Applicants</field>
+            <field name="name">Applications</field>
             <field name="res_model">hr.applicant</field>
             <field name="view_mode">kanban,tree,form,graph,calendar</field>
             <field name="view_id" eval="False"/>
@@ -50,7 +50,7 @@
      <!-- ALL JOBS REQUESTS -->
 
         <menuitem
-            name="Applicants"
+            name="Applications"
             parent="base.menu_crm_case_job_req_main"
             id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job" sequence="1"/>
 	
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py
index ce8ebf42cb0..0f599ab2365 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_subproduct/mrp_subproduct.py
@@ -25,7 +25,7 @@ import decimal_precision as dp
 
 class mrp_subproduct(osv.osv):
     _name = 'mrp.subproduct'
-    _description = 'Sub Product'
+    _description = 'Byproduct'
     _columns={
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), required=True),
diff --git a/addons/product/product.py b/addons/product/product.py
index 70f6a0683d6..546f30289c0 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -291,7 +291,7 @@ class product_template(osv.osv):
         'description_purchase': fields.text('Purchase Description',translate=True),
         'description_sale': fields.text('Sale Description',translate=True),
         'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
-        'supply_method': fields.selection([('produce','Produce'),('buy','Buy')], 'Supply method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
+        'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
         'sale_delay': fields.float('Customer Lead Time', help="This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
         'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
diff --git a/addons/project/project.py b/addons/project/project.py
index 0335b7cb540..4f5b6d9a202 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -161,7 +161,7 @@ class project(osv.osv):
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True),
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
-        'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive an email each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'warn_manager': fields.boolean('Notify Manager', help="If you check this field, the project manager will receive an email each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
 
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
             help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index f29783c67ae..c8958d4ebf7 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -27,7 +27,7 @@
         <act_window
             domain="[('purchase_id', '=', active_id)]"
             id="act_purchase_order_2_stock_picking"
-            name="Receptions"
+            name="Incoming Shipments"
             res_model="stock.picking"
             src_model="purchase.order"
             context="{'default_purchase_id': active_id, 'contact_display': 'partner'}" />
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 95d0acd853d..09b61d98328 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1786,7 +1786,7 @@
         <act_window
             context="{'search_default_done': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}"
             id="act_product_stock_move_open"
-            name="Stock Moves"
+            name="Inventory Move"
             res_model="stock.move"
             src_model="product.product"/>
 

From 16d26ec6479f0afce1ba5dddead7e1a988fffb00 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 16:46:29 +0530
Subject: [PATCH 231/452] [IMP]survey : Added state and buttons on top bar

bzr revid: mma@tinyerp.com-20120504111629-g1dasotn3a9fl712
---
 addons/survey/survey_view.xml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 7ced238b9b2..d74d7095424 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1058,18 +1058,24 @@
             <field name="model">survey.request</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Survey Request">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
+                    <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" icon="gtk-new"/>
+                    <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
+                    <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,waiting_answer"/>
+                </div>
+                </div>
+                <sheet string="Survey Request" layout="auto">
+                    <group class="oe_form_header">
                     <field name="date_deadline"/>
                     <field name="survey_id"/>
                     <field name="user_id" on_change="on_change_user(user_id)"/>
                      <field name="response" readonly="1"/>
-                    <group colspan="4" col="6">
-                     <field name="state"/>
-                        <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
-                        <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
-                        <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" icon="gtk-new"/>
-                        <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From bfe05098460c888fde44d03306f7fa29fd6ffcf7 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 4 May 2012 17:01:36 +0530
Subject: [PATCH 232/452] [imp] add the event page view for user

bzr revid: nco@tinyerp.com-20120504113136-ws9nxquin9sk95vu
---
 addons/event/__openerp__.py                   |   1 +
 addons/event/event_view.xml                   | 131 ++++++++++-------
 addons/event/static/src/css/event.css         |  11 ++
 addons/event/static/src/js/event.js           |   6 +
 addons/event/static/src/xml/event_address.xml |   9 ++
 addons/event_sale/event_sale.py               | 134 ++++++++++--------
 addons/event_sale/event_sale_view.xml         |  85 ++++++-----
 7 files changed, 235 insertions(+), 142 deletions(-)
 create mode 100644 addons/event/static/src/xml/event_address.xml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 85eb78f32f1..88943b06654 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -55,6 +55,7 @@ Note that:
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/*.css'],
     'js': ['static/src/js/event.js'],
+    'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 87e29a641f2..b4df8cb48ed 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -78,65 +78,27 @@
             </field>
         </record>
 
-    <!-- Events Organisation/CONFIGURATION/EVENTS -->
+<!-- Events Organisation/CONFIGURATION/EVENTS -->
 
         <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events"  layout="manual">
-                <div class="oe_form_topbar">
-                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-               		<div class="oe_right">
-                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-               		</div>
-            	</div>
-            	<sheet string="Event Form" layout="auto">
-            		<group col="2">
-            			<group col="2">
-		                	<div class="oe_event_title">
-		                    	<field name="name" nolabel="1"/>
-		                    </div>
-		                    <newline/>
-		                    <group colspan="4" name="venue">
-                            	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
-                            	<field name="location_id" nolabel="1"/> 
-                        	</group>
-			             </group>	
-			             <group>
-			             	<div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
-		                    <table>
-			                   	<tr>
-			                    	<td width="70px" class="oe_td_border">
-			                            Where
-			                        </td>
-			                        <td width="150px">
-			                            <field name="address_id" widget = "geo_address" nolabel="1"/>
-			                        </td>
-			                        <td width="auto">
-	                             		<table>
-											<tr>
-												<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1"/></td>
-											</tr>
-											<tr>
-												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
-											</tr>
-										</table>
-	                                 
-			                        </td>
-			                     </tr>
-		                     </table>   
-			             </group>
-                    </group>	
+                <form string="Events">
+                    <group col="6" colspan="4">
+                        <field name="name"/>
+                        <field name="date_begin"/>
+                        <field name="date_end"/>
+                        <field name="type" on_change="onchange_event_type(type,context)"/>
+                        <field name="user_id"/>
+                        <field name="address_id" />
+                    </group>
                     <notebook colspan="4">
                     <page string="Event">
                         <separator string="Description" colspan="4"/>
                         <field name="note" colspan="4" nolabel="1"/>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager">
+                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
                                 <field name="email" />
@@ -169,7 +131,13 @@
                                     </group>
                             </form>
                             </field>
-                        
+                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                        <group col="4" colspan="2">
+                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                        </group>
                     </page>
                     <page string="Speakers">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
@@ -177,7 +145,7 @@
                         <separator string="Other Speakers" colspan="4"/>
                         <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Extra Info" groups="event.group_event_manager">
+                    <page string="Extra Info">
                         <group col="2" colspan="2">
                             <separator string="Registrations" colspan="2"/>
                             <field name="register_min"/>
@@ -194,6 +162,67 @@
                         </group>
                     </page>
                     </notebook>
+            </form>
+            </field>
+        </record>
+
+
+    <!-- Events Organisation/CONFIGURATION/EVENTS PAGE VIEW -->
+
+        <record model="ir.ui.view" id="view_event_page">
+            <field name="name">Events</field>
+            <field name="model">event.event</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Events"  layout="manual">
+                <div class="oe_form_topbar" readonly="1">
+                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+               		<div class="oe_right">
+                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+               		</div>
+            	</div>
+            	<sheet string="Event Form" layout="auto">
+            		<group col="2">
+            			<group col="2">
+		                	<div class="oe_event_title">
+		                    	<field name="name" nolabel="1" readonly="1"/>
+		                    </div>
+		                    <newline/>
+		                    <group colspan="4" name="venue">
+                            	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
+                            	<field name="location_id" nolabel="1" readonly="1"/> 
+                        	</group>
+			             </group>	
+			             <group>
+			             	<div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
+		                    <table>
+			                   	<tr>
+			                    	<td width="70px" class="oe_td_border">
+			                            Where
+			                        </td>
+			                        <td width="auto">
+			                            <field name="address_id" widget ="geo_address" nolabel="1"/>
+			                        </td>
+			                        <td width="210px">
+	                             		<table>
+											<tr>
+												<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
+											</tr>
+											<tr>
+												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
+											</tr>
+										</table>
+	                                 
+			                        </td>
+			                     </tr>
+		                     </table>   
+			             </group>
+                    </group>	
+                    <separator string="Event Details" colspan="4"/>
+                    <field name="note" colspan="4" nolabel="1" readonly="1"/>
                     </sheet>
             </form>
             </field>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index c9f9084a583..f3f40834072 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -144,4 +144,15 @@ div.oe_fold_column{
 .oe_td_date_border
 {
 	border-right:1px solid black;
+}
+.oe_pager_group11 {
+  float: left;
+  height: 24px;
+  line-height: 24px;
+  display: inline-block;
+  border: 1px solid #ababab;
+  cursor: pointer;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
 }
\ No newline at end of file
diff --git a/addons/event/static/src/js/event.js b/addons/event/static/src/js/event.js
index 6081533397a..bd59bc78818 100644
--- a/addons/event/static/src/js/event.js
+++ b/addons/event/static/src/js/event.js
@@ -14,8 +14,11 @@ openerp.event = function(instance){
 	 	set_value:function(value){
 	 		var self = this;
 			this.get_address(value).done(function(value){
+				console.log("value",value,self);
+				self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
 				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
 				return self.list_addresses(address);
+				
 			});
 			
 	 	},
@@ -49,4 +52,7 @@ openerp.event = function(instance){
 	 	}
 		
 	}));
+
+	
+	
 };
\ No newline at end of file
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event/static/src/xml/event_address.xml
new file mode 100644
index 00000000000..370da230e6b
--- /dev/null
+++ b/addons/event/static/src/xml/event_address.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	
+	<template>
+		<td t-name="address">
+			<t t-esc="record.street"/> <br/>
+			<t t-esc="record.city"/> <br/>
+			<t t-esc="record.country_id[1]"/>
+		</td>
+	</template>
\ No newline at end of file
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 81b69babebf..fa3a9c14f46 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -99,75 +99,93 @@ class event_event(osv.osv):
     _columns = {
                     'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
                 }
-#    def subscribe_to_event(self, cr, uid, ids, context=None):
-#        res = {}
-#        event_pool = self.pool.get('event.event')
-#        register_pool = self.pool.get('event.registration')
-#        sale_order_line_pool = self.pool.get('sale.order.line')
-#        sale_order = self.pool.get('sale.order')
-#        partner_pool = self.pool.get("res.partner")
-#        data_obj = self.pool.get("ir.model.data")
-#        prod_pricelist_obj = self.pool.get('product.pricelist')
-#        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
-#        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
-#        if not partner_ids:
-#            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
-#            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-#            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
-#        else:
-#            new_partner_id = partner_ids[0]
-#            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-#            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']     
-#        for event_id in self.browse(cr, uid, ids, context=context):
-#            sale_order_lines = []
-#            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-#            new_sale_id = sale_order.create(cr, uid, {
-#                'date_order': event_id.date_begin,
-#                'pricelist_id': price_list,
-#                 'partner_id': new_partner_id, 
-#                  'partner_invoice_id': partner_invoice_id,
-#                 'partner_shipping_id': partner_shipping_id
-#                })  
-#            if event_id.event_item_ids:
-#                for items in event_id.event_item_ids:
-#                    product = items.product_id.id
-#                    sale_order_line = sale_order_line_pool.create(cr, uid, {
-#                        'order_id': new_sale_id,                                
-#                        'name': items.product_id.name,
-#                        'product_uom_qty': items.qty,
-#                        'product_id': items.product_id.id,
-#                        'price_unit': items.price,
-#                        'date_planned': items.sales_end_date,
-#                    }, context=context)
-#            view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
-#            if view_id:
-#                res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
-#            res = {
-#                    'name': _('Quotation'),
-#                    'view_type': 'form',
-#                    'view_mode': 'form',
-#                    'res_model': 'sale.order',
-#                    'res_id': new_sale_id,
-#                    'views':[(res_id,'form'), (False, 'tree')],
-#                    'type': 'ir.actions.act_window',
-#                    'nodestroy': True,
-#                    'target': 'current',
-#            }
-#        return res
+    def order_now(self, cr, uid, ids, context=None):
+        res = {}
+        event_pool = self.pool.get('event.event')
+        register_pool = self.pool.get('event.registration')
+        sale_order_line_pool = self.pool.get('sale.order.line')
+        sale_order = self.pool.get('sale.order')
+        partner_pool = self.pool.get("res.partner")
+        data_obj = self.pool.get("ir.model.data")
+        prod_pricelist_obj = self.pool.get('product.pricelist')
+        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
+        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
+        if not partner_ids:
+            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
+            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
+        else:
+            new_partner_id = partner_ids[0]
+            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']     
+        for event_id in self.browse(cr, uid, ids, context=context):
+            sale_order_lines = []
+            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
+            new_sale_id = sale_order.create(cr, uid, {
+                'date_order': event_id.date_begin,
+                'pricelist_id': price_list,
+                 'partner_id': new_partner_id, 
+                  'partner_invoice_id': partner_invoice_id,
+                 'partner_shipping_id': partner_shipping_id
+                })  
+            if event_id.event_item_ids:
+                for items in event_id.event_item_ids:
+                    product = items.product_id.id
+                    sale_order_line = sale_order_line_pool.create(cr, uid, {
+                        'order_id': new_sale_id,                                
+                        'name': items.product_id.name,
+                        'product_uom_qty': items.qty,
+                        'product_id': items.product_id.id,
+                        'price_unit': items.price,
+                        'date_planned': items.sales_end_date,
+                    }, context=context)
+            view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
+            if view_id:
+                res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+            res = {
+                    'name': _('Quotation'),
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'sale.order',
+                    'res_id': new_sale_id,
+                    'views':[(res_id,'form'), (False, 'tree')],
+                    'type': 'ir.actions.act_window',
+                    'nodestroy': True,
+                    'target': 'current',
+            }
+        return res
+    def subscribe_to_event(self, cr, uid, ids, context=None):
+        res = {}
+        data_obj = self.pool.get("ir.model.data")
+        view_id = data_obj._get_id(cr, uid, 'event', 'view_event_page')
+        if view_id:
+            res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+        res = {
+                'name': _('Event Page'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'views':[(res_id,'form'), (False, 'tree')],
+                'res_model': 'event.event',
+                'res_id': ids[0],
+                'type': 'ir.actions.act_window',
+                'nodestroy': True,
+                'target': 'current',
+        }
+        return res
     
 class event_items(osv.osv):
     _name = "event.items"
     _columns = {
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'price': fields.integer('Price'),
-         'qty': fields.integer('QTY'),
-       # 'qty': fields.selection(_max_register, 'QTY'),
+        'max_qty': fields.integer('Max Qty'),
+        'qty': fields.integer('QTY', type = 'integer'),
         'uom_id': fields.many2one('product.uom', 'UoM'),
         'discount': fields.integer('Discount'),
         'event_id': fields.many2one('event.event', 'Event'),
         'sales_end_date': fields.date('Sales End')
         }
-   
+
     def onchange_product_id(self, cr, uid, ids, product, context=None):
         product_obj = self.pool.get('product.product')
         data = {}
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 72782d5c421..0110bc1df2c 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -30,49 +30,68 @@
              </field>
         </record>
         
+		<record model="ir.ui.view" id="view_event_page_inherit">
+			<field name="name">Events Inherit</field>
+			<field name="model">event.event</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="event.view_event_page"/>
+			<field name="arch" type="xml">
+				<xpath expr="//group[@name='venue']" position="after">
+					<field name="event_item_ids" nolabel="1">
+						 <tree editable="top" string="Event Items">
+							 <field name="product_id" readonly="1" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
+							 <field name="sales_end_date" readonly="1"/>
+							 <field name="price" readonly="1"/>
+							 <field name="max_qty" readonly="1" groups="event.group_event_manager"/>
+							 <field name="qty"/>
+				 		</tree>
+					</field>
+					<newline/>
+					<div class="oe_right">
+						<button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
+					</div>
+				</xpath>
+			</field>
+		</record>
+
+
 		<record model="ir.ui.view" id="view_event_form_inherit">
 			<field name="name">Events Inherit</field>
 			<field name="model">event.event</field>
 			<field name="type">form</field>
 			<field name="inherit_id" ref="event.view_event_form"/>
 			<field name="arch" type="xml">
-				<xpath expr="//notebook/page[@string='Extra Info']" position="after">
-                    <page string="Event Items">
-                    <field name="event_item_ids" nolabel="1"/>
-                   </page>
+				<xpath expr="//page[@string='Extra Info']" position="after">
+					<page string="Event Item">
+						<field name="event_item_ids" nolabel="1">
+							 <tree editable="top" string="Event Items">
+								 <field name="product_id" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
+								 <field name="sales_end_date" />
+								 <field name="price"/>
+								 <field name="max_qty" groups="event.group_event_manager"/>
+								 <field name="qty"/>
+				 			</tree>
+						</field>
+						<newline/>
+						<div class="oe_right">
+							<button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
+						</div>
+					</page>
 				</xpath>
 			</field>
 		</record>
 
-		<record model="ir.ui.view" id="view_event_items_tree">
-			 <field name="name">Event Items Tree</field>
-			 <field name="model">event.items</field>
-			 <field name="type">tree</field>
-			 <field name="arch" type="xml">
-				 <tree editable="top" string="Event Items">
-					 <field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
-					 <field name="price"/>
-					 <field name="uom_id" invisible="1"/>
-					 <field name="qty"/>
-					 <field name="discount"/>
-					 <field name="sales_end_date"/>
-				 </tree>
-			 </field>
-		 </record>
+		<record id="view_event_kanban_inherit" model="ir.ui.view">
+            <field name="name">event.inherit.kanban</field>
+            <field name="model">event.event</field>
+            <field name="type">kanban</field>
+            <field name="inherit_id" ref="event.view_event_kanban"/>
+            <field name="arch" type="xml">
+            	<xpath expr="//div/t/t/input[@name='subscribe']" position="replace">
+            		<input type="hidden"/>
+                </xpath> 
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_event_items_form">
-			 <field name="name">Event Items Form</field>
-			 <field name="model">event.items</field>
-			 <field name="type">form</field>
-		 	 <field name="arch" type="xml">
-			 	 <form string="Event Items">
-			   	 	<field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
-			        <field name="price"/>
-			        <field name="qty"/>
-					<field name="discount"/>
-					<field name="sales_end_date"/>
-				</form>
-		 	</field>
-		</record>
     </data>
 </openerp>

From c85d2ff65777b80ab38f991ec31bd4f99a18e60d Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 17:04:32 +0530
Subject: [PATCH 233/452] [IMP]subscription : Added state and buttons on top
 bar

bzr revid: mma@tinyerp.com-20120504113432-3cc9nsnhu9vpw2v7
---
 addons/subscription/subscription_view.xml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 5235e0410bf..d40ea4be243 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -13,8 +13,17 @@
             <field name="model">subscription.subscription</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Subscriptions">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="set_process" states="draft" string="Process" type="object" icon="gtk-go-forward"/>
+                    <button name="set_done" states="running" string="Stop" type="object" icon="gtk-stop"/>
+                    <button name="set_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,running"/>
+                </div>
+                </div>
+                <sheet string="Subscriptions" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name="partner_id" select="1"/>
                         <field name="user_id" select="1"/>
@@ -32,12 +41,6 @@
                             <field colspan="4" name="notes" nolabel="1"/>
                             <separator colspan="4"/>
                             <field colspan="4" name="cron_id" readonly="1"/>
-                            <field name="state" readonly="1"/>
-                            <group col="3" colspan="2">
-                                <button name="set_process" states="draft" string="Process" type="object" icon="gtk-go-forward"/>
-                                <button name="set_done" states="running" string="Stop" type="object" icon="gtk-stop"/>
-                                <button name="set_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
-                            </group>
                         </page>
                         <page string="Documents created">
                             <field colspan="4" name="doc_lines" nolabel="1" widget="one2many_list"/>
@@ -47,6 +50,7 @@
                             <field name="note" colspan="4" nolabel="1"/>
                     </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>

From 12f03240ef4084acb759d7d05a6313481940ed23 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 4 May 2012 17:17:41 +0530
Subject: [PATCH 234/452] [remove] remove the unused console statement.

bzr revid: nco@tinyerp.com-20120504114741-ik1ft1ln90188tpt
---
 addons/event/static/src/js/event.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/event/static/src/js/event.js b/addons/event/static/src/js/event.js
index bd59bc78818..ed390d6af9e 100644
--- a/addons/event/static/src/js/event.js
+++ b/addons/event/static/src/js/event.js
@@ -14,7 +14,6 @@ openerp.event = function(instance){
 	 	set_value:function(value){
 	 		var self = this;
 			this.get_address(value).done(function(value){
-				console.log("value",value,self);
 				self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
 				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
 				return self.list_addresses(address);

From a2a05cfc196ce72613501cb3bc5a962c2e359ae2 Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Fri, 4 May 2012 17:27:48 +0530
Subject: [PATCH 235/452] [IMP]:improved titles State by Status everywhere

bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
---
 addons/account/account.py                          | 10 +++++-----
 addons/account/account_bank_statement.py           |  2 +-
 addons/account/account_invoice.py                  |  2 +-
 addons/account/account_invoice_view.xml            |  2 +-
 addons/account/account_move_line.py                |  2 +-
 addons/account/account_view.xml                    |  8 ++++----
 addons/account/data/account_data.xml               | 10 +++++-----
 addons/account/project/project_view.xml            |  2 +-
 addons/account/report/account_entries_report.py    |  2 +-
 .../account/report/account_invoice_report_view.xml |  2 +-
 addons/account/report/account_report.py            |  2 +-
 .../account_analytic_analysis_menu.xml             |  2 +-
 addons/account_asset/account_asset.py              |  2 +-
 .../account_asset/report/account_asset_report.py   |  2 +-
 .../account_bank_statement.py                      |  2 +-
 addons/account_payment/account_payment.py          |  2 +-
 addons/account_payment/account_payment_view.xml    |  2 +-
 addons/account_voucher/account_voucher.py          |  2 +-
 addons/account_voucher/account_voucher_view.xml    |  2 +-
 addons/account_voucher/report/account_voucher.rml  |  2 +-
 .../report/account_voucher_print.rml               |  2 +-
 .../report/account_voucher_sales_receipt_view.xml  |  2 +-
 .../voucher_payment_receipt_view.xml               |  4 ++--
 .../voucher_sales_purchase_view.xml                |  4 ++--
 addons/analytic/analytic.py                        |  2 +-
 addons/anonymization/anonymization.py              |  6 +++---
 addons/auction/auction.py                          |  4 ++--
 addons/auction/auction_view.xml                    |  4 ++--
 addons/auction/report/report_auction.py            |  2 +-
 addons/auction/report/report_auction_view.xml      |  2 +-
 addons/audittrail/audittrail.py                    |  2 +-
 addons/audittrail/audittrail_view.xml              |  2 +-
 addons/base_action_rule/base_action_rule.py        |  2 +-
 addons/base_calendar/base_calendar.py              |  6 +++---
 addons/base_calendar/base_calendar_view.xml        |  4 ++--
 addons/base_module_quality/base_module_quality.py  |  2 +-
 .../openerp_report_designer/bin/script/lib/gui.py  |  4 ++--
 addons/crm/crm_lead.py                             |  2 +-
 addons/crm/crm_lead_view.xml                       |  4 ++--
 addons/crm/crm_meeting.py                          |  2 +-
 addons/crm/crm_phonecall.py                        |  2 +-
 addons/crm/report/crm_lead_report.py               |  2 +-
 addons/crm/report/crm_lead_report_view.xml         |  2 +-
 addons/crm/report/crm_phonecall_report.py          |  2 +-
 addons/crm/report/crm_phonecall_report_view.xml    |  2 +-
 addons/crm_claim/crm_claim.py                      |  2 +-
 addons/crm_claim/crm_claim_view.xml                |  2 +-
 addons/crm_claim/report/crm_claim_report.py        |  2 +-
 addons/crm_claim/report/crm_claim_report_view.xml  |  2 +-
 addons/crm_fundraising/crm_fundraising.py          |  2 +-
 addons/crm_fundraising/crm_fundraising_view.xml    |  2 +-
 .../report/crm_fundraising_report.py               |  2 +-
 .../report/crm_fundraising_report_view.xml         |  2 +-
 addons/crm_helpdesk/crm_helpdesk.py                |  2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml          |  2 +-
 addons/crm_helpdesk/report/crm_helpdesk_report.py  |  2 +-
 .../report/crm_helpdesk_report_view.xml            |  2 +-
 .../crm_partner_assign/report/crm_lead_report.py   |  2 +-
 .../report/crm_lead_report_view.xml                |  2 +-
 addons/event/event.py                              |  4 ++--
 addons/event/event_view.xml                        |  4 ++--
 addons/fetchmail/fetchmail.py                      |  2 +-
 addons/hr/hr.py                                    |  2 +-
 addons/hr/hr_view.xml                              |  2 +-
 addons/hr_evaluation/hr_evaluation.py              |  2 +-
 addons/hr_evaluation/hr_evaluation_view.xml        |  8 ++++----
 .../hr_evaluation/report/hr_evaluation_report.py   |  2 +-
 .../report/hr_evaluation_report_view.xml           |  2 +-
 addons/hr_expense/hr_expense.py                    |  2 +-
 addons/hr_expense/report/hr_expense_report.py      |  2 +-
 .../hr_expense/report/hr_expense_report_view.xml   |  2 +-
 addons/hr_holidays/hr_holidays.py                  |  2 +-
 addons/hr_holidays/hr_holidays_view.xml            |  2 +-
 addons/hr_payroll/hr_payroll.py                    |  4 ++--
 addons/hr_recruitment/hr_recruitment.py            |  4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml      |  2 +-
 .../hr_recruitment/report/hr_recruitment_report.py |  2 +-
 .../report/hr_recruitment_report_view.xml          |  2 +-
 .../hr_timesheet_invoice/report/report_analytic.py |  2 +-
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py    |  2 +-
 .../hr_timesheet_sheet/report/timesheet_report.py  |  2 +-
 .../report/timesheet_report_view.xml               |  2 +-
 addons/idea/idea.py                                |  2 +-
 addons/idea/idea_view.xml                          |  2 +-
 addons/idea/report/report_vote.py                  |  2 +-
 addons/idea/report/report_vote_view.xml            |  2 +-
 addons/lunch/lunch.py                              |  2 +-
 addons/mail/mail_message.py                        |  2 +-
 addons/mail/mail_message_view.xml                  |  2 +-
 addons/marketing_campaign/marketing_campaign.py    |  6 +++---
 .../marketing_campaign/marketing_campaign_view.xml |  6 +++---
 .../marketing_campaign/report/campaign_analysis.py |  2 +-
 .../report/campaign_analysis_view.xml              |  2 +-
 addons/mrp/mrp.py                                  |  2 +-
 addons/mrp/mrp_view.xml                            |  2 +-
 addons/mrp_operations/__openerp__.py               |  2 +-
 addons/mrp_operations/mrp_operations.py            |  4 ++--
 addons/mrp_operations/mrp_operations_view.xml      |  2 +-
 .../report/mrp_workorder_analysis.py               |  2 +-
 .../report/mrp_workorder_analysis_view.xml         |  2 +-
 addons/mrp_repair/mrp_repair.py                    |  4 ++--
 addons/mrp_repair/mrp_repair_view.xml              |  2 +-
 addons/point_of_sale/account_statement_view.xml    |  4 ++--
 addons/point_of_sale/point_of_sale.py              |  2 +-
 addons/point_of_sale/point_of_sale_view.xml        |  2 +-
 addons/point_of_sale/report/pos_order_report.py    |  2 +-
 addons/point_of_sale/report/pos_sales_user.rml     |  2 +-
 .../point_of_sale/report/pos_sales_user_today.rml  |  2 +-
 .../point_of_sale/report/report_cash_register.py   |  2 +-
 addons/process/process.py                          |  2 +-
 addons/procurement/procurement.py                  |  2 +-
 addons/procurement/procurement_view.xml            |  2 +-
 addons/project/project.py                          |  4 ++--
 addons/project/project_view.xml                    |  2 +-
 addons/project/report/project_report.py            |  6 +++---
 addons/project/report/project_report_view.xml      |  2 +-
 addons/project_issue/project_issue.py              |  2 +-
 addons/project_issue/project_issue_view.xml        |  2 +-
 .../project_issue/report/project_issue_report.py   |  2 +-
 .../report/project_issue_report_view.xml           |  2 +-
 addons/project_long_term/project_long_term.py      |  2 +-
 .../project_long_term/project_long_term_view.xml   |  2 +-
 addons/project_scrum/project_scrum.py              |  4 ++--
 addons/project_scrum/project_scrum_view.xml        |  4 ++--
 addons/purchase/purchase.py                        |  4 ++--
 addons/purchase/purchase_view.xml                  |  6 +++---
 addons/purchase/report/purchase_report_view.xml    |  2 +-
 addons/purchase/stock_view.xml                     |  2 +-
 .../purchase_requisition/purchase_requisition.py   |  2 +-
 .../purchase_requisition_view.xml                  |  2 +-
 addons/sale/report/sale_report_view.xml            |  2 +-
 addons/sale/sale.py                                |  2 +-
 addons/sale/sale_view.xml                          |  6 +++---
 addons/stock/report/picking.rml                    |  4 ++--
 addons/stock/report/report_stock_move.py           |  4 ++--
 addons/stock/report/report_stock_move_view.xml     |  4 ++--
 addons/stock/stock.py                              |  8 ++++----
 addons/stock/stock_view.xml                        | 14 +++++++-------
 addons/stock_planning/stock_planning.py            |  6 +++---
 addons/stock_planning/stock_planning_view.xml      |  2 +-
 addons/subscription/subscription.py                |  2 +-
 addons/subscription/subscription_view.xml          |  2 +-
 addons/survey/survey.py                            |  2 +-
 addons/survey/survey_view.xml                      |  4 ++--
 144 files changed, 205 insertions(+), 205 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 75bfc891980..839161deb65 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -893,7 +893,7 @@ class account_fiscalyear(osv.osv):
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
         'period_ids': fields.one2many('account.period', 'fiscalyear_id', 'Periods'),
-        'state': fields.selection([('draft','Open'), ('done','Closed')], 'State', readonly=True),
+        'state': fields.selection([('draft','Open'), ('done','Closed')], 'Status', readonly=True),
     }
     _defaults = {
         'state': 'draft',
@@ -990,7 +990,7 @@ class account_period(osv.osv):
         'date_start': fields.date('Start of Period', required=True, states={'done':[('readonly',True)]}),
         'date_stop': fields.date('End of Period', required=True, states={'done':[('readonly',True)]}),
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
-        'state': fields.selection([('draft','Open'), ('done','Closed')], 'State', readonly=True,
+        'state': fields.selection([('draft','Open'), ('done','Closed')], 'Status', readonly=True,
                                   help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
         'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
@@ -1117,7 +1117,7 @@ class account_journal_period(osv.osv):
         'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"),
         'icon': fields.function(_icon_get, string='Icon', type='char', size=32),
         'active': fields.boolean('Active', required=True, help="If the active field is set to False, it will allow you to hide the journal period without removing it."),
-        'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
+        'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'Status', required=True, readonly=True,
                                   help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
         'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
         'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
@@ -1264,7 +1264,7 @@ class account_move(osv.osv):
         'ref': fields.char('Reference', size=64),
         'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
-        'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', required=True, readonly=True,
+        'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'Status', required=True, readonly=True,
             help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
         'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
         'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
@@ -2350,7 +2350,7 @@ class account_subscription(osv.osv):
         'period_total': fields.integer('Number of Periods', required=True),
         'period_nbr': fields.integer('Period', required=True),
         'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
-        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State', required=True, readonly=True),
+        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status', required=True, readonly=True),
         'lines_id': fields.one2many('account.subscription.line', 'subscription_id', 'Subscription Lines')
     }
     _defaults = {
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 5601179e0fc..51e3d2dbe85 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -153,7 +153,7 @@ class account_bank_statement(osv.osv):
         'state': fields.selection([('draft', 'New'),
                                    ('open','Open'), # used by cash statements
                                    ('confirm', 'Closed')],
-                                   'State', required=True, readonly="1",
+                                   'Status', required=True, readonly="1",
                                    help='When new statement is created the state will be \'Draft\'.\n'
                                         'And after getting confirmation from the bank it will be in \'Confirmed\' state.'),
         'currency': fields.function(_currency, string='Currency',
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index d06ba70bf02..a0f5dceaf6d 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -206,7 +206,7 @@ class account_invoice(osv.osv):
             ('open','Open'),
             ('paid','Paid'),
             ('cancel','Cancelled')
-            ],'State', select=True, readonly=True,
+            ],'Status', select=True, readonly=True,
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Invoice. \
             \n* The \'Pro-forma\' when invoice is in Pro-forma state,invoice does not have an invoice number. \
             \n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 462e7d56937..72d5da23ef4 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -375,7 +375,7 @@
                         <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                         <filter string="Invoice Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date_invoice'}"/>
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 17120ee265e..9cbc9988526 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -508,7 +508,7 @@ class account_move_line(osv.osv):
         'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
         'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
         'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'),
-        'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State', readonly=True,
+        'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'Status', readonly=True,
                                   help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
         'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7829dc91e03..6e30741c4c3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -68,7 +68,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                        <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </search>
             </field>
@@ -535,7 +535,7 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
-                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                        <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                         <separator orientation="vertical"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
                     </group>
@@ -580,7 +580,7 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
-                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                        <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                         <separator orientation="vertical"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
                     </group>
@@ -1186,7 +1186,7 @@
                             <newline/>
                             <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
                             <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
-                            <separator colspan="4" string="State"/>
+                            <separator colspan="4" string="Status"/>
                             <newline/>
                             <field name="reconcile_id"/>
                             <field name="reconcile_partial_id"/>
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index e111c453325..12fd558a31f 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -125,7 +125,7 @@
         </record>
         <record id="bank_col23" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">State</field>
+            <field name="name">Status</field>
             <field name="field">state</field>
             <field eval="19" name="sequence"/>
         </record>
@@ -212,7 +212,7 @@
         </record>
         <record id="bank_col23_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">State</field>
+            <field name="name">Status</field>
             <field name="field">state</field>
             <field eval="19" name="sequence"/>
         </record>
@@ -287,7 +287,7 @@
         </record>
         <record id="journal_col24" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
-            <field name="name">State</field>
+            <field name="name">Status</field>
             <field name="field">state</field>
             <field eval="19" name="sequence"/>
         </record>
@@ -368,7 +368,7 @@
         </record>
         <record id="sp_journal_col24" model="account.journal.column">
             <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">State</field>
+            <field name="name">Status</field>
             <field name="field">state</field>
             <field eval="19" name="sequence"/>
         </record>
@@ -454,7 +454,7 @@
         </record>
         <record id="sp_refund_journal_col24" model="account.journal.column">
             <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">State</field>
+            <field name="name">Status</field>
             <field name="field">state</field>
             <field eval="19" name="sequence"/>
         </record>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 648af6dda4c..e6948fb2ad0 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -46,7 +46,7 @@
                         <filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Parent Account" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index 29e40c7d5ad..3d3554fd2cc 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -51,7 +51,7 @@ class account_entries_report(osv.osv):
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
         'product_uom_id': fields.many2one('product.uom', 'Product UOM', readonly=True),
-        'move_state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', readonly=True),
+        'move_state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'Status', readonly=True),
         'move_line_state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State of Move Line', readonly=True),
         'reconcile_id': fields.many2one('account.move.reconcile', readonly=True),
         'partner_id': fields.many2one('res.partner','Partner', readonly=True),
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 6e5f83a83d1..76748f41f1b 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -112,7 +112,7 @@
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
                     <filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>
                     <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index 9f81f295d74..555d1ee7c25 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -175,7 +175,7 @@ class report_invoice_created(osv.osv):
             ('open','Open'),
             ('paid','Done'),
             ('cancel','Cancelled')
-        ],'State', readonly=True),
+        ],'Status', readonly=True),
         'origin': fields.char('Source Document', size=64, readonly=True, help="Reference of the document that generated this invoice report."),
         'create_date': fields.datetime('Create Date', readonly=True)
     }
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 964383246dd..0c28155b76d 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -43,7 +43,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="State" icon="terp-personal" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-personal" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 97aec1d8487..0799a59a423 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -223,7 +223,7 @@ class account_asset_asset(osv.osv):
         'parent_id': fields.many2one('account.asset.asset', 'Parent Asset', readonly=True, states={'draft':[('readonly',False)]}),
         'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'),
         'purchase_date': fields.date('Purchase Date', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'State', required=True,
+        'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'Status', required=True,
                                   help="When an asset is created, the state is 'Draft'.\n" \
                                        "If the asset is confirmed, the state goes in 'Running' and the depreciation lines can be posted in the accounting.\n" \
                                        "You can manually close an asset when the depreciation is over. If the last line of depreciation is posted, the asset automatically goes in that state."),
diff --git a/addons/account_asset/report/account_asset_report.py b/addons/account_asset/report/account_asset_report.py
index a7d9adf00f9..000967a555c 100644
--- a/addons/account_asset/report/account_asset_report.py
+++ b/addons/account_asset/report/account_asset_report.py
@@ -33,7 +33,7 @@ class asset_asset_report(osv.osv):
         'asset_id': fields.many2one('account.asset.asset', string='Asset', readonly=True),
         'asset_category_id': fields.many2one('account.asset.category',string='Asset category'),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
-        'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'State', readonly=True),
+        'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'Status', readonly=True),
         'depreciation_value': fields.float('Amount of Depreciation Lines', readonly=True),
         'move_check': fields.boolean('Posted', readonly=True),
         'nbr': fields.integer('# of Depreciation Lines', readonly=True),
diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py
index 6fb51bbc4aa..d42e188679a 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement.py
+++ b/addons/account_bank_statement_extensions/account_bank_statement.py
@@ -113,7 +113,7 @@ class account_bank_statement_line(osv.osv):
         'globalisation_amount': fields.related('globalisation_id', 'amount', type='float',
             relation='account.bank.statement.line.global', string='Glob. Amount', readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed')],
-            'State', required=True, readonly=True),    
+            'Status', required=True, readonly=True),    
         'counterparty_name': fields.char('Counterparty Name', size=35),
         'counterparty_bic': fields.char('Counterparty BIC', size=11),
         'counterparty_number': fields.char('Counterparty Number', size=34),
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 70d3fbe54cc..4aa12634e09 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -94,7 +94,7 @@ class payment_order(osv.osv):
             ('draft', 'Draft'),
             ('open', 'Confirmed'),
             ('cancel', 'Cancelled'),
-            ('done', 'Done')], 'State', select=True,
+            ('done', 'Done')], 'Status', select=True,
             help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'),
         'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}),
         'total': fields.function(_total, string="Total", type='float'),
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 71856dcf703..8375cbef988 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -214,7 +214,7 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Payment Mode" context="{'group_by': 'mode'}" icon="terp-dolar"/>
-                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                        <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 0191f5866ba..597d1bf7308 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -278,7 +278,7 @@ class account_voucher(osv.osv):
              ('proforma','Pro-forma'),
              ('posted','Posted'),
              ('cancel','Cancelled')
-            ], 'State', readonly=True, size=32,
+            ], 'Status', readonly=True, size=32,
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \
                         \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
                         \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index e519d23b09e..3dad80343dc 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -139,7 +139,7 @@
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/account_voucher/report/account_voucher.rml b/addons/account_voucher/report/account_voucher.rml
index 3892d281f5b..6b3337aa64f 100644
--- a/addons/account_voucher/report/account_voucher.rml
+++ b/addons/account_voucher/report/account_voucher.rml
@@ -185,7 +185,7 @@
     <blockTable colWidths="63.0,72.0,44.0,84.0,52.0,210.0" style="Table8">
       <tr>
         <td>
-          <para style="terp_tblheader_General">State:</para>
+          <para style="terp_tblheader_General">Status:</para>
         </td>
         <td>
           <para style="P2">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
diff --git a/addons/account_voucher/report/account_voucher_print.rml b/addons/account_voucher/report/account_voucher_print.rml
index 99935520b81..923e900887a 100644
--- a/addons/account_voucher/report/account_voucher_print.rml
+++ b/addons/account_voucher/report/account_voucher_print.rml
@@ -159,7 +159,7 @@
     <blockTable colWidths="52.0,123.0,50.0,198.0,42.0,59.0" style="Table4">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">State:</para>
+          <para style="terp_tblheader_Details">Status:</para>
         </td>
         <td>
           <para style="P4">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index 0433d9572d4..454bcefd5dd 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -93,7 +93,7 @@
                     <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
                     <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index b422c0dbe73..8db619627d9 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -28,7 +28,7 @@
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -61,7 +61,7 @@
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 162605be36c..9880e4533aa 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -27,7 +27,7 @@
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -59,7 +59,7 @@
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 6e800247cb5..21915b7189f 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -169,7 +169,7 @@ class account_analytic_account(osv.osv):
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End', select=True),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
-        'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed')], 'State', required=True,
+        'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed')], 'Status', required=True,
                                   help='* When an account is created its in \'Draft\' state.\
                                   \n* If any associated partner is there, it can be in \'Open\' state.\
                                   \n* If any pending balance is there it can be in \'Pending\'. \
diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index 39fb415e9e1..21c000aadf7 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -48,7 +48,7 @@ class ir_model_fields_anonymization(osv.osv):
         'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'),
         'field_name': fields.char('Field Name', size=128, required=True),
         'field_id': fields.many2one('ir.model.fields', 'Field', ondelete='set null'),
-        'state': fields.selection(selection=FIELD_STATES, String='State', required=True, readonly=True),
+        'state': fields.selection(selection=FIELD_STATES, String='Status', required=True, readonly=True),
     }
 
     _sql_constraints = [
@@ -209,7 +209,7 @@ class ir_model_fields_anonymization_history(osv.osv):
     _columns = {
         'date': fields.datetime('Date', required=True, readonly=True),
         'field_ids': fields.many2many('ir.model.fields.anonymization', 'anonymized_field_to_history_rel', 'field_id', 'history_id', 'Fields', readonly=True),
-        'state': fields.selection(selection=ANONYMIZATION_HISTORY_STATE, string='State', required=True, readonly=True),
+        'state': fields.selection(selection=ANONYMIZATION_HISTORY_STATE, string='Status', required=True, readonly=True),
         'direction': fields.selection(selection=ANONYMIZATION_DIRECTION, string='Direction', required=True, readonly=True),
         'msg': fields.text('Message', readonly=True),
         'filepath': fields.char(string='File path', size=256, readonly=True),
@@ -243,7 +243,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
         'summary': fields.function(_get_summary, type='text', string='Summary'),
         'file_export': fields.binary(string='Export'),
         'file_import': fields.binary(string='Import'),
-        'state': fields.function(_get_state, string='State', type='selection', selection=ANONYMIZATION_STATES, readonly=False),
+        'state': fields.function(_get_state, string='Status', type='selection', selection=ANONYMIZATION_STATES, readonly=False),
         'msg': fields.text(string='Message'),
     }
 
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 6d8b88f3d06..ed2c5f22f5e 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -96,7 +96,7 @@ class auction_dates(osv.osv):
         'acc_income': fields.many2one('account.account', 'Income Account', required=True),
         'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
         'adj_total': fields.function(_adjudication_get, string='Total Adjudication', store=True),
-        'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True,
+        'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'Status', select=1, readonly=True,
                                   help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'),
         'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=False),
         'buyer_invoice_history': fields.function(_get_invoice, relation='account.invoice', string="Buyer Invoice", type='many2many', multi=True),
@@ -389,7 +389,7 @@ class auction_lots(osv.osv):
             ('unsold', 'Unsold'),
             ('paid', 'Paid'),
             ('sold', 'Sold'),
-            ('taken_away', 'Taken away')), 'State', required=True, readonly=True,
+            ('taken_away', 'Taken away')), 'Status', required=True, readonly=True,
             help=' * The \'Draft\' state is used when a object is encoding as a new object. \
                 \n* The \'Unsold\' state is used when object does not sold for long time, user can also set it as draft state after unsold. \
                 \n* The \'Paid\' state is used when user pay for the object \
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index a807b7c2ce1..3f9ca97e090 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -219,7 +219,7 @@
                 <field name="auction2" string="Last Auction Date"/>
                 <newline/>
                 <group expand="0" string="Group By...">
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <separator orientation="vertical" />
                     <filter string="Auction Date"
                         icon="terp-go-month"
@@ -463,7 +463,7 @@
                          help="Depositer Inventory" domain="[]"
                          context="{'group_by':'bord_vnd_id'}"/>
                      <separator orientation="vertical" />
-                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                      <filter string="Type"
                          icon="terp-stock_symbol-selection"
                          help="Object Category" domain="[]"
diff --git a/addons/auction/report/report_auction.py b/addons/auction/report/report_auction.py
index af5d76b6076..8d554eb768e 100644
--- a/addons/auction/report/report_auction.py
+++ b/addons/auction/report/report_auction.py
@@ -54,7 +54,7 @@ class report_auction(osv.osv):
         'net_margin':fields.float('Net Margin', readonly=True),
         'avg_estimation':fields.float('Avg estimation', readonly=True),
         'user_id':fields.many2one('res.users', 'User', select=1),
-        'state': fields.selection((('draft', 'Draft'), ('unsold', 'Unsold'), ('sold', 'Sold')), 'State', readonly=True, select=1),
+        'state': fields.selection((('draft', 'Draft'), ('unsold', 'Unsold'), ('sold', 'Sold')), 'Status', readonly=True, select=1),
 
     }
 
diff --git a/addons/auction/report/report_auction_view.xml b/addons/auction/report/report_auction_view.xml
index 18f454bf3bb..b65914ff1bc 100644
--- a/addons/auction/report/report_auction_view.xml
+++ b/addons/auction/report/report_auction_view.xml
@@ -77,7 +77,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Auction" icon="terp-purchase" name="auction_date" context="{'group_by':'auction'}"/>
                     <separator orientation="vertical" />
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Type"
                          icon="terp-stock_symbol-selection"
                          help="Object Category" domain="[]"
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 78a180e8d4d..aee9fbd9305 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -43,7 +43,7 @@ class audittrail_rule(osv.osv):
         "log_create": fields.boolean("Log Creates",help="Select this if you want to keep track of creation on any record of the object of this rule"),
         "log_action": fields.boolean("Log Action",help="Select this if you want to keep track of actions on the object of this rule"),
         "log_workflow": fields.boolean("Log Workflow",help="Select this if you want to keep track of workflow on any record of the object of this rule"),
-        "state": fields.selection((("draft", "Draft"), ("subscribed", "Subscribed")), "State", required=True),
+        "state": fields.selection((("draft", "Draft"), ("subscribed", "Subscribed")), "Status", required=True),
         "action_id": fields.many2one('ir.actions.act_window', "Action ID"),
     }
     _defaults = {
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 2e7e2c31ea8..35f8b7babd1 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -68,7 +68,7 @@
                 </group>
                 <newline/>
                   <group expand="0" string="Group By...">
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                 </group>
                 </search>
             </field>
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 50ebd96a3c2..b208864700b 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -95,7 +95,7 @@ trigger date, like sending a reminder 15 minutes before a meeting."),
         'trg_user_id':  fields.many2one('res.users', 'Responsible'),
         'trg_partner_id': fields.many2one('res.partner', 'Partner'),
         'trg_partner_categ_id': fields.many2one('res.partner.category', 'Partner Category'),
-        'trg_state_from': fields.selection(_state_get, 'State', size=16),
+        'trg_state_from': fields.selection(_state_get, 'Status', size=16),
         'trg_state_to': fields.selection(_state_get, 'Button Pressed', size=16),
 
         'act_method': fields.char('Call Object Method', size=64),
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 4dffd8bcbf8..fadd2242c2a 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -337,7 +337,7 @@ class calendar_attendee(osv.osv):
                         ('needs-action', 'Needs Action'),
                         ('accepted', 'Accepted'),
                         ('declined', 'Declined'),
-                        ('delegated', 'Delegated')], 'State', readonly=True, \
+                        ('delegated', 'Delegated')], 'Status', readonly=True, \
                         help="Status of the attendee's participation"),
         'rsvp':  fields.boolean('Required Reply?',
                     help="Indicats whether the favor of a reply is requested"),
@@ -767,7 +767,7 @@ class calendar_alarm(osv.osv):
                     ('run', 'Run'),
                     ('stop', 'Stop'),
                     ('done', 'Done'),
-                ], 'State', select=True, readonly=True),
+                ], 'Status', select=True, readonly=True),
      }
 
     _defaults = {
@@ -1037,7 +1037,7 @@ class calendar_event(osv.osv):
         'base_calendar_url': fields.char('Caldav URL', size=264),
         'state': fields.selection([('tentative', 'Tentative'),
                         ('confirmed', 'Confirmed'),
-                        ('cancelled', 'Cancelled')], 'State', readonly=True),
+                        ('cancelled', 'Cancelled')], 'Status', readonly=True),
         'exdate': fields.text('Exception Date/Times', help="This property \
 defines the list of date/time exceptions for a recurring calendar component."),
         'exrule': fields.char('Exception Rule', size=352, help="Defines a \
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 464290b9e46..f83d6e39344 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -139,7 +139,7 @@
                         <filter string="Required Reply" icon="terp-mail-replied"
                             domain="[]" context="{'group_by':'rsvp'}" />
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize" help="Invitation Type"
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" help="Invitation Type"
                             domain="[]" context="{'group_by':'state'}" />
                     </group>
                </search>
@@ -470,7 +470,7 @@
                                 domain="[]" context="{'group_by':'show_as'}" />
                             <filter string="Privacy" icon="terp-locked"
                                 domain="[]" context="{'group_by':'class'}" />
-                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                            <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
                                 context="{'group_by':'state'}" />
                             <separator orientation="vertical" />
                             <filter string="Date" icon="terp-go-month"
diff --git a/addons/base_module_quality/base_module_quality.py b/addons/base_module_quality/base_module_quality.py
index bbe20bc0b4f..b6b461f5824 100644
--- a/addons/base_module_quality/base_module_quality.py
+++ b/addons/base_module_quality/base_module_quality.py
@@ -296,7 +296,7 @@ class module_quality_detail(osv.osv):
         'summary': fields.text('Summary'),
         'detail': fields.text('Details'),
         'message': fields.char('Message', size=64),
-        'state': fields.selection([('done','Done'),('skipped','Skipped'),], 'State', size=24, help='The test will be completed only if the module is installed or if the test may be processed on uninstalled module.'),
+        'state': fields.selection([('done','Done'),('skipped','Skipped'),], 'Status', size=24, help='The test will be completed only if the module is installed or if the test may be processed on uninstalled module.'),
     }
 
 module_quality_detail()
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
index 975aa387193..d75469ca658 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
@@ -668,14 +668,14 @@ class DBModalDialog:
             UnoControlButtonModel
             UnoControlCheckBoxModel
         """
-        self.setControlModelProperty( cCtrlName, "State", nState )
+        self.setControlModelProperty( cCtrlName, "Status", nState )
 
     def getState( self, cCtrlName ):
         """Supported controls...
             UnoControlButtonModel
             UnoControlCheckBoxModel
         """
-        return self.getControlModelProperty( cCtrlName, "State" )
+        return self.getControlModelProperty( cCtrlName, "Status" )
 
     def setLabel( self, cCtrlName, cLabel ):
         """Supported controls...
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 597eeb8709a..710e8f84a36 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -175,7 +175,7 @@ class crm_lead(crm_case, osv.osv):
                                 multi='day_open', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 multi='day_close', type="float", store=True),
-        'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True,
+        'state': fields.selection(crm.AVAILABLE_STATES, 'Status', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'In progress\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 5f3928b7c40..a8cb6f732bd 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -382,7 +382,7 @@
                         domain="[]" context="{'group_by':'channel_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="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <separator orientation="vertical" groups="base.group_no_one"/>
                     <filter string="Creation" help="Create date" icon="terp-go-month"
                         domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
@@ -619,7 +619,7 @@
                     <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
                     <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
                     <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <separator orientation="vertical" />
                     <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                     <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 70f1d7bff1e..a0e4803cde7 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -70,7 +70,7 @@ class crm_meeting(crm_base, osv.osv):
         'state': fields.selection([('open', 'Confirmed'),
                                     ('draft', 'Unconfirmed'),
                                     ('cancel', 'Cancelled'),
-                                    ('done', 'Done')], 'State', \
+                                    ('done', 'Done')], 'Status', \
                                     size=16, readonly=True),
     }
     _defaults = {
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index e869c2a890a..b60c1905539 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -54,7 +54,7 @@ class crm_phonecall(crm_base, osv.osv):
                                     ('cancel', 'Cancelled'),
                                     ('done', 'Held'),
                                     ('pending', 'Not Held'),
-                                ], 'State', size=16, readonly=True,
+                                ], 'Status', size=16, readonly=True,
                                   help='The state is set to \'Todo\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the call is over, the state is set to \'Held\'.\
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index ab8c7ca7c83..2ee1f2945f4 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -79,7 +79,7 @@ class crm_lead_report(osv.osv):
         'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True),
         'channel_id':fields.many2one('crm.case.channel', 'Channel', readonly=True),
         'type_id':fields.many2one('crm.case.resource.type', 'Campaign', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'email': fields.integer('# Emails', size=128, readonly=True),
         'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg"),
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index e012d4745e4..456afd884ea 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -161,7 +161,7 @@
                         <filter string="Channel" icon="terp-call-start"
                             domain="[]" context="{'group_by':'channel_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize"
+                        <filter string="Status" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
                         <filter string="Year" icon="terp-go-year"
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index ccf0775cfd5..8ee32cfc416 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -45,7 +45,7 @@ class crm_phonecall_report(osv.osv):
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'nbr': fields.integer('# of Cases', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index ea210ddc85a..892ed3791e3 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -109,7 +109,7 @@
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize"
+                        <filter string="Status" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
                         <filter string="Company" icon="terp-go-home"
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 9673ba5e430..1b6d386b0cc 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -75,7 +75,7 @@ class crm_claim(crm.crm_case, osv.osv):
         'partner_phone': fields.char('Phone', size=32),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_ids','=',section_id)]"), 
         'cause': fields.text('Root Cause'),
-        'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True,
+        'state': fields.selection(crm.AVAILABLE_STATES, 'Status', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 03639fc10e4..22bb29d978f 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -231,7 +231,7 @@
                             domain="[]" context="{'group_by':'stage_id'}" />
                         <filter string="Type" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
-                        <filter string="State"
+                        <filter string="Status"
                             icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index 6075a842182..4cda15c0969 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -51,7 +51,7 @@ class crm_claim_report(osv.osv):
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
         'nbr': fields.integer('# of Cases', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index a100747690e..8a241b8acc0 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -139,7 +139,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
                             context="{'group_by':'type_action'}" help="Action Type"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize"
+                        <filter string="Status" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
                         <filter string="Company" icon="terp-go-home"
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 76d0ca8fdd5..90014188777 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -68,7 +68,7 @@ class crm_fundraising(crm.crm_case, osv.osv):
             'duration': fields.float('Duration'),
             'ref': fields.reference('Reference', selection=crm._links_get, size=128),
             'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
-            'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True,
+            'state': fields.selection(crm.AVAILABLE_STATES, 'Status', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 48eb1aa3072..ee02e19d28d 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -254,7 +254,7 @@
                                 icon="terp-dolar" domain="[]"
                                 context="{'group_by':'type_id'}" />
                             <separator orientation="vertical" />
-                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                            <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
                                 context="{'group_by':'state'}" />
                         </group>
                     </search>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report.py b/addons/crm_fundraising/report/crm_fundraising_report.py
index c0f3ec8c3a6..74f36aebfb1 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report.py
+++ b/addons/crm_fundraising/report/crm_fundraising_report.py
@@ -42,7 +42,7 @@ class crm_fundraising_report(osv.osv):
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
         'nbr': fields.integer('# of Cases', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 4a0323ff4da..2629149d75a 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -135,7 +135,7 @@
                             domain="[]"
                             context="{'group_by':'section_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize"
+                        <filter string="Status" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 7717ae2ce21..d5ee8efc17e 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -72,7 +72,7 @@ class crm_helpdesk(crm.crm_case, osv.osv):
                             domain="['|',('section_id','=',False),('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.helpdesk')]"), 
             'duration': fields.float('Duration', states={'done': [('readonly', True)]}), 
-            'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
+            'state': fields.selection(crm.AVAILABLE_STATES, 'Status', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 48681357660..5a3e77926c1 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -249,7 +249,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Priority" icon="terp-rating-rated"
                             domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
                             context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-month"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py
index 55643d9b0f8..93a33d62819 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report.py
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py
@@ -43,7 +43,7 @@ class crm_helpdesk_report(osv.osv):
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
         'nbr': fields.integer('# of Cases', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 64d54fc8cd9..bf90428087a 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -110,7 +110,7 @@
                         <separator orientation="vertical" />
                         <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize"
+                        <filter string="Status" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
                         <filter string="Company" icon="terp-go-home"
diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py
index ab806414cbd..7d9733581a7 100644
--- a/addons/crm_partner_assign/report/crm_lead_report.py
+++ b/addons/crm_partner_assign/report/crm_lead_report.py
@@ -43,7 +43,7 @@ class crm_lead_report_assign(osv.osv):
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'country_id':fields.many2one('res.country', 'Country', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 256719c8742..9e6176cdeab 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -62,7 +62,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize"
+                        <filter string="Status" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
                         <filter string="Company" icon="terp-go-home"
diff --git a/addons/event/event.py b/addons/event/event.py
index 6bf1ea24786..5d44df63c96 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -188,7 +188,7 @@ class event_event(osv.osv):
             ('confirm', 'Confirmed'),
             ('done', 'Done'),
             ('cancel', 'Cancelled')],
-            'State', readonly=True, required=True,
+            'Status', readonly=True, required=True,
             help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'),
         'email_registration_id' : fields.many2one('email.template','Registration Confirmation Email', help='This field contains the template of the mail that will be automatically sent each time a registration for this event is confirmed.'),
         'email_confirmation_id' : fields.many2one('email.template','Event Confirmation Email', help="If you set an email template, each participant will receive this email announcing the confirmation of the event."),
@@ -273,7 +273,7 @@ class event_registration(osv.osv):
         'state': fields.selection([('draft', 'Unconfirmed'),
                                     ('open', 'Confirmed'),
                                     ('cancel', 'Cancelled'),
-                                    ('done', 'Attended')], 'State',
+                                    ('done', 'Attended')], 'Status',
                                     size=16, readonly=True),
     }
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index b30a778047b..5474572a89b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -282,7 +282,7 @@
                         <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Starting Date" icon="terp-go-month"
                             domain="[]" context="{'group_by':'date_begin'}"/>
@@ -465,7 +465,7 @@
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                    </group>
 
                 </search>
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 51702cf28fe..93ebd063051 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -53,7 +53,7 @@ class fetchmail_server(osv.osv):
         'state':fields.selection([
             ('draft', 'Not Confirmed'),
             ('done', 'Confirmed'),
-        ], 'State', select=True, readonly=True),
+        ], 'Status', select=True, readonly=True),
         'server' : fields.char('Server Name', size=256, readonly=True, help="Hostname or IP of the mail server", states={'draft':[('readonly', False)]}),
         'port' : fields.integer('Port', readonly=True, states={'draft':[('readonly', False)]}),
         'type':fields.selection([
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index bd0c730d92d..978b6495b75 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -110,7 +110,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', 'In Position'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', readonly=True, required=True),
+        'state': fields.selection([('open', 'In Position'),('old', 'Old'),('recruit', 'In Recruitement')], 'Status', readonly=True, required=True),
     }
     _defaults = {
         'expected_employees': 1,
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c60eaed818d..a0ab9fbad33 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -415,7 +415,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="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                     </group>
                 </search>
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 6e1983d7a11..a86a8815db2 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -165,7 +165,7 @@ class hr_evaluation(osv.osv):
             ('progress','Waiting Appreciation'),
             ('done','Done'),
             ('cancel','Cancelled'),
-        ], 'State', required=True, readonly=True),
+        ], 'Status', required=True, readonly=True),
         'date_close': fields.date('Ending Date', select=True),
         'progress': fields.float("Progress"),
     }
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e38a8796895..17344dd90ca 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -183,7 +183,7 @@
                                         <field name="user_id" string="Interviewer"/>
                                     </group>
                                     <newline/>
-                                    <separator string="State" colspan="4"/>
+                                    <separator string="Status" colspan="4"/>
                                     <group colspan="4" col="6">
                                          <field name="state"/>
                                     </group>
@@ -268,7 +268,7 @@
                     <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'}" />
+                    <filter string='Status' 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' : 'date'}" />
                    </group>
@@ -314,7 +314,7 @@
                         </group>
                     </group>
                     <newline/>
-                    <separator string="State" colspan="4"/>
+                    <separator string="Status" colspan="4"/>
                     <group colspan="4" col="6">
                          <field name="state"/>
                     </group>
@@ -362,7 +362,7 @@
                         <separator orientation="vertical"/>
                         <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'}"/>
+                        <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py
index bd9e5874d10..a5f4bc71e2f 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report.py
+++ b/addons/hr_evaluation/report/hr_evaluation_report.py
@@ -56,7 +56,7 @@ class hr_evaluation_report(osv.osv):
             ('progress','Final Validation'),
             ('done','Done'),
             ('cancel','Cancelled'),
-        ], 'State',readonly=True),
+        ], 'Status',readonly=True),
     }
     _order = 'create_date desc'
     def init(self, cr):
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index b82c8f6f850..a0ef05fcf69 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -82,7 +82,7 @@
                     <filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/>
                     <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'}"/>
+                    <filter string="Status" 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.py b/addons/hr_expense/hr_expense.py
index 6e7db83bbb7..a35027b20d7 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -84,7 +84,7 @@ class hr_expense_expense(osv.osv):
             ('invoiced', 'Invoiced'),
             ('paid', 'Reimbursed'),
             ('cancelled', 'Refused')],
-            'State', readonly=True, help='When the expense request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Confirmation\'.\
+            'Status', readonly=True, help='When the expense request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Confirmation\'.\
             \nIf the admin accepts it, the state is \'Accepted\'.\n If an invoice is made for the expense request, the state is \'Invoiced\'.\n If the expense is paid to user, the state is \'Reimbursed\'.'),
     }
     _defaults = {
diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index 325a1d850c8..adef11f5269 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -63,7 +63,7 @@ class hr_expense_report(osv.osv):
             ('invoiced', 'Invoiced'),
             ('paid', 'Reimbursed'),
             ('cancelled', 'Cancelled')],
-            'State', readonly=True),
+            'Status', readonly=True),
     }
     _order = 'date desc'
     def init(self, cr):
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 32f4ab32b65..c007f2c2509 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -98,7 +98,7 @@
                 <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                 <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
                 <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
-                <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                 <separator orientation="vertical"/>
                 <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 43d7202547c..8e67233333c 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -114,7 +114,7 @@ class hr_holidays(osv.osv):
         'name': fields.char('Description', required=True, size=64),
         'state': fields.selection([('draft', 'New'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
             ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')],
-            'State', readonly=True, help='The state is set to \'Draft\', when a holiday request is created.\
+            'Status', readonly=True, help='The state is set to \'Draft\', when a holiday request is created.\
             \nThe state is \'Waiting Approval\', when holiday request is confirmed by user.\
             \nThe state is \'Refused\', when holiday request is refused by manager.\
             \nThe state is \'Approved\', when holiday request is approved by manager.'),
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9f8f998cbd9..3b4e7a871ca 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -37,7 +37,7 @@
                         <separator orientation="vertical"/>
                         <filter name="group_type" string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 5c16655a530..e8f96df261b 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -218,7 +218,7 @@ class hr_payslip_run(osv.osv):
         'state': fields.selection([
             ('draft', 'Draft'),
             ('close', 'Close'),
-        ], 'State', select=True, readonly=True),
+        ], 'Status', select=True, readonly=True),
         'date_start': fields.date('Date From', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date_end': fields.date('Date To', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'credit_note': fields.boolean('Credit Note', readonly=True, states={'draft': [('readonly', False)]}, help="If its checked, indicates that all payslips generated from here are refund payslips."),
@@ -271,7 +271,7 @@ class hr_payslip(osv.osv):
             ('verify', 'Waiting'),
             ('done', 'Done'),
             ('cancel', 'Rejected'),
-        ], 'State', select=True, readonly=True,
+        ], 'Status', select=True, readonly=True,
             help='* When the payslip is created the state is \'Draft\'.\
             \n* If the payslip is under verification, the state is \'Waiting\'. \
             \n* If the payslip is confirmed then state is set to \'Done\'.\
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 17a2d11fd0e..62ca25bbcd4 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -144,7 +144,7 @@ class hr_applicant(crm.crm_case, osv.osv):
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
+        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
@@ -169,7 +169,7 @@ class hr_applicant(crm.crm_case, osv.osv):
         'partner_mobile': fields.char('Mobile', size=32),
         'type_id': fields.many2one('hr.recruitment.degree', 'Degree'),
         'department_id': fields.many2one('hr.department', 'Department'),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'survey': fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
         'response': fields.integer("Response"),
         'reference': fields.char('Refered By', size=128),
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 5d175bd16f5..ff8b9eb8ae3 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -206,7 +206,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Appreciation" icon="terp-face-plain" domain="[]" context="{'group_by':'priority'}"/>
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Source" icon="terp-face-plain" domain="[]" context="{'group_by':'source_id'}"/>
                     <separator orientation="vertical" groups="base.group_no_one"/>
                     <filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 1a596dfa2c6..5c74bac4a5a 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -41,7 +41,7 @@ class hr_recruitment_report(osv.osv):
     _columns = {
         'user_id': fields.many2one('res.users', 'User', readonly=True),
         'nbr': fields.integer('# of Cases', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 112258ac4af..6fee524157a 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -109,7 +109,7 @@
                    <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="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                    <separator orientation="vertical"/>
                    <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"/>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic.py b/addons/hr_timesheet_invoice/report/report_analytic.py
index d2db7fd4027..22ea593a3d9 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic.py
+++ b/addons/hr_timesheet_invoice/report/report_analytic.py
@@ -30,7 +30,7 @@ class report_analytic_account_close(osv.osv):
     _auto = False
     _columns = {
         'name': fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
-        'state': fields.char('State', size=32, readonly=True),
+        'state': fields.char('Status', size=32, readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
         'quantity': fields.float('Quantity', readonly=True),
         'quantity_max': fields.float('Max. Quantity', readonly=True),
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 3e0f3963ad5..f9d662b9b5d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -357,7 +357,7 @@ class hr_timesheet_sheet(osv.osv):
             ('new', 'New'),
             ('draft','Open'),
             ('confirm','Waiting Approval'),
-            ('done','Approved')], 'State', select=True, required=True, readonly=True,
+            ('done','Approved')], 'Status', select=True, required=True, readonly=True,
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed timesheet. \
                 \n* The \'Confirmed\' state is used for to confirm the timesheet by user. \
                 \n* The \'Done\' state is used when users timesheet is accepted by his/her senior.'),
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
index 986beb453eb..38e19d708d4 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -51,7 +51,7 @@ class timesheet_report(osv.osv):
             ('new', 'New'),
             ('draft','Draft'),
             ('confirm','Confirmed'),
-            ('done','Done')], 'State', readonly=True),
+            ('done','Done')], 'Status', readonly=True),
         'quantity': fields.float('#Quantity',readonly=True),
         'cost': fields.float('#Cost',readonly=True),
         }
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 96277f10c78..7c06971c7d2 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -102,7 +102,7 @@
                         <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
                         <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'}"/>
+                        <filter string="Status" 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"/>
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 57b7c84351c..f6f0bdac787 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -189,7 +189,7 @@ class idea_idea(osv.osv):
             ('open', 'Opened'),
             ('close', 'Accepted'),
             ('cancel', 'Refused')],
-            'State', readonly=True,
+            'Status', readonly=True,
             help='When the Idea is created the state is \'Draft\'.\n It is \
             opened by the user, the state is \'Opened\'.\
             \nIf the idea is accepted, the state is \'Accepted\'.'
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index b5a23b80481..ab29a6185e4 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -294,7 +294,7 @@
                     <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_id'}"/>
-                    <filter icon="terp-stock_effects-object-colorize" string="State" help="By States" context="{'group_by':'state'}"/>
+                    <filter icon="terp-stock_effects-object-colorize" string="Status" help="By States" context="{'group_by':'state'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/idea/report/report_vote.py b/addons/idea/report/report_vote.py
index f44786ef8a9..84f7b5c033f 100644
--- a/addons/idea/report/report_vote.py
+++ b/addons/idea/report/report_vote.py
@@ -41,7 +41,7 @@ class report_vote(osv.osv):
         'idea_state': fields.selection([('draft', 'Draft'),('open', 'Opened'),
                             ('close', 'Accepted'),
                             ('cancel', 'Cancelled')],
-                            'State'),
+                            'Status'),
         'category_id': fields.many2one('idea.category', 'Category'),
         'creater_id': fields.many2one('res.users', 'User Name'),
 
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index f3b722a4ce5..951ace27f4a 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -64,7 +64,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Category" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" name="State" context="{'group_by':'idea_state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" name="Status" 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"/>
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 226f38b349a..3b06ea5ce32 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -138,7 +138,7 @@ class lunch_order(osv.osv):
         'descript': fields.char('Description Order', readonly=True, size=250, \
             states = {'draft':[('readonly', False)]}),
         'state': fields.selection([('draft', 'New'), ('confirmed', 'Confirmed'), ], \
-            'State', readonly=True, select=True),
+            'Status', readonly=True, select=True),
         'price': fields.function(_price_get, string="Price"),
         'category': fields.many2one('lunch.category','Category'),
     }
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 5d5d599be0e..c062a39b428 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -217,7 +217,7 @@ class mail_message(osv.osv):
                         ('received', 'Received'),
                         ('exception', 'Delivery Failed'),
                         ('cancel', 'Cancelled'),
-                        ], 'State', readonly=True),
+                        ], 'Status', readonly=True),
         'auto_delete': fields.boolean('Auto Delete', help="Permanently delete this email after sending it, to save space"),
         'original': fields.binary('Original', help="Original version of the message, as it was sent on the network", readonly=1),
     }
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 50993f93744..8d2f1907025 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -190,7 +190,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 15753e3ad9a..bef3792d340 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -117,7 +117,7 @@ Normal - the campaign runs normally and automatically sends all emails and repor
                                    ('running', 'Running'),
                                    ('done', 'Done'),
                                    ('cancelled', 'Cancelled'),],
-                                   'State',),
+                                   'Status',),
         'activity_ids': fields.one2many('marketing.campaign.activity',
                                        'campaign_id', 'Activities'),
         'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting.", digits_compute=dp.get_precision('Purchase Price')),
@@ -272,7 +272,7 @@ class marketing_campaign_segment(osv.osv):
                                    ('running', 'Running'),
                                    ('done', 'Done'),
                                    ('cancelled', 'Cancelled')],
-                                   'State',),
+                                   'Status',),
         'date_run': fields.datetime('Launch Date', help="Initial start date of this segment."),
         'date_done': fields.datetime('End Date', help="Date this segment was last closed or cancelled."),
         'date_next_sync': fields.function(_get_next_sync, string='Next Synchronization', type='datetime', help="Next time the synchronization job is scheduled to run automatically"),
@@ -650,7 +650,7 @@ class marketing_campaign_workitem(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner', select=1, readonly=True),
         'state': fields.selection([('todo', 'To Do'),
                                    ('exception', 'Exception'), ('done', 'Done'),
-                                   ('cancelled', 'Cancelled')], 'State', readonly=True),
+                                   ('cancelled', 'Cancelled')], 'Status', readonly=True),
 
         'error_msg' : fields.text('Error Message', readonly=True)
     }
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index d04cde0e428..bb8e2528a3c 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -103,7 +103,7 @@
                    <separator orientation="vertical"/>
                    <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}" />
                    <separator orientation="vertical"/>
-                   <filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
+                   <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
                </group>
            </search>
        </field>
@@ -208,7 +208,7 @@
                <group expand="0" string="Group By...">
                    <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
                    <separator orientation="vertical"/>
-                   <filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
+                   <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
                    <separator orientation="vertical"/>
                    <filter string="Launch Date" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}" />
                </group>
@@ -421,7 +421,7 @@
                    <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
                    <filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}" />
                    <separator orientation="vertical"/>
-                   <filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
+                   <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
                    <separator orientation="vertical"/>
                    <filter string="Execution Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}" />
                </group>
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
index a193476783d..0330cd1f7d3 100644
--- a/addons/marketing_campaign/report/campaign_analysis.py
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -68,7 +68,7 @@ class campaign_analysis(osv.osv):
         'count' : fields.integer('# of Actions', readonly=True),
         'state': fields.selection([('todo', 'To Do'),
                                    ('exception', 'Exception'), ('done', 'Done'),
-                                   ('cancelled', 'Cancelled')], 'State', readonly=True),
+                                   ('cancelled', 'Cancelled')], 'Status', readonly=True),
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'campaign_analysis')
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index ea1ddc9a397..19d1c78f896 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -69,7 +69,7 @@
                     <filter string="Segment" name ="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
                     <filter string="Activity" name ="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
                     <filter string="Resource" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 88908884b26..64fb245bed0 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -481,7 +481,7 @@ class mrp_production(osv.osv):
         'move_created_ids2': fields.one2many('stock.move', 'production_id', 'Produced Products', domain=[('state','in', ('done', 'cancel'))]),
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation'),
-        'state': fields.selection([('draft','New'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','Production Started'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
+        'state': fields.selection([('draft','New'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','Production Started'),('cancel','Cancelled'),('done','Done')],'Status', readonly=True,
                                     help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Picking Exception\'.\
                                     \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production gets started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
         'hour_total': fields.function(_production_calc, type='float', string='Total Hours', multi='workorder', store=True),
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 121567b3e56..6f64c3dcdda 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -823,7 +823,7 @@
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" 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':'date_planned'}" help="Scheduled Date"/>
                     </group>
diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index 01391d9fb0b..76eb3c51a5b 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -29,7 +29,7 @@
 This module adds state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
 =============================================================================================================
 
-State: draft, confirm, done, cancel
+Status: draft, confirm, done, cancel
 When finishing/confirming,cancelling production orders set all state lines to the according state
 
 Create menus:
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 78deb68e5e7..79666352911 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -86,7 +86,7 @@ class mrp_production_workcenter_line(osv.osv):
     _order = "sequence, date_planned"
 
     _columns = {
-       'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pending'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True,
+       'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pending'),('cancel','Cancelled'),('done','Finished')],'Status', readonly=True,
                                  help="* When a work order is created it is set in 'Draft' state.\n" \
                                        "* When user sets work order in start mode that time it will be set in 'In Progress' state.\n" \
                                        "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pending' state.\n" \
@@ -101,7 +101,7 @@ class mrp_production_workcenter_line(osv.osv):
        'production_state':fields.related('production_id','state',
             type='selection',
             selection=[('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')],
-            string='Production State', readonly=True),
+            string='Production Status', readonly=True),
        'product':fields.related('production_id','product_id',type='many2one',relation='product.product',string='Product',
             readonly=True),
        'qty':fields.related('production_id','product_qty',type='float',string='Qty',readonly=True, store=True),
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index ec2ef72d40d..183f62d21ad 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -152,7 +152,7 @@
                         <filter string="Work Center" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/>
                         <filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" 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':'date_planned'}"/>
                     </group>
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis.py b/addons/mrp_operations/report/mrp_workorder_analysis.py
index 545ce73656d..e38f5be7acc 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis.py
+++ b/addons/mrp_operations/report/mrp_workorder_analysis.py
@@ -36,7 +36,7 @@ class mrp_workorder(osv.osv):
         'date': fields.date('Date', readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
         'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), readonly=True),
-        'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True),
+        'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Cancelled'),('done','Finished')],'Status', readonly=True),
         'total_hours': fields.float('Total Hours', readonly=True),
         'total_cycles': fields.float('Total Cycles', readonly=True),
         'delay': fields.float('Delay', readonly=True),
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index 45b6ffd9be9..9b1b022e668 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -75,7 +75,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <filter string="Status" 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="Planned Day"/>
                         <separator orientation="vertical"/>
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 4a0085e3db9..d8c2690124d 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -129,7 +129,7 @@ class mrp_repair(osv.osv):
             ('invoice_except','Invoice Exception'),
             ('done','Done'),
             ('cancel','Cancel')
-            ], 'State', readonly=True,
+            ], 'Status', readonly=True,
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed repair order. \
             \n* The \'Confirmed\' state is used when a user confirms the repair order. \
             \n* The \'Ready to Repair\' state is used to start to repairing, user can start repairing only after repair order is confirmed. \
@@ -655,7 +655,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
                     ('draft','Draft'),
                     ('confirmed','Confirmed'),
                     ('done','Done'),
-                    ('cancel','Canceled')], 'State', required=True, readonly=True,
+                    ('cancel','Canceled')], 'Status', required=True, readonly=True,
                     help=' * The \'Draft\' state is set automatically as draft when repair order in draft state. \
                         \n* The \'Confirmed\' state is set automatically as confirm when repair order in confirm state. \
                         \n* The \'Done\' state is set automatically when repair order is completed.\
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 6af1dc702fa..86d5f3089ba 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -200,7 +200,7 @@
                       <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'}"/>
+                      <filter string="Status" 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'}" help="Guarantee limit"/>
                       <separator orientation="vertical" groups="base.group_multi_company"/>
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index a1a0fa44b39..e5ade747840 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -39,7 +39,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                        <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </search>
             </field>
@@ -65,7 +65,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                        <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 5af78b131b2..5576714b3f7 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -152,7 +152,7 @@ class pos_order(osv.osv):
                                    ('paid', 'Paid'),
                                    ('done', 'Posted'),
                                    ('invoiced', 'Invoiced')],
-                                  'State', readonly=True),
+                                  'Status', readonly=True),
 
         'invoice_id': fields.many2one('account.invoice', 'Invoice'),
         'account_move': fields.many2one('account.move', 'Journal Entry', readonly=True),
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 2622c2ba863..c5954ddb74e 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -150,7 +150,7 @@
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator string="" orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator string="" orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     </group>
diff --git a/addons/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py
index ceb20a11a36..2a66923a39b 100644
--- a/addons/point_of_sale/report/pos_order_report.py
+++ b/addons/point_of_sale/report/pos_order_report.py
@@ -36,7 +36,7 @@ class pos_order_report(osv.osv):
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'state': fields.selection([('draft', 'New'), ('paid', 'Closed'), ('done', 'Synchronized'), ('invoiced', 'Invoiced'), ('cancel', 'Cancelled')],
-                                  'State'),
+                                  'Status'),
         'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
         'price_total':fields.float('Total Price', readonly=True),
         'total_discount':fields.float('Total Discount', readonly=True),
diff --git a/addons/point_of_sale/report/pos_sales_user.rml b/addons/point_of_sale/report/pos_sales_user.rml
index 6374a09da02..8684ea11662 100644
--- a/addons/point_of_sale/report/pos_sales_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user.rml
@@ -139,7 +139,7 @@
           <para style="P1">User</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">State</para>
+          <para style="terp_tblheader_General_Right">Status</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Company</para>
diff --git a/addons/point_of_sale/report/pos_sales_user_today.rml b/addons/point_of_sale/report/pos_sales_user_today.rml
index 5b0bc2a1dcb..d036d2d4813 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -139,7 +139,7 @@
           <para style="P2">User</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">State</para>
+          <para style="terp_tblheader_General_Right">Status</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Company</para>
diff --git a/addons/point_of_sale/report/report_cash_register.py b/addons/point_of_sale/report/report_cash_register.py
index c86c40bb32f..4e99d2010b1 100644
--- a/addons/point_of_sale/report/report_cash_register.py
+++ b/addons/point_of_sale/report/report_cash_register.py
@@ -34,7 +34,7 @@ class report_cash_register(osv.osv):
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'state': fields.selection([('draft', 'Quotation'),('open','Open'),('confirm', 'Confirmed')],'State'),
+        'state': fields.selection([('draft', 'Quotation'),('open','Open'),('confirm', 'Confirmed')],'Status'),
         'journal_id': fields.many2one('account.journal', 'Journal'),
         'balance_start': fields.float('Opening Balance'),
         'balance_end_real': fields.float('Closing Balance'),
diff --git a/addons/process/process.py b/addons/process/process.py
index 524a3236e7b..f9744608c50 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -293,7 +293,7 @@ class process_node(osv.osv):
     _columns = {
         'name': fields.char('Name', size=30,required=True, translate=True),
         'process_id': fields.many2one('process.process', 'Process', required=True, ondelete='cascade'),
-        'kind': fields.selection([('state','State'), ('subflow','Subflow')], 'Kind of Node', required=True),
+        'kind': fields.selection([('state','Status'), ('subflow','Subflow')], 'Kind of Node', required=True),
         'menu_id': fields.many2one('ir.ui.menu', 'Related Menu'),
         'note': fields.text('Notes', translate=True),
         'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'),
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 164314c4573..c858e8c7d3e 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -112,7 +112,7 @@ class procurement_order(osv.osv):
             ('cancel','Cancel'),
             ('ready','Ready'),
             ('done','Done'),
-            ('waiting','Waiting')], 'State', required=True,
+            ('waiting','Waiting')], 'Status', required=True,
             help='When a procurement is created the state is set to \'Draft\'.\n If the procurement is confirmed, the state is set to \'Confirmed\'.\
             \nAfter confirming the state is set to \'Running\'.\n If any exception arises in the order then the state is set to \'Exception\'.\n Once the exception is removed the state becomes \'Ready\'.\n It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'),
         'note': fields.text('Note'),
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index b3e90ab4e6e..245ee2b230b 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -119,7 +119,7 @@
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Reason" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'name'}"/>
                         <filter string="Scheduled Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project/project.py b/addons/project/project.py
index 4f5b6d9a202..6f0bb96fcfc 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -662,7 +662,7 @@ class task(osv.osv):
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
         'type_id': fields.many2one('project.task.type', 'Stage'),
-        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'Status', readonly=True, required=True,
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State',
@@ -1291,7 +1291,7 @@ class project_task_history(osv.osv):
     _columns = {
         'task_id': fields.many2one('project.task', 'Task', ondelete='cascade', required=True, select=True),
         'type_id': fields.many2one('project.task.type', 'Stage'),
-        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'State'),
+        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'Status'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State', required=False),
         'date': fields.date('Date', select=True),
         'end_date': fields.function(_get_date, string='End Date', type="date", store={
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 956b159a0bb..25c90f31b02 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -510,7 +510,7 @@
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type_id'}"/>
-                        <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
                         <separator orientation="vertical" groups="base.group_no_one"/>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 1b66361854b..1012ca9d518 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -51,7 +51,7 @@ class report_project_task_user(osv.osv):
         'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'),
 ('0','Very urgent')], 'Priority', 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),
-        'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'State', readonly=True),
+        'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True, groups="base.group_multi_company"),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
         'type_id': fields.many2one('project.task.type', 'Stage', readonly=True),
@@ -131,7 +131,7 @@ class project_vs_hours(osv.osv):
         'user_id': fields.many2one('res.users', 'Assigned To', readonly=True),
         'planned_hours': fields.float('Planned Hours', readonly=True),
         'total_hours': fields.float('Total Hours', readonly=True),
-        'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'State', required=True, readonly=True)
+        'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'Status', required=True, readonly=True)
     }
     _order = 'project desc'
 
@@ -178,7 +178,7 @@ class task_by_days(osv.osv):
     _auto = False
     _columns = {
         'day': fields.char('Day', size=128, required=True),
-        'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True),
+        'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True, required=True),
         'total_task': fields.float('Total tasks', readonly=True),
         'project_id':fields.many2one('project.project', 'Project')
      }
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index d1306d31b01..3bdec47fcb9 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -132,7 +132,7 @@
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                         <filter string="Stage" icon="terp-stage" context="{'group_by':'type_id'}" />
                         <separator orientation="vertical"/>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index e61af235d42..83f10a72fb7 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -179,7 +179,7 @@ class project_issue(crm.crm_case, osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner', select=1),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
-        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('cancel', 'Cancelled'), ('done', 'Done'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
+        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('cancel', 'Cancelled'), ('done', 'Done'),('pending', 'Pending'), ], 'Status', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 7c22ad748c0..9c24e7243f6 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -186,7 +186,7 @@
                             context="{'group_by':'priority'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]"
                             context="{'group_by':'type_id'}" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
                             context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
                         <filter string="Month" icon="terp-go-month"
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index b550b5c47ce..7cc520308e8 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -38,7 +38,7 @@ class project_issue_report(osv.osv):
     _columns = {
         'name': fields.char('Year', size=64, required=False, readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 1695fa3469a..ee0a4fbd1ed 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -104,7 +104,7 @@
                         <separator orientation="vertical" />
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'type_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize"
+                        <filter string="Status" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
                         <filter string="Company" icon="terp-go-home"
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 612bd784bb0..12278fd2980 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -115,7 +115,7 @@ class project_phase(osv.osv):
         'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'),
         'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
             help="The ressources on the project can be computed automatically by the scheduler"),
-        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.'),
         'progress': fields.function(_compute_progress, string='Progress', help="Computed based on related tasks"),
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7231395a2a9..d6c2dcb43e2 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -239,7 +239,7 @@
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Start Month"/>
                     </group>
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 85eba636b90..273a6f22cab 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -109,7 +109,7 @@ class project_scrum_sprint(osv.osv):
         'progress': fields.function(_compute, group_operator="avg", type='float', multi="progress", string='Progress (0-100)', help="Computed as: Time Spent / Total Time."),
         'effective_hours': fields.function(_compute, multi="effective_hours", string='Effective hours', help="Computed using the sum of the task work done."),
         'expected_hours': fields.function(_compute, multi="expected_hours", string='Planned Hours', help='Estimated time to do the task.'),
-        'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('cancel','Cancelled'),('done','Done')], 'State', required=True),
+        'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('cancel','Cancelled'),('done','Done')], 'Status', required=True),
     }
     _defaults = {
         'state': 'draft',
@@ -229,7 +229,7 @@ class project_scrum_product_backlog(osv.osv):
         'sprint_id': fields.many2one('project.scrum.sprint', 'Sprint'),
         'sequence' : fields.integer('Sequence', help="Gives the sequence order when displaying a list of product backlog."),
         'tasks_id': fields.one2many('project.task', 'product_backlog_id', 'Tasks Details'),
-        'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('done','Done'),('cancel','Cancelled')], 'State', required=True),
+        'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('done','Done'),('cancel','Cancelled')], 'Status', required=True),
         'progress': fields.function(_compute, multi="progress", group_operator="avg", type='float', string='Progress', help="Computed as: Time Spent / Total Time."),
         'effective_hours': fields.function(_compute, multi="effective_hours", string='Spent Hours', help="Computed using the sum of the time spent on every related tasks", store=True),
         'expected_hours': fields.float('Planned Hours', help='Estimated total time to do the Backlog'),
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 0f33ded8523..b54d10292ca 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -167,7 +167,7 @@
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -334,7 +334,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Sprint Month"/>
                     </group>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 687221f371b..d9a02ed836f 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -169,7 +169,7 @@ class purchase_order(osv.osv):
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
         'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')]),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
-        'state': fields.selection(STATE_SELECTION, 'State', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
+        'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
         'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
         'notes': fields.text('Notes'),
@@ -729,7 +729,7 @@ class purchase_order_line(osv.osv):
         'order_id': fields.many2one('purchase.order', 'Order Reference', select=True, required=True, ondelete='cascade'),
         'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',),
         'company_id': fields.related('order_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
-        'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', required=True, readonly=True,
+        'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', required=True, readonly=True,
                                   help=' * The \'Draft\' state is set automatically when purchase order in draft state. \
                                        \n* The \'Confirmed\' state is set automatically as confirm when purchase order in confirm state. \
                                        \n* The \'Done\' state is set automatically when purchase order is set as done. \
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index a074f4d7a08..b4e04d1f1aa 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -232,7 +232,7 @@
                     <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                      <separator orientation="vertical"/>
                     <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Status" 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_order'}"/>
                     <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
@@ -268,7 +268,7 @@
                     <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                      <separator orientation="vertical"/>
                     <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Status" 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_order'}"/>
                     <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
@@ -445,7 +445,7 @@
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by' : 'product_id'}" />
                         <filter icon="terp-gtk-jump-to-rtl" string="Order Reference" domain="[]" context="{'group_by' :'order_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
                         </group>
                </search>
             </field>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 399db12fb01..dc3594afcd7 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -106,7 +106,7 @@
                     <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Status" 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"/>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index c8958d4ebf7..3692149c534 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -84,7 +84,7 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock_effects-object-colorize" name="state" string="State"
+                        <filter icon="terp-stock_effects-object-colorize" name="Status" string="Status"
                             domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month"
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 43cfe2de069..b3e190306b8 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -43,7 +43,7 @@ class purchase_requisition(osv.osv):
         'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}),
         'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase',states={'done': [('readonly', True)]}),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),        
-        'state': fields.selection([('draft','New'),('in_progress','In Progress'),('cancel','Cancelled'),('done','Done')], 'State', required=True)
+        'state': fields.selection([('draft','New'),('in_progress','In Progress'),('cancel','Cancelled'),('done','Done')], 'Status', required=True)
     }
     _defaults = {
         'date_start': time.strftime('%Y-%m-%d %H:%M:%S'),
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index c03afa7b544..269530da636 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -150,7 +150,7 @@
                     <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
                     <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index a86df29d56f..7cb0df63a79 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -104,7 +104,7 @@
                     <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                     <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
                     <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
                     <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c2ee42b6fca..6a3539fc10f 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1025,7 +1025,7 @@ class sale_order_line(osv.osv):
         'number_packages': fields.function(_number_packages, type='integer', string='Number Packages'),
         'notes': fields.text('Notes'),
         'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}),
-        'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'State', required=True, readonly=True,
+        'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'Status', required=True, readonly=True,
                 help='* The \'Draft\' state is set when the related sales order in draft state. \
                     \n* The \'Confirmed\' state is set when the related sales order is confirmed. \
                     \n* The \'Exception\' state is set when the related sales order is set as exception. \
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 847e2e8f463..c5b3323b0d6 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -280,7 +280,7 @@
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" 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_order'}"/>
                     </group>
@@ -434,7 +434,7 @@
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'salesman_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -463,7 +463,7 @@
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 63706a940e6..e8edc1665a1 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -143,7 +143,7 @@
           <para style="terp_tblheader_Details_Centre">Lot</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">State</para>
+          <para style="terp_tblheader_Details_Centre">Status</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Location</para>
@@ -240,7 +240,7 @@
           <para style="terp_tblheader_Details_Centre">Lot</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">State</para>
+          <para style="terp_tblheader_Details">Status</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Location</para>
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index da6be7873c3..99e5e6fa4a2 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -42,7 +42,7 @@ class report_stock_move(osv.osv):
         'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('other', 'Others')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
         'location_id': fields.many2one('stock.location', 'Source Location', readonly=True, select=True, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', readonly=True, select=True, help="Location where the system will stock the finished products."),
-        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True),
+        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', readonly=True, select=True),
         'product_qty':fields.integer('Quantity',readonly=True),
         'categ_id': fields.many2one('product.category', 'Product Category', ),
         'product_qty_in':fields.integer('In Qty',readonly=True),
@@ -162,7 +162,7 @@ class report_stock_inventory(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'product_qty':fields.float('Quantity',  digits_compute=dp.get_precision('Product UoM'), readonly=True),
         'value' : fields.float('Total Value',  digits_compute=dp.get_precision('Account'), required=True),
-        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
+        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', readonly=True, select=True,
               help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
               \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'location_type': fields.selection([('supplier', 'Supplier Location'), ('view', 'View'), ('internal', 'Internal Location'), ('customer', 'Customer Location'), ('inventory', 'Inventory'), ('procurement', 'Procurement'), ('production', 'Production'), ('transit', 'Transit Location for Inter-Companies Transfers')], 'Location Type', required=True),
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 01ef4a70289..e460736addb 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -123,7 +123,7 @@
                     <filter string="Dest. Location" name="dest_location" icon="terp-gtk-jump-to-ltr"  context="{'group_by':'location_dest_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Type" name="group_type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}" help="Shipping type specify, goods coming in or going out"/>
-                    <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Stock journal" name="group_stock_journal" icon="terp-folder-orange" context="{'group_by':'stock_journal'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Company" name="group_state" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
@@ -245,7 +245,7 @@
                     <filter name="group_location" string="Location" icon="terp-go-home" context="{'group_by':'location_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index dee8e2a6c25..9cde40be431 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -634,7 +634,7 @@ class stock_picking(osv.osv):
             ('assigned', 'Ready to Process'),
             ('done', 'Done'),
             ('cancel', 'Cancelled'),
-            ], 'State', readonly=True, select=True,
+            ], 'Status', readonly=True, select=True,
             help="* Draft: not confirmed yet and will not be scheduled until confirmed\n"\
                  "* Confirmed: still waiting for the availability of products\n"\
                  "* Available: products reserved, simply waiting for confirmation.\n"\
@@ -1630,7 +1630,7 @@ class stock_move(osv.osv):
         'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'),
         'picking_id': fields.many2one('stock.picking', 'Reference', select=True,states={'done': [('readonly', True)]}),
         'note': fields.text('Notes'),
-        'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
+        'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', readonly=True, select=True,
               help='When the stock move is created it is in the \'Draft\' state.\n After that, it is set to \'Not Available\' state if the scheduler did not find the products.\n When products are reserved it is set to \'Available\'.\n When the picking is done the state is \'Done\'.\
               \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),
@@ -2656,7 +2656,7 @@ class stock_inventory(osv.osv):
         'date_done': fields.datetime('Date done'),
         'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', states={'done': [('readonly', True)]}),
         'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
-        'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('confirm','Confirmed'),('cancel','Cancelled')), 'State', readonly=True, select=True),
+        'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('confirm','Confirmed'),('cancel','Cancelled')), 'Status', readonly=True, select=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
 
     }
@@ -2782,7 +2782,7 @@ class stock_inventory_line(osv.osv):
         'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
         'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True, select=True, readonly=True),
         'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"),
-        'state': fields.related('inventory_id','state',type='char',string='State',readonly=True),
+        'state': fields.related('inventory_id','state',type='char',string='Status',readonly=True),
     }
 
     def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False, to_date=False):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 09b61d98328..e07287484d1 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -82,7 +82,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
@@ -1035,7 +1035,7 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" 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'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
@@ -1248,7 +1248,7 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <separator orientation="vertical" />
-                        <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
+                        <filter icon="terp-stock_effects-object-colorize" name="state" string="Status" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
@@ -1307,7 +1307,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" 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'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
@@ -1496,7 +1496,7 @@
                         <filter string="Source" name="groupby_location_id" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'location_id'}"/>
                         <filter string="Destination" name="groupby_dest_location_id" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'location_dest_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock_effects-object-colorize" string="State" domain="[]" context="{'group_by':'state'}" />
+                        <filter icon="terp-stock_effects-object-colorize" string="Status" domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
                         <filter string="Creation" name="groupby_create_date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                         <filter string="Expected" name="groupby_date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
@@ -1674,7 +1674,7 @@
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" groups="base.group_no_one"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
                     </group>
@@ -1705,7 +1705,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" groups="base.group_no_one"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
                     </group>
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index d104d57c62b..8f1bb69588d 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -47,7 +47,7 @@ class stock_period(osv.osv):
         'name': fields.char('Period Name', size=64, required=True),
         'date_start': fields.datetime('Start Date', required=True),
         'date_stop': fields.datetime('End Date', required=True),
-        'state': fields.selection([('draft','Draft'), ('open','Open'),('close','Close')], 'State'),
+        'state': fields.selection([('draft','Draft'), ('open','Open'),('close','Close')], 'Status'),
     }
     _defaults = {
         'state': 'draft'
@@ -92,7 +92,7 @@ class stock_sale_forecast(osv.osv):
         'product_uos_categ' : fields.many2one('product.uom.categ', 'Product UoS Category'), # Invisible field for product_uos domain
 # Field used in onchange_uom to check what uom was before change and recalculate quantities according to old uom (active_uom) and new uom.
         'active_uom': fields.many2one('product.uom',  string = "Active UoM"),
-        'state': fields.selection([('draft','Draft'),('validated','Validated')],'State',readonly=True),
+        'state': fields.selection([('draft','Draft'),('validated','Validated')],'Status',readonly=True),
         'analyzed_period1_id': fields.many2one('stock.period', 'Period1', readonly=True, states={'draft':[('readonly',False)]},),
         'analyzed_period2_id': fields.many2one('stock.period', 'Period2', readonly=True, states={'draft':[('readonly',False)]},),
         'analyzed_period3_id': fields.many2one('stock.period', 'Period3', readonly=True, states={'draft':[('readonly',False)]},),
@@ -447,7 +447,7 @@ class stock_planning(osv.osv):
     _columns = {
         'company_id': fields.many2one('res.company', 'Company', required = True),
         'history': fields.text('Procurement History', readonly=True, help = "History of procurement or internal supply of this planning line."),
-        'state' : fields.selection([('draft','Draft'),('done','Done')],'State',readonly=True),
+        'state' : fields.selection([('draft','Draft'),('done','Done')],'Status',readonly=True),
         'period_id': fields.many2one('stock.period' , 'Period', required=True, \
                 help = 'Period for this planning. Requisition will be created for beginning of the period.', select=True),
         'warehouse_id': fields.many2one('stock.warehouse','Warehouse', required=True),
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index b29eb7baace..1a8e09e8cf4 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -17,7 +17,7 @@
                     <newline/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
-                    <separator string="State" colspan="4"/>
+                    <separator string="Status" colspan="4"/>
                     <group col="4" colspan="4">
                         <field name="state" select="1" readonly="1"/>
                         <button name="button_open" string="Open" icon="gtk-ok" states="draft" type="object"/>
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index 0ac08002763..271a87f7bb9 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -69,7 +69,7 @@ class subscription_subscription(osv.osv):
         'interval_type': fields.selection([('days', 'Days'), ('weeks', 'Weeks'), ('months', 'Months')], 'Interval Unit'),
         'exec_init': fields.integer('Number of documents'),
         'date_init': fields.datetime('First Date'),
-        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State'),
+        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status'),
         'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128, help="User can choose the source document on which he wants to create documents"),
         'doc_lines': fields.one2many('subscription.subscription.history', 'subscription_id', 'Documents created', readonly=True),
         'cron_id': fields.many2one('ir.cron', 'Cron Job', help="Scheduler which runs on subscription"),
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 5235e0410bf..d886e64de68 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -93,7 +93,7 @@
                         <filter string="User" icon="terp-personal" name="User" domain="[]" context="{'group_by':'user_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'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 0101cef17b8..676f69a7003 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -702,7 +702,7 @@ class survey_request(osv.osv):
         'email': fields.char("E-mail", size=64),
         'survey_id': fields.many2one("survey", "Survey", required=1, ondelete='cascade'),
         'response': fields.many2one('survey.response', 'Answer'),
-        'state': fields.selection([('draft','Draft'),('waiting_answer', 'Waiting Answer'),('done', 'Done'),('cancel', 'Cancelled')], 'State', readonly=1)
+        'state': fields.selection([('draft','Draft'),('waiting_answer', 'Waiting Answer'),('done', 'Done'),('cancel', 'Cancelled')], 'Status', readonly=1)
     }
     _defaults = {
         'state': lambda * a: 'draft',
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 36a15948b5a..0304ed9f9b1 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -274,7 +274,7 @@
                        <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'responsible_id'}"/>
                         <separator orientation="vertical"/>
                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'type'}"/>
-                       <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
+                       <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                    </group>
                </search>
             </field>
@@ -1111,7 +1111,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                     </group>
                </search>
             </field>

From a444982285e6d8faa0d757dc7ae3fec60d61e28c Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Fri, 4 May 2012 17:34:05 +0530
Subject: [PATCH 236/452] [IMP]:improved title Minimum Stock Rules by
 Reordering Rules everywhere

bzr revid: ssu@tinyerp.com-20120504120405-3txusauaam2y2rbu
---
 addons/procurement/procurement_view.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 245ee2b230b..f5c1a94e0f1 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -162,7 +162,7 @@
             <field name="model">stock.warehouse.orderpoint</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Minimum Stock Rules">
+                <tree string="Reordering Rules">
                     <field name="name"/>
                     <field name="warehouse_id"/>
                     <field name="location_id"/>
@@ -179,7 +179,7 @@
             <field name="model">stock.warehouse.orderpoint</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Minimum Stock Rules Search">
+                <search string="Reordering Rules Search">
                     <group>
                         <field name="name"/>
                         <field name="warehouse_id" widget="selection"/>
@@ -201,7 +201,7 @@
             <field name="model">stock.warehouse.orderpoint</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Minimum Stock Rules">
+                <form string="Reordering Rules">
                     <group col="2" colspan="2">
                         <separator string="General Information" colspan="2" />
                         <field name="name" />
@@ -234,7 +234,7 @@
         </record>
 
         <record id="action_orderpoint_form" model="ir.actions.act_window">
-            <field name="name">Minimum Stock Rules</field>
+            <field name="name">Reordering Rules</field>
             <field name="res_model">stock.warehouse.orderpoint</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -246,7 +246,7 @@
         <act_window
         context="{'search_default_warehouse_id': active_id, 'default_warehouse_id': active_id}"
         id="act_stock_warehouse_2_stock_warehouse_orderpoint"
-        name="Minimum Stock Rules"
+        name="Reordering Rules"
         res_model="stock.warehouse.orderpoint"
         src_model="stock.warehouse"
         groups="stock.group_stock_user"/>
@@ -255,7 +255,7 @@
         <act_window
             context="{'product_uom': locals().has_key('uom_id') and uom_id,'search_default_product_id': [active_id], 'default_product_id': active_id}"
             id="act_product_product_2_stock_warehouse_orderpoint"
-            name="Minimum Stock Rules"
+            name="Reordering Rules"
             res_model="stock.warehouse.orderpoint"
             src_model="product.product"
             groups="stock.group_stock_user"/>
@@ -263,7 +263,7 @@
         <act_window
             context="{'product_uom': locals().has_key('uom_id') and uom_id, 'default_procurement_id': active_id}"
             id="act_procurement_2_stock_warehouse_orderpoint"
-            name="Minimum Stock Rules"
+            name="Reordering Rules"
             res_model="stock.warehouse.orderpoint"
             src_model="procurement.order"
             groups="stock.group_stock_user"/>
@@ -284,7 +284,7 @@
             <field name="arch" type="xml">
                   <group name="misc" position="after">
                       <group col="2" colspan="2" attrs="{'invisible':[('type', '=', 'service')]}">
-                          <separator string="Minimum Stock Rules" colspan="2"/>
+                          <separator string="Reordering Rules" colspan="2"/>
                           <field name="orderpoint_ids" context="{'default_product_uom': uom_id}" nolabel="1">
                               <tree string="Minimum Stock Rule" editable="bottom">
                                   <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>

From 2ad3b321604d8f60282a641660c1e2446c7864cb Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Fri, 4 May 2012 17:43:26 +0530
Subject: [PATCH 237/452] [IMP]:improved title Minimum Salesman by Salesperson
 everywhere

bzr revid: ssu@tinyerp.com-20120504121326-nqpx2eyqc1qrp04w
---
 addons/account/account_invoice.py                             | 2 +-
 addons/account/account_invoice_view.xml                       | 2 +-
 addons/account/report/account_invoice_report.py               | 2 +-
 addons/account/report/account_invoice_report_view.xml         | 2 +-
 .../account_voucher/report/account_voucher_sales_receipt.py   | 2 +-
 .../report/account_voucher_sales_receipt_view.xml             | 2 +-
 addons/crm/crm_lead.py                                        | 2 +-
 addons/crm/crm_lead_view.xml                                  | 4 ++--
 addons/crm/report/crm_lead_report_view.xml                    | 4 ++--
 addons/crm/report/crm_phonecall_report_view.xml               | 4 ++--
 addons/crm_claim/report/crm_claim_report_view.xml             | 4 ++--
 addons/crm_fundraising/report/crm_fundraising_report_view.xml | 4 ++--
 addons/crm_helpdesk/report/crm_helpdesk_report_view.xml       | 4 ++--
 addons/crm_partner_assign/report/crm_lead_report_view.xml     | 2 +-
 addons/crm_partner_assign/report/crm_partner_report_view.xml  | 2 +-
 addons/crm_partner_assign/res_partner_view.xml                | 2 +-
 addons/edi/static/src/xml/edi_sale_purchase.xml               | 2 +-
 addons/hr_recruitment/hr_recruitment_demo.yml                 | 2 +-
 addons/membership/membership_view.xml                         | 2 +-
 addons/membership/report/report_membership.py                 | 2 +-
 addons/membership/report/report_membership_view.xml           | 2 +-
 addons/point_of_sale/point_of_sale_view.xml                   | 2 +-
 addons/point_of_sale/report/pos_order_report.py               | 2 +-
 addons/point_of_sale/report/pos_order_report_view.xml         | 2 +-
 addons/point_of_sale/wizard/pos_payment_report_user.py        | 2 +-
 addons/point_of_sale/wizard/pos_sales_user.py                 | 2 +-
 addons/point_of_sale/wizard/pos_sales_user_today.py           | 2 +-
 addons/sale/report/sale_order.rml                             | 2 +-
 addons/sale/report/sale_report.py                             | 2 +-
 addons/sale/report/sale_report_view.xml                       | 2 +-
 addons/sale/sale.py                                           | 4 ++--
 addons/sale/sale_view.xml                                     | 4 ++--
 32 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index a0f5dceaf6d..db0218bf79c 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -273,7 +273,7 @@ class account_invoice(osv.osv):
             help="Remaining amount due."),
         'payment_ids': fields.function(_compute_lines, relation='account.move.line', type="many2many", string='Payments'),
         'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
-        'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
+        'user_id': fields.many2one('res.users', 'Salesperson', readonly=True, states={'draft':[('readonly',False)]}),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
     }
     _defaults = {
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 72d5da23ef4..d88d5276f7e 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -360,7 +360,7 @@
                             string="Reference"
                             filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
                         <field name="partner_id"/>
-                        <field name="user_id" widget="selection" string="Salesman">
+                        <field name="user_id" widget="selection" string="Salesperson">
                             <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" />
                         </field>
                     </group>
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 2fbe641dba3..31b13f8bf26 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -45,7 +45,7 @@ class account_invoice_report(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
+        'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
         'price_total': fields.float('Total Without Tax', readonly=True),
         'price_average': fields.float('Average Price', readonly=True, group_operator="avg"),
         'currency_rate': fields.float('Currency Rate', readonly=True),
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 76748f41f1b..c464d1cfc46 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -107,7 +107,7 @@
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
-                    <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
                     <filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py
index b31dedc8aa1..53aa5cd4a0d 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt.py
+++ b/addons/account_voucher/report/account_voucher_sales_receipt.py
@@ -37,7 +37,7 @@ class sale_receipt_report(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
+        'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
         'price_total': fields.float('Total Without Tax', readonly=True),
         'price_total_tax': fields.float('Total With Tax', readonly=True),
         'nbr':fields.integer('# of Voucher Lines', readonly=True),
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index 454bcefd5dd..ba1bad2a6bd 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -91,7 +91,7 @@
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
-                    <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 710e8f84a36..7994c9849c1 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -168,7 +168,7 @@ class crm_lead(crm_case, osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'date_closed': fields.datetime('Closed', readonly=True),
         'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"),
-        'user_id': fields.many2one('res.users', 'Salesman'),
+        'user_id': fields.many2one('res.users', 'Salesperson'),
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
         'day_open': fields.function(_compute_day, string='Days to Open', \
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a8cb6f732bd..86386278e86 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -371,7 +371,7 @@
                 </field>
                 <newline/>
                 <group expand="0" string="Group By...">
-                    <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
                     <separator orientation="vertical"/>
@@ -610,7 +610,7 @@
 
                 <newline/>
                 <group expand="0" string="Group By..." colspan="16">
-                    <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                    <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                     <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical" />
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 456afd884ea..d153eed4714 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -119,7 +119,7 @@
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
                         </field>
-                        <field name="user_id" string="Salesman">
+                        <field name="user_id" string="Salesperson">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         </field>
                     </group>
@@ -140,7 +140,7 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
-                        <filter string="Salesman" name="user" icon="terp-personal"
+                        <filter string="Salesperson" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 892ed3791e3..c91999319ce 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -83,7 +83,7 @@
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
                         </field>
-                        <field name="user_id" string="Salesman">
+                        <field name="user_id" string="Salesperson">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         </field>
                     </group>
@@ -99,7 +99,7 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
-                        <filter string="Salesman" name="Salesman" icon="terp-personal"
+                        <filter string="Salesperson" name="Salesperson" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 8a241b8acc0..62beda00c8a 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -95,7 +95,7 @@
                                 help="My company"/>
                         </field>
 
-                        <field name="user_id" string="Salesman">
+                        <field name="user_id" string="Salesperson">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         </field>
                     </group>
@@ -121,7 +121,7 @@
                     </group>
                     <newline/>
                     <group  expand="1" string="Group By...">
-                        <filter string="Salesman" name="Salesman" icon="terp-personal"
+                        <filter string="Salesperson" name="Salesperson" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 2629149d75a..6cdf7410348 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -112,7 +112,7 @@
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>
                         </field>
-                        <field name="user_id" string="Salesman">
+                        <field name="user_id" string="Salesperson">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         </field>
                     </group>
@@ -129,7 +129,7 @@
                     </group>
                     <newline/>
                     <group  expand="1" string="Group By...">
-                        <filter string="Salesman" name="Salesman" icon="terp-personal"
+                        <filter string="Salesperson" name="Salesperson" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index bf90428087a..fdf8d5ad0f9 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -86,7 +86,7 @@
                             domain="[('section_id.user_id.company_id','=',uid)]"
                             help="My company"/>
                         </field>
-                        <field name="user_id" string="Salesman">
+                        <field name="user_id" string="Salesperson">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         </field>
                     </group>
@@ -99,7 +99,7 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
-                        <filter string="Salesman" icon="terp-personal"
+                        <filter string="Salesperson" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 9e6176cdeab..18b31c009ad 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -44,7 +44,7 @@
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">
-                       <filter string="Salesman" name="user" icon="terp-personal"
+                       <filter string="Salesperson" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_assigned_id'}" />
                        <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
index 1cae2a82822..d652848f0fe 100644
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -17,7 +17,7 @@
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">
-                       <filter string="Salesman" name="user" icon="terp-personal"
+                       <filter string="Salesperson" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                        <filter string="Country" icon="terp-go-home" name="group_country" context="{'group_by':'country_id'}" />
                         <separator orientation="vertical" />
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index 4bd768179a3..c7a60083e36 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -176,7 +176,7 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="base.view_res_partner_filter"/>
             <field name="arch" type="xml">
-                <filter string="Salesman" position="after">
+                <filter string="Salesperson" position="after">
                     <filter string="Activation" context="{'group_by' : 'activation'}" domain="[]" icon="terp-personal" />
                 </filter>
             </field>
diff --git a/addons/edi/static/src/xml/edi_sale_purchase.xml b/addons/edi/static/src/xml/edi_sale_purchase.xml
index 4e0fdd7fc4e..698b322606f 100644
--- a/addons/edi/static/src/xml/edi_sale_purchase.xml
+++ b/addons/edi/static/src/xml/edi_sale_purchase.xml
@@ -39,7 +39,7 @@
         <tr class="oe_edi_floor">
             <th align="left">Your Reference</th>
             <th align="left">Date</th>
-            <th align="left">Salesman</th>
+            <th align="left">Salesperson</th>
             <th align="left">Payment terms</th>
         </tr>
         <tr class="oe_edi_data_row">
diff --git a/addons/hr_recruitment/hr_recruitment_demo.yml b/addons/hr_recruitment/hr_recruitment_demo.yml
index 9160c2fb1d2..59508b83c28 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.yml
+++ b/addons/hr_recruitment/hr_recruitment_demo.yml
@@ -7,7 +7,7 @@
     partner_mobile: '9963214587'
     job_id: hr.job_developer
     stage_id: stage_job1
-    name: 'Salesman'
+    name: 'Salesperson'
     partner_phone: '1236547890'
 
 -
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index b65386ca9c9..be5006b337f 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -173,7 +173,7 @@
 	                <field name="membership_start" invisible="1"/>
 	                <newline/>
 	                <group expand="0" string="Group By..." colspan="10" col="8">
-	                    <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
+	                    <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
 	              	    <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
 	              		<separator orientation="vertical"/>
 	                	<filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py
index 631acab46b1..9090c752686 100644
--- a/addons/membership/report/report_membership.py
+++ b/addons/membership/report/report_membership.py
@@ -59,7 +59,7 @@ class report_membership(osv.osv):
         'associate_member_id': fields.many2one('res.partner', 'Associate Member', readonly=True),
         'membership_id': fields.many2one('product.product', 'Membership Product', readonly=True),
         'membership_state': fields.selection(STATE, 'Current Membership State', readonly=True),
-        'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
+        'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True)
         }
 
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index b0ac01ac89f..6b3f6a9eb71 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -56,7 +56,7 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
-                        <filter string="Salesman" icon="terp-personal" name="salesman"
+                        <filter string="Salesperson" icon="terp-personal" name="salesman"
                             domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Associated Partner" icon="terp-partner" name="associate_member_id"
                             domain="[]" context="{'group_by':'associate_member_id'}"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index c5954ddb74e..4fa5c067284 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -148,7 +148,7 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator string="" orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator string="" orientation="vertical"/>
diff --git a/addons/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py
index 2a66923a39b..27086e08b26 100644
--- a/addons/point_of_sale/report/pos_order_report.py
+++ b/addons/point_of_sale/report/pos_order_report.py
@@ -37,7 +37,7 @@ class pos_order_report(osv.osv):
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'state': fields.selection([('draft', 'New'), ('paid', 'Closed'), ('done', 'Synchronized'), ('invoiced', 'Invoiced'), ('cancel', 'Cancelled')],
                                   'Status'),
-        'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
+        'user_id':fields.many2one('res.users', 'Salesperson', readonly=True),
         'price_total':fields.float('Total Price', readonly=True),
         'total_discount':fields.float('Total Discount', readonly=True),
         'average_price': fields.float('Average Price', readonly=True,group_operator="avg"),
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index c5024100a13..a1631ab0203 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -70,7 +70,7 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
-                        <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
+                        <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                         <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.py b/addons/point_of_sale/wizard/pos_payment_report_user.py
index 05d06f4df29..bdb2790dc87 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user.py
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.py
@@ -46,7 +46,7 @@ class pos_payment_report_user(osv.osv_memory):
         }
 
     _columns = {
-        'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesman')
+        'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesperson')
     }
 
 pos_payment_report_user()
diff --git a/addons/point_of_sale/wizard/pos_sales_user.py b/addons/point_of_sale/wizard/pos_sales_user.py
index e17aff8bdca..22ffa66d2ad 100644
--- a/addons/point_of_sale/wizard/pos_sales_user.py
+++ b/addons/point_of_sale/wizard/pos_sales_user.py
@@ -30,7 +30,7 @@ class pos_sale_user(osv.osv_memory):
     _columns = {
         'date_start': fields.date('Date Start', required=True),
         'date_end': fields.date('Date End', required=True),
-        'user_id': fields.many2many('res.users', 'sale_user_rel', 'user_id', 'uid', 'Salesman'),
+        'user_id': fields.many2many('res.users', 'sale_user_rel', 'user_id', 'uid', 'Salesperson'),
     }
 
     def print_report(self, cr, uid, ids, context=None):
diff --git a/addons/point_of_sale/wizard/pos_sales_user_today.py b/addons/point_of_sale/wizard/pos_sales_user_today.py
index 94d84647a7c..f48dd29b01b 100644
--- a/addons/point_of_sale/wizard/pos_sales_user_today.py
+++ b/addons/point_of_sale/wizard/pos_sales_user_today.py
@@ -27,7 +27,7 @@ class pos_sales_user_today(osv.osv_memory):
     _description = 'Sales User Today'
 
     _columns = {
-       'user_id': fields.many2many('res.users', 'sale_user_rel_today', 'user_id', 'uid', 'Salesman'),
+       'user_id': fields.many2many('res.users', 'sale_user_rel_today', 'user_id', 'uid', 'Salesperson'),
     }
 
     def print_report(self, cr, uid, ids, context=None):
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 4b66102c2f0..31f823888d6 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -204,7 +204,7 @@
           <para style="terp_tblheader_General_Centre">[[ o.state &lt;&gt; 'draft' and removeParentNode('para') ]] Quotation Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Salesman</para>
+          <para style="terp_tblheader_General_Centre">Salesperson</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Payment Term</para>
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 42e090d54e5..96e83012287 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -44,7 +44,7 @@ class sale_report(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
         'shop_id': fields.many2one('sale.shop', 'Shop', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
+        'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
         'price_total': fields.float('Total Price', readonly=True),
         'delay': fields.float('Commitment Delay', digits=(16,2), readonly=True),
         'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 7cb0df63a79..15066d8d92c 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -95,7 +95,7 @@
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
-                    <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
+                    <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-partner"  name="Customer" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6a3539fc10f..177ce02b1e0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -215,7 +215,7 @@ class sale_order(osv.osv):
         'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
         'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."),
-        'user_id': fields.many2one('res.users', 'Salesman', states={'draft': [('readonly', False)]}, select=True),
+        'user_id': fields.many2one('res.users', 'Salesperson', states={'draft': [('readonly', False)]}, select=True),
         'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)]}, required=True, change_default=True, select=True),
         'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Invoice address for current sales order."),
         'partner_shipping_id': fields.many2one('res.partner', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."),
@@ -1032,7 +1032,7 @@ class sale_order_line(osv.osv):
                     \n* The \'Done\' state is set when the sales order line has been picked. \
                     \n* The \'Cancelled\' state is set when a user cancel the sales order related.'),
         'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', store=True, string='Customer'),
-        'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesman'),
+        'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesperson'),
         'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
     }
     _order = 'sequence, id'
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c5b3323b0d6..977b273b1a8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -278,7 +278,7 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
@@ -433,7 +433,7 @@
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}"/>
-                        <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'salesman_id'}"/>
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'salesman_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>

From 8ad4e455b0c90aae28fe06f378ff62ee23d772ec Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Fri, 4 May 2012 17:52:06 +0530
Subject: [PATCH 238/452] [IMP]:improved title Salesmen by Salespeople
 everywhere

bzr revid: ssu@tinyerp.com-20120504122206-aiu8lt0suh9xp230
---
 addons/point_of_sale/wizard/pos_details.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py
index ee1d753a9ad..22a1cce22d6 100644
--- a/addons/point_of_sale/wizard/pos_details.py
+++ b/addons/point_of_sale/wizard/pos_details.py
@@ -30,7 +30,7 @@ class pos_details(osv.osv_memory):
     _columns = {
         'date_start': fields.date('Date Start', required=True),
         'date_end': fields.date('Date End', required=True),
-        'user_ids': fields.many2many('res.users', 'pos_details_report_user_rel', 'user_id', 'wizard_id', 'Salesmen'),
+        'user_ids': fields.many2many('res.users', 'pos_details_report_user_rel', 'user_id', 'wizard_id', 'Salespeople'),
     }
     _defaults = {
         'date_start': lambda *a: time.strftime('%Y-%m-%d'),

From ffe8d715b0100c83b2d65ace88c71540ba2c1364 Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Fri, 4 May 2012 17:56:18 +0530
Subject: [PATCH 239/452] [IMP]:improved title Referred Partner by Assigned
 Partner everywhere

bzr revid: ssu@tinyerp.com-20120504122618-hguibd3ej4kde61c
---
 addons/crm_partner_assign/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 9c8d1fb8817..ada71cee0bc 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -58,7 +58,7 @@
             <field name="inherit_id" ref="crm.view_crm_case_opportunities_filter"/>
             <field name="arch" type="xml">
                 <filter string="Team" position="after">
-                    <filter string="Referred Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_assigned_id'}"/>
+                    <filter string="Assigned Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_assigned_id'}"/>
                 </filter>
 
                 <field name="user_id" position="after">

From 8ac820486c46fe6883a95cc01d3f5e964afa9bb3 Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Fri, 4 May 2012 18:02:02 +0530
Subject: [PATCH 240/452] [IMP]:improved title Origin by Source everywhere

bzr revid: ssu@tinyerp.com-20120504123202-an1zb5evaiaazwrf
---
 addons/account/account_invoice.py                             | 2 +-
 addons/account/report/account_print_invoice.rml               | 2 +-
 .../report/report_account_invoice_layout.rml                  | 2 +-
 .../account_invoice_layout/report/special_message_invoice.rml | 2 +-
 addons/event/event.py                                         | 2 +-
 addons/purchase/purchase_view.xml                             | 4 ++--
 addons/purchase_requisition/purchase_requisition.py           | 2 +-
 addons/purchase_requisition/purchase_requisition_view.xml     | 2 +-
 addons/purchase_requisition/report/purchase_requisition.rml   | 2 +-
 addons/stock/stock.py                                         | 4 ++--
 addons/stock/stock_view.xml                                   | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index db0218bf79c..229f9959eaf 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1310,7 +1310,7 @@ class account_invoice_line(osv.osv):
     _description = "Invoice Line"
     _columns = {
         'name': fields.char('Description', size=256, required=True),
-        'origin': fields.char('Origin', size=256, help="Reference of the document that produced this invoice."),
+        'origin': fields.char('Source', size=256, help="Reference of the document that produced this invoice."),
         'invoice_id': fields.many2one('account.invoice', 'Invoice Reference', ondelete='cascade', select=True),
         'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'),
         'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index bb142587de0..7c5007a24fb 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -191,7 +191,7 @@
           <para style="terp_tblheader_General_Centre">Invoice Date</para>
         </td>
     <td>
-          <para style="terp_tblheader_General_Centre">Origin</para>
+          <para style="terp_tblheader_General_Centre">Source</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Customer Code</para>
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index eec4b974e2b..79bce6248d3 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -228,7 +228,7 @@
           <para style="terp_tblheader_General_Centre">Invoice Date</para>
         </td>
 	<td>
-          <para style="terp_tblheader_General_Centre">Origin</para>
+          <para style="terp_tblheader_General_Centre">Source</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Customer Code</para>
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index 97a7f131df6..84049b18f0a 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -232,7 +232,7 @@
           <para style="terp_tblheader_General_Centre">Invoice Date</para>
         </td>
 	<td>
-          <para style="terp_tblheader_General_Centre">Origin</para>
+          <para style="terp_tblheader_General_Centre">Source</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Your Reference</para>
diff --git a/addons/event/event.py b/addons/event/event.py
index 5d44df63c96..496a5d20c5b 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -257,7 +257,7 @@ class event_registration(osv.osv):
     _inherit = ['mail.thread','res.partner']
     _columns = {
         'id': fields.integer('ID'),
-        'origin': fields.char('Origin', size=124,readonly=True,help="Name of the sale order which create the registration"),
+        'origin': fields.char('Source', size=124,readonly=True,help="Name of the sale order which create the registration"),
         'nb_register': fields.integer('Number of Participants', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index b4e04d1f1aa..8aaa807e687 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -231,7 +231,7 @@
                   <group expand="0" string="Group By...">
                     <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                      <separator orientation="vertical"/>
-                    <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                      <separator orientation="vertical"/>
                     <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
@@ -267,7 +267,7 @@
                   <group expand="0" string="Group By...">
                     <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                      <separator orientation="vertical"/>
-                    <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                      <separator orientation="vertical"/>
                     <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index b3e190306b8..8f62393a320 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -33,7 +33,7 @@ class purchase_requisition(osv.osv):
     _description="Purchase Requisition"
     _columns = {
         'name': fields.char('Requisition Reference', size=32,required=True),
-        'origin': fields.char('Origin', size=32),
+        'origin': fields.char('Source', size=32),
         'date_start': fields.datetime('Requisition Date'),
         'date_end': fields.datetime('Requisition Deadline'),
         'user_id': fields.many2one('res.users', 'Responsible'),
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 269530da636..f679be9c14f 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -149,7 +149,7 @@
                   <group expand="0" string="Group By...">
                     <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
diff --git a/addons/purchase_requisition/report/purchase_requisition.rml b/addons/purchase_requisition/report/purchase_requisition.rml
index f33f25536af..95c5d19ba31 100644
--- a/addons/purchase_requisition/report/purchase_requisition.rml
+++ b/addons/purchase_requisition/report/purchase_requisition.rml
@@ -148,7 +148,7 @@
           <para style="terp_tblheader_General_Centre">Type</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Origin</para>
+          <para style="terp_tblheader_General_Centre">Source</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9cde40be431..699c356683b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -617,7 +617,7 @@ class stock_picking(osv.osv):
 
     _columns = {
         'name': fields.char('Reference', size=64, select=True),
-        'origin': fields.char('Origin', size=64, help="Reference of the document that produced this picking.", select=True),
+        'origin': fields.char('Source', size=64, help="Reference of the document that produced this picking.", select=True),
         'backorder_id': fields.many2one('stock.picking', 'Back Order of', help="If this picking was split this field links to the picking that contains the other part that has been processed already.", select=True),
         'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
         'note': fields.text('Notes'),
@@ -1637,7 +1637,7 @@ class stock_move(osv.osv):
         'price_currency_id': fields.many2one('res.currency', 'Currency for average price', help="Technical field used to record the currency chosen by the user during a picking confirmation (when average price costing method is used)"),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order", select=True),
-        'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin", store=True),
+        'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Source", store=True),
 
         # used for colors in tree views:
         'scrapped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scrapped', readonly=True),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e07287484d1..8ff97bfddaa 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1312,7 +1312,7 @@
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                        <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                         <separator orientation="vertical" />
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
                     </group>

From 8851661937661e788b8808022a1f0714ebf9d968 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 18:12:21 +0530
Subject: [PATCH 241/452] [IMP]account_budget : Added state and buttons on top
 bar

bzr revid: mma@tinyerp.com-20120504124221-1afcm5acl6p0q9e4
---
 addons/account_budget/account_budget_view.xml | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 43b936951e8..c35b21677f2 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -104,7 +104,19 @@
             <field name="model">crossovered.budget</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Budget">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                     <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 name="draft" states="cancel" string="Reset to Draft" type="workflow" icon="terp-stock_effects-object-colorize"/>
+                     <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
+                <div class="oe_right">
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </div>
+                </div>
+                <sheet string="Budget" layout="auto">
+                <group class="oe_form_header">
                             <field name="name" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                             <field name="code" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                             <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -134,15 +146,8 @@
                                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                 </form>
                             </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 name="draft" states="cancel" string="Reset to Draft" type="workflow" icon="terp-stock_effects-object-colorize"/>
                             </group>
-
+                    </sheet>
                 </form>
             </field>
         </record>

From 9cd9c20e8f3c6bd6c87c3479f08f50b4c81edcc8 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 18:30:27 +0530
Subject: [PATCH 242/452] [IMP]auction : Added state and buttons on top bar

bzr revid: mma@tinyerp.com-20120504130027-r593yakft15pfk6y
---
 addons/auction/auction_view.xml | 40 ++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index a807b7c2ce1..9236ae3dfcd 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -107,7 +107,15 @@
         <field name="model">auction.dates</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Auctions">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                <button name="close" states="draft" string="Create Invoices" type="object" colspan="2" icon="terp-gtk-go-back-rtl"/>
+            <div class="oe_right">
+                <field name="state" widget="statusbar" nolabel="1"/>
+            </div>
+            </div>
+            <sheet string="Auctions" layout="auto">
+            <group class="oe_form_header">
                 <field name="name" colspan="2" select="1"/>
                 <notebook colspan="4">
                     <page string="Auction Dates">
@@ -123,9 +131,6 @@
                                 <field name="auction2" select="1"/>
                             </group>
                         </group>
-                        <separator string="" colspan="4"/>
-                        <field name="state"/>
-                        <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">
@@ -193,6 +198,8 @@
                         </group>
                     </page>
                 </notebook>
+                </group>
+               </sheet>
             </form>
         </field>
     </record>
@@ -296,8 +303,18 @@
         <field name="type">form</field>
         <field name="priority" eval="8"/>
         <field name="arch" type="xml">
-            <form string="Objects">
-              <group colspan="4" col="8">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                 <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to"/>
+                 <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
+                 <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
+                 <button name="button_unpaid" string="Set to draft" states="sold,unsold,paid" type="object" icon="gtk-convert"/>
+            <div class="oe_right">
+                <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,sold" />
+            </div>
+            </div>
+            <sheet string="Objects" layout="auto">
+              <group colspan="4" col="8" class="oe_form_header">
                 <field name="name" colspan="4"/>
                 <field name="obj_num"/>
                 <newline/>
@@ -363,16 +380,6 @@
                             <field name="paid_vnd"/>
                         </group>
                     </group>
-                       <group colspan="4" col="4">
-                        <separator string="" colspan="4"/>
-                        <field name="state" colspan="1"/>
-                        <group col="8" colspan="2">
-                            <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to"/>
-                            <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
-                            <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
-                            <button name="button_unpaid" string="Set to draft" states="sold,unsold,paid" type="object" icon="gtk-convert"/>
-                        </group>
-                      </group>
                    </page>
                    <page string="Bids">
                        <field name="bid_lines" colspan="4" nolabel="1">
@@ -425,6 +432,7 @@
                         <field name="obj_desc" colspan="4" nolabel="1"/>
                     </page>
                 </notebook>
+                </sheet>
            </form>
         </field>
     </record>

From 827fb865c4c8e966c2e40fde34c2fc1a3eb0100d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 4 May 2012 16:55:51 +0200
Subject: [PATCH 243/452] [IMP] improve methods for counting opportunities,
 meetings, sale orders, and pickings

bzr revid: rco@openerp.com-20120504145551-66l6wy2qumc59r82
---
 addons/crm/res_partner.py  | 32 ++++++++++----------------------
 addons/sale/res_partner.py | 21 +++++++++------------
 addons/stock/product.py    | 25 ++++++++++++-------------
 3 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index 2094276dbef..d58a94f81d0 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -26,21 +26,14 @@ class res_partner(osv.osv):
     """ Inherits partner and adds CRM information in the partner form """
     _inherit = 'res.partner'
 
-    def _opportunity_count(self, cr, uid, ids, field_name, arg, context=None):
-        count = dict.fromkeys(ids, 0)
-        opportunity_pool=self.pool.get('crm.lead')
-        opportunity_ids = opportunity_pool.search(cr, uid, [('partner_id', 'in', ids)])
-        for opportunity in opportunity_pool.browse(cr, uid, opportunity_ids):
-            count[opportunity.partner_id.id] += 1
-        return count
-
-    def _meeting_count(self, cr, uid, ids, field_name, arg, context=None):
-        count = dict.fromkeys(ids, 0)
-        meeting_pool=self.pool.get('crm.meeting')
-        meeting_ids = meeting_pool.search(cr, uid, [('partner_id', 'in', ids)])
-        for meeting in meeting_pool.browse(cr, uid, meeting_ids):
-            count[meeting.partner_id.id] += 1
-        return count
+    def _opportunity_meeting_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        for partner in self.browse(cr, uid, ids, context):
+            res[partner.id] = {
+                'opportunity_count': len(partner.opportunity_ids),
+                'meeting_count': len(partner.meeting_ids),
+            }
+        return res
 
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
@@ -50,13 +43,8 @@ class res_partner(osv.osv):
             'Meetings'),
         'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
             'Phonecalls'),
-        'opportunity_count': fields.function(_opportunity_count , type='integer',string="Opportunity"),
-        'meeting_count': fields.function(_meeting_count , type='integer',string="Meeting"),
-    }
-
-    _defaults = {
-        'opportunity_count': 0,
-        'meeting_count': 0,
+        'opportunity_count': fields.function(_opportunity_meeting_count, string="Opportunity", type='integer', multi='opp_meet'),
+        'meeting_count': fields.function(_opportunity_meeting_count, string="Meeting", type='integer', multi='opp_meet'),
     }
 
     def redirect_partner_form(self, cr, uid, partner_id, context=None):
diff --git a/addons/sale/res_partner.py b/addons/sale/res_partner.py
index f508f4218f0..fd4c9bf8d7e 100644
--- a/addons/sale/res_partner.py
+++ b/addons/sale/res_partner.py
@@ -24,19 +24,16 @@ from tools.translate import _
 
 class res_partner(osv.osv):
     _inherit = 'res.partner'
-    
+
     def _sale_order_count(self, cr, uid, ids, field_name, arg, context=None):
-        count = dict.fromkeys(ids, 0)
-        sale_order_pool=self.pool.get('sale.order')
-        sale_order_ids = sale_order_pool.search(cr, uid, [('partner_id', 'in', ids)])
-        for sale_order in sale_order_pool.browse(cr, uid, sale_order_ids):
-            count[sale_order.partner_id.id] += 1
-        return count
-    
+        res = {}
+        for partner in self.browse(cr, uid, ids, context):
+            res[partner.id] = len(partner.sale_order_ids)
+        return res
+
     _columns = {
-        'sale_order_count': fields.function(_sale_order_count , type='integer',string="Sale Order"),
-    }
-    _defaults = {
-        'sale_order_count': 0,
+        'sale_order_ids': fields.one2many('sale.order', 'partner_id', 'Quotations and Sale Orders'),
+        'sale_order_count': fields.function(_sale_order_count, string='Sale Order', type='integer'),
     }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 58d0ca869df..1f9f99d3664 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -27,15 +27,16 @@ class product_product(osv.osv):
     _inherit = "product.product"
 
     def _stock_picking_count(self, cr, uid, ids, field_name, arg, context=None):
-        count = dict.fromkeys(ids, 0)
-        stock_picking_pool=self.pool.get('stock.picking')
-        if field_name == 'reception_count':
-        	stock_picking_ids = stock_picking_pool.search(cr, uid, [('move_lines.product_id','in',ids),('type','=','in')])
-        else:
-        	stock_picking_ids = stock_picking_pool.search(cr, uid, [('move_lines.product_id','in',ids),('type','=','out')])
-        for stock_picking in stock_picking_pool.browse(cr, uid, stock_picking_ids):
-            count[stock_picking.move_lines[0].product_id.id] += 1
-        return count
+        res = dict([(id, {'reception_count': 0, 'delivery_count': 0}) for id in ids])
+        picking_pool=self.pool.get('stock.picking')
+        picking_ids = picking_pool.search(cr, uid, [('move_lines.product_id', 'in', ids)])
+        for picking in picking_pool.browse(cr, uid, picking_ids, context):
+            field = 'reception_count' if picking.type == 'in' else 'delivery_count'
+            product_ids = set([line.product_id.id for line in picking.move_lines])
+            for product_id in product_ids:
+                if product_id in ids:
+                    res[product_id][field] += 1
+        return res
 
     def get_product_accounts(self, cr, uid, product_id, context=None):
         """ To get the stock input account, stock output account and stock journal related to product.
@@ -342,8 +343,8 @@ class product_product(osv.osv):
         return res
 
     _columns = {
-        'reception_count': fields.function(_stock_picking_count , type='integer',string="Reception"),
-        'delivery_count': fields.function(_stock_picking_count , type='integer',string="Delivery"),
+        'reception_count': fields.function(_stock_picking_count, string="Reception", type='integer', multi='pickings'),
+        'delivery_count': fields.function(_stock_picking_count, string="Delivery", type='integer', multi='pickings'),
         'qty_available': fields.function(_product_available, multi='qty_available',
             type='float',  digits_compute=dp.get_precision('Product UoM'),
             string='Quantity On Hand',
@@ -415,8 +416,6 @@ class product_product(osv.osv):
 
     _defaults = {
         'valuation': 'manual_periodic',
-        'reception_count': 0,
-        'delivery_count': 0,
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):

From 6ea4587fadd9cae94655b629e9f4b62e767304a2 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 4 May 2012 17:00:52 +0200
Subject: [PATCH 244/452] [FIX] stock: do not store field product_id on
 pickings, as storing its value loses search results (m2m vs m2o)

bzr revid: rco@openerp.com-20120504150052-ecatdwfuysdpsmbt
---
 addons/stock/product_view.xml | 5 ++---
 addons/stock/stock.py         | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 57f0fd89667..706e7bf867f 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -132,7 +132,7 @@
             view_mode="tree,form,calendar"
             res_model="stock.picking"
             src_model="product.product"
-            context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
+            context="{'search_default_product_id': [active_id]}"
             domain="[('type','=','in')]"
             />
 
@@ -142,10 +142,9 @@
             view_mode="tree,form,calendar"
             res_model="stock.picking"
             src_model="product.product"
-            context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
+            context="{'search_default_product_id': [active_id]}"
             domain="[('type', '=', 'out')]"
             />
-		
 
         <record model="ir.ui.view" id="product.product_kanban_view">
             <field name="name">Product Kanban</field>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d0f78bef9bd..0bafe03e843 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -648,7 +648,7 @@ class stock_picking(osv.osv):
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  store=True, type='datetime', string='Max. Expected Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
-        'product_id': fields.related('move_lines','product_id', type='many2one', relation='product.product', string='Product',store=True),
+        'product_id': fields.related('move_lines', 'product_id', type='many2one', relation='product.product', string='Product'),
         'auto_picking': fields.boolean('Auto-Picking', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'partner_id': fields.many2one('res.partner', 'Partner', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'invoice_state': fields.selection([

From 0a09dbed34812d416e9c52bc4226117ca3176b7e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Sat, 5 May 2012 23:03:40 +0530
Subject: [PATCH 245/452] [FIX]: Improve css file. Improve view.

bzr revid: atp@tinyerp.com-20120505173340-1jmgy4clza1gy6sh
---
 addons/event/event_view.xml           | 9 +++++----
 addons/event/static/src/css/event.css | 7 +++++++
 addons/event_sale/event_sale.py       | 5 +++--
 addons/event_sale/event_sale_view.xml | 6 +++---
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 42037637ea5..91c2590008d 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -159,7 +159,7 @@
 		                    </div>
 		                    <newline/>
 		                    <group colspan="4" name="venue">
-                            	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
+                            	<div class="oe_sub1"> Venue   : </div> 
                             	<field name="location_id" nolabel="1" readonly="1"/> 
                         	</group>
 			             </group>	
@@ -187,9 +187,10 @@
 			                     </tr>
 		                     </table>   
 			             </group>
-                    </group>	
-                    <separator string="Event Details" colspan="4"/>
-                    <field name="note" colspan="4" nolabel="1" readonly="1"/>
+                    </group>
+                    <separator string="" colspan="4"/>
+                    	<label string="Event Details:" colspan="4"/>
+                    	<field name="note" colspan="4" nolabel="1" readonly="1"/>
                     </sheet>
             </form>
             </field>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 3ff0bb8564f..d53770071d0 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -125,6 +125,9 @@ div.oe_fold_column{
 .oe_sub1
 {
     float:left;
+    height:50px;
+    border-right: 1px solid black;
+    border-color: #DCDCDC;
 }
 .oe_mapbox
 { 
@@ -133,6 +136,7 @@ div.oe_fold_column{
     margin-left:auto; 
     margin-right:auto; 
     text-align: right;
+    
 }
 .oe_td_border
 {
@@ -140,9 +144,12 @@ div.oe_fold_column{
 	padding: 2px;
 	border-right: 1px solid black;
 	text-align: center;
+	border-color: #DCDCDC;
+	
 	
 }
 .oe_td_date_border
 {
 	border-right:1px solid black;
+	border-color: #DCDCDC;
 }
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index eb17f6ac59a..5097ea5b9f3 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -179,8 +179,9 @@ class event_items(osv.osv):
     _columns = {
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'price': fields.integer('Price'),
-        'max_qty': fields.integer('Max.Quantity available'),
-        'qty': fields.integer('QTY', type ='integer'),
+        #Need to convert  this integer field in to dynamic selection.. TODO
+      #  'max_qty': fields.integer('Max.Quantity available'),
+        'qty': fields.integer('Quantity'),
         'uom_id': fields.many2one('product.uom', 'UoM'),
         'discount': fields.integer('Discount'),
         'event_id': fields.many2one('event.event', 'Event'),
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 9fb3fb9f81b..bf2e8833df7 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -42,8 +42,8 @@
 							 <field name="product_id" readonly="1" />
 							 <field name="sales_end_date" readonly="1"/>
 							 <field name="price" readonly="1"/>
-							 <field name="max_qty" readonly="1" groups="event.group_event_manager"/>
-							 <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
+							 <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
+							 <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
 				 		</tree>
 					</field>
 					<newline/>
@@ -68,7 +68,7 @@
 								 <field name="product_id" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
 								 <field name="sales_end_date" />
 								 <field name="price"/>
-								 <field name="max_qty" groups="event.group_event_manager"/>
+								<!-- <field name="max_qty" groups="event.group_event_manager"/> --> 
 								 <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
 				 			</tree>
 						</field>

From 80a595d631f5335b068d445fc87644787d686d1d Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Sat, 5 May 2012 23:33:49 +0530
Subject: [PATCH 246/452] [FIX]: Remove unused space.

bzr revid: atp@tinyerp.com-20120505180349-tlrsdqqpjpm1haaf
---
 addons/event/__openerp__.py           |  2 +-
 addons/event/event_view.xml           | 93 +++++++++++++------------
 addons/event_sale/event_sale_view.xml | 97 +++++++++++++--------------
 3 files changed, 95 insertions(+), 97 deletions(-)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 88943b06654..e36914ee9fb 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -53,7 +53,7 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
-    'css': ['static/src/css/*.css'],
+    'css': ['static/src/css/event.css'],
     'js': ['static/src/js/event.js'],
     'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 91c2590008d..34688f18efb 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -143,54 +143,53 @@
             <field name="arch" type="xml">
                 <form string="Events"  layout="manual">
                 <div class="oe_form_topbar" readonly="1">
-                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-               		<div class="oe_right">
-                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-               		</div>
-            	</div>
-            	<sheet string="Event Form" layout="auto">
-            		<group col="2">
-            			<group col="2">
-		                	<div class="oe_event_title">
-		                    	<field name="name" nolabel="1" readonly="1"/>
-		                    </div>
-		                    <newline/>
-		                    <group colspan="4" name="venue">
-                            	<div class="oe_sub1"> Venue   : </div> 
-                            	<field name="location_id" nolabel="1" readonly="1"/> 
-                        	</group>
-			             </group>	
-			             <group>
-			             	<div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
-		                    <table>
-			                   	<tr>
-			                    	<td width="70px" class="oe_td_border">
-			                            Where
-			                        </td>
-			                        <td width="auto">
-			                            <field name="address_id" widget ="geo_address" nolabel="1"/>
-			                        </td>
-			                        <td width="210px">
-	                             		<table align="right">
-											<tr>
-												<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
-											</tr>
-											<tr>
-												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
-											</tr>
-										</table>
-	                                 
-			                        </td>
-			                     </tr>
-		                     </table>   
-			             </group>
-                    </group>
+                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                   <div class="oe_right">
+                      <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                   </div>
+                </div>
+                <sheet string="Event Form" layout="auto">
+                   <group col="2">
+                     <group col="2">
+                       <div class="oe_event_title">
+                          <field name="name" nolabel="1" readonly="1"/>
+                       </div>
+                      <newline/>
+                      <group colspan="4" name="venue">
+                            <div class="oe_sub1"> Venue   : </div> 
+                              <field name="location_id" nolabel="1" readonly="1"/> 
+                      </group>
+                   </group>	
+                    <group>
+                     <div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
+                     <table>
+                       <tr>
+                         <td width="70px" class="oe_td_border">
+                             Where
+                         </td>
+                         <td width="auto">
+                             <field name="address_id" widget ="geo_address" nolabel="1"/>
+                         </td>
+                         <td width="210px">
+                             <table align="right">
+                              <tr>
+                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
+                              </tr>
+                              <tr>
+                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
+                              </tr>
+                            </table>
+                         </td>
+                       </tr>
+                     </table>
+                  </group>
+                  </group>
                     <separator string="" colspan="4"/>
-                    	<label string="Event Details:" colspan="4"/>
-                    	<field name="note" colspan="4" nolabel="1" readonly="1"/>
+                      <label string="Event Details:" colspan="4"/>
+                       <field name="note" colspan="4" nolabel="1" readonly="1"/>
                     </sheet>
             </form>
             </field>
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index bf2e8833df7..ad752a36dd1 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -30,56 +30,55 @@
              </field>
         </record>
         
-		<record model="ir.ui.view" id="view_event_page_inherit">
-			<field name="name">Events Inherit</field>
-			<field name="model">event.event</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="event.view_event_page"/>
-			<field name="arch" type="xml">
-				<xpath expr="//group[@name='venue']" position="after">
-					<field name="event_item_ids" nolabel="1">
-						 <tree editable="top" string="Event Items">
-							 <field name="product_id" readonly="1" />
-							 <field name="sales_end_date" readonly="1"/>
-							 <field name="price" readonly="1"/>
-							 <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
-							 <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
-				 		</tree>
-					</field>
-					<newline/>
-					<div class="oe_right">
-						<button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
-					</div>
-				</xpath>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_event_page_inherit">
+          <field name="name">Events Inherit</field>
+          <field name="model">event.event</field>
+          <field name="type">form</field>
+          <field name="inherit_id" ref="event.view_event_page"/>
+          <field name="arch" type="xml">
+          <xpath expr="//group[@name='venue']" position="after">
+            <field name="event_item_ids" nolabel="1">
+               <tree editable="top" string="Event Items">
+                  <field name="product_id" readonly="1" />
+                   <field name="sales_end_date" readonly="1"/>
+                   <field name="price" readonly="1"/>
+                    <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
+                   <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
+               </tree>
+              </field>
+               <newline/>
+               <div class="oe_right">
+                 <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
+               </div>
+          </xpath>
+          </field>
+        </record>
 
-
-		<record model="ir.ui.view" id="view_event_form_inherit">
-			<field name="name">Events Inherit</field>
-			<field name="model">event.event</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="event.view_event_form"/>
-			<field name="arch" type="xml">
-				<xpath expr="//page[@string='Extra Info']" position="after">
-					<page string="Event Item">
-						<field name="event_item_ids" nolabel="1">
-							 <tree editable="top" string="Event Items">
-								 <field name="product_id" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
-								 <field name="sales_end_date" />
-								 <field name="price"/>
-								<!-- <field name="max_qty" groups="event.group_event_manager"/> --> 
-								 <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
-				 			</tree>
-						</field>
-						<newline/>
-						<div class="oe_right">
-							<button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
-						</div>
-					</page>
-				</xpath>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_event_form_inherit">
+           <field name="name">Events Inherit</field>
+           <field name="model">event.event</field>
+           <field name="type">form</field>
+          <field name="inherit_id" ref="event.view_event_form"/>
+          <field name="arch" type="xml">
+           <xpath expr="//page[@string='Extra Info']" position="after">
+             <page string="Event Item">
+             <field name="event_item_ids" nolabel="1">
+             <tree editable="top" string="Event Items">
+                <field name="product_id" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
+                <field name="sales_end_date" />
+                <field name="price"/>
+                <!-- <field name="max_qty" groups="event.group_event_manager"/> --> 
+                <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
+             </tree>
+            </field>
+            <newline/>
+            <div class="oe_right">
+                <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
+            </div>
+             </page>
+           </xpath>
+          </field>
+        </record>
 
 		<record id="view_event_kanban_inherit" model="ir.ui.view">
             <field name="name">event.inherit.kanban</field>

From 20624a156e9edaa09db5267a6f68b60f2bd1a827 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 7 May 2012 10:56:45 +0530
Subject: [PATCH 247/452] [FIX]: Optimize code.

bzr revid: atp@tinyerp.com-20120507052645-5jkwjolm0tm3rb5c
---
 addons/event/event.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 62b1d79f969..2d5c85aef4a 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -104,13 +104,11 @@ class event_event(osv.osv):
                 raise osv.except_osv(_('Error!'),_("The total of confirmed registration for the event '%s' does not meet the expected minimum/maximum. You should maybe reconsider those limits before going further") % (self.event.name))
             
     def check_available_seats(self, cr, uid, ids, context=None):
-        if isinstance(ids, list):
-            ids = ids[0]
-        else:
-            ids = ids 
-        total_confirmed = self.browse(cr, uid, ids, context=context).register_current
-        register_max = self.browse(cr, uid, ids, context=context).register_max
-        available_seats = register_max - total_confirmed
+        available_seats = False
+        for event in self.browse(cr, uid, ids, context=context):
+            total_confirmed = event.register_current
+            register_max = event.register_max
+            available_seats = register_max - total_confirmed
         return available_seats
             
     def check_registration_limits_before(self, cr, uid, ids, no_of_registration, context=None):
@@ -317,9 +315,10 @@ class event_registration(osv.osv):
         """ Open Registration
         """
         event_obj = self.pool.get('event.event')
-        event_id = self.browse(cr, uid, ids, context=context)[0].event_id.id
-        no_of_registration = self.browse(cr, uid, ids, context=context)[0].nb_register
-        event_obj.check_registration_limits_before(cr, uid, event_id, no_of_registration, context=context)
+        for register in  self.browse(cr, uid, ids, context=context):
+            event_id = register.event_id.id
+            no_of_registration = register.nb_register
+            event_obj.check_registration_limits_before(cr, uid, [event_id], no_of_registration, context=context)
         res = self.confirm_registration(cr, uid, ids, context=context)
         self.mail_user(cr, uid, ids, context=context)
         return res

From f2c731459bf9e06c090b3c0bb8a3e79d96c0eb81 Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Mon, 7 May 2012 11:05:35 +0530
Subject: [PATCH 248/452] [IMP]:improve title Based on receptions by Bases on
 incoming shipments as per requirement

bzr revid: ssu@tinyerp.com-20120507053535-qkjfzrq1qk6ez2yy
---
 addons/purchase/purchase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index d9a02ed836f..00d98ed265c 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -179,7 +179,7 @@ class purchase_order(osv.osv):
         'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'),
         'invoiced': fields.function(_invoiced, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"),
         'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
-        'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on receptions')], 'Invoicing Control', required=True,
+        'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Bases on incoming shipments')], 'Invoicing Control', required=True,
             help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' from where you can selectively create an invoice.\n" \
                 "Based on generated invoice: create a draft invoice you can validate later.\n" \
                 "Based on receptions: let you create an invoice when receptions are validated."

From ecf4383009fa58b39d9b209db470926abca8ab33 Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Mon, 7 May 2012 11:16:56 +0530
Subject: [PATCH 249/452] [IMP]:improve title Based on receptions by Bases on
 incoming shipments in yml and xml files

bzr revid: ssu@tinyerp.com-20120507054656-vgzgavr908v9y9mj
---
 addons/purchase/purchase.py                                   | 2 +-
 addons/purchase/stock_view.xml                                | 4 ++--
 .../purchase/test/process/generate_invoice_from_reception.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 00d98ed265c..ec93bc0f9d2 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -182,7 +182,7 @@ class purchase_order(osv.osv):
         'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Bases on incoming shipments')], 'Invoicing Control', required=True,
             help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' from where you can selectively create an invoice.\n" \
                 "Based on generated invoice: create a draft invoice you can validate later.\n" \
-                "Based on receptions: let you create an invoice when receptions are validated."
+                "Bases on incoming shipments: let you create an invoice when receptions are validated."
         ),
         'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, string='Expected Date', type='date', select=True, help="This is computed as the minimum scheduled date of all purchase order lines' products.",
             store = {
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 3692149c534..7f44baef713 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -100,7 +100,7 @@
         </record>
  
         <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
-            <field name="name">Based on receptions</field>
+            <field name="name">Bases on incoming shipments</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -108,7 +108,7 @@
             <field name="domain">[('type','=','in')]</field>
             <field name="context">{"default_type": "in", "contact_display": "partner_address", "search_default_done": 1, "search_default_to_invoice": 1}</field>
             <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
-            <field name="help">If you set the Invoicing Control on a purchase order as "Based on receptions", you can track here all the product receptions and create invoices for those receptions.</field>
+            <field name="help">If you set the Invoicing Control on a purchase order as "Bases on incoming shipments", you can track here all the product receptions and create invoices for those receptions.</field>
        </record>
 
         <menuitem action="action_picking_tree4_picking_to_invoice"
diff --git a/addons/purchase/test/process/generate_invoice_from_reception.yml b/addons/purchase/test/process/generate_invoice_from_reception.yml
index 0e042db1176..f6a835b4087 100644
--- a/addons/purchase/test/process/generate_invoice_from_reception.yml
+++ b/addons/purchase/test/process/generate_invoice_from_reception.yml
@@ -1,5 +1,5 @@
 -
- I confirm another order where invoice control is 'Based on receptions'.
+ I confirm another order where invoice control is 'Bases on incoming shipments'.
 -
   !workflow {model: purchase.order, action: purchase_confirm, ref: order_purchase2}
 -

From de059928314359e025bdbf2a109247f076c5320b Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 7 May 2012 11:25:20 +0530
Subject: [PATCH 250/452] [IMP]bank : Added state and buttons on top bar in
 statement reconciliation

bzr revid: mma@tinyerp.com-20120507055520-dakd4awcvn8j6qiz
---
 addons/account/account_view.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1c24a487676..4945da29a03 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -666,8 +666,17 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bank Statement">
-                    <group col="7" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                        <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
+                        <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state"  widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                    </div>
+                </div>
+                <sheet string="Bank Statement" layout="auto">
+                    <group col="7" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name="date" select="1" on_change="onchange_date(date, company_id)"/>
                         <field name='company_id' widget="selection" groups="base.group_multi_company" />
@@ -697,12 +706,9 @@
                         </page>
                     </notebook>
                     <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"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From 341e8845d55ae4f3ea3f03f3739af29e057811a7 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 7 May 2012 14:50:27 +0530
Subject: [PATCH 251/452] [IMP]crm,hr: Fix the crm opt_out field problem and
 set Employee group for leave_id field in kanban view

bzr revid: dbr@tinyerp.com-20120507092027-gnqcqpzaa6ese1x8
---
 addons/crm/crm_lead.py                  | 6 +++---
 addons/crm/crm_lead_view.xml            | 4 ++--
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 00f477a75d7..a9e981e3278 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -163,7 +163,7 @@ class crm_lead(crm_case, osv.osv):
         'contact_name': fields.char('Contact Name', size=64),
         'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner company that will be created while converting the lead into opportunity', select=1),
         'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."),
-        'optout': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
+        'opt_out': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
         'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'date_closed': fields.datetime('Closed', readonly=True),
@@ -228,10 +228,10 @@ class crm_lead(crm_case, osv.osv):
         return obj_id
     
     def on_change_optin(self, cr, uid, ids, optin):
-        return {'value':{'optin':optin,'optout':False}}
+        return {'value':{'optin':optin,'opt_out':False}}
 
     def on_change_optout(self, cr, uid, ids, optout):
-        return {'value':{'optout':optout,'optin':False}}
+        return {'value':{'opt_out':optout,'optin':False}}
 
     def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
         if not stage_id:
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 0d89eb4198f..14d3edf5b0e 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -145,7 +145,7 @@
                     <group colspan="2" col="2">
                         <separator string="Mailings" colspan="2" col="2"/>
                         <field name="optin" on_change="on_change_optin(optin)"/>
-                        <field name="optout" on_change="on_change_optout(optout)"/>
+                        <field name="opt_out" on_change="on_change_optout(opt_out)"/>
                     </group>
                     <group colspan="2" col="2" groups="base.group_no_one">
                         <separator string="Statistics" colspan="2" col="2"/>
@@ -508,7 +508,7 @@
                     <group colspan="2" col="2">
                         <separator string="Mailings" colspan="2"/>
                         <field name="optin" on_change="on_change_optin(optin)"/>
-                        <field name="optout" on_change="on_change_optout(optout)"/>
+                        <field name="opt_out" on_change="on_change_optout(opt_out)"/>
                     </group>
                 </page>
                 <page string="Extra Info">
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9f8f998cbd9..9355f610b9f 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -517,7 +517,7 @@
                     <li t-if="record.current_leave_id.raw_value || record.last_login.raw_value">
                         <span t-if="record.current_leave_id.raw_value" t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_color_3':'oe_kanban_color_2'">
                             <span class="oe_kanban_button" style="font-size: 100%%">
-                                <field name="current_leave_id"/>
+                                <field name="current_leave_id" groups="base.group_user"/>
                             </span>
                         </span>
                         <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">

From 22b7a6d61b9de79b3c6d7ca17653283368d4bf94 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 7 May 2012 14:51:13 +0530
Subject: [PATCH 252/452] Title improvement: Usability

bzr revid: tta@openerp.com-20120507092113-i2nva976uvwi6n7y
---
 openerp/addons/base/res/res_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index bcbeb0f3d99..d72dbef64fe 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -159,7 +159,7 @@ class res_partner(osv.osv):
         'street2': fields.char('Street2', size=128),
         'zip': fields.char('Zip', change_default=True, size=24),
         'city': fields.char('City', size=128),
-        'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"),
+        'state_id': fields.many2one("res.country.state", 'State', domain="[('country_id','=',country_id)]"),
         'country_id': fields.many2one('res.country', 'Country'),
         'country': fields.related('country_id', type='many2one', relation='res.country', string='Country'),   # for backward compatibility
         'email': fields.char('E-Mail', size=240),

From 7a087d62406f33c43f102eb02ae6bd8e242488a0 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 7 May 2012 15:40:32 +0530
Subject: [PATCH 253/452] [FIX]: Remove page view from form view and place it
 into event_sale module.

bzr revid: atp@tinyerp.com-20120507101032-e9q0u4cgng231i62
---
 addons/event/event_view.xml           | 61 -----------------
 addons/event_sale/event_sale.py       |  2 +-
 addons/event_sale/event_sale_view.xml | 99 +++++++++++++++++++++------
 3 files changed, 78 insertions(+), 84 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 34688f18efb..23257cd8efe 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -134,67 +134,6 @@
         </record>
 
 
-    <!-- Events Organisation/CONFIGURATION/EVENTS PAGE VIEW -->
-
-        <record model="ir.ui.view" id="view_event_page">
-            <field name="name">Events</field>
-            <field name="model">event.event</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Events"  layout="manual">
-                <div class="oe_form_topbar" readonly="1">
-                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                   <div class="oe_right">
-                      <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                   </div>
-                </div>
-                <sheet string="Event Form" layout="auto">
-                   <group col="2">
-                     <group col="2">
-                       <div class="oe_event_title">
-                          <field name="name" nolabel="1" readonly="1"/>
-                       </div>
-                      <newline/>
-                      <group colspan="4" name="venue">
-                            <div class="oe_sub1"> Venue   : </div> 
-                              <field name="location_id" nolabel="1" readonly="1"/> 
-                      </group>
-                   </group>	
-                    <group>
-                     <div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
-                     <table>
-                       <tr>
-                         <td width="70px" class="oe_td_border">
-                             Where
-                         </td>
-                         <td width="auto">
-                             <field name="address_id" widget ="geo_address" nolabel="1"/>
-                         </td>
-                         <td width="210px">
-                             <table align="right">
-                              <tr>
-                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
-                              </tr>
-                              <tr>
-                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
-                              </tr>
-                            </table>
-                         </td>
-                       </tr>
-                     </table>
-                  </group>
-                  </group>
-                    <separator string="" colspan="4"/>
-                      <label string="Event Details:" colspan="4"/>
-                       <field name="note" colspan="4" nolabel="1" readonly="1"/>
-                    </sheet>
-            </form>
-            </field>
-        </record>
-
         <!-- Event tree view -->
 
         <record model="ir.ui.view" id="view_event_tree">
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 5097ea5b9f3..0abbfc2cfb3 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -158,7 +158,7 @@ class event_event(osv.osv):
     def subscribe_to_event(self, cr, uid, ids, context=None):
         res = {}
         data_obj = self.pool.get("ir.model.data")
-        view_id = data_obj._get_id(cr, uid, 'event', 'view_event_page')
+        view_id = data_obj._get_id(cr, uid, 'event_sale', 'view_event_page')
         if view_id:
             res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
         res = {
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index ad752a36dd1..1c2d520beb8 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -30,30 +30,85 @@
              </field>
         </record>
         
-        <record model="ir.ui.view" id="view_event_page_inherit">
-          <field name="name">Events Inherit</field>
-          <field name="model">event.event</field>
-          <field name="type">form</field>
-          <field name="inherit_id" ref="event.view_event_page"/>
-          <field name="arch" type="xml">
-          <xpath expr="//group[@name='venue']" position="after">
-            <field name="event_item_ids" nolabel="1">
-               <tree editable="top" string="Event Items">
-                  <field name="product_id" readonly="1" />
-                   <field name="sales_end_date" readonly="1"/>
-                   <field name="price" readonly="1"/>
-                    <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
-                   <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
-               </tree>
-              </field>
-               <newline/>
-               <div class="oe_right">
-                 <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
-               </div>
-          </xpath>
-          </field>
+        
+    <!-- Events Organisation/CONFIGURATION/EVENTS PAGE VIEW -->
+
+        <record model="ir.ui.view" id="view_event_page">
+            <field name="name">Events</field>
+            <field name="model">event.event</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Events"  layout="manual">
+                <div class="oe_form_topbar" readonly="1">
+                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                   <div class="oe_right">
+                      <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                   </div>
+                </div>
+                <sheet string="Event Form" layout="auto">
+                   <group col="2">
+                     <group col="2">
+                       <div class="oe_event_title">
+                          <field name="name" nolabel="1" readonly="1"/>
+                       </div>
+                      <newline/>
+                      <group colspan="4" name="venue">
+                            <div class="oe_sub1"> Venue   : </div> 
+                              <field name="location_id" nolabel="1" readonly="1"/> 
+                      </group>
+                       <field name="event_item_ids" nolabel="1">
+                         <tree editable="top" string="Event Items">
+                          <field name="product_id" readonly="1" />
+                          <field name="sales_end_date" readonly="1"/>
+                          <field name="price" readonly="1"/>
+                          <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
+                          <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
+                         </tree>
+                       </field>
+                       <newline/>
+                      <div class="oe_right">
+                         <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
+                      </div>
+                   </group>	
+                    <group>
+                     <div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
+                     <table>
+                       <tr>
+                         <td width="70px" class="oe_td_border">
+                             Where
+                         </td>
+                         <td width="auto">
+                             <field name="address_id" widget ="geo_address" nolabel="1"/>
+                         </td>
+                         <td width="210px">
+                             <table align="right">
+                              <tr>
+                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
+                              </tr>
+                              <tr>
+                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
+                              </tr>
+                            </table>
+                         </td>
+                         
+                       </tr>
+                     </table>
+                  </group>
+                  </group>
+                    <separator string="" colspan="4"/>
+                      <label string="Event Details:" colspan="4"/>
+                       <field name="note" colspan="4" nolabel="1" readonly="1"/>
+                    </sheet>
+            </form>
+            </field>
         </record>
 
+        
+
+
         <record model="ir.ui.view" id="view_event_form_inherit">
            <field name="name">Events Inherit</field>
            <field name="model">event.event</field>

From 89997dcfce59219d44376d464864bbddb6fb4f20 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 7 May 2012 18:46:57 +0530
Subject: [PATCH 254/452] [IMP]delivery : fix the issue  inherited view of
 delivery

bzr revid: mma@tinyerp.com-20120507131657-gcew1671nugwxjjk
---
 addons/delivery/delivery_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index db46a4ba7e7..49678f2dc8d 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -234,7 +234,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
+                <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
                     <field name="weight"/>
                     <field name="weight_net"/>
                 </xpath>
@@ -316,7 +316,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/sheet/notebook/page[@string='Products']/group/button[@string='Create Invoice']" position="after">
+                <xpath expr="/form/div/button[@string='Create Invoice']" position="after">
                     <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
                 </xpath>
             </field>

From 0029c8a9586ed6e30506e29a0b963ee869504427 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 8 May 2012 11:17:40 +0530
Subject: [PATCH 255/452] [IMP]Association: Set partner kanban for Association

bzr revid: dbr@tinyerp.com-20120508054740-xgww8hatkt4tu5gy
---
 addons/membership/membership_view.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index a92fe708b77..8662c0451ef 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -193,18 +193,25 @@
         </record>
 
         <record model="ir.actions.act_window.view" id="action_membership_members_view_tree">
-            <field name="sequence" eval="1"/>
+            <field name="sequence" eval="2"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="membership_members_tree"/>
             <field name="act_window_id" ref="action_membership_members"/>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_membership_members_view_form">
-            <field name="sequence" eval="2"/>
+            <field name="sequence" eval="3"/>
             <field name="view_mode">form</field>
             <field name="view_id" ref="base.view_partner_form"/>
             <field name="act_window_id" ref="action_membership_members"/>
         </record>
+        
+         <record model="ir.actions.act_window.view" id="action_membership_members_view_kanban">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">kanban</field>
+            <field name="view_id" ref="base.res_partner_kanban_view"/>
+            <field name="act_window_id" ref="action_membership_members"/>
+        </record>
 
         <menuitem name="Members" parent="menu_membership" id="menu_members" sequence="2" action="action_membership_members"/>
 

From 081a758ecf4b8cf99dbc121a451eadaf17b6ee6c Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 8 May 2012 11:30:09 +0530
Subject: [PATCH 256/452] [IMP]Association: Set Members kanban for Association

bzr revid: dbr@tinyerp.com-20120508060009-a25a6gzragjc56qk
---
 addons/membership/membership_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 8662c0451ef..91f41eda6fb 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -215,8 +215,6 @@
 
         <menuitem name="Members" parent="menu_membership" id="menu_members" sequence="2" action="action_membership_members"/>
 
-        <menuitem name="Association" id="base.menu_association" sequence="9" action="action_membership_members"/>
-			
         <!-- PARTNERS -->
 
         <record model="ir.ui.view" id="view_partner_tree">

From 7bdb8147e53b078d6de70658cde2cd4c626cc2f1 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 8 May 2012 15:02:51 +0530
Subject: [PATCH 257/452] [FIX]crm:optout field to opt_out

bzr revid: dbr@tinyerp.com-20120508093251-wg6fgzrbyqxqiqmz
---
 addons/crm/test/ui/crm_demo.yml           | 2 +-
 addons/import_sugarcrm/import_sugarcrm.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/test/ui/crm_demo.yml b/addons/crm/test/ui/crm_demo.yml
index 5ef40838466..a949fecae03 100644
--- a/addons/crm/test/ui/crm_demo.yml
+++ b/addons/crm/test/ui/crm_demo.yml
@@ -15,7 +15,7 @@
     name: 'Need 20 Days of Consultancy'
     type: opportunity
     state: draft
-    optout: True
+    opt_out: True
 -
   I create phonecall record to call partner onchange method.
 -
diff --git a/addons/import_sugarcrm/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py
index d6e43866bf2..3ff14bcf1c7 100644
--- a/addons/import_sugarcrm/import_sugarcrm.py
+++ b/addons/import_sugarcrm/import_sugarcrm.py
@@ -697,7 +697,7 @@ class sugar_import(import_framework):
                 'state': map_val('status', self.lead_state) ,
                 'fax': 'phone_fax',
                 'referred': 'refered_by',
-                'optout': 'do_not_call',
+                'opt_out': 'do_not_call',
                 'channel_id/id': call(self.get_channel_id, value('lead_source')),
                 'type_id/id': ref(self.TABLE_COMPAIGN, 'campaign_id'),
                 'country_id/id': 'country_id/id',

From 6b2efcbeb9ba386f1b9ef8a7395eb0c6b99ff39d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 8 May 2012 18:21:37 +0200
Subject: [PATCH 258/452] [ADD] new implementation of saving current search to
 new filter

bzr revid: xmo@openerp.com-20120508162137-b3qu0os79zl5wz0w
---
 addons/web/controllers/main.py      |  19 ----
 addons/web/static/src/css/base.css  |  22 ++++
 addons/web/static/src/css/base.sass |  18 +++
 addons/web/static/src/js/search.js  | 165 +++++++++++++++++-----------
 addons/web/static/src/xml/base.xml  |   8 ++
 5 files changed, 148 insertions(+), 84 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 9b4c8335e35..72ed638879a 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1287,25 +1287,6 @@ class SearchView(View):
                 del filter['domain']
         return filters
 
-    @openerpweb.jsonrequest
-    def save_filter(self, req, model, name, context_to_save, domain):
-        Model = req.session.model("ir.filters")
-        ctx = common.nonliterals.CompoundContext(context_to_save)
-        ctx.session = req.session
-        ctx = ctx.evaluate()
-        domain = common.nonliterals.CompoundDomain(domain)
-        domain.session = req.session
-        domain = domain.evaluate()
-        uid = req.session._uid
-        context = req.session.eval_context(req.context)
-        to_return = Model.create_or_replace({"context": ctx,
-                                             "domain": domain,
-                                             "model_id": model,
-                                             "name": name,
-                                             "user_id": uid
-                                             }, context)
-        return to_return
-
     @openerpweb.jsonrequest
     def add_to_dashboard(self, req, menu_id, action_id, context_to_save, domain, view_mode, name=''):
         ctx = common.nonliterals.CompoundContext(context_to_save)
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 8ebac64ea6d..466e51e7a90 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1175,6 +1175,17 @@
   border: 1px solid #cccccc;
   text-align: left;
 }
+.openerp .oe_searchview .oe_searchview_drawer button, .openerp .oe_searchview .oe_searchview_drawer .button {
+  border: none;
+  background: white;
+  padding: 0 2px;
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+  -box-shadow: none;
+  -moz-border-radius: 0;
+  -webkit-border-radius: 0;
+  border-radius: 0;
+}
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters {
   display: table;
   width: 100%;
@@ -1205,6 +1216,17 @@
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li:hover {
   background-color: #f0f0fa;
 }
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom .oe_searchview_custom_save {
+  font-size: 1px;
+  letter-spacing: -1px;
+  color: transparent;
+}
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom .oe_searchview_custom_save:before {
+  font-family: "mnmliconsRegular";
+  content: "S";
+  font-size: 20px;
+  color: #404040;
+}
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4 {
   border-top: 1px solid #cccccc;
   margin: 5px 0 3px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 0fd7b5658c9..55d56056619 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -932,6 +932,13 @@ $colour4: #8a89ba
             border: 1px solid #ccc
             text-align: left
 
+            button, .button
+                border: none
+                background: white
+                padding: 0 2px
+                @include box-shadow(none)
+                @include radius(0)
+
             .oe_searchview_filters
                 display: table
                 width: 100%
@@ -960,6 +967,17 @@ $colour4: #8a89ba
                     &:hover
                         background-color: #f0f0fa
 
+            .oe_searchview_custom
+                .oe_searchview_custom_save
+                    font-size: 1px
+                    letter-spacing: -1px
+                    color: transparent
+                    &:before
+                        font-family: "mnmliconsRegular"
+                        content: "S"
+                        font-size: 20px
+                        color: #404040
+
             .oe_searchview_advanced
                 h4
                     border-top: 1px solid #ccc
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index b9d46201149..1b61fe00b8d 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -221,8 +221,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         this.hidden = !!hidden;
         this.headless = this.hidden && !this.has_defaults;
 
-        this.filter_data = {};
-
         this.input_subviews = [];
 
         this.ready = $.Deferred();
@@ -246,13 +244,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                 model: this.model,
                 view_id: this.view_id,
                 context: this.dataset.get_context() });
-            // FIXME: local eval of domain and context to get rid of special endpoint
-            var filters = this.rpc('/web/searchview/get_filters', {
-                model: this.model
-            }).then(function (filters) { self.custom_filters = filters; });
 
-            $.when(load_view, filters)
-                .pipe(function (load) { return load[0]; })
+            $.when(load_view)
                 .pipe(this.on_loaded)
                 .fail(function () {
                     self.ready.reject.apply(null, arguments);
@@ -535,42 +528,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                 limit : 80
             });
             break;
-        case 'save_filter':
-            var data = this.build_search_data();
-            var context = new instance.web.CompoundContext();
-            _.each(data.contexts, function(x) {
-                context.add(x);
-            });
-            var domain = new instance.web.CompoundDomain();
-            _.each(data.domains, function(x) {
-                domain.add(x);
-            });
-            var groupbys = _.pluck(data.groupbys, "group_by").join();
-            context.add({"group_by": groupbys});
-            var dial_html = QWeb.render("SearchView.managed-filters.add");
-            var $dial = $(dial_html);
-            instance.web.dialog($dial, {
-                modal: true,
-                title: _t("Filter Entry"),
-                buttons: [
-                    {text: _t("Cancel"), click: function() {
-                        $(this).dialog("close");
-                    }},
-                    {text: _t("OK"), click: function() {
-                        $(this).dialog("close");
-                        var name = $(this).find("input").val();
-                        self.rpc('/web/searchview/save_filter', {
-                            model: self.dataset.model,
-                            context_to_save: context,
-                            domain: domain,
-                            name: name
-                        }).then(function() {
-                            self.reload_managed_filters();
-                        });
-                    }}
-                ]
-            });
-            break;
         case '':
             this.do_clear();
         }
@@ -647,17 +604,23 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         });
     },
     /**
-     * Performs the search view collection of widget data.
+     * Extract search data from the view's facets.
      *
-     * If the collection went well (all fields are valid), then triggers
-     * :js:func:`instance.web.SearchView.on_search`.
+     * Result is an object with 4 (own) properties:
      *
-     * If at least one field failed its validation, triggers
-     * :js:func:`instance.web.SearchView.on_invalid` instead.
+     * errors
+     *     An array of any error generated during data validation and
+     *     extraction, contains the validation error objects
+     * domains
+     *     Array of domains
+     * contexts
+     *     Array of contexts
+     * groupbys
+     *     Array of domains, in groupby order rather than view order
      *
-     * @param e jQuery event object coming from the "Search" button
+     * @return {Object}
      */
-    do_search: function () {
+    build_search_data: function () {
         var domains = [], contexts = [], groupbys = [], errors = [];
 
         this.query.each(function (facet) {
@@ -683,12 +646,30 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                 }
             }
         });
-
-        if (!_.isEmpty(errors)) {
-            this.on_invalid(errors);
+        return {
+            domains: domains,
+            contexts: contexts,
+            groupbys: groupbys,
+            errors: errors
+        };
+    }, /**
+     * Performs the search view collection of widget data.
+     *
+     * If the collection went well (all fields are valid), then triggers
+     * :js:func:`instance.web.SearchView.on_search`.
+     *
+     * If at least one field failed its validation, triggers
+     * :js:func:`instance.web.SearchView.on_invalid` instead.
+     *
+     * @param e jQuery event object coming from the "Search" button
+     */
+    do_search: function () {
+        var search = this.build_search_data();
+        if (!_.isEmpty(search.errors)) {
+            this.on_invalid(search.errors);
             return;
         }
-        return this.on_search(domains, contexts, groupbys);
+        return this.on_search(search.domains, search.contexts, search.groupbys);
     },
     /**
      * Triggered after the SearchView has collected all relevant domains and
@@ -1356,6 +1337,68 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
     }
 });
 
+instance.web.search.CustomFilters = instance.web.search.Input.extend({
+    template: 'SearchView.CustomFilters',
+    start: function () {
+        this.$element.on('submit', 'form', this.proxy('save_current'));
+        // FIXME: local eval of domain and context to get rid of special endpoint
+        return this.rpc('/web/searchview/get_filters', {
+            model: this.view.model
+        }).pipe(this.proxy('set_filters'));
+    },
+    set_filters: function (filters) {
+        var self = this;
+        var content = this.$element.find('.oe_searchview_custom_list');
+        return $.when.apply(null, _(filters).chain()
+            .map(function (filter) {
+                // FIXME: handling of ``disabled`` being set
+                var f = new instance.web.search.Filter({attrs: {
+                    string: filter.name,
+                    context: filter.context,
+                    domain: filter.domain
+                }}, self.view);
+                return new instance.web.search.FilterGroup([f], self.view);
+            })
+            .invoke('appendTo', content)
+            .value());
+    },
+    save_current: function () {
+        var self = this;
+        var $name = this.$element.find('input');
+
+        var search = this.view.build_search_data();
+        this.rpc('/web/session/eval_domain_and_context', {
+            domains: search.domains,
+            contexts: search.contexts,
+            group_by_seq: search.groupbys || []
+        }).pipe(function (results) {
+            if (!_.isEmpty(results.group_by)) {
+                results.context.group_by = results.group_by;
+            }
+            var name = $name.val();
+            // FIXME: creates filter and group even if the call fails :/
+            var f = new instance.web.search.Filter({attrs: {
+                string: name,
+                context: results.context,
+                domain: results.domain
+            }}, self.view);
+            (new instance.web.search.FilterGroup([f], self.view))
+                .appendTo(self.$element.find('.oe_searchview_custom_list'));
+            // FIXME: current context?
+            return new instance.web.Model('ir.filters').call('create_or_replace', [{
+                name: name,
+                user_id: instance.connection.uid,
+                model_id: self.view.model,
+                context: results.context,
+                domain: results.domain
+            }]);
+        }).then(function () {
+            $name.val('');
+        });
+        return false;
+    }
+});
+
 instance.web.search.Filters = instance.web.search.Input.extend({
     template: 'SearchView.Filters',
     _in_drawer: true,
@@ -1395,16 +1438,8 @@ instance.web.search.Filters = instance.web.search.Input.extend({
         // the db, add all of this as a group in the smallest column
         (col1.length <= col2.length ? col1 : col2).push({
             name: _t("Custom Filters"),
-            filters: _.map(this.view.custom_filters, function (filter) {
-                // FIXME: handling of ``disabled`` being set
-                var f = new instance.web.search.Filter({attrs: {
-                    string: filter.name,
-                    context: filter.context,
-                    domain: filter.domain
-                }}, self.view);
-                return new instance.web.search.FilterGroup([f], self.view);
-            }),
-            length: this.view.custom_filters.length
+            filters: [new instance.web.search.CustomFilters(self.view)],
+            length: 1
         });
         return $.when(
             this.render_column(col1, $('<div>').appendTo(this.$element)),
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 4b208a31b8f..f2df82b1b58 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1469,6 +1469,14 @@
 </t>
 <div t-name="SearchView.Filters" class="oe_searchview_filters">
 
+</div>
+<div t-name="SearchView.CustomFilters" class="oe_searchview_custom">
+    <div class="oe_searchview_custom_list"/>
+    <form>
+        <label for="oe_searchview_custom_input">Save current search:</label>
+        <input id="oe_searchview_custom_input"/>
+        <button class="oe_searchview_custom_save">Save</button>
+    </form>
 </div>
 <div t-name="SearchView.advanced" class="oe_searchview_advanced">
     <h4>Advanced Search...</h4>

From 4e17a1cf8cf74ddf70476900b5e0c668a1ada773 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Wed, 9 May 2012 11:08:31 +0530
Subject: [PATCH 259/452] [IMP] Kind -> Contract Category

bzr revid: tta@openerp.com-20120509053831-7bvysptcoq57xhsq
---
 openerp/addons/base/publisher_warranty/publisher_warranty.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty.py b/openerp/addons/base/publisher_warranty/publisher_warranty.py
index 2fa47f150f3..f6fdd04de14 100644
--- a/openerp/addons/base/publisher_warranty/publisher_warranty.py
+++ b/openerp/addons/base/publisher_warranty/publisher_warranty.py
@@ -230,7 +230,7 @@ class publisher_warranty_contract(osv.osv):
         'date_stop' : fields.date('Ending Date', readonly=True),
         'state' : fields.selection([('unvalidated', 'Unvalidated'), ('valid', 'Valid')
                             , ('terminated', 'Terminated'), ('canceled', 'Canceled')], string="State", readonly=True),
-        'kind' : fields.char('Kind', size=64, readonly=True),
+        'kind' : fields.char('Contract Category', size=64, readonly=True),
         "check_support": fields.boolean("Support Level 1", readonly=True),
         "check_opw": fields.boolean("OPW", readonly=True, help="Checked if this is an OpenERP Publisher's Warranty contract (versus older contract types"),
     }

From 9241bce4156129737fd7702afcd39dc55f6efe9c Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Wed, 9 May 2012 11:42:01 +0530
Subject: [PATCH 260/452] [IMP] Title improvement.

bzr revid: tta@openerp.com-20120509061201-tcq537146cbvxwyp
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 6c540fd6957..07b41cf1a2e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -368,7 +368,7 @@
 </t>
 <t t-name="About-Page">
     <div>
-        <a class="oe_activate_debug_mode" href="?debug" style="float:right; font-size: 80%;">Activate the developper mode</a>
+        <a class="oe_activate_debug_mode" href="?debug" style="float:right; font-size: 80%;">Activate the developer mode</a>
         <h1 style="margin:0;">OpenERP</h1>
         <h3 style="margin:15px 0;padding:0;">Version <t t-esc="version_info.version"/></h3>
         <p>

From acc99e494621956383f6724eb15756a05dc5fd63 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 9 May 2012 13:00:01 +0530
Subject: [PATCH 261/452] [IMP]project,association: set project menu and for
 association set member kanban

bzr revid: dbr@tinyerp.com-20120509073001-06pexpkk1s76lggc
---
 addons/membership/membership_view.xml | 1 +
 addons/project/project_view.xml       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 91f41eda6fb..fdfec7363aa 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -213,6 +213,7 @@
             <field name="act_window_id" ref="action_membership_members"/>
         </record>
 
+        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9" action="action_membership_members"/>
         <menuitem name="Members" parent="menu_membership" id="menu_members" sequence="2" action="action_membership_members"/>
 
         <!-- PARTNERS -->
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 4aacc844bfc..f389cf47224 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -633,7 +633,7 @@
         <menuitem id="menu_project_config_project" name="Projects and Stages" parent="menu_definitions" sequence="1"/>
 
         <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_project_config_project" sequence="2" groups="base.group_no_one"/>
-        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_config_project" sequence="1" groups="base.group_no_one"/>
+        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1" groups="base.group_no_one"/>
 
         <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 

From f08d7c254bc7c43524c6e2f826d2fafeeac870f2 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 9 May 2012 15:42:48 +0530
Subject: [PATCH 262/452] [IMP]hr_holidays:remove record rules

bzr revid: dbr@tinyerp.com-20120509101248-yu48ybdqsuu8fgiz
---
 addons/hr_holidays/hr_holidays_view.xml |  2 +-
 addons/hr_holidays/security/ir_rule.xml | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9355f610b9f..9f8f998cbd9 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -517,7 +517,7 @@
                     <li t-if="record.current_leave_id.raw_value || record.last_login.raw_value">
                         <span t-if="record.current_leave_id.raw_value" t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_color_3':'oe_kanban_color_2'">
                             <span class="oe_kanban_button" style="font-size: 100%%">
-                                <field name="current_leave_id" groups="base.group_user"/>
+                                <field name="current_leave_id"/>
                             </span>
                         </span>
                         <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index f05008203df..8e8c97bf7ea 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -2,18 +2,5 @@
 <openerp>
   <data>
 
-    <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">[(1,'=',1)]</field>
-        <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/>
-    </record>
-    <record id="property_rule_holidays_employee" model="ir.rule">
-        <field name="name">Employee Holidays</field>
-        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
-        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-        <field name="groups" eval="[(4,ref('base.group_user'))]"/>
-    </record>
-
   </data>
 </openerp>

From 042e72de8d9c3f2838c6e1d443c83dc4da48c8c8 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 May 2012 17:12:10 +0530
Subject: [PATCH 263/452] [FIX]: Fix alignment in kanban view. add accessrights
 for event.items.

bzr revid: atp@tinyerp.com-20120509114210-r3tp1nnn5rvoipqy
---
 addons/event/event_view.xml           | 3 ++-
 addons/event/static/src/css/event.css | 4 ++--
 addons/event_sale/__openerp__.py      | 1 +
 addons/event_sale/event_sale_view.xml | 3 ---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 23257cd8efe..6432a50542e 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -53,13 +53,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Events">
-                    <group col="6" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="name"/>
                         <field name="date_begin"/>
                         <field name="date_end"/>
                         <field name="type" on_change="onchange_event_type(type,context)"/>
                         <field name="user_id"/>
                         <field name="address_id" />
+                        <field name="location_id"/> 
                     </group>
                     <notebook colspan="4">
                     <page string="Event">
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index d53770071d0..f898647db23 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -37,7 +37,7 @@ div.oe_fold_column{
     border: 1px solid #ababab;
     color: #404040;
     font-size: 12px;
-    padding: 3px 10px;
+    padding: 0px !important;
     text-align: center;
     -o-background-size: 100% 100%;
     -moz-background-size: 100% 100%;
@@ -117,7 +117,7 @@ div.oe_fold_column{
    background-color: #DC5F59;
  }
  .no_of_seats{
-    width:25px;    
+    width:35px;    
  }
 .oe_event_title{
   font-size: 25px;
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index d8f689986e2..e235c31aa08 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -36,6 +36,7 @@ It defines a new kind of service products that offers you the possibility to cho
     'author': 'OpenERP SA',
     'depends': ['event','sale','sale_crm'],
     'update_xml': [
+        'security/ir.model.access.csv',
         'event_sale_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 1c2d520beb8..faaa157d356 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -127,9 +127,6 @@
              </tree>
             </field>
             <newline/>
-            <div class="oe_right">
-                <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
-            </div>
              </page>
            </xpath>
           </field>

From d2faa8c8ea8e94a77c78d2538080e253a9fcf29e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 May 2012 17:13:57 +0530
Subject: [PATCH 264/452] [ADD]: ADD security files

bzr revid: atp@tinyerp.com-20120509114357-ikyou2uf4uo3iwhd
---
 addons/event_sale/security/ir.model.access.csv | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 addons/event_sale/security/ir.model.access.csv

diff --git a/addons/event_sale/security/ir.model.access.csv b/addons/event_sale/security/ir.model.access.csv
new file mode 100644
index 00000000000..da2067dff00
--- /dev/null
+++ b/addons/event_sale/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_event_items,event.items,event.model_event_items,event.group_event_user,1,1,0,0

From 9ea1132374f4a170863c78fd78eb388d8910b98b Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 May 2012 17:30:11 +0530
Subject: [PATCH 265/452] [FIX]: Change model_id in security access right.

bzr revid: atp@tinyerp.com-20120509120011-f4224eeji0m8ix05
---
 addons/event_sale/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event_sale/security/ir.model.access.csv b/addons/event_sale/security/ir.model.access.csv
index da2067dff00..8078ec3ff78 100644
--- a/addons/event_sale/security/ir.model.access.csv
+++ b/addons/event_sale/security/ir.model.access.csv
@@ -1,2 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_event_items,event.items,event.model_event_items,event.group_event_user,1,1,0,0
+access_event_items,event.items,event_sale.model_event_items,event.group_event_user,1,1,0,0

From 8d2723ac4f49e17c186cb701a250abd28015e432 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 May 2012 17:42:44 +0530
Subject: [PATCH 266/452] [FIX]: Fix address template problem.

bzr revid: atp@tinyerp.com-20120509121244-ougokpvpe9i5dxkx
---
 addons/event/static/src/js/event.js           | 2 +-
 addons/event/static/src/xml/event_address.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/static/src/js/event.js b/addons/event/static/src/js/event.js
index 0932d6ed776..4fb368d0845 100644
--- a/addons/event/static/src/js/event.js
+++ b/addons/event/static/src/js/event.js
@@ -14,7 +14,7 @@ openerp.event = function(instance){
 	 	set_value:function(value){
 	 		var self = this;
 			this.get_address(value).done(function(value){
-				self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
+				if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
 				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
 				return self.list_addresses(address);
 				
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event/static/src/xml/event_address.xml
index 370da230e6b..14c7051cf7d 100644
--- a/addons/event/static/src/xml/event_address.xml
+++ b/addons/event/static/src/xml/event_address.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 	
 	<template>
-		<td t-name="address">
+		<td id = "address_text" t-name="address">
 			<t t-esc="record.street"/> <br/>
 			<t t-esc="record.city"/> <br/>
 			<t t-esc="record.country_id[1]"/>

From cd4c6fdd287d80c7358f5c06af2763b44d1a5135 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 9 May 2012 15:32:41 +0200
Subject: [PATCH 267/452] [ADD] core keyboard navigation between facets

bzr revid: xmo@openerp.com-20120509133241-42nl3comllgerxui
---
 addons/web/static/src/js/search.js | 102 +++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 1b61fe00b8d..b5e5f8f3f1f 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -117,6 +117,11 @@ my.SearchQuery = B.Collection.extend({
     }
 });
 
+function assert(condition, message) {
+    if(!condition) {
+        throw new Error(message);
+    }
+}
 my.InputView = instance.web.Widget.extend({
     template: 'SearchView.InputView',
     start: function () {
@@ -124,6 +129,7 @@ my.InputView = instance.web.Widget.extend({
         var p = this._super.apply(this, arguments);
         this.$element.on('focus', this.proxy('onFocus'));
         this.$element.on('blur', this.proxy('onBlur'));
+        this.$element.on('keydown', this.proxy('onKeydown'));
         return p;
     },
     onFocus: function () {
@@ -132,6 +138,65 @@ my.InputView = instance.web.Widget.extend({
     onBlur: function () {
         this.$element.text('');
         this.getParent().$element.trigger('blur');
+    },
+    getSelection: function () {
+        // get Text node
+        var root = this.$element[0].childNodes[0];
+        if (!root || !root.textContent) {
+            // if input does not have a child node, or the child node is an
+            // empty string, then the selection can only be (0, 0)
+            return {start: 0, end: 0};
+        }
+        if (window.getSelection) {
+            var domRange = window.getSelection().getRangeAt(0);
+            assert(domRange.startContainer === root,
+                   "selection should be in the input view");
+            assert(domRange.endContainer === root,
+                   "selection should be in the input view");
+            return {
+                start: domRange.startOffset,
+                end: domRange.endOffset
+            }
+        } else if (document.selection) {
+            var ieRange = document.selection.createRange();
+            var rangeParent = ieRange.parentElement();
+            assert(rangeParent === root,
+                   "selection should be in the input view");
+            var offsetRange = document.body.createTextRange();
+            offsetRange = offsetRange.moveToElementText(rangeParent);
+            offsetRange.setEndPoint("EndToStart", ieRange);
+            var start = offsetRange.text.length;
+            return {
+                start: start,
+                end: start + ieRange.text.length
+            }
+        }
+        throw new Error("Could not get caret position");
+    },
+    onKeydown: function (e) {
+        var sel;
+        switch (e.which) {
+        // Do not insert newline, but let it bubble so searchview can use it
+        case $.ui.keyCode.ENTER:
+            e.preventDefault();
+            break;
+
+        // let left/right events propagate to view if caret is at input border
+        // and not a selection
+        case $.ui.keyCode.LEFT:
+            sel = this.getSelection();
+            if (sel.start !== 0 || sel.start !== sel.end) {
+                e.stopPropagation();
+            }
+            break;
+        case $.ui.keyCode.RIGHT:
+            sel = this.getSelection();
+            var len = this.$element.text().length;
+            if (sel.start !== len || sel.start !== sel.end) {
+                e.stopPropagation();
+            }
+            break;
+        }
     }
 });
 my.FacetView = instance.web.Widget.extend({
@@ -252,6 +317,20 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                 });
         }
 
+        this.$element.on('keydown',
+                '.oe_searchview_input, .oe_searchview_facet', function (e) {
+            switch(e.which) {
+            case $.ui.keyCode.LEFT:
+                self.focusPreceding(this);
+                e.preventDefault();
+                break;
+            case $.ui.keyCode.RIGHT:
+                self.focusFollowing(this);
+                e.preventDefault();
+                break;
+            }
+        });
+
         this.$element.on('click', '.oe_searchview_clear', function (e) {
             e.stopImmediatePropagation();
             self.query.reset();
@@ -292,6 +371,29 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         this.$element.hide();
     },
 
+    subviewForRoot: function (subview_root) {
+        return _(this.input_subviews).detect(function (subview) {
+            return subview.$element[0] === subview_root;
+        });
+    },
+    focusRelative: function (subview, direction) {
+        var index = _(this.input_subviews).indexOf(subview) + direction;
+        if (index < 0) {
+            index = this.input_subviews.length - 1;
+        } else if (index >= this.input_subviews.length) {
+            index = 0;
+        }
+        this.input_subviews[index].$element.focus();
+    },
+    focusPreceding: function (subview_root) {
+        return this.focusRelative(
+            this.subviewForRoot(subview_root), -1);
+    },
+    focusFollowing: function (subview_root) {
+        return this.focusRelative(
+            this.subviewForRoot(subview_root), +1);
+    },
+
     /**
      * Sets up thingie where all the mess is put?
      */

From 195cb2811dbce3bdbbfd4c470b581c3871fbdbf1 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Wed, 9 May 2012 19:12:00 +0530
Subject: [PATCH 268/452] Improve the Title

bzr revid: tta@openerp.com-20120509134200-byd11lj0eokr6gpy
---
 addons/web/static/src/js/view_form.js | 1 +
 addons/web/static/src/js/views.js     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index b1289512f4f..d0eda645196 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2930,6 +2930,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
     _template: 'One2Many.listview',
     do_add_record: function () {
         if (this.options.editable) {
+            console.log("this.options :: ",this.options);
             this._super.apply(this, arguments);
         } else {
             var self = this;
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 798c5bb1493..c4ff0efd70c 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -730,7 +730,7 @@ instance.web.Sidebar = instance.web.Widget.extend({
         var view = this.getParent();
         this.sections = [
             { 'name' : 'print', 'label' : _t('Print'), },
-            { 'name' : 'files', 'label' : _t('Attachement'), },
+            { 'name' : 'files', 'label' : _t('Attachment'), },
             { 'name' : 'other', 'label' : _t('More'), }
         ];
         this.items = {

From 538b16c2350b75eccdefc249de6c58d851571c42 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 9 May 2012 16:12:42 +0200
Subject: [PATCH 269/452] [ADD] backspace from within an empty input should
 remove the preceding facet, if any

bzr revid: xmo@openerp.com-20120509141242-5l75w08ruv4r8xtc
---
 addons/web/static/src/js/search.js | 31 +++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index b5e5f8f3f1f..198740f4a97 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -125,7 +125,6 @@ function assert(condition, message) {
 my.InputView = instance.web.Widget.extend({
     template: 'SearchView.InputView',
     start: function () {
-        var self = this;
         var p = this._super.apply(this, arguments);
         this.$element.on('focus', this.proxy('onFocus'));
         this.$element.on('blur', this.proxy('onBlur'));
@@ -181,6 +180,18 @@ my.InputView = instance.web.Widget.extend({
             e.preventDefault();
             break;
 
+        // FIXME: may forget content if non-empty but caret at index 0, ok?
+        case $.ui.keyCode.BACKSPACE:
+            sel = this.getSelection();
+            if (sel.start === 0 && sel.start === sel.end) {
+                e.preventDefault();
+                var preceding = this.getParent().siblingSubview(this, -1);
+                if (preceding && (preceding instanceof my.FacetView)) {
+                    preceding.model.destroy();
+                }
+            }
+            break;
+
         // let left/right events propagate to view if caret is at input border
         // and not a selection
         case $.ui.keyCode.LEFT:
@@ -376,22 +387,24 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
             return subview.$element[0] === subview_root;
         });
     },
-    focusRelative: function (subview, direction) {
+    siblingSubview: function (subview, direction, wrap_around) {
         var index = _(this.input_subviews).indexOf(subview) + direction;
-        if (index < 0) {
+        if (wrap_around && index < 0) {
             index = this.input_subviews.length - 1;
-        } else if (index >= this.input_subviews.length) {
+        } else if (wrap_around && index >= this.input_subviews.length) {
             index = 0;
         }
-        this.input_subviews[index].$element.focus();
+        return this.input_subviews[index];
     },
     focusPreceding: function (subview_root) {
-        return this.focusRelative(
-            this.subviewForRoot(subview_root), -1);
+        return this.siblingSubview(
+            this.subviewForRoot(subview_root), -1, true)
+                .$element.focus();
     },
     focusFollowing: function (subview_root) {
-        return this.focusRelative(
-            this.subviewForRoot(subview_root), +1);
+        return this.siblingSubview(
+            this.subviewForRoot(subview_root), +1, true)
+                .$element.focus();
     },
 
     /**

From 0d51f8992c4fad5cd46a0879b22dc2a697eb0769 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 9 May 2012 17:12:17 +0200
Subject: [PATCH 270/452] [IMP] Insert completed facet in stead of the index
 used for the completion, instead of always adding them to the end (if
 applicable)

bzr revid: xmo@openerp.com-20120509151217-4juo2hm8xxj21uj9
---
 addons/web/static/src/js/search.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 198740f4a97..7c35a79ef84 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -500,7 +500,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
     select_completion: function (e, ui) {
         e.preventDefault();
 
-        this.query.add(ui.item.facet);
+        var input_index = _(this.input_subviews).indexOf(
+            this.subviewForRoot(
+                this.$element.find('div.oe_searchview_input:focus')[0]));
+        this.query.add(ui.item.facet, {at: input_index / 2});
     },
     renderFacets: function () {
         var self = this;

From 9dc92d18d5d86459ade21c8d9985c0deda005f20 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 May 2012 23:08:39 +0530
Subject: [PATCH 271/452] [Add]: Add css file into event_sale modules.

bzr revid: atp@tinyerp.com-20120509173839-q3y5egsp8xliyfvi
---
 addons/event/__openerp__.py                   |  2 --
 addons/event/event_view.xml                   |  4 +--
 addons/event/static/src/css/event.css         | 34 -------------------
 addons/event_sale/__openerp__.py              |  3 ++
 .../event_sale/static/src/css/event_page.css  | 31 +++++++++++++++++
 .../static/src/js/google_map.js}              |  0
 .../static/src/xml/event_address.xml          |  0
 7 files changed, 36 insertions(+), 38 deletions(-)
 create mode 100644 addons/event_sale/static/src/css/event_page.css
 rename addons/{event/static/src/js/event.js => event_sale/static/src/js/google_map.js} (100%)
 rename addons/{event => event_sale}/static/src/xml/event_address.xml (100%)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index e36914ee9fb..ea0e4316ef5 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -54,8 +54,6 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/event.css'],
-    'js': ['static/src/js/event.js'],
-    'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6432a50542e..0d8a4478650 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -53,14 +53,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Events">
-                    <group col="8" colspan="4">
+                    <group col="6" colspan="4">
                         <field name="name"/>
                         <field name="date_begin"/>
                         <field name="date_end"/>
                         <field name="type" on_change="onchange_event_type(type,context)"/>
                         <field name="user_id"/>
                         <field name="address_id" />
-                        <field name="location_id"/> 
                     </group>
                     <notebook colspan="4">
                     <page string="Event">
@@ -121,6 +120,7 @@
                             <field name="register_prospect"/>
                             <field name="register_current"/>
                             <field name="register_attended"/>
+                            <field name="location_id"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator string="Emails" colspan="2"/>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index f898647db23..b0f5db0e9d2 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -119,37 +119,3 @@ div.oe_fold_column{
  .no_of_seats{
     width:35px;    
  }
-.oe_event_title{
-  font-size: 25px;
-}
-.oe_sub1
-{
-    float:left;
-    height:50px;
-    border-right: 1px solid black;
-    border-color: #DCDCDC;
-}
-.oe_mapbox
-{ 
-    width:auto;
-    height:200px;
-    margin-left:auto; 
-    margin-right:auto; 
-    text-align: right;
-    
-}
-.oe_td_border
-{
-	width: 5em;
-	padding: 2px;
-	border-right: 1px solid black;
-	text-align: center;
-	border-color: #DCDCDC;
-	
-	
-}
-.oe_td_date_border
-{
-	border-right:1px solid black;
-	border-color: #DCDCDC;
-}
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index e235c31aa08..e4d9cd3897c 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -41,6 +41,9 @@ It defines a new kind of service products that offers you the possibility to cho
     ],
     'demo_xml': ['event_demo.xml'],
     'test':['test/confirm.yml'],
+    'css': ['static/src/css/event_page.css'],
+    'js': ['static/src/js/google_map.js'],
+    'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/event_sale/static/src/css/event_page.css b/addons/event_sale/static/src/css/event_page.css
new file mode 100644
index 00000000000..0f7b2a81e32
--- /dev/null
+++ b/addons/event_sale/static/src/css/event_page.css
@@ -0,0 +1,31 @@
+.oe_event_title{
+  font-size: 25px;
+}
+.oe_sub1
+{
+    float:left;
+    height:50px;
+    border-right: 1px solid black;
+    border-color: #DCDCDC;
+}
+.oe_mapbox
+{ 
+    width:auto;
+    height:200px;
+    margin-left:auto; 
+    margin-right:auto; 
+    text-align: right;
+}
+.oe_td_border
+{
+    width: 5em;
+    padding: 2px;
+    border-right: 1px solid black;
+    text-align: center;
+    border-color: #DCDCDC;
+}
+.oe_td_date_border
+{
+    border-right:1px solid black;
+    border-color: #DCDCDC;
+}
diff --git a/addons/event/static/src/js/event.js b/addons/event_sale/static/src/js/google_map.js
similarity index 100%
rename from addons/event/static/src/js/event.js
rename to addons/event_sale/static/src/js/google_map.js
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event_sale/static/src/xml/event_address.xml
similarity index 100%
rename from addons/event/static/src/xml/event_address.xml
rename to addons/event_sale/static/src/xml/event_address.xml

From 369e54b547b1ac590b40becb075c073f6a2047b8 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 10 May 2012 11:10:50 +0530
Subject: [PATCH 272/452] [FIX]: Fix yaml as per event improvement.

bzr revid: atp@tinyerp.com-20120510054050-pjkux4vl1lgnlfxc
---
 addons/event/test/process/event_draft2done.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/event/test/process/event_draft2done.yml b/addons/event/test/process/event_draft2done.yml
index d3f3d1fb466..dfe2b01cb33 100644
--- a/addons/event/test/process/event_draft2done.yml
+++ b/addons/event/test/process/event_draft2done.yml
@@ -9,6 +9,7 @@
    name: event
    date_begin: 2012-01-01 19:05:15
    date_end: 2012-01-01 20:05:15
+   register_max: 10
 -
   I create a registration for the event
 -
@@ -32,6 +33,15 @@
    I confirm the registration1
 -
    !python {model: event.registration}: |
+     event_pool = self.pool.get("event.event")
+     for register in self.browse(cr, uid, [ref("event_registration1")], context):
+         nb_register = register.nb_register
+         event_id = register.event_id.id
+         available_seats = event_pool.check_available_seats(cr, uid, [event_id], context=context)
+         if available_seats and nb_register > available_seats:
+             assert available_seats, "seats available."
+         elif available_seats == 0:
+             assert available_seats, "No Tickets Available."
      self.registration_open(cr, uid, [ref("event_registration1")],context=context)
 -
    I check that registration is "confirmed"

From b7210951a4569b8a9038f15acf67e5379f403fd8 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 10 May 2012 16:32:05 +0530
Subject: [PATCH 273/452] [IMP] Improved code for advance invoice.

bzr revid: tpa@tinyerp.com-20120510110205-bbuu7wddtpeez7k6
---
 addons/sale/sale_demo.xml                     |   1 +
 .../sale/wizard/sale_make_invoice_advance.py  | 142 ++++++++++++------
 .../sale/wizard/sale_make_invoice_advance.xml |  47 ++----
 3 files changed, 113 insertions(+), 77 deletions(-)

diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 3d8bbae9ad7..d9946c812c7 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -268,6 +268,7 @@
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product.uom_day"/>
             <field name="uom_po_id" ref="product.uom_day"/>
+            <field name="company_id" eval="[]"/>
         </record>
 
     <record id="base.user_demo" model="res.users">
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 94cae45519d..9a9eda88c70 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -24,16 +24,57 @@ from tools.translate import _
 class sale_advance_payment_inv(osv.osv_memory):
     _name = "sale.advance.payment.inv"
     _description = "Sales Advance Payment Invoice"
+
+    def _default_product_id(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        product_id = False
+        data_obj = self.pool.get('ir.model.data')
+        try:
+            product_id = data_obj.get_object_reference(cr, uid, 'sale', 'advance_product_0')[1]
+        finally:
+            return product_id
+
     _columns = {
-        'product_id': fields.many2one('product.product', 'Advance Product', required=True,
+        'product_id': fields.many2one('product.product', 'Advance Product', required=False,
             help="Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."),
         'amount': fields.float('Advance Amount', digits=(16, 2), required=True, help="The amount to be invoiced in advance."),
         'qtty': fields.float('Quantity', digits=(16, 2), required=True),
+        'pay_type':fields.selection([('percentage','Percentage'), ('fixed','Fixed Price')], 'Pay Type', required=True),
+        'advance': fields.boolean('Advance'),
     }
+
     _defaults = {
-        'qtty': 1.0
+        'qtty': 1.0,
+        'pay_type': 'fixed',
+        'product_id': _default_product_id,
     }
 
+    def onchange_pay_type(self, cr, uid, ids, pay_type,product_id, context=None):
+        if not product_id:
+            return {'value': {'amount': 0}}
+        if pay_type == 'percentage':
+            return {'value': {'amount':0,'product_id':False }}
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        return {'value': {'amount':product.list_price}}
+
+    def onchange_advance_product(self, cr, uid, ids, product_id, context=None):
+        data_obj = self.pool.get('ir.model.data')
+        value = {}
+        value['advance'] = 'False'
+        if not product_id:
+            return {'value': {'amount': 0,'advance': False}}
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        value['amount'] = product.list_price
+        try:
+            res_id = data_obj._get_id(cr, uid, 'sale', 'advance_product_0')
+            if res_id:
+                advance_id = data_obj.browse(cr, uid, res_id, context=context).res_id
+                if product.id ==  advance_id:
+                    value['advance'] = 'True'
+        finally:
+            return {'value': value}
+
     def create_invoices(self, cr, uid, ids, context=None):
         """
              To create invoices.
@@ -66,21 +107,52 @@ class sale_advance_payment_inv(osv.osv_memory):
                 val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id,
                         uom = False, partner_id = sale.partner_id.id, fposition_id = sale.fiscal_position.id)
                 res = val['value']
+
+                if not sale_adv_obj.product_id.id :
+                    prop = self.pool.get('ir.property').get(cr, uid,
+                                         'property_account_income_categ', 'product.category',
+                                         context=context)
+                    account_id = prop and prop.id or False
+                    account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, sale.fiscal_position.id or False, account_id)
+                    res['account_id'] = account_id
+                    if not res.get('account_id'):
+                        raise osv.except_osv(_('Configuration Error !'),
+                                _('There is no income account defined '))
+
                 if not res.get('account_id'):
                     raise osv.except_osv(_('Configuration Error !'),
                                 _('There is no income account defined ' \
                                         'for this product: "%s" (id:%d)') % \
                                         (sale_adv_obj.product_id.name, sale_adv_obj.product_id.id,))
-                
+
+                final_amount = 0
+                if sale_adv_obj.amount <= 0.00:
+                    raise osv.except_osv(_('Data Insufficient !'),
+                        _('Please check the Advance Amount, it should not be 0 or less!'))
+                else:
+                    if sale_adv_obj.pay_type == 'percentage':
+                        final_amount = sale.amount_total * sale_adv_obj.amount / 100
+                        if not res.get('name'):
+                            res['name'] = "Advance of %s"%(final_amount)
+                    else:
+                        final_amount = sale_adv_obj.amount
+                        if not res.get('name'):
+                            res['name'] = "Advance of %s %s"%(final_amount,sale.pricelist_id.currency_id.symbol)
+
+                if res.get('invoice_line_tax_id'):
+                    res['invoice_line_tax_id'] = [(6, 0, res.get('invoice_line_tax_id'))]
+                else:
+                    res['invoice_line_tax_id'] = False
+
                 line_id = obj_lines.create(cr, uid, {
                     'name': res.get('name'),
                     'account_id': res['account_id'],
-                    'price_unit': sale_adv_obj.amount,
-                    'quantity': sale_adv_obj.qtty,
+                    'price_unit': final_amount,
+                    'quantity': sale_adv_obj.qtty or 1.0,
                     'discount': False,
-                    'uos_id': res.get('uos_id'),
+                    'uos_id': res.get('uos_id') or False,
                     'product_id': sale_adv_obj.product_id.id,
-                    'invoice_line_tax_id': [(6, 0, res.get('invoice_line_tax_id'))],
+                    'invoice_line_tax_id': res.get('invoice_line_tax_id'),
                     'account_analytic_id': sale.project_id.id or False,
                     #'note':'',
                 })
@@ -112,49 +184,29 @@ class sale_advance_payment_inv(osv.osv_memory):
         # If not, the advance will be deduced when generating the final invoice
         #
                 if sale.order_policy == 'picking':
-                    self.pool.get('sale.order.line').create(cr, uid, {
+                    vals = {
                         'order_id': sale.id,
-                        'name': res.get('name'),
-                        'price_unit': -sale_adv_obj.amount,
-                        'product_uom_qty': sale_adv_obj.qtty,
-                        'product_uos_qty': sale_adv_obj.qtty,
-                        'product_uos': res.get('uos_id'),
-                        'product_uom': res.get('uos_id'),
-                        'product_id': sale_adv_obj.product_id.id,
+                        'name': res.get('name')  or ("%s %s %s "%(sale_adv_obj.amount,sale_adv_obj.pay_type,"Advance.")),
+                        'price_unit': -final_amount,
+                        'product_uom_qty': sale_adv_obj.qtty or 1.0,
+                        'product_uos_qty': sale_adv_obj.qtty or 1.0,
+                        'product_uos': res.get('uos_id') or False,
+                        'product_id': sale_adv_obj.product_id.id or False,
                         'discount': False,
-                        'tax_id': [(6, 0, res.get('invoice_line_tax_id'))],
-                    }, context)
+                        'tax_id': res.get('invoice_line_tax_id'),
+                    }
+                    if res.get('uos_id'):
+                        vals.update({'product_uom': res.get('uos_id')})
+                    self.pool.get('sale.order.line').create(cr, uid, vals, context)
 
         context.update({'invoice_id':list_inv})
 
-        return {
-            'name': 'Open Invoice',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'sale.open.invoice',
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-            'context': context
-        }
+        if context.get('open_invoices'):
+            return self.open_invoices( cr, uid, ids, context=context)
+        else:
+            return {'type': 'ir.actions.act_window_close'}
 
-sale_advance_payment_inv()
-
-class sale_open_invoice(osv.osv_memory):
-    _name = "sale.open.invoice"
-    _description = "Sales Open Invoice"
-
-    def open_invoice(self, cr, uid, ids, context=None):
-
-        """
-             To open invoice.
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param ids: the ID or list of IDs if we want more than one
-             @param context: A standard dictionary
-             @return:
-
-        """
+    def open_invoices(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         mod_obj = self.pool.get('ir.model.data')
@@ -176,6 +228,6 @@ class sale_open_invoice(osv.osv_memory):
             'type': 'ir.actions.act_window',
          }
 
-sale_open_invoice()
+sale_advance_payment_inv()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 2cdcb9b8c99..0c3bb031b3b 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -7,15 +7,24 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Advance Invoice">
-                    <field name="product_id"/>
+                    <group colspan="2">
+                        <field name="product_id" on_change="onchange_advance_product(product_id)" context="{'search_default_services':1}" attrs="{'invisible': [('pay_type','=','percentage')]}" />
+                    </group>
                     <newline />
-                    <field name="qtty" invisible="1"/>
-                    <field name="amount"/>
+                    <group colspan="2" col="6">
+                        <field name="qtty" invisible="1"/>
+                        <field name="amount"/>
+                        <field name="pay_type" nolabel="1" attrs="{'readonly':[('advance','=','True')]}" on_change="onchange_pay_type(pay_type,product_id)"/>
+                        <field name="advance" invisible="1"/>
+                    </group>
                     <newline />
                     <separator string="" colspan="4"/>
-                    <label string=""  colspan="2" />
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward"/>
+                    <label string="" colspan="6" />
+                    <group colspan="4">
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward" context="{'open_invoices': False}"/>
+                        <button name="create_invoices" string="Create and view Invoice" type="object" icon="terp-camera_test" context="{'open_invoices': True}" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -28,31 +37,5 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-
-        <record id="view_sale_open_invoice" model="ir.ui.view">
-            <field name="name">Open Invoice</field>
-            <field name="model">sale.open.invoice</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Invoices">
-                    <label string="You invoice has been successfully created!" />
-                    <newline />
-                    <separator string="" colspan="4"/>
-                    <group colspan="4">
-                        <button special="cancel" string="Close" icon="gtk-cancel"/>
-                        <button name="open_invoice" string="Open Invoice" type="object" icon="gtk-go-forward"/>
-                    </group>
-                 </form>
-            </field>
-        </record>
-
-        <record id="action_view_sale_open_invoice" model="ir.actions.act_window">
-            <field name="name">Open Invoice</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sale.open.invoice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
     </data>
 </openerp>

From 06aa99eb19db9f2c7b19dd5d6f590b67ea574984 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 10 May 2012 14:42:44 +0200
Subject: [PATCH 274/452] [IMP] correctly re-focus search view after rendering
 it

bzr revid: xmo@openerp.com-20120510124244-y1t9wy0zitfxlfv3
---
 addons/web/static/src/js/search.js | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 7c35a79ef84..2e4abda7b2a 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -505,24 +505,46 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                 this.$element.find('div.oe_searchview_input:focus')[0]));
         this.query.add(ui.item.facet, {at: input_index / 2});
     },
-    renderFacets: function () {
+    /**
+     *
+     * @param {openerp.web.search.SearchQuery | openerp.web.search.Facet} _1
+     * @param {openerp.web.search.Facet} [_2]
+     * @param {Object} [options]
+     */
+    renderFacets: function (_1, _2, options) {
+        // _1: model if event=change, otherwise collection
+        // _2: undefined if event=change, otherwise model
         var self = this;
+        var started = [];
         var $e = this.$element.find('div.oe_searchview_facets');
         _.invoke(this.input_subviews, 'destroy');
         this.input_subviews = [];
 
         var i = new my.InputView(this);
-        i.appendTo($e);
+        started.push(i.appendTo($e));
         this.input_subviews.push(i);
         this.query.each(function (facet) {
             var f = new my.FacetView(this, facet);
-            f.appendTo($e);
+            started.push(f.appendTo($e));
             self.input_subviews.push(f);
 
             var i = new my.InputView(this);
-            i.appendTo($e);
+            started.push(i.appendTo($e));
             self.input_subviews.push(i);
         }, this);
+
+        $.when.apply(null, started).then(function () {
+            var input_to_focus;
+            // options.at: facet inserted at given index, focus next input
+            // otherwise just focus last input
+            if (!options || typeof options.at !== 'number') {
+                input_to_focus = _.last(self.input_subviews);
+            } else {
+                input_to_focus = self.input_subviews[(options.at + 1) * 2];
+            }
+
+            input_to_focus.$element.focus();
+        });
     },
 
     /**

From 257d2fc1539c8f282b8a34cf93b5e2f3d4b0a10b Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 10 May 2012 18:15:43 +0530
Subject: [PATCH 275/452] [IMP] improved code.

bzr revid: tpa@tinyerp.com-20120510124543-b57sft39eosm6gvb
---
 addons/sale/wizard/sale_make_invoice_advance.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 9a9eda88c70..f1f7989a54c 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -67,11 +67,9 @@ class sale_advance_payment_inv(osv.osv_memory):
         product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
         value['amount'] = product.list_price
         try:
-            res_id = data_obj._get_id(cr, uid, 'sale', 'advance_product_0')
-            if res_id:
-                advance_id = data_obj.browse(cr, uid, res_id, context=context).res_id
-                if product.id ==  advance_id:
-                    value['advance'] = 'True'
+            advance_id = data_obj.get_object_reference(cr, uid, 'sale', 'advance_product_0')[1]
+            if product.id ==  advance_id:
+                value['advance'] = 'True'
         finally:
             return {'value': value}
 

From 978eae621d54b8c8bf1bc0afdf2d754d40bc2c42 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 10 May 2012 20:52:14 +0200
Subject: [PATCH 276/452] [CHG] split custom filters handling out of regular
 filters

bzr revid: xmo@openerp.com-20120510185214-qyh7wybl0un036dt
---
 addons/web/static/src/css/base.css  | 11 +++-
 addons/web/static/src/css/base.sass | 10 ++-
 addons/web/static/src/js/search.js  | 94 +++++++++++++++++------------
 addons/web/static/src/xml/base.xml  |  2 +-
 4 files changed, 73 insertions(+), 44 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 466e51e7a90..6d2287aa1c0 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1175,6 +1175,14 @@
   border: 1px solid #cccccc;
   text-align: left;
 }
+.openerp .oe_searchview .oe_searchview_drawer > div {
+  border-top: 1px solid #cccccc;
+  margin: 3px 0;
+}
+.openerp .oe_searchview .oe_searchview_drawer > div:first-child {
+  border-top: none;
+  margin: 0;
+}
 .openerp .oe_searchview .oe_searchview_drawer button, .openerp .oe_searchview .oe_searchview_drawer .button {
   border: none;
   background: white;
@@ -1228,8 +1236,7 @@
   color: #404040;
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4 {
-  border-top: 1px solid #cccccc;
-  margin: 5px 0 3px;
+  margin: 0;
   cursor: pointer;
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4:before {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 55d56056619..cf35624d4b1 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -932,6 +932,13 @@ $colour4: #8a89ba
             border: 1px solid #ccc
             text-align: left
 
+            > div
+                border-top: 1px solid #ccc
+                margin: 3px 0
+            > div:first-child
+                border-top: none
+                margin: 0
+
             button, .button
                 border: none
                 background: white
@@ -980,8 +987,7 @@ $colour4: #8a89ba
 
             .oe_searchview_advanced
                 h4
-                    border-top: 1px solid #ccc
-                    margin: 5px 0 3px
+                    margin: 0
                     cursor: pointer
 
                 h4:before
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 2e4abda7b2a..3a190a538db 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -624,9 +624,11 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
             data.fields_view.fields);
 
         // add Filters to this.inputs, need view.controls filled
-        var filters = new instance.web.search.Filters(this);
+        (new instance.web.search.Filters(this));
+        // add custom filters to this.inputs
+        (new instance.web.search.CustomFilters(this));
         // add Advanced to this.inputs
-        var advanced = new instance.web.search.Advanced(this);
+        (new instance.web.search.Advanced(this));
 
         // build drawer
         var drawer_started = $.when.apply(
@@ -1479,28 +1481,52 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
 
 instance.web.search.CustomFilters = instance.web.search.Input.extend({
     template: 'SearchView.CustomFilters',
+    _in_drawer: true,
     start: function () {
+        this.model = new instance.web.Model('ir.filters');
+        this.filters = {};
         this.$element.on('submit', 'form', this.proxy('save_current'));
         // FIXME: local eval of domain and context to get rid of special endpoint
         return this.rpc('/web/searchview/get_filters', {
             model: this.view.model
         }).pipe(this.proxy('set_filters'));
     },
-    set_filters: function (filters) {
+    append_filter: function (filter) {
         var self = this;
-        var content = this.$element.find('.oe_searchview_custom_list');
-        return $.when.apply(null, _(filters).chain()
-            .map(function (filter) {
-                // FIXME: handling of ``disabled`` being set
-                var f = new instance.web.search.Filter({attrs: {
-                    string: filter.name,
-                    context: filter.context,
-                    domain: filter.domain
-                }}, self.view);
-                return new instance.web.search.FilterGroup([f], self.view);
-            })
-            .invoke('appendTo', content)
-            .value());
+        var key = _.str.sprintf('(%s)%s', filter.user_id, filter.name);
+
+        var $filter;
+        if (key in this.filters) {
+            $filter = this.filters[key];
+        } else {
+            var id = filter.id;
+            $filter = this.filters[key] = $('<li></li>')
+                .appendTo(this.$element.find('.oe_searchview_custom_list'))
+                .text(filter.name);
+            $('<button type="button">').appendTo($filter)
+                .text(_t("Delete"))
+                .click(function () {
+                    self.model.call('unlink', [id]).then(function () {
+                        $filter.remove();
+                    });
+                });
+        }
+
+        $filter.unbind('click').click(function () {
+            self.view.query.reset([{
+                category: _("Custom Filter"),
+                icon: 'M',
+                field: {
+                    get_context: function () { return filter.context; },
+                    get_groupby: function () { return [filter.context]; },
+                    get_domain: function () { return filter.domain; }
+                },
+                values: [{label: filter.name, value: null}]
+            }]);
+        });
+    },
+    set_filters: function (filters) {
+        _(filters).map(_.bind(this.append_filter, this));
     },
     save_current: function () {
         var self = this;
@@ -1511,29 +1537,26 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
             domains: search.domains,
             contexts: search.contexts,
             group_by_seq: search.groupbys || []
-        }).pipe(function (results) {
+        }).then(function (results) {
             if (!_.isEmpty(results.group_by)) {
                 results.context.group_by = results.group_by;
             }
-            var name = $name.val();
-            // FIXME: creates filter and group even if the call fails :/
-            var f = new instance.web.search.Filter({attrs: {
-                string: name,
-                context: results.context,
-                domain: results.domain
-            }}, self.view);
-            (new instance.web.search.FilterGroup([f], self.view))
-                .appendTo(self.$element.find('.oe_searchview_custom_list'));
-            // FIXME: current context?
-            return new instance.web.Model('ir.filters').call('create_or_replace', [{
-                name: name,
+            var filter = {
+                name: $name.val(),
+                // FIXME: optional on public/private checkbox
                 user_id: instance.connection.uid,
                 model_id: self.view.model,
                 context: results.context,
                 domain: results.domain
-            }]);
-        }).then(function () {
-            $name.val('');
+            };
+            // FIXME: current context?
+            return self.model.call('create_or_replace', [filter]).then(function (id) {
+                if (id) {
+                    filter.id = id;
+                }
+                self.append_filter(filter);
+                $name.val('');
+            });
         });
         return false;
     }
@@ -1574,13 +1597,6 @@ instance.web.search.Filters = instance.web.search.Input.extend({
             }
         }
 
-        // Create a Custom Filter FilterGroup for each custom filter read from
-        // the db, add all of this as a group in the smallest column
-        (col1.length <= col2.length ? col1 : col2).push({
-            name: _t("Custom Filters"),
-            filters: [new instance.web.search.CustomFilters(self.view)],
-            length: 1
-        });
         return $.when(
             this.render_column(col1, $('<div>').appendTo(this.$element)),
             this.render_column(col2, $('<div>').appendTo(this.$element)));
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f2df82b1b58..b4a4c0a9726 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1471,7 +1471,7 @@
 
 </div>
 <div t-name="SearchView.CustomFilters" class="oe_searchview_custom">
-    <div class="oe_searchview_custom_list"/>
+    <ul class="oe_searchview_custom_list"/>
     <form>
         <label for="oe_searchview_custom_input">Save current search:</label>
         <input id="oe_searchview_custom_input"/>

From cfdcd92ecc6d810f8c316c9a2962257f95960bf0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 10 May 2012 21:04:39 +0200
Subject: [PATCH 277/452] [ADD] trivial handling of private/public filters

bzr revid: xmo@openerp.com-20120510190439-o9s20f10pmcukefu
---
 addons/web/static/src/js/search.js | 9 ++++++---
 addons/web/static/src/xml/base.xml | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 3a190a538db..8e826d728c3 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1502,7 +1502,10 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
             var id = filter.id;
             $filter = this.filters[key] = $('<li></li>')
                 .appendTo(this.$element.find('.oe_searchview_custom_list'))
+                .addClass(filter.user_id ? 'oe_searchview_custom_private'
+                                         : 'oe_searchview_custom_public')
                 .text(filter.name);
+
             $('<button type="button">').appendTo($filter)
                 .text(_t("Delete"))
                 .click(function () {
@@ -1530,7 +1533,8 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
     },
     save_current: function () {
         var self = this;
-        var $name = this.$element.find('input');
+        var $name = this.$element.find('input:first');
+        var private_filter = this.$element.find('input:last').prop('checked');
 
         var search = this.view.build_search_data();
         this.rpc('/web/session/eval_domain_and_context', {
@@ -1543,8 +1547,7 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
             }
             var filter = {
                 name: $name.val(),
-                // FIXME: optional on public/private checkbox
-                user_id: instance.connection.uid,
+                user_id: private_filter ? instance.connection.uid : false,
                 model_id: self.view.model,
                 context: results.context,
                 domain: results.domain
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index b4a4c0a9726..5e8224f0ab3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1472,9 +1472,12 @@
 </div>
 <div t-name="SearchView.CustomFilters" class="oe_searchview_custom">
     <ul class="oe_searchview_custom_list"/>
-    <form>
-        <label for="oe_searchview_custom_input">Save current search:</label>
+    <form class="oe_searchview_custom_closed">
+        <label for="oe_searchview_custom_input" class="oe_searchview_custom_title">
+            Save current search</label>
         <input id="oe_searchview_custom_input"/>
+        <label for="oe_searchview_custom_private">Private: </label>
+        <input id="oe_searchview_custom_private" type="checkbox" checked="checked"/>
         <button class="oe_searchview_custom_save">Save</button>
     </form>
 </div>

From 323708d83dc298b3a850173907004ad2262f41e6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 11 May 2012 11:58:22 +0200
Subject: [PATCH 278/452] [IMP] use filter help message if no string on a
 search filter

bzr revid: xmo@openerp.com-20120511095822-eqhuo6isbfvdf44c
---
 addons/web/static/src/js/search.js | 4 ++--
 addons/web/static/src/xml/base.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 8e826d728c3..0515a2136d0 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1031,7 +1031,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
             .filter(function (f) {
                 return f.attrs && f.attrs.name && !!defaults[f.attrs.name];
             }).map(function (f) {
-                return {label: f.attrs.string || f.attrs.name,
+                return {label: f.attrs.string || f.attrs.help || f.attrs.name,
                         value: f};
             }).value();
         if (_.isEmpty(fs)) { return $.when(null); }
@@ -1093,7 +1093,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
     },
     toggle: function (filter) {
         this.view.query.toggle(this.make_facet([{
-            label: filter.attrs.string || filter.attrs.name,
+            label: filter.attrs.string || filter.attrs.help || filter.attrs.name,
             value: filter
         }]));
     }
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 5e8224f0ab3..12db7a4a822 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1372,7 +1372,7 @@
 </button>
 <ul t-name="SearchView.filters">
     <li t-foreach="widget.filters" t-as="filter">
-        <t t-esc="filter.attrs.string or filter.attrs.name or 'Ω'"/>
+        <t t-esc="filter.attrs.string or filter.attrs.help or filter.attrs.name or 'Ω'"/>
     </li>
 </ul>
 <t t-name="SearchView.filters.facet">

From e53ce6d3c6cd9ab0277c1d0625d4edd782db1bd8 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 11 May 2012 15:53:14 +0530
Subject: [PATCH 279/452] [IMP]hr_holiday: remove date_to condition from domain
 for getting correct value

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

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 43d7202547c..92becaff923 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -487,7 +487,7 @@ class hr_employee(osv.osv):
     def _get_leave_status(self, cr, uid, ids, name, args, context=None):
         holidays_id = self.pool.get('hr.holidays').search(cr, uid, 
            [('employee_id', 'in', ids), ('date_from','<=',time.strftime('%Y-%m-%d %H:%M:%S')), 
-            ('date_to','>=',time.strftime('%Y-%m-%d %H:%M:%S')),('type','=','remove'),('state','not in',('cancel','refuse'))],
+            ('type','=','remove'),('state','not in',('cancel','refuse'))],
            context=context)
         result = {}
         for id in ids:

From 872c87cc59be880cc7edd102982aa4663fc10bc3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 11 May 2012 12:24:16 +0200
Subject: [PATCH 280/452] [FIX] test: extracting custom filers from filters
 groups means one more input in the search view

bzr revid: xmo@openerp.com-20120511102416-1zryi8n7t1d33cmi
---
 addons/web/static/test/search.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index ca34750ad1c..ee97e18f571 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -995,9 +995,10 @@ $(document).ready(function () {
             .fail(function (error) { ok(false, error.message); })
             .done(function () {
                 var $fs = $fix.find('.oe_searchview_filters ul');
-                // 3 filters, 1 filtergroup, 1 advanced and 1 Filters widget
-                equal(view.inputs.length, 6,
-                      'view should have 6 inputs total');
+                // 3 filters, 1 filtergroup, 1 custom filters widget,
+                // 1 advanced and 1 Filters widget
+                equal(view.inputs.length, 7,
+                      'view should have 7 inputs total');
                 equal($fs.children().length, 3,
                       "drawer should have a filter group with 3 filters");
                 equal(_.str.strip($fs.children().eq(0).text()), "Foo1",

From f3721bb43b8372308d4d838c6d8aa0ebd0e85eee Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 11 May 2012 13:32:22 +0200
Subject: [PATCH 281/452] [FIX] bloody retarded shit from
 revid:nicolas.vanhoren@openerp.com-20120418145003-vk8kkfgyp0y94hzm

bzr revid: xmo@openerp.com-20120511113222-o4vj35vscnbebvh8
---
 addons/web/static/src/js/formats.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 640ba4d5a93..2b527686ddd 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -111,7 +111,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) {
             return value_if_empty === undefined ?  '' : value_if_empty;
     }
     var l10n = _t.database.parameters;
-    switch (descriptor.type || (descriptor.field && descriptor.field.type)) {
+    switch (descriptor.widget || descriptor.type || (descriptor.field && descriptor.field.type)) {
         case 'id':
             return value.toString();
         case 'integer':
@@ -171,7 +171,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
         case "":
             return value_if_empty === undefined ?  false : value_if_empty;
     }
-    switch (descriptor.type || (descriptor.field && descriptor.field.type)) {
+    switch (descriptor.widget || descriptor.type || (descriptor.field && descriptor.field.type)) {
         case 'integer':
             var tmp;
             do {

From b0a13bff6784fa4b9244dfa68865a53844975ea6 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 11 May 2012 17:15:13 +0530
Subject: [PATCH 282/452] [IMP]load script from addons side.

bzr revid: vme@tinyerp.com-20120511114513-bfco3w7u0itaq171
---
 addons/event_sale/static/src/js/google_map.js | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/addons/event_sale/static/src/js/google_map.js b/addons/event_sale/static/src/js/google_map.js
index 4fb368d0845..179c26069cc 100644
--- a/addons/event_sale/static/src/js/google_map.js
+++ b/addons/event_sale/static/src/js/google_map.js
@@ -1,9 +1,9 @@
 openerp.event = function(instance){
 	instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
 	instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, {
-
 		init : function(){
 			this._super.apply(this,arguments);
+			this.googleMapsLoaded = $.Deferred();
 		},
 
 		start:function(){
@@ -11,13 +11,27 @@ openerp.event = function(instance){
 		
 	 	set_input_id:function(id){
 	 	},
+	 	map_load: function() {
+	 		var self = this;
+	 		if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
+			googleMapsCallback = function () {
+        		self.googleMapsLoaded.resolve();
+    		};
+			 $.ajax({
+	                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
+	                dataType: "script"
+	            }).fail(self.googleMapsLoaded.reject);
+			return this.googleMapsLoaded.promise();
+		},
 	 	set_value:function(value){
 	 		var self = this;
 			this.get_address(value).done(function(value){
 				if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
 				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
-				return self.list_addresses(address);
-				
+				var defer = self.Map_Load();
+				defer.done(function(){
+					return self.render_map(address);	
+				})
 			});
 			
 	 	},
@@ -28,7 +42,7 @@ openerp.event = function(instance){
 			return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
 	 	},
 
-	 	list_addresses: function(address){
+	 	render_map: function(address){
 	 		var geocoder = new google.maps.Geocoder();
 			geocoder.geocode( { 'address': address}, function(results, status) 
 			{

From 32ecb048dc3daa39573c37144683d3842490dbb2 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 11 May 2012 17:33:06 +0530
Subject: [PATCH 283/452] [IMP]perfect indentation.

bzr revid: vme@tinyerp.com-20120511120306-j72jwc1mm8kfdsq4
---
 addons/event_sale/static/src/js/google_map.js | 124 +++++++++---------
 1 file changed, 60 insertions(+), 64 deletions(-)

diff --git a/addons/event_sale/static/src/js/google_map.js b/addons/event_sale/static/src/js/google_map.js
index 179c26069cc..6fe69160447 100644
--- a/addons/event_sale/static/src/js/google_map.js
+++ b/addons/event_sale/static/src/js/google_map.js
@@ -1,68 +1,64 @@
 openerp.event = function(instance){
-	instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
-	instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, {
-		init : function(){
-			this._super.apply(this,arguments);
-			this.googleMapsLoaded = $.Deferred();
-		},
+    instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
+    instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, {
+        init : function(){
+            this._super.apply(this,arguments);
+            this.googleMapsLoaded = $.Deferred();
+        },
+        start:function(){
+        },
 
-		start:function(){
-		},
-		
-	 	set_input_id:function(id){
-	 	},
-	 	map_load: function() {
-	 		var self = this;
-	 		if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
-			googleMapsCallback = function () {
-        		self.googleMapsLoaded.resolve();
-    		};
-			 $.ajax({
-	                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
-	                dataType: "script"
-	            }).fail(self.googleMapsLoaded.reject);
-			return this.googleMapsLoaded.promise();
-		},
-	 	set_value:function(value){
-	 		var self = this;
-			this.get_address(value).done(function(value){
-				if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
-				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
-				var defer = self.Map_Load();
-				defer.done(function(){
-					return self.render_map(address);	
-				})
-			});
-			
-	 	},
-	 	get_address:function(value){
-	 		if (!value || value.length == 0){
-	 			return $.Deferred().reject();
-	 		}
-			return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
-	 	},
+        set_input_id:function(id){
+        },
+        map_load: function() {
+            var self = this;
+            if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
+                googleMapsCallback = function () {
+                self.googleMapsLoaded.resolve();
+            };
+            $.ajax({
+                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
+                dataType: "script"
+            }).fail(self.googleMapsLoaded.reject);
+            return this.googleMapsLoaded.promise();
+        },
+        set_value:function(value){
+            var self = this;
+            this.get_address(value).done(function(value){
+            if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
+            var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
+            var defer = self.Map_Load();
+            defer.done(function(){
+                return self.render_map(address);	
+            });
+            });
+        },
+        get_address:function(value){
+            if (!value || value.length == 0){
+                return $.Deferred().reject();
+            }
+            return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
+        },
 
-	 	render_map: function(address){
-	 		var geocoder = new google.maps.Geocoder();
-			geocoder.geocode( { 'address': address}, function(results, status) 
-			{
-			if (status == google.maps.GeocoderStatus.OK){
-				var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
-				var myOptions = {       
-					zoom: 17,       
-					center:  new google.maps.LatLng(lat,lng),       
-					mapTypeId: google.maps.MapTypeId.ROADMAP     
-				}
-		    	return new google.maps.Marker({
-				    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
-				    position: new google.maps.LatLng(lat,lng)
-			 	 });
-	 		}
-			});
-			
-	 	},
-	 	get_value:function(){
-	 	}
-		
-	}));
+        render_map: function(address){
+            var geocoder = new google.maps.Geocoder();
+            geocoder.geocode( { 'address': address}, function(results, status){
+                if (status == google.maps.GeocoderStatus.OK){
+                    var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
+                    var myOptions = {
+                    zoom: 17,
+                    center:  new google.maps.LatLng(lat,lng),
+                    mapTypeId: google.maps.MapTypeId.ROADMAP
+                }
+                return new google.maps.Marker({
+                    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
+                    position: new google.maps.LatLng(lat,lng)
+                });
+                }
+            });
+        },
+        get_value:function(){
+        }
+
+    }));
 };
\ No newline at end of file

From 7b4137b49ce9038295f3bb12a42d8492bda9109a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 11 May 2012 14:07:26 +0200
Subject: [PATCH 284/452] [FIX] advanced search

reimplement facet management internally, don't try to go through facets

also tests

bzr revid: xmo@openerp.com-20120511120726-ue2y7exuqv2wh22p
---
 addons/web/static/src/js/search.js |  31 +++++----
 addons/web/static/test/search.js   | 101 ++++++++++++++++++++++++++++-
 2 files changed, 115 insertions(+), 17 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 0515a2136d0..2ec0a79a3cd 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1644,25 +1644,28 @@ instance.web.search.Advanced = instance.web.search.Input.extend({
     commit_search: function () {
         var self = this;
         // Get domain sections from all propositions
-        var children = this.getChildren(),
-            domain = _.invoke(children, 'get_proposition');
-        var filters = _(domain).map(function (section) {
+        var children = this.getChildren();
+        var domain = _.invoke(children, 'get_proposition');
+        var vals = _(domain).map(function (section) {
             return {
-                label: _.str.sprintf('%s(%s)%s',
-                        section[0], section[1], section[2]),
-                value: new instance.web.search.Filter({attrs: {
-                    domain: [section]
-                }}, self.view)
-            };
+                label: _.str.sprintf('%s(%s)%s', section[0], section[1], section[2]),
+                value: null
+            }
         });
-        // Create Filter (& FilterGroup around it) with that domain
-        var f = new instance.web.search.FilterGroup(filters, this.view);
-        // add group to query
+        for (var i = domain.length; --i;) {
+            domain.unshift('|');
+        }
+
         this.view.query.add({
             category: _t("Advanced"),
-            values: filters,
-            field: f
+            values: vals,
+            field: {
+                get_context: function () { },
+                get_domain: function () { return domain;},
+                get_groupby: function () { }
+            }
         });
+
         // remove all propositions
         _.invoke(children, 'destroy');
         // add new empty proposition
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index ee97e18f571..0295d14ad01 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -203,7 +203,7 @@ $(document).ready(function () {
                 return {result: {fields_view: {
                     type: 'search',
                     fields: {
-                        dummy: {type: 'char'}
+                        dummy: {type: 'char', string: "Dummy"}
                     },
                     arch: {
                         tag: 'search',
@@ -225,7 +225,7 @@ $(document).ready(function () {
         };
         instance.connection.responses['/web/searchview/fields_get'] = function () {
             return {result: {fields: {
-                dummy: {type: 'char'}
+                dummy: {type: 'char', string: 'Dummy'}
             }}};
         };
 
@@ -716,7 +716,7 @@ $(document).ready(function () {
         var $fix = $('#qunit-fixture');
         var view = makeSearchView({
             get_domain: function (facet) {
-                equal(facet.get('category'), "dummy");
+                equal(facet.get('category'), "Dummy");
                 deepEqual(facet.values.toJSON(), [{label: "42", value: 42}]);
                 got_domain = true;
                 return null;
@@ -1059,5 +1059,100 @@ $(document).ready(function () {
             });
     });
 
+    module('advanced', {
+        setup: function () {
+            instance = window.openerp.init([]);
+            window.openerp.web.corelib(instance);
+            window.openerp.web.coresetup(instance);
+            window.openerp.web.chrome(instance);
+            window.openerp.web.data(instance);
+            window.openerp.web.formats(instance);
+            window.openerp.web.search(instance);
+
+            instance.web.qweb.add_template(doc);
+
+            mockifyRPC(instance.connection);
+        }
+    });
+    asyncTest('single-advanced', 6, function () {
+        var view = makeSearchView();
+        var $fix = $('#qunit-fixture');
+
+        view.appendTo($fix)
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function () {
+                var $advanced = $fix.find('.oe_searchview_advanced');
+                // open advanced search (not actually useful)
+                $advanced.find('> h4').click();
+                // select proposition (only one)
+                var $prop = $advanced.find('> form li:first');
+                // field select should have two possible values, dummy and id
+                equal($prop.find('.searchview_extended_prop_field option').length,
+                      2, "advanced search should provide choice between two fields");
+                // field should be dummy
+                equal($prop.find('.searchview_extended_prop_field').val(),
+                      'dummy',
+                      "only field should be dummy");
+                // operator should be "contains"/'ilike'
+                equal($prop.find('.searchview_extended_prop_op').val(),
+                      'ilike', "default char operator should be ilike");
+                // put value in
+                $prop.find('.searchview_extended_prop_value input')
+                     .val("stupid value");
+                // validate advanced search
+                $advanced.find('button.oe_apply').click();
+
+                // resulting search
+                equal(view.query.length, 1, "search query should have a single facet");
+                var facet = view.query.at(0);
+                ok(!facet.get('field').get_context(facet),
+                   "advanced search facets should yield no context");
+                deepEqual(facet.get('field').get_domain(facet),
+                          [['dummy', 'ilike', "stupid value"]],
+                          "advanced search facet should return proposed domain");
+            });
+    });
+    asyncTest('multiple-advanced', 3, function () {
+        var view = makeSearchView();
+        var $fix = $('#qunit-fixture');
+
+        view.appendTo($fix)
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function () {
+                var $advanced = $fix.find('.oe_searchview_advanced');
+                // open advanced search (not actually useful)
+                $advanced.find('> h4').click();
+                // open second condition
+                $advanced.find('button.oe_add_condition').click();
+                // select first proposition
+                var $prop1 = $advanced.find('> form li:first');
+                $prop1.find('.searchview_extended_prop_field').val('dummy').change();
+                $prop1.find('.searchview_extended_prop_op').val('ilike');
+                $prop1.find('.searchview_extended_prop_value input')
+                     .val("stupid value");
+
+                // select first proposition
+                var $prop2 = $advanced.find('> form li:last');
+                // need to trigger event manually or op not changed
+                $prop2.find('.searchview_extended_prop_field').val('id').change();
+                $prop2.find('.searchview_extended_prop_op').val('=');
+                $prop2.find('.searchview_extended_prop_value input')
+                     .val(42);
+                // validate advanced search
+                $advanced.find('button.oe_apply').click();
+
+                // resulting search
+                equal(view.query.length, 1, "search query should have a single facet");
+                var facet = view.query.at(0);
+                ok(!facet.get('field').get_context(facet),
+                   "advanced search facets should yield no context");
+                deepEqual(facet.get('field').get_domain(facet),
+                          ['|', ['dummy', 'ilike', "stupid value"],
+                                ['id', '=', 42]],
+                          "advanced search facet should return proposed domain");
+            });
+    });
     // TODO: UI tests?
 });

From 19da90f3d33ebd4e0f0b04e1558e60ea8dd44407 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 11 May 2012 18:26:23 +0530
Subject: [PATCH 285/452] [IMP] sale_analytic_plans: set xpath.

bzr revid: tpa@tinyerp.com-20120511125623-8n1yxymutof53n12
---
 addons/sale_analytic_plans/sale_analytic_plans_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index 743bbcb48d9..2d4ff082288 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -18,7 +18,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-           <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='delay']" position="after">
+           <xpath expr="/form/sheet/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='delay']" position="after">
                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
            </xpath>
         </field>

From 93bf731f2f3a30871c7553c36dd4b49688a0416e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 11 May 2012 14:57:24 +0200
Subject: [PATCH 286/452] [TEST] for clearing search view

bzr revid: xmo@openerp.com-20120511125724-we09bm8aif8z4drg
---
 addons/web/static/test/search.js | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 0295d14ad01..dddf813b9ab 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -917,6 +917,41 @@ $(document).ready(function () {
             });
     });
 
+    module('removal', {
+        setup: function () {
+            instance = window.openerp.init([]);
+            window.openerp.web.corelib(instance);
+            window.openerp.web.coresetup(instance);
+            window.openerp.web.chrome(instance);
+            window.openerp.web.data(instance);
+            window.openerp.web.search(instance);
+
+            instance.web.qweb.add_template(doc);
+
+            mockifyRPC(instance.connection);
+        }
+    });
+    asyncTest('clear button', function () {
+        var $fix = $('#qunit-fixture');
+        var view = makeSearchView({
+            facet_for_defaults: function (defaults) {
+                return $.when({
+                    field: this,
+                    category: 'Dummy',
+                    values: [{label: 'dummy', value: defaults.dummy}]
+                });
+            }
+        }, {dummy: 42});
+        view.appendTo($fix)
+            .always(start)
+            .fail(function (error) { ok(false, error.message); })
+            .done(function () {
+                equal(view.query.length, 1, "view should have default facet");
+                $fix.find('.oe_searchview_clear').click();
+                equal(view.query.length, 0, "cleared view should not have any facet");
+            });
+    });
+
     module('drawer', {
         setup: function () {
             instance = window.openerp.init([]);

From 3ecf0e1ae19f9b86251bd0f20154df6a1ad3d2f7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 11 May 2012 15:16:13 +0200
Subject: [PATCH 287/452] [IMP] doc for facet's field property

bzr revid: xmo@openerp.com-20120511131613-zbqye92sex1ius6x
---
 doc/search-view.rst | 65 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 47 insertions(+), 18 deletions(-)

diff --git a/doc/search-view.rst b/doc/search-view.rst
index 2acaea3c8ad..66ad38d7d91 100644
--- a/doc/search-view.rst
+++ b/doc/search-view.rst
@@ -14,7 +14,8 @@ multiple fields). The goal for this change is twofold:
   OpenERP Web's new design.
 
 The internal structure of the faceted search is inspired by
-`VisualSearch <http://documentcloud.github.com/visualsearch/>`_ [#]_.
+`VisualSearch <http://documentcloud.github.com/visualsearch/>`_
+[#previous]_.
 
 As does VisualSearch, the new search view is based on `Backbone`_ and
 makes significant use of Backbone's models and collections (OpenERP
@@ -63,7 +64,7 @@ contains a non-falsy value for the field's ``@name`` and calls
 :js:func:`openerp.web.search.Input.facet_for` with that value.
 
 There is no default implementation of
-:js:func:`openerp.web.search.Input.facet_for` [#]_, but
+:js:func:`openerp.web.search.Input.facet_for` [#no_impl]_, but
 :js:class:`openerp.web.search.Field` provides one, which uses the
 value as-is to fetch a :js:class:`~openerp.web.search.Facet`.
 
@@ -76,7 +77,8 @@ inputs through the :js:func:`~openerp.web.search.Input.complete`
 method.
 
 This method should take a single argument (the string being typed by
-the user) and should fetch an ``Array`` of possible completions [#]_.
+the user) and should fetch an ``Array`` of possible completions
+[#completion]_.
 
 A default implementation is provided which fetches nothing.
 
@@ -205,9 +207,9 @@ with directly by external objects or search view controls
     .. js:attribute:: field
 
         The :js:class:`~openerp.web.search.Input` instance which
-        originally created the facet, used to delegate some operations
-        (such as serializing the facet's values to domains and
-        contexts). This is a backbone model attribute.
+        originally created the facet [#facet-field]_, used to delegate
+        some operations (such as serializing the facet's values to
+        domains and contexts). This is a backbone model attribute.
 
     .. js:attribute:: values
 
@@ -262,7 +264,7 @@ OpenERP this is done via :ref:`domains <openerpserver:domains>`. On
 the other hand, the OpenERP Web 7 search view's state is modelled
 after a collection of :js:class:`~openerp.web.search.Facet`, and each
 field of a search view may have special requirements when it comes to
-the domains it produces [#]_.
+the domains it produces [#special]_.
 
 So there needs to be some way of mapping
 :js:class:`~openerp.web.search.Facet` objects to OpenERP search data.
@@ -464,20 +466,47 @@ The advanced search is now a more standard
 :js:class:`~openerp.web.search.Input` configured to be rendered in the
 drawer.
 
-.. [#] the original view was implemented on top of a monkey-patched
-       VisualSearch, but as our needs diverged from VisualSearch's goal this
-       made less and less sense ultimately leading to a clean-room
-       reimplementation
+.. [#previous]
 
-.. [#] In case you are extending the search view with a brand new type
-       of input
+    the original view was implemented on top of a monkey-patched
+    VisualSearch, but as our needs diverged from VisualSearch's goal
+    this made less and less sense ultimately leading to a clean-room
+    reimplementation
 
-.. [#] Ideally this array should not hold more than about 10 items,
-       but the search view does not put any constraint on this at the
-       moment. Note that this may change.
+.. [#no_impl]
 
-.. [#] search view fields may also bundle context data to add to the
-       search context
+    In case you are extending the search view with a brand new type of
+    input
+
+.. [#completion]
+
+    Ideally this array should not hold more than about 10 items, but
+    the search view does not put any constraint on this at the
+    moment. Note that this may change.
+
+.. [#facet-field]
+
+    ``field`` does not actually need to be an instance of
+    :js:class:`~openerp.web.search.Input`, nor does it need to be what
+    created the facet, it just needs to provide the three
+    facet-serialization methods
+    :js:func:`~openerp.web.search.Input.get_domain`,
+    :js:func:`~openerp.web.search.Input.get_context` and
+    :js:func:`~openerp.web.search.Input.get_gropuby`, existing
+    :js:class:`~openerp.web.search.Input` subtypes merely provide
+    convenient base implementation for those methods.
+
+    Complex search view inputs (especially those living in the drawer)
+    may prefer using object literals with the right slots returning
+    closed-over values or some other scheme un-bound to an actual
+    :js:class:`~openerp.web.search.Input`, as
+    :js:class:`~openerp.web.search.CustomFilters` and
+    :js:class:`~openerp.web.search.Advanced` do.
+
+.. [#special]
+
+    search view fields may also bundle context data to add to the
+    search context
 
 .. _Backbone:
     http://documentcloud.github.com/backbone/

From c20d7cfb47bfbebfac6a8c6322a74b05a8a5c0a1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 11 May 2012 16:32:25 +0200
Subject: [PATCH 288/452] [IMP] unify open/close behavior of advanced and
 custom filters, close custom after creating

bzr revid: xmo@openerp.com-20120511143225-472ineg91e111tvv
---
 addons/web/static/src/css/base.css  | 25 +++++++++-------
 addons/web/static/src/css/base.sass | 45 +++++++++++++++--------------
 addons/web/static/src/js/search.js  | 13 +++++++--
 addons/web/static/src/xml/base.xml  | 12 ++++----
 4 files changed, 54 insertions(+), 41 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6d2287aa1c0..11095d7baf1 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1183,6 +1183,13 @@
   border-top: none;
   margin: 0;
 }
+.openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * {
+  margin: 0;
+  cursor: pointer;
+}
+.openerp .oe_searchview .oe_searchview_drawer h4:before {
+  content: "▸ ";
+}
 .openerp .oe_searchview .oe_searchview_drawer button, .openerp .oe_searchview .oe_searchview_drawer .button {
   border: none;
   background: white;
@@ -1224,24 +1231,20 @@
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li:hover {
   background-color: #f0f0fa;
 }
-.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom .oe_searchview_custom_save {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom form {
+  display: none;
+}
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom form button {
   font-size: 1px;
   letter-spacing: -1px;
   color: transparent;
 }
-.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom .oe_searchview_custom_save:before {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom form button:before {
   font-family: "mnmliconsRegular";
   content: "S";
   font-size: 20px;
   color: #404040;
 }
-.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4 {
-  margin: 0;
-  cursor: pointer;
-}
-.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4:before {
-  content: "▸ ";
-}
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced form {
   display: none;
 }
@@ -1259,10 +1262,10 @@
   list-style: none;
   margin: 0;
 }
-.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened h4:before {
+.openerp .oe_searchview .oe_searchview_drawer .oe_opened h4:before {
   content: "▾ ";
 }
-.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened form {
+.openerp .oe_searchview .oe_searchview_drawer .oe_opened form {
   display: block;
 }
 .openerp .oe_view_topbar {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index cf35624d4b1..c1824427f58 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -939,6 +939,13 @@ $colour4: #8a89ba
                 border-top: none
                 margin: 0
 
+            h4, h4 *
+                margin: 0
+                cursor: pointer
+
+            h4:before
+                content: "▸ "
+
             button, .button
                 border: none
                 background: white
@@ -975,24 +982,20 @@ $colour4: #8a89ba
                         background-color: #f0f0fa
 
             .oe_searchview_custom
-                .oe_searchview_custom_save
-                    font-size: 1px
-                    letter-spacing: -1px
-                    color: transparent
-                    &:before
-                        font-family: "mnmliconsRegular"
-                        content: "S"
-                        font-size: 20px
-                        color: #404040
+                form
+                    display: none
+
+                    button
+                        font-size: 1px
+                        letter-spacing: -1px
+                        color: transparent
+                        &:before
+                            font-family: "mnmliconsRegular"
+                            content: "S"
+                            font-size: 20px
+                            color: #404040
 
             .oe_searchview_advanced
-                h4
-                    margin: 0
-                    cursor: pointer
-
-                h4:before
-                    content: "▸ "
-
                 form
                     display: none
 
@@ -1008,11 +1011,11 @@ $colour4: #8a89ba
                     list-style: none
                     margin: 0
 
-                &.oe_opened
-                    h4:before
-                        content: "▾ "
-                    form
-                        display: block
+            .oe_opened
+                h4:before
+                    content: "▾ "
+                form
+                    display: block
     // }}}
     // View.topbar {{{
     .oe_view_topbar
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 2ec0a79a3cd..bce4770339b 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1483,9 +1483,13 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
     template: 'SearchView.CustomFilters',
     _in_drawer: true,
     start: function () {
+        var self = this;
         this.model = new instance.web.Model('ir.filters');
         this.filters = {};
         this.$element.on('submit', 'form', this.proxy('save_current'));
+        this.$element.on('click', 'h4', function () {
+            self.$element.toggleClass('oe_opened');
+        });
         // FIXME: local eval of domain and context to get rid of special endpoint
         return this.rpc('/web/searchview/get_filters', {
             model: this.view.model
@@ -1508,7 +1512,8 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
 
             $('<button type="button">').appendTo($filter)
                 .text(_t("Delete"))
-                .click(function () {
+                .click(function (e) {
+                    e.stopPropagation();
                     self.model.call('unlink', [id]).then(function () {
                         $filter.remove();
                     });
@@ -1534,7 +1539,7 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
     save_current: function () {
         var self = this;
         var $name = this.$element.find('input:first');
-        var private_filter = this.$element.find('input:last').prop('checked');
+        var private_filter = !this.$element.find('input:last').prop('checked');
 
         var search = this.view.build_search_data();
         this.rpc('/web/session/eval_domain_and_context', {
@@ -1558,7 +1563,9 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
                     filter.id = id;
                 }
                 self.append_filter(filter);
-                $name.val('');
+                self.$element
+                    .removeClass('oe_opened')
+                    .find('form')[0].reset();
             });
         });
         return false;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 12db7a4a822..f123710edb6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1472,13 +1472,13 @@
 </div>
 <div t-name="SearchView.CustomFilters" class="oe_searchview_custom">
     <ul class="oe_searchview_custom_list"/>
-    <form class="oe_searchview_custom_closed">
-        <label for="oe_searchview_custom_input" class="oe_searchview_custom_title">
-            Save current search</label>
+    <h4 class="oe_searchview_custom_title">
+        <label for="oe_searchview_custom_input">Save search</label></h4>
+    <form>
         <input id="oe_searchview_custom_input"/>
-        <label for="oe_searchview_custom_private">Private: </label>
-        <input id="oe_searchview_custom_private" type="checkbox" checked="checked"/>
-        <button class="oe_searchview_custom_save">Save</button>
+        <button>Save</button><br/>
+        <label for="oe_searchview_custom_public">Share with all users:</label>
+        <input id="oe_searchview_custom_public" type="checkbox"/>
     </form>
 </div>
 <div t-name="SearchView.advanced" class="oe_searchview_advanced">

From c692ee6639c50101b148135867f9a49d9ab6d461 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 11 May 2012 16:34:59 +0200
Subject: [PATCH 289/452] [IMP] use button for advanced search clause removal

bzr revid: xmo@openerp.com-20120511143459-0kil402r0qp4ed0h
---
 addons/web/static/src/xml/base.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f123710edb6..1e4fe45e287 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1504,8 +1504,7 @@
         </select>
         <select class="searchview_extended_prop_op"/>
         <span class="searchview_extended_prop_value"/>
-        <a class="searchview_extended_delete_prop"
-                href="javascript:void(0)"><span> </span></a>
+        <button type="button" class="searchview_extended_delete_prop">Delete</button>
     </li>
 </t>
 <t t-name="SearchView.extended_search.proposition.char">

From d760265c30e32e384f0d5c6181eb839e1010ebb8 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 14 May 2012 12:59:58 +0530
Subject: [PATCH 290/452] [IMP] improved code.

bzr revid: tpa@tinyerp.com-20120514072958-hpwt4mj222b1x6vk
---
 addons/sale/wizard/sale_make_invoice_advance.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index f1f7989a54c..46e8cdfeac4 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -28,12 +28,11 @@ class sale_advance_payment_inv(osv.osv_memory):
     def _default_product_id(self, cr, uid, context=None):
         if context is None:
             context = {}
-        product_id = False
-        data_obj = self.pool.get('ir.model.data')
         try:
-            product_id = data_obj.get_object_reference(cr, uid, 'sale', 'advance_product_0')[1]
-        finally:
-            return product_id
+            product_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'sale', 'advance_product_0')[1]
+        except ValueError:
+            return False
+        return product_id
 
     _columns = {
         'product_id': fields.many2one('product.product', 'Advance Product', required=False,
@@ -59,7 +58,6 @@ class sale_advance_payment_inv(osv.osv_memory):
         return {'value': {'amount':product.list_price}}
 
     def onchange_advance_product(self, cr, uid, ids, product_id, context=None):
-        data_obj = self.pool.get('ir.model.data')
         value = {}
         value['advance'] = 'False'
         if not product_id:
@@ -67,7 +65,7 @@ class sale_advance_payment_inv(osv.osv_memory):
         product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
         value['amount'] = product.list_price
         try:
-            advance_id = data_obj.get_object_reference(cr, uid, 'sale', 'advance_product_0')[1]
+            advance_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'sale', 'advance_product_0')[1]
             if product.id ==  advance_id:
                 value['advance'] = 'True'
         finally:

From e92d187b4cc46353801d0a1e5d37e1649aca11d0 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 14 May 2012 16:56:14 +0530
Subject: [PATCH 291/452] [IMP] rename pay_type field to advance_payment_method

bzr revid: tpa@tinyerp.com-20120514112614-xc6dk5irsbmvr9ml
---
 addons/sale/wizard/sale_make_invoice_advance.py  | 12 ++++++------
 addons/sale/wizard/sale_make_invoice_advance.xml |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 46e8cdfeac4..c1f05a9e6f2 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -39,20 +39,20 @@ class sale_advance_payment_inv(osv.osv_memory):
             help="Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."),
         'amount': fields.float('Advance Amount', digits=(16, 2), required=True, help="The amount to be invoiced in advance."),
         'qtty': fields.float('Quantity', digits=(16, 2), required=True),
-        'pay_type':fields.selection([('percentage','Percentage'), ('fixed','Fixed Price')], 'Pay Type', required=True),
+        'advance_payment_method':fields.selection([('percentage','Percentage'), ('fixed','Fixed Price')], 'Pay Type', required=True),
         'advance': fields.boolean('Advance'),
     }
 
     _defaults = {
         'qtty': 1.0,
-        'pay_type': 'fixed',
+        'advance_payment_method': 'fixed',
         'product_id': _default_product_id,
     }
 
-    def onchange_pay_type(self, cr, uid, ids, pay_type,product_id, context=None):
+    def onchange_advance_payment_method(self, cr, uid, ids, advance_payment_method,product_id, context=None):
         if not product_id:
             return {'value': {'amount': 0}}
-        if pay_type == 'percentage':
+        if advance_payment_method == 'percentage':
             return {'value': {'amount':0,'product_id':False }}
         product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
         return {'value': {'amount':product.list_price}}
@@ -126,7 +126,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                     raise osv.except_osv(_('Data Insufficient !'),
                         _('Please check the Advance Amount, it should not be 0 or less!'))
                 else:
-                    if sale_adv_obj.pay_type == 'percentage':
+                    if sale_adv_obj.advance_payment_method == 'percentage':
                         final_amount = sale.amount_total * sale_adv_obj.amount / 100
                         if not res.get('name'):
                             res['name'] = "Advance of %s"%(final_amount)
@@ -182,7 +182,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                 if sale.order_policy == 'picking':
                     vals = {
                         'order_id': sale.id,
-                        'name': res.get('name')  or ("%s %s %s "%(sale_adv_obj.amount,sale_adv_obj.pay_type,"Advance.")),
+                        'name': res.get('name')  or ("%s %s %s "%(sale_adv_obj.amount,sale_adv_obj.advance_payment_method,"Advance.")),
                         'price_unit': -final_amount,
                         'product_uom_qty': sale_adv_obj.qtty or 1.0,
                         'product_uos_qty': sale_adv_obj.qtty or 1.0,
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 0c3bb031b3b..01742712668 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -8,13 +8,13 @@
             <field name="arch" type="xml">
                 <form string="Advance Invoice">
                     <group colspan="2">
-                        <field name="product_id" on_change="onchange_advance_product(product_id)" context="{'search_default_services':1}" attrs="{'invisible': [('pay_type','=','percentage')]}" />
+                        <field name="product_id" on_change="onchange_advance_product(product_id)" context="{'search_default_services':1}" attrs="{'invisible': [('advance_payment_method','=','percentage')]}" />
                     </group>
                     <newline />
                     <group colspan="2" col="6">
                         <field name="qtty" invisible="1"/>
                         <field name="amount"/>
-                        <field name="pay_type" nolabel="1" attrs="{'readonly':[('advance','=','True')]}" on_change="onchange_pay_type(pay_type,product_id)"/>
+                        <field name="advance_payment_method" nolabel="1" attrs="{'readonly':[('advance','=','True')]}" on_change="onchange_advance_payment_method(advance_payment_method,product_id)"/>
                         <field name="advance" invisible="1"/>
                     </group>
                     <newline />

From 3536f267795e490cdba70df2ba99c04753108613 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 14 May 2012 16:59:14 +0530
Subject: [PATCH 292/452] [IMP] improved erro message.

bzr revid: tpa@tinyerp.com-20120514112914-z1v8uuuv3upf1e1y
---
 addons/sale/wizard/sale_make_invoice_advance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index c1f05a9e6f2..c8c1c3b9c6a 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -113,7 +113,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                     res['account_id'] = account_id
                     if not res.get('account_id'):
                         raise osv.except_osv(_('Configuration Error !'),
-                                _('There is no income account defined '))
+                                _('There is no income account defined as global property.'))
 
                 if not res.get('account_id'):
                     raise osv.except_osv(_('Configuration Error !'),

From 6246bd0401d229bc062016c27be80e9267999bde Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 14 May 2012 17:20:13 +0530
Subject: [PATCH 293/452] [IMP] improved code.

bzr revid: tpa@tinyerp.com-20120514115013-6fofhsvmmrjfj707
---
 addons/sale/wizard/sale_make_invoice_advance.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index c8c1c3b9c6a..237d0254a1a 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -110,10 +110,11 @@ class sale_advance_payment_inv(osv.osv_memory):
                                          context=context)
                     account_id = prop and prop.id or False
                     account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, sale.fiscal_position.id or False, account_id)
-                    res['account_id'] = account_id
-                    if not res.get('account_id'):
+                    if not account_id:
                         raise osv.except_osv(_('Configuration Error !'),
                                 _('There is no income account defined as global property.'))
+                    else:
+                        res['account_id'] = account_id
 
                 if not res.get('account_id'):
                     raise osv.except_osv(_('Configuration Error !'),

From 48fa9b06cb58e37b49b60cf16f9942a9daf7af13 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 14 May 2012 16:24:49 +0200
Subject: [PATCH 294/452] [IMP] redo faceted search styles from scratch

bzr revid: xmo@openerp.com-20120514142449-m2us3n83iqp2jskb
---
 addons/web/static/src/css/base.css  | 84 ++++++++++++++--------------
 addons/web/static/src/css/base.sass | 86 ++++++++++++++---------------
 addons/web/static/src/xml/base.xml  | 18 +++---
 3 files changed, 92 insertions(+), 96 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 11095d7baf1..5b032ebed4c 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1091,9 +1091,6 @@
 .openerp .oe_searchview .oe_searchview_unfold_drawer:before {
   content: "▾";
 }
-.openerp .oe_searchview .oe_searchview_facets {
-  display: inline-block;
-}
 .openerp .oe_searchview .oe_searchview_facets:before {
   color: #cccccc;
   font-family: "mnmliconsRegular";
@@ -1102,64 +1099,63 @@
   padding: 0 1px 0 3px;
   display: inline;
 }
-.openerp .oe_searchview .oe_searchview_input {
-  height: 2em;
-  padding: 0 3px;
+.openerp .oe_searchview .oe_searchview_facets * {
+  vertical-align: top;
   display: inline-block;
+  line-height: 26px;
 }
-.openerp .oe_searchview .oe_searchview_input:focus {
+.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet {
+  height: 26px;
+}
+.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input:focus, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet:focus {
   outline: none;
 }
-.openerp .oe_searchview .oe_searchview_facet {
+.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input {
+  padding: 0 3px;
+}
+.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet {
   position: relative;
   cursor: pointer;
-  display: inline-block;
-  margin: 1px 0;
-  padding: 0;
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  -box-shadow: none;
-  text-align: left;
   border: 1px solid #afafb6;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
-  background: #f0f0fa;
-  height: 18px;
-  line-height: 18px;
-  -webkit-font-smoothing: auto;
-}
-.openerp .oe_searchview .oe_searchview_facet span {
-  display: inline-block;
-  height: 18px;
-}
-.openerp .oe_searchview .oe_searchview_facet span span {
-  border-left: 1px solid #afafb6;
-  padding: 0 4px;
-}
-.openerp .oe_searchview .oe_searchview_facet .oe_facet_remove {
-  position: absolute;
-  top: 0;
-  left: 2px;
-  color: white;
-}
-.openerp .oe_searchview .oe_searchview_facet .oe_facet_remove:hover {
-  color: #cccccc;
-}
-.openerp .oe_searchview .oe_searchview_facet .oe_facet_category {
-  padding: 0 4px 0 14px;
-  color: white;
   background: #8786b7;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4);
+  -webkit-font-smoothing: auto;
+  padding-left: 1.1em;
+  margin: 1px 0;
 }
-.openerp .oe_searchview .oe_searchview_facet:focus {
+.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet:focus {
   border-color: #a6a6fe;
   -moz-box-shadow: 0 0 3px 1px #a6a6fe;
   -webkit-box-shadow: 0 0 3px 1px #a6a6fe;
   -box-shadow: 0 0 3px 1px #a6a6fe;
 }
-.openerp .oe_searchview .oe_searchview_facet:focus .oe_facet_category {
-  margin-left: 0;
+.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_values {
+  background: #f0f0fa;
+  -moz-border-radius: 0 3px 3px 0;
+  -webkit-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+}
+.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value {
+  height: 24px;
+  padding: 1px 0.1em;
+}
+.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category {
+  color: white;
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4);
+}
+.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value {
+  border-left: 1px solid #afafb6;
+}
+.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_remove {
+  position: absolute;
+  top: 0;
+  left: 2px;
+  color: white;
+}
+.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_remove:hover {
+  color: #cccccc;
 }
 .openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer {
   display: block;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c1824427f58..1c868f107cb 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -857,7 +857,6 @@ $colour4: #8a89ba
                 content: "▾"
 
         .oe_searchview_facets
-            display: inline-block
             &:before
                 color: #ccc
                 font-family: "mnmliconsRegular"
@@ -866,56 +865,57 @@ $colour4: #8a89ba
                 padding: 0 1px 0 3px
                 display: inline
 
-        .oe_searchview_input
-            height: 2em
-            padding: 0 3px
-            display: inline-block
-            &:focus
-                outline: none
-
-        .oe_searchview_facet
-            position: relative
-            cursor: pointer
-            display: inline-block
-            margin: 1px 0
-            padding: 0
-            @include box-shadow(none)
-            text-align: left
-            border: 1px solid $facets-border
-            @include radius(3px)
-            background: #f0f0fa
-            height: 18px
-            line-height: 18px
-            -webkit-font-smoothing: auto
-
-            span
+            *
+                vertical-align: top
                 display: inline-block
-                height: 18px
-                span
-                    border-left: 1px solid $facets-border
-                    padding: 0 4px
+                line-height: 26px
 
-            .oe_facet_remove
-                position: absolute
-                top: 0
-                left: 2px
-                color: white
+            .oe_searchview_input, .oe_searchview_facet
+                height: 26px
+                &:focus
+                    outline: none
 
-                &:hover
-                    color: #ccc
+            .oe_searchview_input
+                padding: 0 3px
 
-            .oe_facet_category
-                padding: 0 4px 0 14px
-                color: white
+            .oe_searchview_facet
+                position: relative
+                cursor: pointer
+                border: 1px solid $facets-border
+                @include radius(3px)
                 background: #8786b7
-                text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4)
+                -webkit-font-smoothing: auto
+                padding-left: 1.1em
+                // spacing for opera, FF
+                margin: 1px 0
 
-            &:focus
-                border-color: $facets-border-selected
-                @include box-shadow(0 0 3px 1px $facets-border-selected)
+                &:focus
+                    border-color: $facets-border-selected
+                    @include box-shadow(0 0 3px 1px $facets-border-selected)
+
+                .oe_facet_values
+                    background: #f0f0fa
+                    @include radius(0 3px 3px 0)
+
+                .oe_facet_category, .oe_facet_value
+                    height: 24px
+                    padding: 1px 0.1em
 
                 .oe_facet_category
-                    margin-left: 0
+                    color: white
+                    text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4)
+
+                .oe_facet_value
+                    border-left: 1px solid $facets-border
+
+                .oe_facet_remove
+                    position: absolute
+                    top: 0
+                    left: 2px
+                    color: white
+
+                    &:hover
+                        color: #ccc
 
         &.oe_searchview_open_drawer
             .oe_searchview_drawer
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 1e4fe45e287..8f40db182f4 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1299,19 +1299,19 @@
 <div t-name="SearchView.InputView"
      class="oe_searchview_input"
      contenteditable="true"/>
-<button t-name="SearchView.FacetView"
-     type="button"
-     class="oe_searchview_facet">
-    <span class="oe_facet_remove">✖</span>
-
-    <span class="oe_facet_category oe_i" t-if="widget.model.has('icon')">
+<!-- tabindex: makes div focusable -->
+<div t-name="SearchView.FacetView"
+     class="oe_searchview_facet"
+     tabindex="0"
+    ><span class="oe_facet_remove">✖</span
+    ><span class="oe_facet_category oe_i" t-if="widget.model.has('icon')">
         <t t-esc="widget.model.get('icon')"/>
     </span
     ><span class="oe_facet_category" t-if="!widget.model.has('icon')">
         <t t-esc="widget.model.get('category')"/>
-    </span ><span/>
-</button>
-<span t-name="SearchView.FacetView.Value">
+    </span ><span class="oe_facet_values"
+/></div>
+<span t-name="SearchView.FacetView.Value" class="oe_facet_value">
     <t t-esc="widget.model.get('label')"/>
 </span>
 

From a14ebda56d8302521c4160ee41b88cf0b915dd1f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 14 May 2012 17:05:10 +0200
Subject: [PATCH 295/452] [FIX] focus when clicking on search view itself in FF
 and MSIE

bzr revid: xmo@openerp.com-20120514150510-jbc2nf6o3s1gv6wf
---
 addons/web/static/src/js/search.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index bce4770339b..c8ad0d12fcd 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -350,9 +350,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
             e.stopImmediatePropagation();
             self.$element.toggleClass('oe_searchview_open_drawer');
         });
-        // Focus last input if the view itself is clicked
+        // Focus last input if the view itself is clicked (empty section of
+        // facets element)
         this.$element.on('click', function (e) {
-            if (e.target === self.$element[0]) {
+            if (e.target === self.$element.find('.oe_searchview_facets')[0]) {
                 self.$element.find('.oe_searchview_input:last').focus();
             }
         });

From 865f022aa57232d1c535e7d6e35e531b1211fe87 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 14 May 2012 17:41:58 +0200
Subject: [PATCH 296/452] [FIX] handling of focusing and blurring searchview
 itself (styling) in MSIE and Firefox

bzr revid: xmo@openerp.com-20120514154158-a97vqsxav5afyquo
---
 addons/web/static/src/js/search.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index c8ad0d12fcd..a7016b9d6ef 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -132,11 +132,11 @@ my.InputView = instance.web.Widget.extend({
         return p;
     },
     onFocus: function () {
-        this.getParent().$element.trigger('focus');
+        this.trigger('focused', this);
     },
     onBlur: function () {
         this.$element.text('');
-        this.getParent().$element.trigger('blur');
+        this.trigger('blurred', this);
     },
     getSelection: function () {
         // get Text node
@@ -223,6 +223,8 @@ my.FacetView = instance.web.Widget.extend({
     },
     start: function () {
         var self = this;
+        this.$element.on('focus', function () { self.trigger('focused', self); });
+        this.$element.on('blur', function () { self.trigger('blurred', self); });
         this.$element.on('click', function (e) {
             if ($(e.target).is('.oe_facet_remove')) {
                 self.model.destroy();
@@ -357,13 +359,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                 self.$element.find('.oe_searchview_input:last').focus();
             }
         });
-        // focusing class on whole searchview, :focus is not transitive
-        this.$element.on('focus', function () {
-            self.$element.addClass('oe_focused');
-        });
-        this.$element.on('blur', function () {
-            self.$element.removeClass('oe_focused');
-        });
         // when the completion list opens/refreshes, automatically select the
         // first completion item so if the user just hits [RETURN] or [TAB] it
         // automatically selects it
@@ -506,6 +501,12 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                 this.$element.find('div.oe_searchview_input:focus')[0]));
         this.query.add(ui.item.facet, {at: input_index / 2});
     },
+    childFocused: function () {
+        this.$element.addClass('oe_focused');
+    },
+    childBlurred: function () {
+        this.$element.removeClass('oe_focused');
+    },
     /**
      *
      * @param {openerp.web.search.SearchQuery | openerp.web.search.Facet} _1
@@ -533,6 +534,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
             started.push(i.appendTo($e));
             self.input_subviews.push(i);
         }, this);
+        _.each(this.input_subviews, function (childView) {
+            childView.on('focused', self, self.proxy('childFocused'));
+            childView.on('blurred', self, self.proxy('childBlurred'));
+        });
 
         $.when.apply(null, started).then(function () {
             var input_to_focus;

From 80363141d70aa926a65b30adb058d015b5d1cde4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 15 May 2012 08:12:12 +0200
Subject: [PATCH 297/452] [IMP] iconify delete buttons for advanced filters and
 custom filters

bzr revid: xmo@openerp.com-20120515061212-b0jeuludzh4jstob
---
 addons/web/static/src/css/base.css  | 11 +++++++++++
 addons/web/static/src/css/base.sass | 25 +++++++++++++++++--------
 addons/web/static/src/js/search.js  |  5 +++--
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 5b032ebed4c..b5941bd280b 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1264,6 +1264,17 @@
 .openerp .oe_searchview .oe_searchview_drawer .oe_opened form {
   display: block;
 }
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete, .openerp .oe_searchview .oe_searchview_drawer .searchview_extended_delete_prop {
+  font-size: 1px;
+  letter-spacing: -1px;
+  color: transparent;
+}
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete:before, .openerp .oe_searchview .oe_searchview_drawer .searchview_extended_delete_prop:before {
+  font-family: "mnmliconsRegular";
+  content: "d";
+  font-size: 20px;
+  color: #404040;
+}
 .openerp .oe_view_topbar {
   border-bottom: 1px solid #cacaca;
   background-color: #fcfcfc;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 1c868f107cb..5e3f43b92c5 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -64,6 +64,18 @@ $colour4: #8a89ba
     -webkit-box-sizing: border-box
     box-sizing: border-box
 
+// Transforms the (readable) text of an inline element into an mmlicons icon,
+// allows for actual readable text in-code (and in readers?) with iconic looks
+@mixin text-to-icon($icon-name, $color: #404040)
+    font-size: 1px
+    letter-spacing: -1px
+    color: transparent
+    &:before
+        font-family: "mnmliconsRegular"
+        content: $icon-name
+        font-size: 20px
+        color: $color
+
 // }}}
 
 .openerp.openerp-web-client-container
@@ -986,14 +998,7 @@ $colour4: #8a89ba
                     display: none
 
                     button
-                        font-size: 1px
-                        letter-spacing: -1px
-                        color: transparent
-                        &:before
-                            font-family: "mnmliconsRegular"
-                            content: "S"
-                            font-size: 20px
-                            color: #404040
+                        @include text-to-icon("S")
 
             .oe_searchview_advanced
                 form
@@ -1016,6 +1021,10 @@ $colour4: #8a89ba
                     content: "▾ "
                 form
                     display: block
+
+            // delete buttons
+            .oe_searchview_custom_delete, .searchview_extended_delete_prop
+                @include text-to-icon("d")
     // }}}
     // View.topbar {{{
     .oe_view_topbar
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index a7016b9d6ef..cd26d799632 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1516,14 +1516,15 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
                                          : 'oe_searchview_custom_public')
                 .text(filter.name);
 
-            $('<button type="button">').appendTo($filter)
+            $('<button type="button" class="oe_searchview_custom_delete">')
                 .text(_t("Delete"))
                 .click(function (e) {
                     e.stopPropagation();
                     self.model.call('unlink', [id]).then(function () {
                         $filter.remove();
                     });
-                });
+                })
+                .appendTo($filter);
         }
 
         $filter.unbind('click').click(function () {

From e7fb5c93c520287c73dcce1a064d299d6c236510 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 15 May 2012 08:18:33 +0200
Subject: [PATCH 298/452] [IMP] round corners of drawer to match virtual search
 field, have drawer width match that of search field

bzr revid: xmo@openerp.com-20120515061833-zkwb0pdvkm9mnb27
---
 addons/web/static/src/css/base.css  | 7 ++++++-
 addons/web/static/src/css/base.sass | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b5941bd280b..10251f8759a 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1163,13 +1163,18 @@
 .openerp .oe_searchview .oe_searchview_drawer {
   position: absolute;
   z-index: 1;
+  margin-top: 3px;
   top: 100%;
   right: 0;
   background-color: white;
-  width: 410px;
+  width: 100%;
   display: none;
   border: 1px solid #cccccc;
   text-align: left;
+  padding-bottom: 0.5em;
+  -moz-border-radius: 1em;
+  -webkit-border-radius: 1em;
+  border-radius: 1em;
 }
 .openerp .oe_searchview .oe_searchview_drawer > div {
   border-top: 1px solid #cccccc;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5e3f43b92c5..574d00150dc 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -936,13 +936,17 @@ $colour4: #8a89ba
         .oe_searchview_drawer
             position: absolute
             z-index: 1
+            // detach drawer from field slightly
+            margin-top: 3px
             top: 100%
             right: 0
             background-color: white
-            width: 410px
+            width: 100%
             display: none
             border: 1px solid #ccc
             text-align: left
+            padding-bottom: 0.5em
+            @include radius(1em)
 
             > div
                 border-top: 1px solid #ccc

From cff21795ed673624bb47ccb5c842c49ac9829140 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 15 May 2012 08:22:54 +0200
Subject: [PATCH 299/452] [IMP] looks of advanced search: don't wrap
 propositions, stretch drawer instead

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 10251f8759a..0f66ecfa696 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1167,7 +1167,7 @@
   top: 100%;
   right: 0;
   background-color: white;
-  width: 100%;
+  min-width: 100%;
   display: none;
   border: 1px solid #cccccc;
   text-align: left;
@@ -1262,6 +1262,7 @@
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li {
   list-style: none;
   margin: 0;
+  white-space: nowrap;
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_opened h4:before {
   content: "▾ ";
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 574d00150dc..29797710efd 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -941,7 +941,7 @@ $colour4: #8a89ba
             top: 100%
             right: 0
             background-color: white
-            width: 100%
+            min-width: 100%
             display: none
             border: 1px solid #ccc
             text-align: left
@@ -1019,6 +1019,7 @@ $colour4: #8a89ba
                 li
                     list-style: none
                     margin: 0
+                    white-space: nowrap
 
             .oe_opened
                 h4:before
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8f40db182f4..fb3d03e88c6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1482,7 +1482,7 @@
     </form>
 </div>
 <div t-name="SearchView.advanced" class="oe_searchview_advanced">
-    <h4>Advanced Search...</h4>
+    <h4>Advanced Search</h4>
     <form>
         <ul>
 

From 345aaa503ddaa0eb103bdd291bc337eb19f11de9 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 15 May 2012 11:54:25 +0530
Subject: [PATCH 300/452] [IMP]crm: remove conflicts

bzr revid: dbr@tinyerp.com-20120515062425-n158ost14j62l9oo
---
 addons/crm/crm_lead.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 9e97de8359c..08cd2acb03e 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -228,21 +228,11 @@ class crm_lead(crm_case, osv.osv):
         self.create_send_note(cr, uid, [obj_id], context=context)
         return obj_id
     
-<<<<<<< TREE
-    def on_change_optin(self, cr, uid, ids, optin):
-        return {'value':{'optin':optin,'opt_out':False}}
-=======
     def on_change_opt_in(self, cr, uid, ids, opt_in):
         return {'value':{'opt_in':opt_in,'opt_out':False}}
->>>>>>> MERGE-SOURCE
 
-<<<<<<< TREE
-    def on_change_optout(self, cr, uid, ids, optout):
-        return {'value':{'opt_out':optout,'optin':False}}
-=======
     def on_change_opt_out(self, cr, uid, ids, opt_out):
         return {'value':{'opt_out':opt_out,'opt_in':False}}
->>>>>>> MERGE-SOURCE
 
     def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
         if not stage_id:

From 797361cfa15ebf7bfb920426655ab0b226d9a4b8 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 15 May 2012 12:08:22 +0530
Subject: [PATCH 301/452] [IMP]crm: remove conflicts from view file

bzr revid: dbr@tinyerp.com-20120515063822-zerahy2iigodwmvw
---
 addons/crm/crm_lead_view.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index bef141e293d..f898e8cd479 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -508,13 +508,8 @@
                     </group>
                     <group colspan="2" col="2" class="oe_form_group_label_border">
                         <separator string="Mailings" colspan="2"/>
-<<<<<<< TREE
-                        <field name="optin" on_change="on_change_optin(optin)"/>
-                        <field name="opt_out" on_change="on_change_optout(opt_out)"/>
-=======
                         <field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
                         <field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
->>>>>>> MERGE-SOURCE
                     </group>
                 </page>
                 <page string="Extra Info">

From 0416eb786d53b09537332b419d056b6c1aa251c1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 15 May 2012 08:43:40 +0200
Subject: [PATCH 302/452] [ADD] auto-completion on filters (and group-by
 filters)

bzr revid: xmo@openerp.com-20120515064340-l2kuwbf95faqy35r
---
 addons/web/static/src/js/search.js | 43 +++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index cd26d799632..f4620e84309 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -999,6 +999,7 @@ instance.web.search.Input = instance.web.search.Widget.extend( /** @lends instan
 instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends instance.web.search.FilterGroup# */{
     template: 'SearchView.filters',
     icon: 'q',
+    completion_label: _lt("Filter on: %s"),
     /**
      * Inclusive group of filters, creates a continuous "button" with clickable
      * sections (the normal display for filters is to be a self-contained button)
@@ -1032,13 +1033,19 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
             field: this
         }
     },
+    make_value: function (filter) {
+        return {
+            label: filter.attrs.string || filter.attrs.help || filter.attrs.name,
+            value: filter
+        };
+    },
     facet_for_defaults: function (defaults) {
+        var self = this;
         var fs = _(this.filters).chain()
             .filter(function (f) {
                 return f.attrs && f.attrs.name && !!defaults[f.attrs.name];
             }).map(function (f) {
-                return {label: f.attrs.string || f.attrs.help || f.attrs.name,
-                        value: f};
+                return self.make_value(f);
             }).value();
         if (_.isEmpty(fs)) { return $.when(null); }
         return $.when(this.make_facet(fs));
@@ -1098,14 +1105,38 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
         this.toggle(this.filters[$(e.target).index()]);
     },
     toggle: function (filter) {
-        this.view.query.toggle(this.make_facet([{
-            label: filter.attrs.string || filter.attrs.help || filter.attrs.name,
-            value: filter
-        }]));
+        this.view.query.toggle(this.make_facet([this.make_value(filter)]));
+    },
+    complete: function (item) {
+        var self = this;
+        item = item.toLowerCase();
+        var facet_values = _(this.filters).chain()
+            .filter(function (filter) {
+                var at = {
+                    string: filter.attrs.string || '',
+                    help: filter.attrs.help || '',
+                    name: filter.attrs.name || ''
+                };
+                var include = _.str.include;
+                return include(at.string.toLowerCase(), item)
+                    || include(at.help.toLowerCase(), item)
+                    || include(at.name.toLowerCase(), item);
+            })
+            .map(this.make_value)
+            .value();
+        if (_(facet_values).isEmpty()) { return $.when(null); }
+        return $.when(_.map(facet_values, function (facet_value) {
+            return {
+                label: _.str.sprintf(self.completion_label.toString(),
+                                     facet_value.label),
+                facet: self.make_facet([facet_value])
+            }
+        }));
     }
 });
 instance.web.search.GroupbyGroup = instance.web.search.FilterGroup.extend({
     icon: 'w',
+    completion_label: _lt("Group by: %s"),
     init: function (filters, view) {
         this._super(filters, view);
         // Not flanders: facet unicity is handled through the

From 26b4c5a8324bfb0521b7ece231f7370b91b7108c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 15 May 2012 09:07:04 +0200
Subject: [PATCH 303/452] [REM] visualsearch lib from our source

bzr revid: xmo@openerp.com-20120515070704-kmms0mq20gdemysv
---
 addons/web/static/lib/visualsearch/LICENSE    |   22 -
 addons/web/static/lib/visualsearch/README     |   16 -
 addons/web/static/lib/visualsearch/Rakefile   |   37 -
 addons/web/static/lib/visualsearch/assets.yml |   28 -
 .../build/visualsearch-datauri.css            |  310 ---
 .../lib/visualsearch/build/visualsearch.css   |  310 ---
 .../lib/visualsearch/build/visualsearch.js    | 1845 -----------------
 addons/web/static/lib/visualsearch/demo.html  |  453 ----
 addons/web/static/lib/visualsearch/index.html |  537 -----
 9 files changed, 3558 deletions(-)
 delete mode 100755 addons/web/static/lib/visualsearch/LICENSE
 delete mode 100755 addons/web/static/lib/visualsearch/README
 delete mode 100755 addons/web/static/lib/visualsearch/Rakefile
 delete mode 100755 addons/web/static/lib/visualsearch/assets.yml
 delete mode 100755 addons/web/static/lib/visualsearch/build/visualsearch-datauri.css
 delete mode 100755 addons/web/static/lib/visualsearch/build/visualsearch.css
 delete mode 100755 addons/web/static/lib/visualsearch/build/visualsearch.js
 delete mode 100755 addons/web/static/lib/visualsearch/demo.html
 delete mode 100755 addons/web/static/lib/visualsearch/index.html

diff --git a/addons/web/static/lib/visualsearch/LICENSE b/addons/web/static/lib/visualsearch/LICENSE
deleted file mode 100755
index fe0ea1154c4..00000000000
--- a/addons/web/static/lib/visualsearch/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2011 Samuel Clay, @samuelclay, DocumentCloud
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/addons/web/static/lib/visualsearch/README b/addons/web/static/lib/visualsearch/README
deleted file mode 100755
index c059a9824d6..00000000000
--- a/addons/web/static/lib/visualsearch/README
+++ /dev/null
@@ -1,16 +0,0 @@
- __      ___                 _  _____                     _       _     
- \ \    / (_)               | |/ ____|                   | |     (_)    
-  \ \  / / _ ___ _   _  __ _| | (___   ___  __ _ _ __ ___| |__    _ ___ 
-   \ \/ / | / __| | | |/ _` | |\___ \ / _ \/ _` | '__/ __| '_ \  | / __|
-    \  /  | \__ \ |_| | (_| | |____) |  __/ (_| | | | (__| | | |_| \__ \
-     \/   |_|___/\__,_|\__,_|_|_____/ \___|\__,_|_|  \___|_| |_(_) |___/
-                                                                _/ |    
-                                                               |__/    
-                                                               
-VisualSearch.js enhances ordinary search boxes with the ability to autocomplete 
-faceted search queries. Specify the facets for completion, along with the
-completable values for any facet. You can retrieve the search query as a 
-structured object, so you don't have to parse the query string yourself.
-
-For documentation, pre-packed downloads, demos, and tests, see:
-http://documentcloud.github.com/visualsearch
\ No newline at end of file
diff --git a/addons/web/static/lib/visualsearch/Rakefile b/addons/web/static/lib/visualsearch/Rakefile
deleted file mode 100755
index 192a50b944e..00000000000
--- a/addons/web/static/lib/visualsearch/Rakefile
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'rubygems'
-require 'jammit'
-require 'fileutils'
-
-desc "Use Jammit to compile the multiple versions of Visual Search"
-task :build do
-  $VS_MIN = false
-  Jammit.package!({
-    :config_path   => "assets.yml",
-    :output_folder => "build"
-  })
-  
-  $VS_MIN = true
-  Jammit.package!({
-    :config_path   => "assets.yml",
-    :output_folder => "build-min"
-  })
-  
-  # Move the JSTs back to lib to accomodate the demo page.
-  FileUtils.mv("build/visualsearch_templates.js", "lib/js/templates/templates.js")
-      
-  # Fix image url paths.
-  ['build', 'build-min'].each do |build|
-    File.open("#{build}/visualsearch.css", 'r+') do |file|
-      css = file.read
-      css.gsub!(/url\((.*?)images\/embed\/icons/, 'url(../images/embed/icons')
-      file.rewind
-      file.write(css)
-      file.truncate(css.length)
-    end
-  end
-end
-
-desc "Build the docco documentation"
-task :docs do
-  sh "docco lib/js/*.js lib/js/**/*.js"
-end
diff --git a/addons/web/static/lib/visualsearch/assets.yml b/addons/web/static/lib/visualsearch/assets.yml
deleted file mode 100755
index 357c37c74aa..00000000000
--- a/addons/web/static/lib/visualsearch/assets.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-embed_assets:           datauri
-javascript_compressor:  closure
-template_function:      _.template
-gzip_assets:            <% if $VS_MIN %>on<% else %>off<% end %>
-compress_assets:        <% if $VS_MIN %>on<% else %>off<% end %>
-
-javascripts:
-  dependencies:
-    - vendor/jquery-*.js
-    - vendor/jquery.ui.core.js
-    - vendor/jquery.ui.widget.js
-    - vendor/jquery.ui.position.js
-    - vendor/jquery.ui.*.js
-    - vendor/underscore-*.js
-    - vendor/backbone-*.js
-  visualsearch:
-    - lib/js/visualsearch.js
-    - lib/js/views/*.js
-    - lib/js/utils/*.js
-    - lib/js/models/*.js
-    - lib/js/templates/*.jst
-  <% unless $VS_MIN %>visualsearch_templates:
-    - lib/js/templates/*.jst
-  <% end %>
-
-stylesheets:
-  visualsearch:
-    - lib/css/*.css
\ No newline at end of file
diff --git a/addons/web/static/lib/visualsearch/build/visualsearch-datauri.css b/addons/web/static/lib/visualsearch/build/visualsearch-datauri.css
deleted file mode 100755
index 3e3edd0063f..00000000000
--- a/addons/web/static/lib/visualsearch/build/visualsearch-datauri.css
+++ /dev/null
@@ -1,310 +0,0 @@
-.VS-search .VS-icon {
-  background-repeat: no-repeat;
-  background-position: center center;
-  vertical-align: middle;
-  width: 16px; height: 16px;
-}
-  .VS-search .VS-icon-cancel {
-    width: 11px; height: 11px;
-    background-position: center 0;
-    background-image: url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAWCAYAAAAW5GZjAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAb9JREFUeNqUUr1qAkEQ3j0khQp6kihaeGgEEa18gTQR0iRY+BaBSMDGwidIEUKqFL6BopgqBAJ5AMFGjUU0d4WHEvwJarvZ77gRIzGYgb1hZr+Z75vZ40IIzqTNZrPj8Xicn0wmmcViEXS73aaqqq+BQODG6/W+A8MBNk3zfDAY3C6Xy0O2ZS6X6zMSiVwHg8FHLjtq7Xb7RQKj7BeTzVCgJ5PJU2U0GhUk7REuMpkMi8fjFggeMeecrVYrFRId0CgTAgDDMFg4HLbA8IjJgHNgGEr0er0fQIphUmZAwdSUADUB4RFDsz3oSMF6CLzZkQqgGebz+Z75dDqNdTqdp13bgDmdTj2VSp0oWHg0Gr2UNH2Z/9o+yMv7K4/HY/C/XhDUfr//jl7QQVT9fp/V63VWqVRYt9tliUSCZbPZg1wux9Lp9PqFeK1Wu9A0DdXz7YM87i0FrVZLs4Fi1wmFQh/NZjOmVKvVgq7rR/QflMtlixGedjwcDlUpMQ9tbzalkAAB2/R297mNW+sT2wUbUnA//V/nYrH4QOBNABUQuFQq3TNMuc82sDVrz41G42yvPeODAwZQ0QzwiJEnzLcAAwBJ6WXlwoBgZAAAAABJRU5ErkJggg==");
-    cursor: pointer;
-  }
-    .VS-search .VS-icon-cancel:hover {
-      background-position: center -11px;
-    }
-  .VS-search .VS-icon-search {
-    width: 12px; height: 12px;
-    background-image: url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAUZJREFUeNpUUM2qgmAQzS8NiUgLzTIXLZQW1QuI9AY9QPSW9gQ9QiriwpJQEBVrVWT2d7p2L9xZzDdzZs7M+YYqy/J8Ptu2vd/v4zgeDAaqqk4mE47jar9GnU6nzWbjOA5FUa/Xq0Jns9l8Pud5vkpp58cwAOzhcBhFkeu6GNztdg3D+Db5vo9nOp2iiWGYTqdDCMFe4LquI0aVpGmKR9M0lmUbjQY8YiBJklTb4YkoilBzOBzq9TogeMQIJEmqmlAlo9EIyXa7tSyrKAp4xEBkWUb5q2k8Hh+PR8/zwjCEgufz+aESstvtoKnVan2GgY31kBkEAfT1ej1FUZDiNIIgrFYr9H1ug3teLpfH43G/3/FBUJGu1+s8z8FZLpc0mmiabrfbf5fEumazuVgsTNO8Xq+3242qRNT+G0CMz7IMzH6//xZgAA60tj6rqzxpAAAAAElFTkSuQmCC");
-  }
-
-/*------------------------------ RESET + DEFAULT STYLES ---------------------------------*/
-
-/* 
-Eric Meyer's final reset.css
-Source: http://meyerweb.com/eric/thoughts/2007/05/01/reset-reloaded/ 
-*/
-.VS-search div, .VS-search span, .VS-search a, .VS-search img, 
-.VS-search ul, .VS-search li, .VS-search form, .VS-search label,
-.VS-interface ul, .VS-interface li, .VS-interface {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  outline: 0;
-  font-weight: inherit;
-  font-style: inherit;
-  font-size: 100%;
-  font-family: inherit;
-  vertical-align: baseline;
-}
-
-.VS-search :focus {
-  outline: 0;
-}
-.VS-search {
-  line-height: 1;
-  color: black;
-}
-.VS-search ol, .VS-search ul {
-  list-style: none;
-}
-
-/* ===================== */
-/* = General and Reset = */
-/* ===================== */
-
-.VS-search {
-  font-family: Arial, sans-serif;
-  color: #373737;
-  font-size: 12px;
-}
-.VS-search input {
-  display: block;
-  border: none;
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-  outline: none;
-  margin: 0; padding: 4px;
-  background: transparent;
-  font-size: 16px;
-  line-height: 20px;
-  width: 100%;
-}
-.VS-interface, .VS-search .dialog, .VS-search input {
-  font-family: "Lucida Grande", "Lucida Sans Unicode", Helvetica, Arial, sans-serif !important;
-  line-height: 1.1em;
-}
-
-/* ========== */
-/* = Layout = */
-/* ========== */
-
-.VS-search .VS-search-box {
-  cursor: text;
-  position: relative;
-  background: transparent;
-  border: 2px solid #ccc;
-  border-radius: 16px; -webkit-border-radius: 16px; -moz-border-radius: 16px;
-  background-color: #fafafa;
-  -webkit-box-shadow: inset 0px 0px 3px #ccc;
-  -moz-box-shadow: inset 0px 0px 3px #ccc;
-  box-shadow: inset 0px 0px 3px #ccc;
-  min-height: 28px;
-  height: auto;
-}
-  .VS-search .VS-search-box.VS-focus {
-    border-color: #acf;
-    -webkit-box-shadow: inset 0px 0px 3px #acf;
-    -moz-box-shadow: inset 0px 0px 3px #acf;
-    box-shadow: inset 0px 0px 3px #acf;
-  }
-  .VS-search .VS-search-inner {
-    position: relative;
-    margin: 0 20px 0 22px;
-    overflow: hidden;
-  }
-  .VS-search input {
-    width: 100px;
-  }
-  .VS-search input,
-  .VS-search .VS-input-width-tester {
-    padding: 6px 0;
-    float: left;
-    color: #808080;
-    font: 13px/17px Helvetica, Arial;
-  }
-  .VS-search.VS-focus input {
-    color: #606060;
-  }
-  .VS-search .VS-icon-search {
-    position: absolute;
-    left: 9px; top: 8px;
-  }
-  .VS-search .VS-icon-cancel {
-    position: absolute;
-    right: 9px; top: 8px;
-  }
-
-/* ================ */
-/* = Search Facet = */
-/* ================ */
-
-.VS-search .search_facet {
-  float: left;
-  margin: 0;
-  padding: 0 0 0 14px;
-  position: relative;
-  border: 1px solid transparent;
-  height: 20px;
-  margin: 3px -3px 3px 0;
-}
-  .VS-search .search_facet.is_selected {
-    margin-left: -3px;
-    -webkit-border-radius: 16px;
-    -moz-border-radius: 16px;
-    border-radius: 16px;
-    background-color: #d2e6fd;
-    background-image: -moz-linear-gradient(top, #d2e6fd, #b0d1f9); /* FF3.6 */
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#d2e6fd), to(#b0d1f9)); /* Saf4+, Chrome */
-    background-image: linear-gradient(top, #d2e6fd, #b0d1f9);
-    border: 1px solid #6eadf5;
-  }
-  .VS-search .search_facet .category {
-    float: left;
-    text-transform: uppercase;
-    font-weight: bold;
-    font-size: 10px;
-    color: #808080;
-    padding: 8px 0 5px;
-    line-height: 13px;
-    cursor: pointer;
-    padding: 4px 0 0;
-  }
-  .VS-search .search_facet.is_selected .category {
-    margin-left: 3px;
-  }
-  .VS-search .search_facet .search_facet_input_container {
-    float: left;
-  }
-  .VS-search .search_facet input {
-    margin: 0;
-    padding: 0;
-    color: #000;
-    font-size: 13px;
-    line-height: 16px;
-    padding: 5px 0 5px 4px;
-    height: 16px;
-    width: auto;
-    z-index: 100;
-    position: relative;
-    padding-top: 1px;
-    padding-bottom: 2px;
-    padding-right: 3px;
-
-  }
-  .VS-search .search_facet.is_editing input,
-  .VS-search .search_facet.is_selected input {
-    color: #000;
-  }
-  .VS-search .search_facet .search_facet_remove {
-    position: absolute;
-    left: 0;
-    top: 4px;
-  }
-    .VS-search .search_facet.is_selected .search_facet_remove {
-      opacity: 0.4;
-      left: 3px;
-      filter: alpha(opacity=40);
-      background-position: center -11px;
-    }
-    .VS-search .search_facet .search_facet_remove:hover {
-      opacity: 1;
-    }
-  .VS-search .search_facet.is_editing .category,
-  .VS-search .search_facet.is_selected .category {
-    color: #000;
-  }
-  .VS-search .search_facet.search_facet_maybe_delete .category,
-  .VS-search .search_facet.search_facet_maybe_delete input {
-    color: darkred;
-  }
-
-/* ================ */
-/* = Search Input = */
-/* ================ */
-
-.VS-search .search_input {
-  height: 28px;
-  float: left;
-  margin-left: -1px;
-}
-  .VS-search .search_input input {
-    padding: 6px 3px 6px 2px;
-    line-height: 10px;
-    height: 22px;
-    margin-top: -4px;
-    width: 10px;
-    z-index: 100;
-    min-width: 4px;
-    position: relative;
-  }
-  .VS-search .search_input.is_editing input {
-    color: #202020;
-  }
-
-/* ================ */
-/* = Autocomplete = */
-/* ================ */
-
-.VS-interface.ui-autocomplete {
-  position: absolute;
-  border: 1px solid #C0C0C0;
-  border-top: 1px solid #D9D9D9;
-  background-color: #F6F6F6;
-  cursor: pointer;
-  z-index: 10000;
-  padding: 0;
-  margin: 0;
-  width: auto;
-  min-width: 80px;
-  max-width: 220px;
-  max-height: 240px;
-  overflow-y: auto;
-  overflow-x: hidden;
-  font-size: 13px;
-  top: 5px;
-  opacity: 0.97;
-  box-shadow: 3px 4px 5px -2px rgba(0, 0, 0, 0.5); -webkit-box-shadow: 3px 4px 5px -2px rgba(0, 0, 0, 0.5); -moz-box-shadow: 3px 4px 5px -2px rgba(0, 0, 0, 0.5);
-}
-  .VS-interface.ui-autocomplete .ui-autocomplete-category {
-    text-transform: capitalize;
-    font-size: 11px;
-    padding: 4px 4px 4px;
-    border-top: 1px solid #A2A2A2;
-    border-bottom: 1px solid #A2A2A2;
-    background-color: #B7B7B7;
-    text-shadow: 0 -1px 0 #999;
-    font-weight: bold;
-    color: white;
-    cursor: default;
-  }
-  .VS-interface.ui-autocomplete .ui-menu-item {
-      float: none;
-  }
-  .VS-interface.ui-autocomplete .ui-menu-item a {
-    color: #000;
-    outline: none;
-    display: block;
-    padding: 3px 4px 5px;
-    border-radius: none;
-    line-height: 1;
-    background-color: #F8F8F8;
-    background-image: -moz-linear-gradient(top, #F8F8F8, #F3F3F3); /* FF3.6 */
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#F8F8F8), to(#F3F3F3)); /* Saf4+, Chrome */
-    background-image: linear-gradient(top, #F8F8F8, #F3F3F3);
-    border-top: 1px solid #FAFAFA;
-    border-bottom: 1px solid #f0f0f0;
-  }
-  .VS-interface.ui-autocomplete .ui-menu-item a:active {
-    outline: none;
-  }
-  .VS-interface.ui-autocomplete .ui-menu-item .ui-state-hover {
-    background-color: #6483F7;
-    background-image: -moz-linear-gradient(top, #648bF5, #2465f3); /* FF3.6 */
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#648bF5), to(#2465f3)); /* Saf4+, Chrome */
-    background-image: linear-gradient(top, #648bF5, #2465f3);
-    border-top: 1px solid #5b83ec;
-    border-bottom: 1px solid #1459e9;
-    border-left: none;
-    border-right: none;
-    color: white;
-    margin: 0;
-  }
-  .VS-interface.ui-autocomplete .ui-corner-all {
-    border-radius: 0;
-  }
-  .VS-interface.ui-autocomplete li {
-    list-style: none;
-    width: auto;
-  }
diff --git a/addons/web/static/lib/visualsearch/build/visualsearch.css b/addons/web/static/lib/visualsearch/build/visualsearch.css
deleted file mode 100755
index 079ff122300..00000000000
--- a/addons/web/static/lib/visualsearch/build/visualsearch.css
+++ /dev/null
@@ -1,310 +0,0 @@
-.VS-search .VS-icon {
-  background-repeat: no-repeat;
-  background-position: center center;
-  vertical-align: middle;
-  width: 16px; height: 16px;
-}
-  .VS-search .VS-icon-cancel {
-    width: 11px; height: 11px;
-    background-position: center 0;
-    background-image: url(../images/embed/icons/cancel_search.png?1311104738);
-    cursor: pointer;
-  }
-    .VS-search .VS-icon-cancel:hover {
-      background-position: center -11px;
-    }
-  .VS-search .VS-icon-search {
-    width: 12px; height: 12px;
-    background-image: url(../images/embed/icons/search_glyph.png?1311104738);
-  }
-
-/*------------------------------ RESET + DEFAULT STYLES ---------------------------------*/
-
-/* 
-Eric Meyer's final reset.css
-Source: http://meyerweb.com/eric/thoughts/2007/05/01/reset-reloaded/ 
-*/
-.VS-search div, .VS-search span, .VS-search a, .VS-search img, 
-.VS-search ul, .VS-search li, .VS-search form, .VS-search label,
-.VS-interface ul, .VS-interface li, .VS-interface {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  outline: 0;
-  font-weight: inherit;
-  font-style: inherit;
-  font-size: 100%;
-  font-family: inherit;
-  vertical-align: baseline;
-}
-
-.VS-search :focus {
-  outline: 0;
-}
-.VS-search {
-  line-height: 1;
-  color: black;
-}
-.VS-search ol, .VS-search ul {
-  list-style: none;
-}
-
-/* ===================== */
-/* = General and Reset = */
-/* ===================== */
-
-.VS-search {
-  font-family: Arial, sans-serif;
-  color: #373737;
-  font-size: 12px;
-}
-.VS-search input {
-  display: block;
-  border: none;
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-  outline: none;
-  margin: 0; padding: 4px;
-  background: transparent;
-  font-size: 16px;
-  line-height: 20px;
-  width: 100%;
-}
-.VS-interface, .VS-search .dialog, .VS-search input {
-  font-family: "Lucida Grande", "Lucida Sans Unicode", Helvetica, Arial, sans-serif !important;
-  line-height: 1.1em;
-}
-
-/* ========== */
-/* = Layout = */
-/* ========== */
-
-.VS-search .VS-search-box {
-  cursor: text;
-  position: relative;
-  background: transparent;
-  border: 2px solid #ccc;
-  border-radius: 16px; -webkit-border-radius: 16px; -moz-border-radius: 16px;
-  background-color: #fafafa;
-  -webkit-box-shadow: inset 0px 0px 3px #ccc;
-  -moz-box-shadow: inset 0px 0px 3px #ccc;
-  box-shadow: inset 0px 0px 3px #ccc;
-  min-height: 28px;
-  height: auto;
-}
-  .VS-search .VS-search-box.VS-focus {
-    border-color: #acf;
-    -webkit-box-shadow: inset 0px 0px 3px #acf;
-    -moz-box-shadow: inset 0px 0px 3px #acf;
-    box-shadow: inset 0px 0px 3px #acf;
-  }
-  .VS-search .VS-search-inner {
-    position: relative;
-    margin: 0 20px 0 22px;
-    overflow: hidden;
-  }
-  .VS-search input {
-    width: 100px;
-  }
-  .VS-search input,
-  .VS-search .VS-input-width-tester {
-    padding: 6px 0;
-    float: left;
-    color: #808080;
-    font: 13px/17px Helvetica, Arial;
-  }
-  .VS-search.VS-focus input {
-    color: #606060;
-  }
-  .VS-search .VS-icon-search {
-    position: absolute;
-    left: 9px; top: 8px;
-  }
-  .VS-search .VS-icon-cancel {
-    position: absolute;
-    right: 9px; top: 8px;
-  }
-
-/* ================ */
-/* = Search Facet = */
-/* ================ */
-
-.VS-search .search_facet {
-  float: left;
-  margin: 0;
-  padding: 0 0 0 14px;
-  position: relative;
-  border: 1px solid transparent;
-  height: 20px;
-  margin: 3px -3px 3px 0;
-}
-  .VS-search .search_facet.is_selected {
-    margin-left: -3px;
-    -webkit-border-radius: 16px;
-    -moz-border-radius: 16px;
-    border-radius: 16px;
-    background-color: #d2e6fd;
-    background-image: -moz-linear-gradient(top, #d2e6fd, #b0d1f9); /* FF3.6 */
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#d2e6fd), to(#b0d1f9)); /* Saf4+, Chrome */
-    background-image: linear-gradient(top, #d2e6fd, #b0d1f9);
-    border: 1px solid #6eadf5;
-  }
-  .VS-search .search_facet .category {
-    float: left;
-    text-transform: uppercase;
-    font-weight: bold;
-    font-size: 10px;
-    color: #808080;
-    padding: 8px 0 5px;
-    line-height: 13px;
-    cursor: pointer;
-    padding: 4px 0 0;
-  }
-  .VS-search .search_facet.is_selected .category {
-    margin-left: 3px;
-  }
-  .VS-search .search_facet .search_facet_input_container {
-    float: left;
-  }
-  .VS-search .search_facet input {
-    margin: 0;
-    padding: 0;
-    color: #000;
-    font-size: 13px;
-    line-height: 16px;
-    padding: 5px 0 5px 4px;
-    height: 16px;
-    width: auto;
-    z-index: 100;
-    position: relative;
-    padding-top: 1px;
-    padding-bottom: 2px;
-    padding-right: 3px;
-
-  }
-  .VS-search .search_facet.is_editing input,
-  .VS-search .search_facet.is_selected input {
-    color: #000;
-  }
-  .VS-search .search_facet .search_facet_remove {
-    position: absolute;
-    left: 0;
-    top: 4px;
-  }
-    .VS-search .search_facet.is_selected .search_facet_remove {
-      opacity: 0.4;
-      left: 3px;
-      filter: alpha(opacity=40);
-      background-position: center -11px;
-    }
-    .VS-search .search_facet .search_facet_remove:hover {
-      opacity: 1;
-    }
-  .VS-search .search_facet.is_editing .category,
-  .VS-search .search_facet.is_selected .category {
-    color: #000;
-  }
-  .VS-search .search_facet.search_facet_maybe_delete .category,
-  .VS-search .search_facet.search_facet_maybe_delete input {
-    color: darkred;
-  }
-
-/* ================ */
-/* = Search Input = */
-/* ================ */
-
-.VS-search .search_input {
-  height: 28px;
-  float: left;
-  margin-left: -1px;
-}
-  .VS-search .search_input input {
-    padding: 6px 3px 6px 2px;
-    line-height: 10px;
-    height: 22px;
-    margin-top: -4px;
-    width: 10px;
-    z-index: 100;
-    min-width: 4px;
-    position: relative;
-  }
-  .VS-search .search_input.is_editing input {
-    color: #202020;
-  }
-
-/* ================ */
-/* = Autocomplete = */
-/* ================ */
-
-.VS-interface.ui-autocomplete {
-  position: absolute;
-  border: 1px solid #C0C0C0;
-  border-top: 1px solid #D9D9D9;
-  background-color: #F6F6F6;
-  cursor: pointer;
-  z-index: 10000;
-  padding: 0;
-  margin: 0;
-  width: auto;
-  min-width: 80px;
-  max-width: 220px;
-  max-height: 240px;
-  overflow-y: auto;
-  overflow-x: hidden;
-  font-size: 13px;
-  top: 5px;
-  opacity: 0.97;
-  box-shadow: 3px 4px 5px -2px rgba(0, 0, 0, 0.5); -webkit-box-shadow: 3px 4px 5px -2px rgba(0, 0, 0, 0.5); -moz-box-shadow: 3px 4px 5px -2px rgba(0, 0, 0, 0.5);
-}
-  .VS-interface.ui-autocomplete .ui-autocomplete-category {
-    text-transform: capitalize;
-    font-size: 11px;
-    padding: 4px 4px 4px;
-    border-top: 1px solid #A2A2A2;
-    border-bottom: 1px solid #A2A2A2;
-    background-color: #B7B7B7;
-    text-shadow: 0 -1px 0 #999;
-    font-weight: bold;
-    color: white;
-    cursor: default;
-  }
-  .VS-interface.ui-autocomplete .ui-menu-item {
-      float: none;
-  }
-  .VS-interface.ui-autocomplete .ui-menu-item a {
-    color: #000;
-    outline: none;
-    display: block;
-    padding: 3px 4px 5px;
-    border-radius: none;
-    line-height: 1;
-    background-color: #F8F8F8;
-    background-image: -moz-linear-gradient(top, #F8F8F8, #F3F3F3); /* FF3.6 */
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#F8F8F8), to(#F3F3F3)); /* Saf4+, Chrome */
-    background-image: linear-gradient(top, #F8F8F8, #F3F3F3);
-    border-top: 1px solid #FAFAFA;
-    border-bottom: 1px solid #f0f0f0;
-  }
-  .VS-interface.ui-autocomplete .ui-menu-item a:active {
-    outline: none;
-  }
-  .VS-interface.ui-autocomplete .ui-menu-item .ui-state-hover {
-    background-color: #6483F7;
-    background-image: -moz-linear-gradient(top, #648bF5, #2465f3); /* FF3.6 */
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#648bF5), to(#2465f3)); /* Saf4+, Chrome */
-    background-image: linear-gradient(top, #648bF5, #2465f3);
-    border-top: 1px solid #5b83ec;
-    border-bottom: 1px solid #1459e9;
-    border-left: none;
-    border-right: none;
-    color: white;
-    margin: 0;
-  }
-  .VS-interface.ui-autocomplete .ui-corner-all {
-    border-radius: 0;
-  }
-  .VS-interface.ui-autocomplete li {
-    list-style: none;
-    width: auto;
-  }
diff --git a/addons/web/static/lib/visualsearch/build/visualsearch.js b/addons/web/static/lib/visualsearch/build/visualsearch.js
deleted file mode 100755
index 319d978db3c..00000000000
--- a/addons/web/static/lib/visualsearch/build/visualsearch.js
+++ /dev/null
@@ -1,1845 +0,0 @@
-// This is the annotated source code for
-// [VisualSearch.js](http://documentcloud.github.com/visualsearch/),
-// a rich search box for real data.
-// 
-// The annotated source HTML is generated by
-// [Docco](http://jashkenas.github.com/docco/).
-
-/** @license VisualSearch.js 0.2.2
- *  (c) 2011 Samuel Clay, @samuelclay, DocumentCloud Inc.
- *  VisualSearch.js may be freely distributed under the MIT license.
- *  For all details and documentation:
- *  http://documentcloud.github.com/visualsearch
- */
-
-(function() {
-
-  var $ = jQuery; // Handle namespaced jQuery
-
-  // Setting up VisualSearch globals. These will eventually be made instance-based.
-  if (!window.VS) window.VS = {};
-  if (!VS.app)    VS.app    = {};
-  if (!VS.ui)     VS.ui     = {};
-  if (!VS.model)  VS.model  = {};
-  if (!VS.utils)  VS.utils  = {};
-
-  // Sets the version for VisualSearch to be used programatically elsewhere.
-  VS.VERSION = '0.2.2';
-
-  VS.VisualSearch = function(options) {
-    var defaults = {
-      container   : '',
-      query       : '',
-      unquotable  : [],
-      callbacks   : {
-        search          : $.noop,
-        focus           : $.noop,
-        blur            : $.noop,
-        facetMatches    : $.noop,
-        valueMatches    : $.noop
-      }
-    };
-    this.options           = _.extend({}, defaults, options);
-    this.options.callbacks = _.extend({}, defaults.callbacks, options.callbacks);
-
-    VS.app.hotkeys.initialize();
-    this.searchQuery   = new VS.model.SearchQuery();
-    this.searchBox     = new VS.ui.SearchBox({app: this});
-
-    if (options.container) {
-      var searchBox = this.searchBox.render().el;
-      $(this.options.container).html(searchBox);
-    }
-    this.searchBox.value(this.options.query || '');
-
-    // Disable page caching for browsers that incorrectly cache the visual search inputs.
-    // This is forced the browser to re-render the page when it is retrieved in its history.
-    $(window).bind('unload', function(e) {});
-
-    // Gives the user back a reference to the `searchBox` so they
-    // can use public methods.
-    return this;
-  };
-
-  // Entry-point used to tie all parts of VisualSearch together. It will either attach
-  // itself to `options.container`, or pass back the `searchBox` so it can be rendered
-  // at will.
-  VS.init = function(options) {
-    return new VS.VisualSearch(options);
-  };
-
-})();
-(function() {
-
-var $ = jQuery; // Handle namespaced jQuery
-
-// The search box is responsible for managing the many facet views and input views.
-VS.ui.SearchBox = Backbone.View.extend({
-
-  id  : 'search',
-
-  events : {
-    'click .VS-cancel-search-box' : 'clearSearch',
-    'mousedown .VS-search-box'    : 'maybeFocusSearch',
-    'dblclick .VS-search-box'     : 'highlightSearch',
-    'click .VS-search-box'        : 'maybeTripleClick'
-  },
-
-  // Creating a new SearchBox registers handlers for re-rendering facets when necessary,
-  // as well as handling typing when a facet is selected.
-  initialize : function() {
-    this.app = this.options.app;
-    this.flags = {
-      allSelected : false
-    };
-    this.facetViews = [];
-    this.inputViews = [];
-    _.bindAll(this, 'renderFacets', '_maybeDisableFacets', 'disableFacets',
-              'deselectAllFacets', 'addedFacet', 'removedFacet', 'changedFacet');
-    this.app.searchQuery
-            .bind('reset', this.renderFacets)
-            .bind('add', this.addedFacet)
-            .bind('remove', this.removedFacet)
-            .bind('change', this.changedFacet);
-    $(document).bind('keydown', this._maybeDisableFacets);
-  },
-
-  // Renders the search box, but requires placement on the page through `this.el`.
-  render : function() {
-    $(this.el).append(JST['search_box']({}));
-    $(document.body).setMode('no', 'search');
-
-    return this;
-  },
-
-  // # Querying Facets #
-
-  // Either gets a serialized query string or sets the faceted query from a query string.
-  value : function(query) {
-    if (query == null) return this.serialize();
-    return this.setQuery(query);
-  },
-
-  // Uses the VS.app.searchQuery collection to serialize the current query from the various
-  // facets that are in the search box.
-  serialize : function() {
-    var query           = [];
-    var inputViewsCount = this.inputViews.length;
-
-    this.app.searchQuery.each(_.bind(function(facet, i) {
-      query.push(this.inputViews[i].value());
-      query.push(facet.serialize());
-    }, this));
-
-    if (inputViewsCount) {
-      query.push(this.inputViews[inputViewsCount-1].value());
-    }
-
-    return _.compact(query).join(' ');
-  },
-
-  // Takes a query string and uses the SearchParser to parse and render it. Note that
-  // `VS.app.SearchParser` refreshes the `VS.app.searchQuery` collection, which is bound
-  // here to call `this.renderFacets`.
-  setQuery : function(query) {
-    this.currentQuery = query;
-    VS.app.SearchParser.parse(this.app, query);
-  },
-
-  // Returns the position of a facet/input view. Useful when moving between facets.
-  viewPosition : function(view) {
-    var views    = view.type == 'facet' ? this.facetViews : this.inputViews;
-    var position = _.indexOf(views, view);
-    if (position == -1) position = 0;
-    return position;
-  },
-
-  // Used to launch a search. Hitting enter or clicking the search button.
-  searchEvent : function(e) {
-    var query = this.value();
-    this.focusSearch(e);
-    this.value(query);
-    this.app.options.callbacks.search(query, this.app.searchQuery);
-  },
-
-  // # Rendering Facets #
-
-  // Add a new facet. Facet will be focused and ready to accept a value. Can also
-  // specify position, in the case of adding facets from an inbetween input.
-  addFacet : function(category, initialQuery, position) {
-    category     = VS.utils.inflector.trim(category);
-    initialQuery = VS.utils.inflector.trim(initialQuery || '');
-    if (!category) return;
-    
-    var model = new VS.model.SearchFacet({
-      category : category,
-      value    : initialQuery || '',
-      app      : this.app
-    });
-    this.app.searchQuery.add(model, {at: position});
-  },
-
-  // Renders a newly added facet, and selects it.
-  addedFacet : function (model) {
-    this.renderFacets();
-    var facetView = _.detect(this.facetViews, function(view) {
-      if (view.model == model) return true;
-    });
-
-    _.defer(function() {
-      facetView.enableEdit();
-    });
-  },
-
-  // Changing a facet programmatically re-renders it.
-  changedFacet: function () {
-    this.renderFacets();
-  },
-
-  // When removing a facet, potentially do something. For now, the adjacent
-  // remaining facet is selected, but this is handled by the facet's view,
-  // since its position is unknown by the time the collection triggers this
-  // remove callback.
-  removedFacet : function (facet, query, options) {},
-
-  // Renders each facet as a searchFacet view.
-  renderFacets : function() {
-    this.facetViews = [];
-    this.inputViews = [];
-
-    this.$('.VS-search-inner').empty();
-
-    this.app.searchQuery.each(_.bind(function(facet, i) {
-      this.renderFacet(facet, i);
-    }, this));
-
-    // Add on an n+1 empty search input on the very end.
-    this.renderSearchInput();
-  },
-
-  // Render a single facet, using its category and query value.
-  renderFacet : function(facet, position) {
-    var view = new VS.ui.SearchFacet({
-      app   : this.app,
-      model : facet,
-      order : position
-    });
-
-    // Input first, facet second.
-    this.renderSearchInput();
-    this.facetViews.push(view);
-    this.$('.VS-search-inner').children().eq(position*2).after(view.render().el);
-
-    view.calculateSize();
-    _.defer(_.bind(view.calculateSize, view));
-
-    return view;
-  },
-
-  // Render a single input, used to create and autocomplete facets
-  renderSearchInput : function() {
-    var input = new VS.ui.SearchInput({position: this.inputViews.length, app: this.app});
-    this.$('.VS-search-inner').append(input.render().el);
-    this.inputViews.push(input);
-  },
-
-  // # Modifying Facets #
-
-  // Clears out the search box. Command+A + delete can trigger this, as can a cancel button.
-  //
-  // If a `clearSearch` callback was provided, the callback is invoked and
-  // provided with a function performs the actual removal of the data.  This
-  // allows third-party developers to either clear data asynchronously, or
-  // prior to performing their custom "clear" logic.
-  clearSearch : function(e) {
-    var actualClearSearch = _.bind(function() {
-      this.disableFacets();
-      this.value('');
-      this.flags.allSelected = false;
-      this.searchEvent(e);
-      this.focusSearch(e);
-    }, this);
-
-    if (this.app.options.callbacks.clearSearch) {
-      this.app.options.callbacks.clearSearch(actualClearSearch);
-    } else {
-      actualClearSearch();
-    }
-  },
-
-  // Command+A selects all facets.
-  selectAllFacets : function() {
-    this.flags.allSelected = true;
-
-    $(document).one('click.selectAllFacets', this.deselectAllFacets);
-
-    _.each(this.facetViews, function(facetView, i) {
-      facetView.selectFacet();
-    });
-    _.each(this.inputViews, function(inputView, i) {
-      inputView.selectText();
-    });
-  },
-
-  // Used by facets and input to see if all facets are currently selected.
-  allSelected : function(deselect) {
-    if (deselect) this.flags.allSelected = false;
-    return this.flags.allSelected;
-  },
-
-  // After `selectAllFacets` is engaged, this method is bound to the entire document.
-  // This immediate disables and deselects all facets, but it also checks if the user
-  // has clicked on either a facet or an input, and properly selects the view.
-  deselectAllFacets : function(e) {
-    this.disableFacets();
-
-    if (this.$(e.target).is('.category,input')) {
-      var el   = $(e.target).closest('.search_facet,.search_input');
-      var view = _.detect(this.facetViews.concat(this.inputViews), function(v) {
-        return v.el == el[0];
-      });
-      if (view.type == 'facet') {
-        view.selectFacet();
-      } else if (view.type == 'input') {
-        _.defer(function() {
-          view.enableEdit(true);
-        });
-      }
-    }
-  },
-
-  // Disables all facets except for the passed in view. Used when switching between
-  // facets, so as not to have to keep state of active facets.
-  disableFacets : function(keepView) {
-    _.each(this.inputViews, function(view) {
-      if (view && view != keepView &&
-          (view.modes.editing == 'is' || view.modes.selected == 'is')) {
-        view.disableEdit();
-      }
-    });
-    _.each(this.facetViews, function(view) {
-      if (view && view != keepView &&
-          (view.modes.editing == 'is' || view.modes.selected == 'is')) {
-        view.disableEdit();
-        view.deselectFacet();
-      }
-    });
-
-    this.flags.allSelected = false;
-    this.removeFocus();
-    $(document).unbind('click.selectAllFacets');
-  },
-
-  // Resize all inputs to account for extra keystrokes which may be changing the facet
-  // width incorrectly. This is a safety check to ensure inputs are correctly sized.
-  resizeFacets : function(view) {
-    _.each(this.facetViews, function(facetView, i) {
-      if (!view || facetView == view) {
-        facetView.resize();
-      }
-    });
-  },
-
-  // Handles keydown events on the document. Used to complete the Cmd+A deletion, and
-  // blurring focus.
-  _maybeDisableFacets : function(e) {
-    if (this.flags.allSelected && VS.app.hotkeys.key(e) == 'backspace') {
-      e.preventDefault();
-      this.clearSearch(e);
-      return false;
-    } else if (this.flags.allSelected && VS.app.hotkeys.printable(e)) {
-      this.clearSearch(e);
-    }
-  },
-
-  // # Focusing Facets #
-
-  // Move focus between facets and inputs. Takes a direction as well as many options
-  // for skipping over inputs and only to facets, placement of cursor position in facet
-  // (i.e. at the end), and selecting the text in the input/facet.
-  focusNextFacet : function(currentView, direction, options) {
-    options = options || {};
-    var viewCount    = this.facetViews.length;
-    var viewPosition = options.viewPosition || this.viewPosition(currentView);
-
-    if (!options.skipToFacet) {
-      // Correct for bouncing between matching text and facet arrays.
-      if (currentView.type == 'text'  && direction > 0) direction -= 1;
-      if (currentView.type == 'facet' && direction < 0) direction += 1;
-    } else if (options.skipToFacet && currentView.type == 'text' &&
-               viewCount == viewPosition && direction >= 0) {
-      // Special case of looping around to a facet from the last search input box.
-      viewPosition = 0;
-      direction    = 0;
-    }
-    var view, next = Math.min(viewCount, viewPosition + direction);
-
-    if (currentView.type == 'text') {
-      if (next >= 0 && next < viewCount) {
-        view = this.facetViews[next];
-      } else if (next == viewCount) {
-        view = this.inputViews[this.inputViews.length-1];
-      }
-      if (view && options.selectFacet && view.type == 'facet') {
-        view.selectFacet();
-      } else if (view) {
-        view.enableEdit();
-        view.setCursorAtEnd(direction || options.startAtEnd);
-      }
-    } else if (currentView.type == 'facet') {
-      if (options.skipToFacet) {
-        if (next >= viewCount || next < 0) {
-          view = _.last(this.inputViews);
-          view.enableEdit();
-        } else {
-          view = this.facetViews[next];
-          view.enableEdit();
-          view.setCursorAtEnd(direction || options.startAtEnd);
-        }
-      } else {
-        view = this.inputViews[next];
-        view.enableEdit();
-      }
-    }
-    if (options.selectText) view.selectText();
-    this.resizeFacets();
-  },
-
-  maybeFocusSearch : function(e) {
-    if ($(e.target).is('.VS-search-box') ||
-        $(e.target).is('.VS-search-inner') ||
-        e.type == 'keydown') {
-      this.focusSearch(e);
-    }
-  },
-
-  // Bring focus to last input field.
-  focusSearch : function(e, selectText) {
-    var view = this.inputViews[this.inputViews.length-1];
-    view.enableEdit(selectText);
-    if (!selectText) view.setCursorAtEnd(-1);
-    if (e.type == 'keydown') {
-      view.keydown(e);
-      view.box.trigger('keydown');
-    }
-    _.defer(_.bind(function() {
-      if (!this.$('input:focus').length) {
-        view.enableEdit(selectText);
-      }
-    }, this));
-  },
-
-  // Double-clicking on the search wrapper should select the existing text in
-  // the last search input. Also start the triple-click timer.
-  highlightSearch : function(e) {
-    if ($(e.target).is('.VS-search-box') ||
-        $(e.target).is('.VS-search-inner') ||
-        e.type == 'keydown') {
-      var lastinput = this.inputViews[this.inputViews.length-1];
-      lastinput.startTripleClickTimer();
-      this.focusSearch(e, true);
-    }
-  },
-
-  maybeTripleClick : function(e) {
-    var lastinput = this.inputViews[this.inputViews.length-1];
-    return lastinput.maybeTripleClick(e);
-  },
-
-  // Used to show the user is focused on some input inside the search box.
-  addFocus : function() {
-    this.app.options.callbacks.focus();
-    this.$('.VS-search-box').addClass('VS-focus');
-  },
-
-  // User is no longer focused on anything in the search box.
-  removeFocus : function() {
-    this.app.options.callbacks.blur();
-    var focus = _.any(this.facetViews.concat(this.inputViews), function(view) {
-      return view.isFocused();
-    });
-    if (!focus) this.$('.VS-search-box').removeClass('VS-focus');
-  },
-
-  // Show a menu which adds pre-defined facets to the search box. This is unused for now.
-  showFacetCategoryMenu : function(e) {
-    e.preventDefault();
-    e.stopPropagation();
-    if (this.facetCategoryMenu && this.facetCategoryMenu.modes.open == 'is') {
-      return this.facetCategoryMenu.close();
-    }
-
-    var items = [
-      {title: 'Account', onClick: _.bind(this.addFacet, this, 'account', '')},
-      {title: 'Project', onClick: _.bind(this.addFacet, this, 'project', '')},
-      {title: 'Filter', onClick: _.bind(this.addFacet, this, 'filter', '')},
-      {title: 'Access', onClick: _.bind(this.addFacet, this, 'access', '')}
-    ];
-
-    var menu = this.facetCategoryMenu || (this.facetCategoryMenu = new dc.ui.Menu({
-      items       : items,
-      standalone  : true
-    }));
-
-    this.$('.VS-icon-search').after(menu.render().open().content);
-    return false;
-  }
-
-});
-
-})();
-
-(function() {
-
-var $ = jQuery; // Handle namespaced jQuery
-
-// This is the visual search facet that holds the category and its autocompleted
-// input field.
-VS.ui.SearchFacet = Backbone.View.extend({
-
-  type : 'facet',
-
-  className : 'search_facet',
-
-  events : {
-    'click .category'           : 'selectFacet',
-    'keydown input'             : 'keydown',
-    'mousedown input'           : 'enableEdit',
-    'mouseover .VS-icon-cancel' : 'showDelete',
-    'mouseout .VS-icon-cancel'  : 'hideDelete',
-    'click .VS-icon-cancel'     : 'remove'
-  },
-
-  initialize : function(options) {
-    this.flags = {
-      canClose : false
-    };
-    _.bindAll(this, 'set', 'keydown', 'deselectFacet', 'deferDisableEdit');
-  },
-
-  // Rendering the facet sets up autocompletion, events on blur, and populates
-  // the facet's input with its starting value.
-  render : function() {
-    $(this.el).html(JST['search_facet']({
-      model : this.model
-    }));
-
-    this.setMode('not', 'editing');
-    this.setMode('not', 'selected');
-    this.box = this.$('input');
-    this.box.val(this.model.get('value'));
-    this.box.bind('blur', this.deferDisableEdit);
-    // Handle paste events with `propertychange`
-    this.box.bind('input propertychange', this.keydown);
-    this.setupAutocomplete();
-
-    return this;
-  },
-
-  // This method is used to setup the facet's input to auto-grow.
-  // This is defered in the searchBox so it can be attached to the
-  // DOM to get the correct font-size.
-  calculateSize : function() {
-    this.box.autoGrowInput();
-    this.box.unbind('updated.autogrow');
-    this.box.bind('updated.autogrow', _.bind(this.moveAutocomplete, this));
-  },
-
-  // Forces a recalculation of this facet's input field's value. Called when
-  // the facet is focused, removed, or otherwise modified.
-  resize : function(e) {
-    this.box.trigger('resize.autogrow', e);
-  },
-
-  // Watches the facet's input field to see if it matches the beginnings of
-  // words in `autocompleteValues`, which is different for every category.
-  // If the value, when selected from the autocompletion menu, is different
-  // than what it was, commit the facet and search for it.
-  setupAutocomplete : function() {
-    this.box.autocomplete({
-      source    : _.bind(this.autocompleteValues, this),
-      minLength : 0,
-      delay     : 0,
-      autoFocus : true,
-      position  : {offset : "0 5"},
-      create    : _.bind(function(e, ui) {
-        $(this.el).find('.ui-autocomplete-input').css('z-index','auto');
-      }, this),
-      select    : _.bind(function(e, ui) {
-        e.preventDefault();
-        var originalValue = this.model.get('value');
-        this.set(ui.item.value);
-        if (originalValue != ui.item.value || this.box.val() != ui.item.value) {
-          this.search(e);
-        }
-        return false;
-      }, this),
-      open      : _.bind(function(e, ui) {
-        var box = this.box;
-        this.box.autocomplete('widget').find('.ui-menu-item').each(function() {
-          var $value = $(this);
-          if ($value.data('item.autocomplete')['value'] == box.val()) {
-            box.data('autocomplete').menu.activate(new $.Event("mouseover"), $value);
-          }
-        });
-      }, this)
-    });
-
-    this.box.autocomplete('widget').addClass('VS-interface');
-  },
-
-  // As the facet's input field grows, it may move to the next line in the
-  // search box. `autoGrowInput` triggers an `updated` event on the input
-  // field, which is bound to this method to move the autocomplete menu.
-  moveAutocomplete : function() {
-    var autocomplete = this.box.data('autocomplete');
-    if (autocomplete) {
-      autocomplete.menu.element.position({
-        my        : "left top",
-        at        : "left bottom",
-        of        : this.box.data('autocomplete').element,
-        collision : "flip",
-        offset    : "0 5"
-      });
-    }
-  },
-
-  // When a user enters a facet and it is being edited, immediately show
-  // the autocomplete menu and size it to match the contents.
-  searchAutocomplete : function(e) {
-    var autocomplete = this.box.data('autocomplete');
-    if (autocomplete) {
-      var menu = autocomplete.menu.element;
-      autocomplete.search();
-
-      // Resize the menu based on the correctly measured width of what's bigger:
-      // the menu's original size or the menu items' new size.
-      menu.outerWidth(Math.max(
-        menu.width('').outerWidth(),
-        autocomplete.element.outerWidth()
-      ));
-    }
-  },
-
-  // Closes the autocomplete menu. Called on disabling, selecting, deselecting,
-  // and anything else that takes focus out of the facet's input field.
-  closeAutocomplete : function() {
-    var autocomplete = this.box.data('autocomplete');
-    if (autocomplete) autocomplete.close();
-  },
-
-  // Search terms used in the autocomplete menu. These are specific to the facet,
-  // and only match for the facet's category. The values are then matched on the
-  // first letter of any word in matches, and finally sorted according to the
-  // value's own category. You can pass `preserveOrder` as an option in the 
-  // `facetMatches` callback to skip any further ordering done client-side.
-  autocompleteValues : function(req, resp) {
-    var category = this.model.get('category');
-    var value    = this.model.get('value');
-    var searchTerm = req.term;
-
-    this.options.app.options.callbacks.valueMatches(category, searchTerm, function(matches, options) {
-      options = options || {};
-      matches = matches || [];
-      
-      if (searchTerm && value != searchTerm) {
-        if (options.preserveMatches) {
-          return matches;
-        } else {
-          var re = VS.utils.inflector.escapeRegExp(searchTerm || '');
-          var matcher = new RegExp('\\b' + re, 'i');
-          matches = $.grep(matches, function(item) {
-            return matcher.test(item) ||
-                   matcher.test(item.value) ||
-                   matcher.test(item.label);
-        });
-        }
-      }
-      
-      if (options.preserveOrder) {
-        resp(matches);
-      } else {
-        resp(_.sortBy(matches, function(match) {
-          if (match == value || match.value == value) return '';
-          else return match;
-        }));
-      }
-    });
-
-  },
-
-  // Sets the facet's model's value.
-  set : function(value) {
-    if (!value) return;
-    this.model.set({'value': value});
-  },
-
-  // Before the searchBox performs a search, we need to close the
-  // autocomplete menu.
-  search : function(e, direction) {
-    if (!direction) direction = 1;
-    this.closeAutocomplete();
-    this.options.app.searchBox.searchEvent(e);
-    _.defer(_.bind(function() {
-      this.options.app.searchBox.focusNextFacet(this, direction, {viewPosition: this.options.order});
-    }, this));
-  },
-
-  // Begin editing the facet's input. This is called when the user enters
-  // the input either from another facet or directly clicking on it.
-  //
-  // This method tells all other facets and inputs to disable so it can have
-  // the sole focus. It also prepares the autocompletion menu.
-  enableEdit : function() {
-    if (this.modes.editing != 'is') {
-      this.setMode('is', 'editing');
-      this.deselectFacet();
-      if (this.box.val() == '') {
-        this.box.val(this.model.get('value'));
-      }
-    }
-
-    this.flags.canClose = false;
-    this.options.app.searchBox.disableFacets(this);
-    this.options.app.searchBox.addFocus();
-    _.defer(_.bind(function() {
-      this.options.app.searchBox.addFocus();
-    }, this));
-    this.resize();
-    this.searchAutocomplete();
-    this.box.focus();
-  },
-
-  // When the user blurs the input, they may either be going to another input
-  // or off the search box entirely. If they go to another input, this facet
-  // will be instantly disabled, and the canClose flag will be turned back off.
-  //
-  // However, if the user clicks elsewhere on the page, this method starts a timer
-  // that checks if any of the other inputs are selected or are being edited. If
-  // not, then it can finally close itself and its autocomplete menu.
-  deferDisableEdit : function() {
-    this.flags.canClose = true;
-    _.delay(_.bind(function() {
-      if (this.flags.canClose && !this.box.is(':focus') &&
-          this.modes.editing == 'is' && this.modes.selected != 'is') {
-        this.disableEdit();
-      }
-    }, this), 250);
-  },
-
-  // Called either by other facets receiving focus or by the timer in `deferDisableEdit`,
-  // this method will turn off the facet, remove any text selection, and close
-  // the autocomplete menu.
-  disableEdit : function() {
-    var newFacetQuery = VS.utils.inflector.trim(this.box.val());
-    if (newFacetQuery != this.model.get('value')) {
-      this.set(newFacetQuery);
-    }
-    this.flags.canClose = false;
-    this.box.selectRange(0, 0);
-    this.box.blur();
-    this.setMode('not', 'editing');
-    this.closeAutocomplete();
-    this.options.app.searchBox.removeFocus();
-  },
-
-  // Selects the facet, which blurs the facet's input and highlights the facet.
-  // If this is the only facet being selected (and not part of a select all event),
-  // we attach a mouse/keyboard watcher to check if the next action by the user
-  // should delete this facet or just deselect it.
-  selectFacet : function(e) {
-    if (e) e.preventDefault();
-    var allSelected = this.options.app.searchBox.allSelected();
-    if (this.modes.selected == 'is') return;
-
-    if (this.box.is(':focus')) {
-      this.box.setCursorPosition(0);
-      this.box.blur();
-    }
-
-    this.flags.canClose = false;
-    this.closeAutocomplete();
-    this.setMode('is', 'selected');
-    this.setMode('not', 'editing');
-    if (!allSelected || e) {
-      $(document).unbind('keydown.facet', this.keydown);
-      $(document).unbind('click.facet', this.deselectFacet);
-      _.defer(_.bind(function() {
-        $(document).unbind('keydown.facet').bind('keydown.facet', this.keydown);
-        $(document).unbind('click.facet').one('click.facet', this.deselectFacet);
-      }, this));
-      this.options.app.searchBox.disableFacets(this);
-      this.options.app.searchBox.addFocus();
-    }
-    return false;
-  },
-
-  // Turns off highlighting on the facet. Called in a variety of ways, this
-  // only deselects the facet if it is selected, and then cleans up the
-  // keyboard/mouse watchers that were created when the facet was first
-  // selected.
-  deselectFacet : function(e) {
-    if (e) e.preventDefault();
-    if (this.modes.selected == 'is') {
-      this.setMode('not', 'selected');
-      this.closeAutocomplete();
-      this.options.app.searchBox.removeFocus();
-    }
-    $(document).unbind('keydown.facet', this.keydown);
-    $(document).unbind('click.facet', this.deselectFacet);
-    return false;
-  },
-
-  // Is the user currently focused in this facet's input field?
-  isFocused : function() {
-    return this.box.is(':focus');
-  },
-
-  // Hovering over the delete button styles the facet so the user knows that
-  // the delete button will kill the entire facet.
-  showDelete : function() {
-    $(this.el).addClass('search_facet_maybe_delete');
-  },
-
-  // On `mouseout`, the user is no longer hovering on the delete button.
-  hideDelete : function() {
-    $(this.el).removeClass('search_facet_maybe_delete');
-  },
-
-  // When switching between facets, depending on the direction the cursor is
-  // coming from, the cursor in this facet's input field should match the original
-  // direction.
-  setCursorAtEnd : function(direction) {
-    if (direction == -1) {
-      this.box.setCursorPosition(this.box.val().length);
-    } else {
-      this.box.setCursorPosition(0);
-    }
-  },
-
-  // Deletes the facet and sends the cursor over to the nearest input field.
-  remove : function(e) {
-    var committed = this.model.get('value');
-    this.deselectFacet();
-    this.disableEdit();
-    this.options.app.searchQuery.remove(this.model);
-    if (committed) {
-      this.search(e, -1);
-    } else {
-      this.options.app.searchBox.renderFacets();
-      this.options.app.searchBox.focusNextFacet(this, -1, {viewPosition: this.options.order});
-    }
-  },
-
-  // Selects the text in the facet's input field. When the user tabs between
-  // facets, convention is to highlight the entire field.
-  selectText: function() {
-    this.box.selectRange(0, this.box.val().length);
-  },
-
-  // Handles all keyboard inputs when in the facet's input field. This checks
-  // for movement between facets and inputs, entering a new value that needs
-  // to be autocompleted, as well as the removal of this facet.
-  keydown : function(e) {
-    var key = VS.app.hotkeys.key(e);
-
-    if (key == 'enter' && this.box.val()) {
-      this.disableEdit();
-      this.search(e);
-    } else if (key == 'left') {
-      if (this.modes.selected == 'is') {
-        this.deselectFacet();
-        this.options.app.searchBox.focusNextFacet(this, -1, {startAtEnd: -1});
-      } else if (this.box.getCursorPosition() == 0 && !this.box.getSelection().length) {
-        this.selectFacet();
-      }
-    } else if (key == 'right') {
-      if (this.modes.selected == 'is') {
-        e.preventDefault();
-        this.deselectFacet();
-        this.setCursorAtEnd(0);
-        this.enableEdit();
-      } else if (this.box.getCursorPosition() == this.box.val().length) {
-        e.preventDefault();
-        this.disableEdit();
-        this.options.app.searchBox.focusNextFacet(this, 1);
-      }
-    } else if (VS.app.hotkeys.shift && key == 'tab') {
-      e.preventDefault();
-      this.options.app.searchBox.focusNextFacet(this, -1, {
-        startAtEnd  : -1,
-        skipToFacet : true,
-        selectText  : true
-      });
-    } else if (key == 'tab') {
-      e.preventDefault();
-      this.options.app.searchBox.focusNextFacet(this, 1, {
-        skipToFacet : true,
-        selectText  : true
-      });
-    } else if (VS.app.hotkeys.command && (e.which == 97 || e.which == 65)) {
-      e.preventDefault();
-      this.options.app.searchBox.selectAllFacets();
-      return false;
-    } else if (VS.app.hotkeys.printable(e) && this.modes.selected == 'is') {
-      this.options.app.searchBox.focusNextFacet(this, -1, {startAtEnd: -1});
-      this.remove(e);
-    } else if (key == 'backspace') {
-      if (this.modes.selected == 'is') {
-        e.preventDefault();
-        this.remove(e);
-      } else if (this.box.getCursorPosition() == 0 &&
-                 !this.box.getSelection().length) {
-        e.preventDefault();
-        this.selectFacet();
-      }
-    }
-
-    this.resize(e);
-    
-    // Handle paste events
-    if (e.which == null) {
-        this.searchAutocomplete(e);
-        _.defer(_.bind(this.resize, this, e));
-    }
-  }
-
-});
-
-})();
-
-(function() {
-
-var $ = jQuery; // Handle namespaced jQuery
-
-// This is the visual search input that is responsible for creating new facets.
-// There is one input placed in between all facets.
-VS.ui.SearchInput = Backbone.View.extend({
-
-  type : 'text',
-
-  className : 'search_input',
-
-  events : {
-    'keypress input'  : 'keypress',
-    'keydown input'   : 'keydown',
-    'click input'     : 'maybeTripleClick',
-    'dblclick input'  : 'startTripleClickTimer'
-  },
-
-  initialize : function() {
-    this.app = this.options.app;
-    this.flags = {
-      canClose : false
-    };
-    _.bindAll(this, 'removeFocus', 'addFocus', 'moveAutocomplete', 'deferDisableEdit');
-  },
-
-  // Rendering the input sets up autocomplete, events on focusing and blurring
-  // the input, and the auto-grow of the input.
-  render : function() {
-    $(this.el).html(JST['search_input']({}));
-
-    this.setMode('not', 'editing');
-    this.setMode('not', 'selected');
-    this.box = this.$('input');
-    this.box.autoGrowInput();
-    this.box.bind('updated.autogrow', this.moveAutocomplete);
-    this.box.bind('blur',  this.deferDisableEdit);
-    this.box.bind('focus', this.addFocus);
-    this.setupAutocomplete();
-
-    return this;
-  },
-
-  // Watches the input and presents an autocompleted menu, taking the
-  // remainder of the input field and adding a separate facet for it.
-  //
-  // See `addTextFacetRemainder` for explanation on how the remainder works.
-  setupAutocomplete : function() {
-    this.box.autocomplete({
-      minLength : 1,
-      delay     : 50,
-      autoFocus : true,
-      position  : {offset : "0 -1"},
-      source    : _.bind(this.autocompleteValues, this),
-      create    : _.bind(function(e, ui) {
-        $(this.el).find('.ui-autocomplete-input').css('z-index','auto');
-      }, this),
-      select    : _.bind(function(e, ui) {
-        e.preventDefault();
-        e.stopPropagation();
-        var remainder = this.addTextFacetRemainder(ui.item.value);
-        var position  = this.options.position + (remainder ? 1 : 0);
-        this.app.searchBox.addFacet(ui.item.value, '', position);
-        return false;
-      }, this)
-    });
-
-    // Renders the results grouped by the categories they belong to.
-    this.box.data('autocomplete')._renderMenu = function(ul, items) {
-      var category = '';
-      _.each(items, _.bind(function(item, i) {
-        if (item.category && item.category != category) {
-          ul.append('<li class="ui-autocomplete-category">'+item.category+'</li>');
-          category = item.category;
-        }
-        this._renderItem(ul, item);
-      }, this));
-    };
-
-    this.box.autocomplete('widget').addClass('VS-interface');
-  },
-
-  // Search terms used in the autocomplete menu. The values are matched on the
-  // first letter of any word in matches, and finally sorted according to the
-  // value's own category. You can pass `preserveOrder` as an option in the 
-  // `facetMatches` callback to skip any further ordering done client-side.
-  autocompleteValues : function(req, resp) {
-    var searchTerm = req.term;
-    var lastWord   = searchTerm.match(/\w+$/); // Autocomplete only last word.
-    var re         = VS.utils.inflector.escapeRegExp(lastWord && lastWord[0] || ' ');
-    this.app.options.callbacks.facetMatches(function(prefixes, options) {
-      options = options || {};
-      prefixes = prefixes || [];
-      
-      // Only match from the beginning of the word.
-      var matcher    = new RegExp('^' + re, 'i');
-      var matches    = $.grep(prefixes, function(item) {
-        return item && matcher.test(item.label || item);
-      });
-
-      if (options.preserveOrder) {
-        resp(matches);
-      } else {
-        resp(_.sortBy(matches, function(match) {
-          if (match.label) return match.category + '-' + match.label;
-          else             return match;
-        }));
-      }
-    });
-
-  },
-
-  // Closes the autocomplete menu. Called on disabling, selecting, deselecting,
-  // and anything else that takes focus out of the facet's input field.
-  closeAutocomplete : function() {
-    var autocomplete = this.box.data('autocomplete');
-    if (autocomplete) autocomplete.close();
-  },
-
-  // As the input field grows, it may move to the next line in the
-  // search box. `autoGrowInput` triggers an `updated` event on the input
-  // field, which is bound to this method to move the autocomplete menu.
-  moveAutocomplete : function() {
-    var autocomplete = this.box.data('autocomplete');
-    if (autocomplete) {
-      autocomplete.menu.element.position({
-        my        : "left top",
-        at        : "left bottom",
-        of        : this.box.data('autocomplete').element,
-        collision : "none",
-        offset    : '0 -1'
-      });
-    }
-  },
-
-  // When a user enters a facet and it is being edited, immediately show
-  // the autocomplete menu and size it to match the contents.
-  searchAutocomplete : function(e) {
-    var autocomplete = this.box.data('autocomplete');
-    if (autocomplete) {
-      var menu = autocomplete.menu.element;
-      autocomplete.search();
-
-      // Resize the menu based on the correctly measured width of what's bigger:
-      // the menu's original size or the menu items' new size.
-      menu.outerWidth(Math.max(
-        menu.width('').outerWidth(),
-        autocomplete.element.outerWidth()
-      ));
-    }
-  },
-
-  // If a user searches for "word word category", the category would be
-  // matched and autocompleted, and when selected, the "word word" would
-  // also be caught as the remainder and then added in its own facet.
-  addTextFacetRemainder : function(facetValue) {
-    var boxValue = this.box.val();
-    var lastWord = boxValue.match(/\b(\w+)$/);
-    var matcher = new RegExp(lastWord[0], "i");
-    if (lastWord && facetValue.search(matcher) == 0) {
-      boxValue = boxValue.replace(/\b(\w+)$/, '');
-    }
-    boxValue = boxValue.replace('^\s+|\s+$', '');
-    if (boxValue) {
-      this.app.searchBox.addFacet('text', boxValue, this.options.position);
-    }
-    return boxValue;
-  },
-
-  // Directly called to focus the input. This is different from `addFocus`
-  // because this is not called by a focus event. This instead calls a
-  // focus event causing the input to become focused.
-  enableEdit : function(selectText) {
-    this.addFocus();
-    if (selectText) {
-      this.selectText();
-    }
-    this.box.focus();
-  },
-
-  // Event called on user focus on the input. Tells all other input and facets
-  // to give up focus, and starts revving the autocomplete.
-  addFocus : function() {
-    this.flags.canClose = false;
-    if (!this.app.searchBox.allSelected()) {
-      this.app.searchBox.disableFacets(this);
-    }
-    this.app.searchBox.addFocus();
-    this.setMode('is', 'editing');
-    this.setMode('not', 'selected');
-    this.searchAutocomplete();
-  },
-
-  // Directly called to blur the input. This is different from `removeFocus`
-  // because this is not called by a blur event.
-  disableEdit : function() {
-    this.box.blur();
-    this.removeFocus();
-  },
-
-  // Event called when user blur's the input, either through the keyboard tabbing
-  // away or the mouse clicking off. Cleans up
-  removeFocus : function() {
-    this.flags.canClose = false;
-    this.app.searchBox.removeFocus();
-    this.setMode('not', 'editing');
-    this.setMode('not', 'selected');
-    this.closeAutocomplete();
-  },
-
-  // When the user blurs the input, they may either be going to another input
-  // or off the search box entirely. If they go to another input, this facet
-  // will be instantly disabled, and the canClose flag will be turned back off.
-  //
-  // However, if the user clicks elsewhere on the page, this method starts a timer
-  // that checks if any of the other inputs are selected or are being edited. If
-  // not, then it can finally close itself and its autocomplete menu.
-  deferDisableEdit : function() {
-    this.flags.canClose = true;
-    _.delay(_.bind(function() {
-      if (this.flags.canClose &&
-          !this.box.is(':focus') &&
-          this.modes.editing == 'is') {
-        this.disableEdit();
-      }
-    }, this), 250);
-  },
-
-  // Starts a timer that will cause a triple-click, which highlights all facets.
-  startTripleClickTimer : function() {
-    this.tripleClickTimer = setTimeout(_.bind(function() {
-      this.tripleClickTimer = null;
-    }, this), 500);
-  },
-
-  // Event on click that checks if a triple click is in play. The
-  // `tripleClickTimer` is counting down, ready to be engaged and intercept
-  // the click event to force a select all instead.
-  maybeTripleClick : function(e) {
-    if (!!this.tripleClickTimer) {
-      e.preventDefault();
-      this.app.searchBox.selectAllFacets();
-      return false;
-    }
-  },
-
-  // Is the user currently focused in the input field?
-  isFocused : function() {
-    return this.box.is(':focus');
-  },
-
-  // When serializing the facets, the inputs need to also have their values represented,
-  // in case they contain text that is not yet faceted (but will be once the search is
-  // completed).
-  value : function() {
-    return this.box.val();
-  },
-
-  // When switching between facets and inputs, depending on the direction the cursor
-  // is coming from, the cursor in this facet's input field should match the original
-  // direction.
-  setCursorAtEnd : function(direction) {
-    if (direction == -1) {
-      this.box.setCursorPosition(this.box.val().length);
-    } else {
-      this.box.setCursorPosition(0);
-    }
-  },
-
-  // Selects the entire range of text in the input. Useful when tabbing between inputs
-  // and facets.
-  selectText : function() {
-    this.box.selectRange(0, this.box.val().length);
-    if (!this.app.searchBox.allSelected()) {
-      this.box.focus();
-    } else {
-      this.setMode('is', 'selected');
-    }
-  },
-
-  // Before the searchBox performs a search, we need to close the
-  // autocomplete menu.
-  search : function(e, direction) {
-    if (!direction) direction = 0;
-    this.closeAutocomplete();
-    this.app.searchBox.searchEvent(e);
-    _.defer(_.bind(function() {
-      this.app.searchBox.focusNextFacet(this, direction);
-    }, this));
-  },
-
-  // Callback fired on key press in the search box. We search when they hit return.
-  keypress : function(e) {
-    var key = VS.app.hotkeys.key(e);
-
-    if (key == 'enter') {
-      return this.search(e, 100);
-    } else if (VS.app.hotkeys.colon(e)) {
-      this.box.trigger('resize.autogrow', e);
-      var query    = this.box.val();
-      var prefixes = [];
-      if (this.app.options.callbacks.facetMatches) {
-          this.app.options.callbacks.facetMatches(function(p) {
-              prefixes = p;
-          });
-      }
-      var labels   = _.map(prefixes, function(prefix) {
-        if (prefix.label) return prefix.label;
-        else              return prefix;
-      });
-      if (_.contains(labels, query)) {
-        e.preventDefault();
-        var remainder = this.addTextFacetRemainder(query);
-        var position  = this.options.position + (remainder?1:0);
-        this.app.searchBox.addFacet(query, '', position);
-        return false;
-      }
-    } else if (key == 'backspace') {
-      if (this.box.getCursorPosition() == 0 && !this.box.getSelection().length) {
-        e.preventDefault();
-        e.stopPropagation();
-        e.stopImmediatePropagation();
-        this.app.searchBox.resizeFacets();
-        return false;
-      }
-    }
-  },
-
-  // Handles all keyboard inputs when in the input field. This checks
-  // for movement between facets and inputs, entering a new value that needs
-  // to be autocompleted, as well as stepping between facets with backspace.
-  keydown : function(e) {
-    var key = VS.app.hotkeys.key(e);
-
-    if (key == 'left') {
-      if (this.box.getCursorPosition() == 0) {
-        e.preventDefault();
-        this.app.searchBox.focusNextFacet(this, -1, {startAtEnd: -1});
-      }
-    } else if (key == 'right') {
-      if (this.box.getCursorPosition() == this.box.val().length) {
-        e.preventDefault();
-        this.app.searchBox.focusNextFacet(this, 1, {selectFacet: true});
-      }
-    } else if (VS.app.hotkeys.shift && key == 'tab') {
-      e.preventDefault();
-      this.app.searchBox.focusNextFacet(this, -1, {selectText: true});
-    } else if (key == 'tab') {
-      e.preventDefault();
-      var value = this.box.val();
-      if (value.length) {
-        var remainder = this.addTextFacetRemainder(value);
-        var position  = this.options.position + (remainder?1:0);
-        this.app.searchBox.addFacet(value, '', position);
-      } else {
-        this.app.searchBox.focusNextFacet(this, 0, {
-          skipToFacet: true,
-          selectText: true
-        });
-      }
-    } else if (VS.app.hotkeys.command &&
-               String.fromCharCode(e.which).toLowerCase() == 'a') {
-      e.preventDefault();
-      this.app.searchBox.selectAllFacets();
-      return false;
-    } else if (key == 'backspace' && !this.app.searchBox.allSelected()) {
-      if (this.box.getCursorPosition() == 0 && !this.box.getSelection().length) {
-        e.preventDefault();
-        this.app.searchBox.focusNextFacet(this, -1, {backspace: true});
-        return false;
-      }
-    }
-
-    this.box.trigger('resize.autogrow', e);
-  }
-
-});
-
-})();
-
-(function(){
-
-  var $ = jQuery; // Handle namespaced jQuery
-
-  // Makes the view enter a mode. Modes have both a 'mode' and a 'group',
-  // and are mutually exclusive with any other modes in the same group.
-  // Setting will update the view's modes hash, as well as set an HTML class
-  // of *[mode]_[group]* on the view's element. Convenient way to swap styles
-  // and behavior.
-  Backbone.View.prototype.setMode = function(mode, group) {
-    this.modes || (this.modes = {});
-    if (this.modes[group] === mode) return;
-    $(this.el).setMode(mode, group);
-    this.modes[group] = mode;
-  };
-
-})();
-(function() {
-
-var $ = jQuery; // Handle namespaced jQuery
-
-// DocumentCloud workspace hotkeys. To tell if a key is currently being pressed,
-// just ask `VS.app.hotkeys.[key]` on `keypress`, or ask `VS.app.hotkeys.key(e)`
-// on `keydown`.
-//
-// For the most headache-free way to use this utility, check modifier keys,
-// like shift and command, with `VS.app.hotkeys.shift`, and check every other
-// key with `VS.app.hotkeys.key(e) == 'key_name'`.
-VS.app.hotkeys = {
-
-  // Keys that will be mapped to the `hotkeys` namespace.
-  KEYS: {
-    '16':  'shift',
-    '17':  'command',
-    '91':  'command',
-    '93':  'command',
-    '224': 'command',
-    '13':  'enter',
-    '37':  'left',
-    '38':  'upArrow',
-    '39':  'right',
-    '40':  'downArrow',
-    '46':  'delete',
-    '8':   'backspace',
-    '9':   'tab',
-    '188': 'comma'
-  },
-
-  // Binds global keydown and keyup events to listen for keys that match `this.KEYS`.
-  initialize : function() {
-    _.bindAll(this, 'down', 'up', 'blur');
-    $(document).bind('keydown', this.down);
-    $(document).bind('keyup', this.up);
-    $(window).bind('blur', this.blur);
-  },
-
-  // On `keydown`, turn on all keys that match.
-  down : function(e) {
-    var key = this.KEYS[e.which];
-    if (key) this[key] = true;
-  },
-
-  // On `keyup`, turn off all keys that match.
-  up : function(e) {
-    var key = this.KEYS[e.which];
-    if (key) this[key] = false;
-  },
-
-  // If an input is blurred, all keys need to be turned off, since they are no longer
-  // able to modify the document.
-  blur : function(e) {
-    for (var key in this.KEYS) this[this.KEYS[key]] = false;
-  },
-
-  // Check a key from an event and return the common english name.
-  key : function(e) {
-    return this.KEYS[e.which];
-  },
-
-  // Colon is special, since the value is different between browsers.
-  colon : function(e) {
-    var charCode = e.which;
-    return charCode && String.fromCharCode(charCode) == ":";
-  },
-
-  // Check a key from an event and match it against any known characters.
-  // The `keyCode` is different depending on the event type: `keydown` vs. `keypress`.
-  //
-  // These were determined by looping through every `keyCode` and `charCode` that
-  // resulted from `keydown` and `keypress` events and counting what was printable.
-  printable : function(e) {
-    var code = e.which;
-    if (e.type == 'keydown') {
-      if (code == 32 ||                      // space
-          (code >= 48 && code <= 90) ||      // 0-1a-z
-          (code >= 96 && code <= 111) ||     // 0-9+-/*.
-          (code >= 186 && code <= 192) ||    // ;=,-./^
-          (code >= 219 && code <= 222)) {    // (\)'
-        return true;
-      }
-    } else {
-      // [space]!"#$%&'()*+,-.0-9:;<=>?@A-Z[\]^_`a-z{|} and unicode characters
-      if ((code >= 32 && code <= 126)  ||
-          (code >= 160 && code <= 500) ||
-          (String.fromCharCode(code) == ":")) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-};
-
-})();
-(function() {
-
-var $ = jQuery; // Handle namespaced jQuery
-
-// Naive English transformations on words. Only used for a few transformations 
-// in VisualSearch.js.
-VS.utils.inflector = {
-
-  // Delegate to the ECMA5 String.prototype.trim function, if available.
-  trim : function(s) {
-    return s.trim ? s.trim() : s.replace(/^\s+|\s+$/g, '');
-  },
-  
-  // Escape strings that are going to be used in a regex. Escapes punctuation
-  // that would be incorrect in a regex.
-  escapeRegExp : function(s) {
-    return s.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
-  }
-};
-
-})();
-(function() {
-
-var $ = jQuery; // Handle namespaced jQuery
-
-$.fn.extend({
-
-  // Makes the selector enter a mode. Modes have both a 'mode' and a 'group',
-  // and are mutually exclusive with any other modes in the same group.
-  // Setting will update the view's modes hash, as well as set an HTML class
-  // of *[mode]_[group]* on the view's element. Convenient way to swap styles
-  // and behavior.
-  setMode : function(state, group) {
-    group    = group || 'mode';
-    var re   = new RegExp("\\w+_" + group + "(\\s|$)", 'g');
-    var mode = (state === null) ? "" : state + "_" + group;
-    this.each(function() {
-      this.className = (this.className.replace(re, '')+' '+mode)
-                       .replace(/\s\s/g, ' ');
-    });
-    return mode;
-  },
-
-  // When attached to an input element, this will cause the width of the input
-  // to match its contents. This calculates the width of the contents of the input
-  // by measuring a hidden shadow div that should match the styling of the input.
-  autoGrowInput: function() {
-    return this.each(function() {
-      var $input  = $(this);
-      var $tester = $('<div />').css({
-        opacity     : 0,
-        top         : -9999,
-        left        : -9999,
-        position    : 'absolute',
-        whiteSpace  : 'nowrap'
-      }).addClass('VS-input-width-tester').addClass('VS-interface');
-
-      // Watch for input value changes on all of these events. `resize`
-      // event is called explicitly when the input has been changed without
-      // a single keypress.
-      var events = 'keydown.autogrow keypress.autogrow ' +
-                   'resize.autogrow change.autogrow';
-      $input.next('.VS-input-width-tester').remove();
-      $input.after($tester);
-      $input.unbind(events).bind(events, function(e, realEvent) {
-        if (realEvent) e = realEvent;
-        var value = $input.val();
-
-        // Watching for the backspace key is tricky because it may not
-        // actually be deleting the character, but instead the key gets
-        // redirected to move the cursor from facet to facet.
-        if (VS.app.hotkeys.key(e) == 'backspace') {
-          var position = $input.getCursorPosition();
-          if (position > 0) value = value.slice(0, position-1) +
-                                    value.slice(position, value.length);
-        } else if (VS.app.hotkeys.printable(e) &&
-                   !VS.app.hotkeys.command) {
-          value += String.fromCharCode(e.which);
-        }
-        value = value.replace(/&/g, '&amp;')
-                     .replace(/\s/g,'&nbsp;')
-                     .replace(/</g, '&lt;')
-                     .replace(/>/g, '&gt;');
-
-        $tester.html(value);
-        $input.width($tester.width() + 3);
-        $input.trigger('updated.autogrow');
-      });
-
-      // Sets the width of the input on initialization.
-      $input.trigger('resize.autogrow');
-    });
-  },
-
-
-  // Cross-browser method used for calculating where the cursor is in an
-  // input field.
-  getCursorPosition: function() {
-    var position = 0;
-    var input    = this.get(0);
-
-    if (document.selection) { // IE
-      input.focus();
-      var sel    = document.selection.createRange();
-      var selLen = document.selection.createRange().text.length;
-      sel.moveStart('character', -input.value.length);
-      position   = sel.text.length - selLen;
-    } else if (input && $(input).is(':visible') &&
-               input.selectionStart != null) { // Firefox/Safari
-      position = input.selectionStart;
-    }
-
-    return position;
-  },
-
-  // A simple proxy for `selectRange` that sets the cursor position in an
-  // input field.
-  setCursorPosition: function(position) {
-    return this.each(function() {
-      return $(this).selectRange(position, position);
-    });
-  },
-
-  // Cross-browser way to select text in an input field.
-  selectRange: function(start, end) {
-    return this.each(function() {
-      if (this.setSelectionRange) { // FF/Webkit
-        this.focus();
-        this.setSelectionRange(start, end);
-      } else if (this.createTextRange) { // IE
-        var range = this.createTextRange();
-        range.collapse(true);
-        range.moveEnd('character', end);
-        range.moveStart('character', start);
-        if (end - start >= 0) range.select();
-      }
-    });
-  },
-
-  // Returns an object that contains the text selection range values for
-  // an input field.
-  getSelection: function() {
-    var input = this[0];
-
-    if (input.selectionStart != null) { // FF/Webkit
-      var start = input.selectionStart;
-      var end   = input.selectionEnd;
-      return {
-        start   : start,
-        end     : end,
-        length  : end-start,
-        text    : input.value.substr(start, end-start)
-      };
-    } else if (document.selection) { // IE
-      var range = document.selection.createRange();
-      if (range) {
-        var textRange = input.createTextRange();
-        var copyRange = textRange.duplicate();
-        textRange.moveToBookmark(range.getBookmark());
-        copyRange.setEndPoint('EndToStart', textRange);
-        var start = copyRange.text.length;
-        var end   = start + range.text.length;
-        return {
-          start   : start,
-          end     : end,
-          length  : end-start,
-          text    : range.text
-        };
-      }
-    }
-    return {start: 0, end: 0, length: 0};
-  }
-
-});
-
-// Debugging in Internet Explorer. This allows you to use 
-// `console.log(['message', var1, var2, ...])`. Just remove the `false` and
-// add your console.logs. This will automatically stringify objects using
-// `JSON.stringify', so you can read what's going out. Think of this as a
-// *Diet Firebug Lite Zero with Lemon*.
-if ($.browser.msie && false) {
-  window.console = {};
-  var _$ied;
-  window.console.log = function(msg) {
-    if (_.isArray(msg)) {
-      var message = msg[0];
-      var vars = _.map(msg.slice(1), function(arg) {
-        return JSON.stringify(arg);
-      }).join(' - ');
-    }
-    if(!_$ied){
-      _$ied = $('<div><ol></ol></div>').css({
-        'position': 'fixed',
-        'bottom': 10,
-        'left': 10,
-        'zIndex': 20000,
-        'width': $('body').width() - 80,
-        'border': '1px solid #000',
-        'padding': '10px',
-        'backgroundColor': '#fff',
-        'fontFamily': 'arial,helvetica,sans-serif',
-        'fontSize': '11px'
-      });
-      $('body').append(_$ied);
-    }
-    var $message = $('<li>'+message+' - '+vars+'</li>').css({
-      'borderBottom': '1px solid #999999'
-    });
-    _$ied.find('ol').append($message);
-    _.delay(function() {
-      $message.fadeOut(500);
-    }, 5000);
-  };
-
-}
-
-})();
-
-(function() {
-
-var $ = jQuery; // Handle namespaced jQuery
-
-// Used to extract keywords and facets from the free text search.
-var FREETEXT_RE = '(\'[^\']+\'|"[^"]+"|[^\'"\\s]\\S*)';
-var CATEGORY_RE = FREETEXT_RE +                     ':\\s*';
-VS.app.SearchParser = {
-
-  // Matches `category: "free text"`, with and without quotes.
-  ALL_FIELDS : new RegExp(CATEGORY_RE + FREETEXT_RE, 'g'),
-
-  // Matches a single category without the text. Used to correctly extract facets.
-  CATEGORY   : new RegExp(CATEGORY_RE),
-
-  // Called to parse a query into a collection of `SearchFacet` models.
-  parse : function(instance, query) {
-    var searchFacets = this._extractAllFacets(instance, query);
-    instance.searchQuery.reset(searchFacets);
-    return searchFacets;
-  },
-
-  // Walks the query and extracts facets, categories, and free text.
-  _extractAllFacets : function(instance, query) {
-    var facets = [];
-    var originalQuery = query;
-
-    while (query) {
-      var category, value;
-      originalQuery = query;
-      var field = this._extractNextField(query);
-      if (!field) {
-        category = 'text';
-        value    = this._extractSearchText(query);
-        query    = VS.utils.inflector.trim(query.replace(value, ''));
-      } else if (field.indexOf(':') != -1) {
-        category = field.match(this.CATEGORY)[1].replace(/(^['"]|['"]$)/g, '');
-        value    = field.replace(this.CATEGORY, '').replace(/(^['"]|['"]$)/g, '');
-        query    = VS.utils.inflector.trim(query.replace(field, ''));
-      } else if (field.indexOf(':') == -1) {
-        category = 'text';
-        value    = field;
-        query    = VS.utils.inflector.trim(query.replace(value, ''));
-      }
-
-      if (category && value) {
-          var searchFacet = new VS.model.SearchFacet({
-            category : category,
-            value    : VS.utils.inflector.trim(value),
-            app      : instance
-          });
-          facets.push(searchFacet);
-      }
-      if (originalQuery == query) break;
-    }
-
-    return facets;
-  },
-
-  // Extracts the first field found, capturing any free text that comes
-  // before the category.
-  _extractNextField : function(query) {
-    var textRe = new RegExp('^\\s*(\\S+)\\s+(?=' + CATEGORY_RE + FREETEXT_RE + ')');
-    var textMatch = query.match(textRe);
-    if (textMatch && textMatch.length >= 1) {
-      return textMatch[1];
-    } else {
-      return this._extractFirstField(query);
-    }
-  },
-
-  // If there is no free text before the facet, extract the category and value.
-  _extractFirstField : function(query) {
-    var fields = query.match(this.ALL_FIELDS);
-    return fields && fields.length && fields[0];
-  },
-
-  // If the found match is not a category and facet, extract the trimmed free text.
-  _extractSearchText : function(query) {
-    query = query || '';
-    var text = VS.utils.inflector.trim(query.replace(this.ALL_FIELDS, ''));
-    return text;
-  }
-
-};
-
-})();
-
-(function() {
-
-var $ = jQuery; // Handle namespaced jQuery
-
-// The model that holds individual search facets and their categories.
-// Held in a collection by `VS.app.searchQuery`.
-VS.model.SearchFacet = Backbone.Model.extend({
-
-  // Extract the category and value and serialize it in preparation for
-  // turning the entire searchBox into a search query that can be sent
-  // to the server for parsing and searching.
-  serialize : function() {
-    var category = this.quoteCategory(this.get('category'));
-    var value    = VS.utils.inflector.trim(this.get('value'));
-
-    if (!value) return '';
-
-    if (!_.contains(this.get("app").options.unquotable || [], category) && category != 'text') {
-      value = this.quoteValue(value);
-    }
-
-    if (category != 'text') {
-      category = category + ': ';
-    } else {
-      category = "";
-    }
-    return category + value;
-  },
-  
-  // Wrap categories that have spaces or any kind of quote with opposite matching
-  // quotes to preserve the complex category during serialization.
-  quoteCategory : function(category) {
-    var hasDoubleQuote = (/"/).test(category);
-    var hasSingleQuote = (/'/).test(category);
-    var hasSpace       = (/\s/).test(category);
-    
-    if (hasDoubleQuote && !hasSingleQuote) {
-      return "'" + category + "'";
-    } else if (hasSpace || (hasSingleQuote && !hasDoubleQuote)) {
-      return '"' + category + '"';
-    } else {
-      return category;
-    }
-  },
-  
-  // Wrap values that have quotes in opposite matching quotes. If a value has
-  // both single and double quotes, just use the double quotes.
-  quoteValue : function(value) {
-    var hasDoubleQuote = (/"/).test(value);
-    var hasSingleQuote = (/'/).test(value);
-    
-    if (hasDoubleQuote && !hasSingleQuote) {
-      return "'" + value + "'";
-    } else {
-      return '"' + value + '"';
-    }
-  }
-
-});
-
-})();
-(function() {
-
-var $ = jQuery; // Handle namespaced jQuery
-
-// Collection which holds all of the individual facets (category: value).
-// Used for finding and removing specific facets.
-VS.model.SearchQuery = Backbone.Collection.extend({
-
-  // Model holds the category and value of the facet.
-  model : VS.model.SearchFacet,
-
-  // Turns all of the facets into a single serialized string.
-  serialize : function() {
-    return this.map(function(facet){ return facet.serialize(); }).join(' ');
-  },
-  
-  facets : function() {
-    return this.map(function(facet) {
-      var value = {};
-      value[facet.get('category')] = facet.get('value');
-      return value;
-    });
-  },
-
-  // Find a facet by its category. Multiple facets with the same category
-  // is fine, but only the first is returned.
-  find : function(category) {
-    var facet = this.detect(function(facet) {
-      return facet.get('category') == category;
-    });
-    return facet && facet.get('value');
-  },
-
-  // Counts the number of times a specific category is in the search query.
-  count : function(category) {
-    return this.select(function(facet) {
-      return facet.get('category') == category;
-    }).length;
-  },
-
-  // Returns an array of extracted values from each facet in a category.
-  values : function(category) {
-    var facets = this.select(function(facet) {
-      return facet.get('category') == category;
-    });
-    return _.map(facets, function(facet) { return facet.get('value'); });
-  },
-
-  // Checks all facets for matches of either a category or both category and value.
-  has : function(category, value) {
-    return this.any(function(facet) {
-      var categoryMatched = facet.get('category') == category;
-      if (!value) return categoryMatched;
-      return categoryMatched && facet.get('value') == value;
-    });
-  },
-
-  // Used to temporarily hide a specific category and serialize the search query.
-  withoutCategory : function(category) {
-    return this.map(function(facet) {
-      if (facet.get('category') != category) return facet.serialize();
-    }).join(' ');
-  }
-
-});
-
-})();(function(){
-window.JST = window.JST || {};
-
-window.JST['search_box'] = _.template('<div class="VS-search">\n  <div class="VS-search-box-wrapper VS-search-box">\n    <div class="VS-icon VS-icon-search"></div>\n    <div class="VS-search-inner"></div>\n    <div class="VS-icon VS-icon-cancel VS-cancel-search-box" title="clear search"></div>\n  </div>\n</div>');
-window.JST['search_facet'] = _.template('<% if (model.has(\'category\')) { %>\n  <div class="category"><%= model.get(\'category\') %>:</div>\n<% } %>\n\n<div class="search_facet_input_container">\n  <input type="text" class="search_facet_input VS-interface" value="" />\n</div>\n\n<div class="search_facet_remove VS-icon VS-icon-cancel"></div>');
-window.JST['search_input'] = _.template('<input type="text" />');
-})();
\ No newline at end of file
diff --git a/addons/web/static/lib/visualsearch/demo.html b/addons/web/static/lib/visualsearch/demo.html
deleted file mode 100755
index 212fb7cee28..00000000000
--- a/addons/web/static/lib/visualsearch/demo.html
+++ /dev/null
@@ -1,453 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="chrome=1">
-  <title>DocumentCloud's VisualSearch.js</title>
-  <style>
-    body {
-      font-size: 16px;
-      line-height: 24px;
-      background: #FEF3CA;
-      color: #022;
-      height: 100%;
-      font-family: "Palatino Linotype", "Book Antiqua", Palatino, FreeSerif, serif;
-    }
-    div.container {
-      width: 720px;
-      margin: 50px 0 50px 50px;
-    }
-    p, li {
-      margin: 16px 0 16px 0;
-      width: 550px;
-    }
-      p.break {
-        margin-top: 35px;
-      }
-    ol {
-      padding-left: 24px;
-    }
-      ol li {
-        font-weight: bold;
-        margin-left: 0;
-      }
-    a, a:visited {
-      padding: 0 2px;
-      text-decoration: none;
-      background: #f0c095;
-      color: #252519;
-    }
-    a:active, a:hover {
-      color: #FFF;
-      background: #C25D00;
-    }
-    h1, h2, h3, h4, h5, h6 {
-      margin-top: 40px;
-    }
-    b.header {
-      font-size: 18px;
-    }
-    span.alias {
-      font-size: 14px;
-      font-style: italic;
-      margin-left: 20px;
-    }
-    table {
-      margin: 16px 0; padding: 0;
-    }
-      tr, td, th {
-        margin: 0; padding: 0;
-        text-align: left;
-      }
-        th {
-          padding: 24px 0 0;
-        }
-        tr:first-child th {
-          padding-top: 0;
-        }
-        td {
-          padding: 6px 15px 6px 0;
-        }
-          td.definition {
-            line-height: 18px;
-            font-size: 14px;
-          }
-    table.downloads td {
-      padding-left: 18px;
-    }
-    .demo-hint {
-      font-size: 13px;
-      margin: 0 0 12px 12px;
-      font-weight: normal;
-    }
-    #VS code, #VS pre, #VS tt {
-      font-family: Monaco, Consolas, "Lucida Console", monospace;
-      font-size: 12px;
-      line-height: 18px;
-      color: #444;
-      background: none;
-    }
-      #VS code {
-        margin-left: 8px;
-        padding: 0 0 0 12px;
-        font-weight: normal;
-      }
-      #VS pre {
-        font-size: 12px;
-        padding: 2px 0 2px 0;
-        border-left: 6px solid #829C37;
-        margin: 12px 0;
-      }
-    #search_query {
-      margin: 18px 0;
-      opacity: 0;
-    }
-      #search_query .raquo {
-        font-size: 18px;
-        line-height: 12px;
-        font-weight: bold;
-        margin-right: 4px;
-      }
-    #search_query2 {
-      margin: 18px 0;
-      opacity: 0;
-    }
-      #search_query2 .raquo {
-        font-size: 18px;
-        line-height: 12px;
-        font-weight: bold;
-        margin-right: 4px;
-      }
-  </style>
-
-  <link rel="stylesheet" href="lib/css/reset.css" type="text/css" media="screen" charset="utf-8">
-  <link rel="stylesheet" href="lib/css/icons.css" type="text/css" media="screen" charset="utf-8">
-  <link rel="stylesheet" href="lib/css/workspace.css" type="text/css" media="screen" charset="utf-8">
-
-  <script src="vendor/jquery-1.6.1.js" type="text/javascript" charset="utf-8"></script>
-  <!-- <script src="vendor/backported/jquery-1.4.4.js" type="text/javascript" charset="utf-8"></script> -->
-  <script src="vendor/jquery.ui.core.js" type="text/javascript" charset="utf-8"></script>
-  <script src="vendor/jquery.ui.widget.js" type="text/javascript" charset="utf-8"></script>
-  <script src="vendor/jquery.ui.position.js" type="text/javascript" charset="utf-8"></script>
-  <script src="vendor/jquery.ui.autocomplete.js" type="text/javascript" charset="utf-8"></script>
-  <script src="vendor/underscore-1.1.5.js" type="text/javascript" charset="utf-8"></script>
-  <script src="vendor/backbone-0.5.0.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/js/visualsearch.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/js/views/search_box.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/js/views/search_facet.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/js/views/search_input.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/js/models/search_facets.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/js/models/search_query.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/js/utils/backbone_extensions.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/js/utils/hotkeys.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/js/utils/jquery_extensions.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/js/utils/search_parser.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/js/utils/inflector.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/js/templates/templates.js" type="text/javascript" charset="utf-8"></script>
-</head>
-<body>
-
-  <div class="container" id="VS">
-
-    <h1><a href="index.html">VisualSearch.js</a></h1>
-
-    <p>
-      <a href="http://github.com/documentcloud/visualsearch">VisualSearch.js</a>
-      enhances ordinary search boxes with the ability to autocomplete
-      faceted search queries. Specify the facets for completion, along with the
-      completable values for any facet. You can retrieve the search query as a
-      structured object, so you don't have to parse the query string yourself.
-    </p>
-
-    <p>
-      <a href="docs/visualsearch.html">The complete annotated source code</a>
-      is also available.
-    </p>
-
-    <p>
-      The project is
-      <a href="http://github.com/documentcloud/visualsearch/">hosted on GitHub</a>.
-      You can report bugs and discuss features on the
-      <a href="http://github.com/documentcloud/visualsearch/issues">issues page</a>,
-      on Freenode in the <tt>#documentcloud</tt> channel,
-      or send tweets to <a href="http://twitter.com/documentcloud">@documentcloud</a>.
-    </p>
-
-    <p>
-      <i>VisualSearch.js is an open-source component of <a href="http://documentcloud.org/">DocumentCloud</a>.</i>
-    </p>
-    <h2 id="demo">Demo <span class="demo-hint"><i>Try searching for: <b>account</b>, <b>filter</b>, <b>access</b>, <b>title</b>, <b>city</b>, <b>state</b>, or <b>country</b>.</i></span></h2>
-
-    <div id="search_box_container"></div>
-    <div id="search_query">&nbsp;</div>
-
-    <script type="text/javascript" charset="utf-8">
-      $(document).ready(function() {
-        window.visualSearch = VS.init({
-          container  : $('#search_box_container'),
-          query      : 'country: "South Africa" account: 5-samuel title: "Pentagon Papers"',
-          // query      : '',
-          unquotable : [
-            'text',
-            'account',
-            'filter',
-            'access'
-          ],
-          callbacks  : {
-            search : function(query, searchCollection) {
-              var $query = $('#search_query');
-              $query.stop().animate({opacity : 1}, {duration: 300, queue: false});
-              $query.html('<span class="raquo">&raquo;</span> You searched for: <b>' + searchCollection.serialize() + '</b>');
-              clearTimeout(window.queryHideDelay);
-              window.queryHideDelay = setTimeout(function() {
-                $query.animate({
-                  opacity : 0
-                }, {
-                  duration: 1000,
-                  queue: false
-                });
-              }, 2000);
-            },
-            valueMatches : function(category, searchTerm, callback) {
-              switch (category) {
-              case 'account':
-                  callback([
-                    { value: '1-amanda', label: 'Amanda' },
-                    { value: '2-aron',   label: 'Aron' },
-                    { value: '3-eric',   label: 'Eric' },
-                    { value: '4-jeremy', label: 'Jeremy' },
-                    { value: '5-samuel', label: 'Samuel' },
-                    { value: '6-scott',  label: 'Scott' }
-                  ]);
-                  break;
-                case 'filter':
-                  callback(['published', 'unpublished', 'draft']);
-                  break;
-                case 'access':
-                  callback(['public', 'private', 'protected']);
-                  break;
-                case 'title':
-                  callback([
-                    'Pentagon Papers',
-                    'CoffeeScript Manual',
-                    'Laboratory for Object Oriented Thinking',
-                    'A Repository Grows in Brooklyn'
-                  ]);
-                  break;
-                case 'city':
-                  callback([
-                    'Cleveland',
-                    'New York City',
-                    'Brooklyn',
-                    'Manhattan',
-                    'Queens',
-                    'The Bronx',
-                    'Staten Island',
-                    'San Francisco',
-                    'Los Angeles',
-                    'Seattle',
-                    'London',
-                    'Portland',
-                    'Chicago',
-                    'Boston'
-                  ])
-                  break;
-                case 'state':
-                  callback([
-                    "Alabama", "Alaska", "Arizona", "Arkansas", "California",
-                    "Colorado", "Connecticut", "Delaware", "District of Columbia", "Florida",
-                    "Georgia", "Guam", "Hawaii", "Idaho", "Illinois",
-                    "Indiana", "Iowa", "Kansas", "Kentucky", "Louisiana",
-                    "Maine", "Maryland", "Massachusetts", "Michigan", "Minnesota",
-                    "Mississippi", "Missouri", "Montana", "Nebraska", "Nevada",
-                    "New Hampshire", "New Jersey", "New Mexico", "New York", "North Carolina",
-                    "North Dakota", "Ohio", "Oklahoma", "Oregon", "Pennsylvania",
-                    "Puerto Rico", "Rhode Island", "South Carolina", "South Dakota", "Tennessee",
-                    "Texas", "Utah", "Vermont", "Virginia", "Virgin Islands",
-                    "Washington", "West Virginia", "Wisconsin", "Wyoming"
-                  ]);
-                  break
-                case 'country':
-                  callback([
-                    "China", "India", "United States", "Indonesia", "Brazil",
-                    "Pakistan", "Bangladesh", "Nigeria", "Russia", "Japan",
-                    "Mexico", "Philippines", "Vietnam", "Ethiopia", "Egypt",
-                    "Germany", "Turkey", "Iran", "Thailand", "D. R. of Congo",
-                    "France", "United Kingdom", "Italy", "Myanmar", "South Africa",
-                    "South Korea", "Colombia", "Ukraine", "Spain", "Tanzania",
-                    "Sudan", "Kenya", "Argentina", "Poland", "Algeria",
-                    "Canada", "Uganda", "Morocco", "Iraq", "Nepal",
-                    "Peru", "Afghanistan", "Venezuela", "Malaysia", "Uzbekistan",
-                    "Saudi Arabia", "Ghana", "Yemen", "North Korea", "Mozambique",
-                    "Taiwan", "Syria", "Ivory Coast", "Australia", "Romania",
-                    "Sri Lanka", "Madagascar", "Cameroon", "Angola", "Chile",
-                    "Netherlands", "Burkina Faso", "Niger", "Kazakhstan", "Malawi",
-                    "Cambodia", "Guatemala", "Ecuador", "Mali", "Zambia",
-                    "Senegal", "Zimbabwe", "Chad", "Cuba", "Greece",
-                    "Portugal", "Belgium", "Czech Republic", "Tunisia", "Guinea",
-                    "Rwanda", "Dominican Republic", "Haiti", "Bolivia", "Hungary",
-                    "Belarus", "Somalia", "Sweden", "Benin", "Azerbaijan",
-                    "Burundi", "Austria", "Honduras", "Switzerland", "Bulgaria",
-                    "Serbia", "Israel", "Tajikistan", "Hong Kong", "Papua New Guinea",
-                    "Togo", "Libya", "Jordan", "Paraguay", "Laos",
-                    "El Salvador", "Sierra Leone", "Nicaragua", "Kyrgyzstan", "Denmark",
-                    "Slovakia", "Finland", "Eritrea", "Turkmenistan"
-                  ], {preserveOrder: true});
-                  break;
-              }
-            },
-            facetMatches : function(callback) {
-              callback([
-                'account', 'filter', 'access', 'title',
-                { label: 'city',    category: 'location' },
-                { label: 'address', category: 'location' },
-                { label: 'country', category: 'location' },
-                { label: 'state',   category: 'location' },
-              ]);
-            }
-          }
-        });
-      });
-    </script>
-
-
-
-    <div id="search_box_container2"></div>
-    <div id="search_query2">&nbsp;</div>
-
-    <script type="text/javascript" charset="utf-8">
-      $(document).ready(function() {
-        var visualSearch = VS.init({
-          container  : $('#search_box_container2'),
-          query      : '',
-          // query      : '',
-          unquotable : [
-            'text',
-            'account',
-            'filter',
-            'access'
-          ],
-          callbacks  : {
-            search : function(query, searchCollection) {
-              console.log(["query", searchCollection.facets(), query]);
-              var $query = $('#search_query2');
-              $query.stop().animate({opacity : 1}, {duration: 300, queue: false});
-              $query.html('<span class="raquo">&raquo;</span> You searched for: <b>' + searchCollection.serialize() + '</b>');
-              clearTimeout(window.queryHideDelay2);
-              window.queryHideDelay2 = setTimeout(function() {
-                $query.animate({
-                  opacity : 0
-                }, {
-                  duration: 1000,
-                  queue: false
-                });
-              }, 2000);
-            },
-            valueMatches : function(category, searchTerm, callback) {
-              switch (category) {
-              case 'account':
-                  callback([
-                    { value: '1-amanda', label: 'Amanda' },
-                    { value: '2-aron',   label: 'Aron' },
-                    { value: '3-eric',   label: 'Eric' },
-                    { value: '4-jeremy', label: 'Jeremy' },
-                    { value: '5-samuel', label: 'Samuel' },
-                    { value: '6-scott',  label: 'Scott' }
-                  ]);
-                  break;
-                case 'filter':
-                  callback(['published', 'unpublished', 'draft']);
-                  break;
-                case 'access':
-                  callback(['public', 'private', 'protected']);
-                  break;
-                case 'title':
-                  callback([
-                    'Pentagon Papers',
-                    'CoffeeScript Manual',
-                    'Laboratory for Object Oriented Thinking',
-                    'A Repository Grows in Brooklyn'
-                  ]);
-                  break;
-                case 'city':
-                  callback([
-                    'Cleveland',
-                    'New York City',
-                    'Brooklyn',
-                    'Manhattan',
-                    'Queens',
-                    'The Bronx',
-                    'Staten Island',
-                    'San Francisco',
-                    'Los Angeles',
-                    'Seattle',
-                    'London',
-                    'Portland',
-                    'Chicago',
-                    'Boston'
-                  ])
-                  break;
-                case 'state':
-                  callback([
-                    "Alabama", "Alaska", "Arizona", "Arkansas", "California",
-                    "Colorado", "Connecticut", "Delaware", "District of Columbia", "Florida",
-                    "Georgia", "Guam", "Hawaii", "Idaho", "Illinois",
-                    "Indiana", "Iowa", "Kansas", "Kentucky", "Louisiana",
-                    "Maine", "Maryland", "Massachusetts", "Michigan", "Minnesota",
-                    "Mississippi", "Missouri", "Montana", "Nebraska", "Nevada",
-                    "New Hampshire", "New Jersey", "New Mexico", "New York", "North Carolina",
-                    "North Dakota", "Ohio", "Oklahoma", "Oregon", "Pennsylvania",
-                    "Puerto Rico", "Rhode Island", "South Carolina", "South Dakota", "Tennessee",
-                    "Texas", "Utah", "Vermont", "Virginia", "Virgin Islands",
-                    "Washington", "West Virginia", "Wisconsin", "Wyoming"
-                  ]);
-                  break
-                case 'country':
-                  callback([
-                    "China", "India", "United States", "Indonesia", "Brazil",
-                    "Pakistan", "Bangladesh", "Nigeria", "Russia", "Japan",
-                    "Mexico", "Philippines", "Vietnam", "Ethiopia", "Egypt",
-                    "Germany", "Turkey", "Iran", "Thailand", "D. R. of Congo",
-                    "France", "United Kingdom", "Italy", "Myanmar", "South Africa",
-                    "South Korea", "Colombia", "Ukraine", "Spain", "Tanzania",
-                    "Sudan", "Kenya", "Argentina", "Poland", "Algeria",
-                    "Canada", "Uganda", "Morocco", "Iraq", "Nepal",
-                    "Peru", "Afghanistan", "Venezuela", "Malaysia", "Uzbekistan",
-                    "Saudi Arabia", "Ghana", "Yemen", "North Korea", "Mozambique",
-                    "Taiwan", "Syria", "Ivory Coast", "Australia", "Romania",
-                    "Sri Lanka", "Madagascar", "Cameroon", "Angola", "Chile",
-                    "Netherlands", "Burkina Faso", "Niger", "Kazakhstan", "Malawi",
-                    "Cambodia", "Guatemala", "Ecuador", "Mali", "Zambia",
-                    "Senegal", "Zimbabwe", "Chad", "Cuba", "Greece",
-                    "Portugal", "Belgium", "Czech Republic", "Tunisia", "Guinea",
-                    "Rwanda", "Dominican Republic", "Haiti", "Bolivia", "Hungary",
-                    "Belarus", "Somalia", "Sweden", "Benin", "Azerbaijan",
-                    "Burundi", "Austria", "Honduras", "Switzerland", "Bulgaria",
-                    "Serbia", "Israel", "Tajikistan", "Hong Kong", "Papua New Guinea",
-                    "Togo", "Libya", "Jordan", "Paraguay", "Laos",
-                    "El Salvador", "Sierra Leone", "Nicaragua", "Kyrgyzstan", "Denmark",
-                    "Slovakia", "Finland", "Eritrea", "Turkmenistan"
-                  ]);
-                  break;
-              }
-            },
-            facetMatches : function(callback) {
-              callback([
-                'account', 'filter', 'access', 'title',
-                { label: 'city',    category: 'location' },
-                { label: 'address', category: 'location' },
-                { label: 'country', category: 'location' },
-                { label: 'state',   category: 'location' },
-              ], {
-                  preserveOrder: true
-              });
-            }
-          }
-        });
-      });
-    </script>
-    
-  </div>
-
-</body>
-</html>
diff --git a/addons/web/static/lib/visualsearch/index.html b/addons/web/static/lib/visualsearch/index.html
deleted file mode 100755
index 07cc8de20e8..00000000000
--- a/addons/web/static/lib/visualsearch/index.html
+++ /dev/null
@@ -1,537 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="chrome=1">
-  <title>DocumentCloud's VisualSearch.js</title>
-  <style>
-    body {
-      font-size: 16px;
-      line-height: 24px;
-      background: #FEF3CA;
-      height: 100%;
-      color: #022;
-      font-family: Arial;
-      font-family: "Palatino Linotype", "Book Antiqua", Palatino, FreeSerif, serif;
-    }
-    div.container {
-      width: 720px;
-      margin: 50px 0 50px 50px;
-    }
-    p, li {
-      margin: 16px 0 16px 0;
-      width: 550px;
-    }
-      p.break {
-        margin-top: 35px;
-      }
-    ol {
-      padding-left: 24px;
-    }
-      ol li {
-        font-weight: bold;
-        margin-left: 0;
-      }
-    a, a:visited {
-      padding: 0 2px;
-      text-decoration: none;
-      background: #f0c095;
-      color: #252519;
-    }
-    a:active, a:hover {
-      color: #000;
-      background: #e0a070;
-    }
-    h1, h2, h3, h4, h5, h6 {
-      margin-top: 40px;
-    }
-    b.header {
-      font-size: 18px;
-    }
-    span.alias {
-      font-size: 14px;
-      font-style: italic;
-      margin-left: 20px;
-    }
-    table {
-      margin: 16px 0; padding: 0;
-    }
-      tr, td, th {
-        margin: 0; padding: 0;
-        text-align: left;
-      }
-        th {
-          padding: 24px 0 0;
-        }
-        tr:first-child th {
-          padding-top: 0;
-        }
-        td {
-          padding: 6px 15px 6px 0;
-        }
-          td.definition {
-            line-height: 18px;
-            font-size: 14px;
-          }
-    table.downloads td {
-      padding-left: 18px;
-    }
-    .demo-hint {
-      font-size: 13px;
-      margin: 0 0 12px 12px;
-      font-weight: normal;
-    }
-    #VS code, #VS pre, #VS tt {
-      font-family: Monaco, Consolas, "Lucida Console", monospace;
-      font-size: 12px;
-      line-height: 18px;
-      color: #444;
-      background: none;
-    }
-      #VS code {
-        margin-left: 8px;
-        padding: 0 0 0 12px;
-        font-weight: normal;
-      }
-      #VS pre {
-        font-size: 12px;
-        padding: 2px 0 2px 0;
-        border-left: 6px solid #829C37;
-        margin: 12px 0;
-      }
-    #search_query {
-      margin: 18px 0 -24px;
-      opacity: 0;
-    }
-      #search_query .raquo {
-        font-size: 18px;
-        line-height: 12px;
-        font-weight: bold;
-        margin-right: 4px;
-      }
-    .attribution {
-      margin: -12px 0 24px;
-      font-size: 14px;
-    }
-  </style>
-
-  <link rel="stylesheet" href="build-min/visualsearch-datauri.css" type="text/css" media="screen" charset="utf-8">
-  <link rel="stylesheet" href="docs/assets/github.css" type="text/css" media="screen" charset="utf-8">
-
-  <script src="build-min/dependencies.js" type="text/javascript" charset="utf-8"></script>
-  <script src="build-min/visualsearch.js" type="text/javascript" charset="utf-8"></script>
-  <script src="docs/assets/highlight.js" type="text/javascript" charset="utf-8"></script>
-  <script src="docs/assets/javascript.js" type="text/javascript" charset="utf-8"></script>
-  <script src="docs/assets/xml.js" type="text/javascript" charset="utf-8"></script>
-  <script>
-    hljs.initHighlightingOnLoad();
-  </script>
-
-</head>
-<body>
-
-  <div class="container" id="VS">
-
-    <h1>VisualSearch.js</h1>
-    
-    <p class="attribution">
-      <i>
-        Created by <a href="http://github.com/samuelclay">Samuel Clay</a>, 
-        <a href="http://twitter.com/samuelclay">@samuelclay</a>.
-      </i>
-    </p>
-    
-    <p>
-      <a href="http://github.com/documentcloud/visualsearch">VisualSearch.js</a>
-      enhances ordinary search boxes with the ability to autocomplete
-      faceted search queries. Specify the facets for completion, along with the
-      completable values for any facet. You can retrieve the search query as a
-      structured object, so you don't have to parse the query string yourself.
-    </p>
-    
-    <p>
-      <a href="https://www.documentcloud.org/public/#search/group%3A%20dcloud%20chair%3A%20%22Christopher%20Dodd%22%20TARP">Here's an example of a search on DocumentCloud.org that uses facets.</a>
-    </p>
-
-    <p>
-      The project is
-      <a href="http://github.com/documentcloud/visualsearch/">hosted on GitHub</a>.
-      You can report bugs and discuss features on the
-      <a href="http://github.com/documentcloud/visualsearch/issues">issues page</a>,
-      on Freenode in the <tt>#documentcloud</tt> channel,
-      or send tweets to <a href="http://twitter.com/documentcloud">@documentcloud</a>.
-    </p>
-
-    <p>
-      <i>VisualSearch.js is an open-source component of <a href="http://documentcloud.org/">DocumentCloud</a>. 
-      <br />
-      <a href="docs/visualsearch.html">The complete annotated source code</a>
-      is also available.</i>
-    </p>
-
-    <h2>Table of Contents</h2>
-
-    <a href="#demo">Demo</a> | <a href="#downloads">Downloads</a> | <a href="#usage">Usage</a> | <a href="#changelog">Change Log</a>
-
-
-    <h2 id="demo">Demo <span class="demo-hint"><i>Try searching for: <b>account</b>, <b>filter</b>, <b>access</b>, <b>title</b>, <b>city</b>, <b>state</b>, or <b>country</b>.</i></span></h2>
-
-
-
-    <div id="search_box_container"></div>
-    <div id="search_query">&nbsp;</div>
-
-    <script type="text/javascript" charset="utf-8">
-      $(document).ready(function() {
-        var visualSearch = VS.init({
-          container  : $('#search_box_container'),
-          query      : 'country: "United States" state: "New York" account: 5-samuel title: "Pentagon Papers"',
-          unquotable : [
-            'text',
-            'account',
-            'filter',
-            'access'
-          ],
-          callbacks  : {
-            search : function(query, searchCollection) {
-              var $query = $('#search_query');
-              var count  = searchCollection.size();
-              $query.stop().animate({opacity : 1}, {duration: 300, queue: false});
-              $query.html('<span class="raquo">&raquo;</span> You searched for: ' +
-                          '<b>' + (query || '<i>nothing</i>') + '</b>. ' +
-                          '(' + count + ' facet' + (count==1 ? '' : 's') + ')');
-              clearTimeout(window.queryHideDelay);
-              window.queryHideDelay = setTimeout(function() {
-                $query.animate({
-                  opacity : 0
-                }, {
-                  duration: 1000,
-                  queue: false
-                });
-              }, 2000);
-            },
-            facetMatches : function(callback) {
-              callback([
-                'account', 'filter', 'access', 'title',
-                { label: 'city',    category: 'location' },
-                { label: 'country', category: 'location' },
-                { label: 'state',   category: 'location' },
-              ]);
-            },
-            valueMatches : function(facet, searchTerm, callback) {
-              switch (facet) {
-              case 'account':
-                  callback([
-                    { value: '1-amanda', label: 'Amanda' },
-                    { value: '2-aron',   label: 'Aron' },
-                    { value: '3-eric',   label: 'Eric' },
-                    { value: '4-jeremy', label: 'Jeremy' },
-                    { value: '5-samuel', label: 'Samuel' },
-                    { value: '6-scott',  label: 'Scott' }
-                  ]);
-                  break;
-                case 'filter':
-                  callback(['published', 'unpublished', 'draft']);
-                  break;
-                case 'access':
-                  callback(['public', 'private', 'protected']);
-                  break;
-                case 'title':
-                  callback([
-                    'Pentagon Papers',
-                    'CoffeeScript Manual',
-                    'Laboratory for Object Oriented Thinking',
-                    'A Repository Grows in Brooklyn'
-                  ]);
-                  break;
-                case 'city':
-                  callback([
-                    'Cleveland',
-                    'New York City',
-                    'Brooklyn',
-                    'Manhattan',
-                    'Queens',
-                    'The Bronx',
-                    'Staten Island',
-                    'San Francisco',
-                    'Los Angeles',
-                    'Seattle',
-                    'London',
-                    'Portland',
-                    'Chicago',
-                    'Boston'
-                  ]);
-                  break;
-                case 'state':
-                  callback([
-                    "Alabama", "Alaska", "Arizona", "Arkansas", "California",
-                    "Colorado", "Connecticut", "Delaware", "District of Columbia", "Florida",
-                    "Georgia", "Guam", "Hawaii", "Idaho", "Illinois",
-                    "Indiana", "Iowa", "Kansas", "Kentucky", "Louisiana",
-                    "Maine", "Maryland", "Massachusetts", "Michigan", "Minnesota",
-                    "Mississippi", "Missouri", "Montana", "Nebraska", "Nevada",
-                    "New Hampshire", "New Jersey", "New Mexico", "New York", "North Carolina",
-                    "North Dakota", "Ohio", "Oklahoma", "Oregon", "Pennsylvania",
-                    "Puerto Rico", "Rhode Island", "South Carolina", "South Dakota", "Tennessee",
-                    "Texas", "Utah", "Vermont", "Virginia", "Virgin Islands",
-                    "Washington", "West Virginia", "Wisconsin", "Wyoming"
-                  ]);
-                  break;
-                case 'country':
-                  callback([
-                    "China", "India", "United States", "Indonesia", "Brazil",
-                    "Pakistan", "Bangladesh", "Nigeria", "Russia", "Japan",
-                    "Mexico", "Philippines", "Vietnam", "Ethiopia", "Egypt",
-                    "Germany", "Turkey", "Iran", "Thailand", "D. R. of Congo",
-                    "France", "United Kingdom", "Italy", "Myanmar", "South Africa",
-                    "South Korea", "Colombia", "Ukraine", "Spain", "Tanzania",
-                    "Sudan", "Kenya", "Argentina", "Poland", "Algeria",
-                    "Canada", "Uganda", "Morocco", "Iraq", "Nepal",
-                    "Peru", "Afghanistan", "Venezuela", "Malaysia", "Uzbekistan",
-                    "Saudi Arabia", "Ghana", "Yemen", "North Korea", "Mozambique",
-                    "Taiwan", "Syria", "Ivory Coast", "Australia", "Romania",
-                    "Sri Lanka", "Madagascar", "Cameroon", "Angola", "Chile",
-                    "Netherlands", "Burkina Faso", "Niger", "Kazakhstan", "Malawi",
-                    "Cambodia", "Guatemala", "Ecuador", "Mali", "Zambia",
-                    "Senegal", "Zimbabwe", "Chad", "Cuba", "Greece",
-                    "Portugal", "Belgium", "Czech Republic", "Tunisia", "Guinea",
-                    "Rwanda", "Dominican Republic", "Haiti", "Bolivia", "Hungary",
-                    "Belarus", "Somalia", "Sweden", "Benin", "Azerbaijan",
-                    "Burundi", "Austria", "Honduras", "Switzerland", "Bulgaria",
-                    "Serbia", "Israel", "Tajikistan", "Hong Kong", "Papua New Guinea",
-                    "Togo", "Libya", "Jordan", "Paraguay", "Laos",
-                    "El Salvador", "Sierra Leone", "Nicaragua", "Kyrgyzstan", "Denmark",
-                    "Slovakia", "Finland", "Eritrea", "Turkmenistan"
-                  ], {preserveOrder: true});
-                  break;
-              }
-            }
-          }
-        });
-      });
-    </script>
-
-    <h2 id="downloads">Downloads <i style="padding-left: 12px; font-size:12px;">(Right-click, and use "Save As")</i></h2>
-
-    <table class="downloads">
-
-      <tr>
-        <th colspan="2">0. Everything (<tt>visualsearch.zip</tt>)</th>
-      </tr>
-      <tr>
-        <td><a href="https://github.com/documentcloud/visualsearch/zipball/master">Download everything</a></td>
-      </tr>
-
-      <tr>
-        <th colspan="2">1. VisualSearch JavaScript (<tt>visualsearch.js</tt>)</th>
-      </tr>
-      <tr>
-        <td><a href="build-min/visualsearch.js">Production Version (0.2.2)</a></td>
-        <td><i>8kb, Minified and Gzipped</i></td>
-      </tr>
-      <tr>
-        <td><a href="build/visualsearch.js">Development Version (0.2.2)</a></td>
-        <td><i>45kb, Uncompressed with Comments</i></td>
-      </tr>
-
-      <tr>
-        <th colspan="2">2. VisualSearch Stylesheets (<tt>visualsearch.css</tt>)</th>
-      </tr>
-      <tr>
-        <td colspan="2"><i>You should include both the datauri and image urls versions. <a href="#css">See how to include both</a></i></td>
-      </tr>
-      <tr>
-        <td><a href="build-min/visualsearch-datauri.css">Production Version - datauri</a></td>
-        <td><i>4kb, Minified and Gzipped</i></td>
-      </tr>
-      <tr>
-        <td><a href="build-min/visualsearch.css">Production Version - image urls</a></td>
-        <td><i>4kb, Minified and Gzipped</i></td>
-      </tr>
-      <tr>
-        <td><a href="build/visualsearch.css">Development Version</a></td>
-        <td><i>8kb, Uncompressed with Comments</i></td>
-      </tr>
-      <tr>
-        <th colspan="2">3. VisualSearch Images</th>
-      </tr>
-      <tr>
-        <td><img src="lib/images/embed/icons/search_glyph.png"> <a href="lib/images/embed/icons/search_glyph.png">Search Glyph</a></td>
-        <td><i>4kb, embedded in visualsearch-datauri.css</i></td>
-      </tr>
-      <tr>
-        <td><img src="lib/images/embed/icons/cancel_search.png"> <a href="lib/images/embed/icons/cancel_search.png">Cancel Button</a></td>
-        <td><i>4kb, embedded in visualsearch-datauri.css</i></td>
-      </tr>
-
-      <tr>
-        <th colspan="2">4. VisualSearch Dependencies (<tt>jQuery 1.4+, jQuery UI, Underscore.js, Backbone.js</tt>)</th>
-      </tr>
-      <tr>
-        <td colspan="2"><i>You should only include the dependencies you don't already have.</i></td>
-      </tr>
-      <tr>
-        <td><a href="build-min/dependencies.js">Production Version - All</a></td>
-        <td><i>49kb, Minified and Gzipped</i></td>
-      </tr>
-      <tr>
-        <td><a href="build/dependencies.js">Development Version - All</a></td>
-        <td><i>340kb, Uncompressed with Comments</i></td>
-      </tr>
-      <tr>
-        <td><a href="vendor/jquery-1.6.1.js">jQuery 1.6.1</a></td>
-        <td><i>238kb, Uncompressed with Comments</i></td>
-      </tr>
-      <tr>
-        <td>jQuery UI 1.8.13: <br /><a href="vendor/jquery.ui.core.js">Core</a> <a href="vendor/jquery.ui.position.js">Position</a> <a href="vendor/jquery.ui.widget.js">Widget</a> <a href="vendor/jquery.ui.autocomplete.js">Autocomplete</a></td>
-        <td><i>48kb, Uncompressed with Comments</i></td>
-      </tr>
-      <tr>
-        <td><a href="vendor/underscore-1.1.5.js">Underscore 1.1.5</a></td>
-        <td><i>29kb, Uncompressed with Comments</i></td>
-      </tr>
-      <tr>
-        <td><a href="vendor/backbone-0.5.0.js">Backbone 0.5.0</a></td>
-        <td><i>41kb, Uncompressed with Comments</i></td>
-      </tr>
-
-    </table>
-
-    <h2 id="usage">Usage</h2>
-
-    <p>To use VisualSearch.js on your site, follow these instructions on installation, configuration, and customization.</p>
-
-    <ol>
-      <li class="xml" id="css">Insert the JavaScript and CSS into your page:<br />
-        <pre><code>&lt;script src="visualsearch.js" type="text/javascript"&gt;&lt;/script&gt;
-&lt;!--[if (!IE)|(gte IE 8)]&gt;&lt;!--&gt;
-  &lt;link href="visualsearch-datauri.css" media="screen" rel="stylesheet" type="text/css" /&gt;
-&lt;!--&lt;![endif]--&gt;
-&lt;!--[if lte IE 7]&gt;&lt;!--&gt;
-  &lt;link href="visualsearch.css" media="screen" rel="stylesheet" type="text/css" /&gt;
-&lt;!--&lt;![endif]--&gt;</code></pre>
-      </li>
-      <li>Initialize the Visual Search box:<br />
-        <pre class="javascript"><code>&lt;div class="visual_search"&gt;&lt;/div&gt;
-
-&lt;script type="text/javascript" charset="utf-8"&gt;
-  $(document).ready(function() {
-    var visualSearch = VS.init({
-      container : $('.visual_search'),
-      query     : '',
-      callbacks : {
-        search       : function(query, searchCollection) {},
-        facetMatches : function(callback) {},
-        valueMatches : function(facet, searchTerm, callback) {}
-      }
-    });
-  });
-&lt;/script&gt;</code></pre>
-      </li>
-      <li class="javascript">Customize the autocompleted facets and values:
-        <pre><code>callbacks : {
-  ...
-  // These are the facets that will be autocompleted in an empty input.
-  facetMatches : function(callback) {
-    callback([
-      'account', 'filter', 'access', 'title',
-      { label: 'city',    category: 'location' },
-      { label: 'address', category: 'location' },
-      { label: 'country', category: 'location' },
-      { label: 'state',   category: 'location' },
-    ]);
-  }
-  ...
-  // These are the values that match specific categories, autocompleted
-  // in a category's input field.  searchTerm can be used to filter the
-  // list on the server-side, prior to providing a list to the widget.
-  valueMatches : function(facet, searchTerm, callback) {
-    switch (facet) {
-    case 'account':
-        callback([
-          { value: '1-amanda', label: 'Amanda' },
-          { value: '2-aron',   label: 'Aron' },
-          { value: '3-eric',   label: 'Eric' },
-          { value: '4-jeremy', label: 'Jeremy' },
-          { value: '5-samuel', label: 'Samuel' },
-          { value: '6-scott',  label: 'Scott' }
-        ]);
-        break;
-      case 'filter':
-        callback(['published', 'unpublished', 'draft']);
-        break;
-      case 'access':
-        callback(['public', 'private', 'protected']);
-        break;
-      case 'title':
-        callback([
-          'Pentagon Papers',
-          'CoffeeScript Manual',
-          'Laboratory for Object Oriented Thinking',
-          'A Repository Grows in Brooklyn'
-        ]);
-        break;
-    }
-  }
-...
-}</code></pre>
-      </li>
-      <li class="javascript">Inspect the Visual Search box
-        <pre><code>// Returns the unstructured search query
-visualSearch.searchBox.value() 
-// "country: "South Africa" account: 5-samuel title: "Pentagon Papers""
-
-// Returns an array of Facet model instances
-visualSearch.searchQuery.facets()
-// [FacetModel&lt;country:"South Africa">, 
-//  FacetModel&lt;account:5-samuel>, 
-//  FacetModel&lt;title:"Pentagon Papers">]
-
-// Set the search query with raw text
-visualSearch.searchBox.value("Country: US State: \"New York\" Key: Value")
-
-</code></pre>
-      </li>
-    </ol>
-
-
-    <h2 id="changelog">Change Log</h2>
-
-    <p>
-      <b class="header">0.2.2</b> <i>March 10th, 2012</i><br />
-      If you do not want to automatically filter the value matches, you can pass an
-      options hash with <tt>preserveMatches: true</tt> as the second argument to the callback.
-      <a href="https://github.com/documentcloud/visualsearch/pull/44">See pull request #44</a> for details.
-    </p>
-    <p>
-      <b class="header">0.2.1</b> <i>November 14th, 2011</i><br />
-      The autocompleted facets and values that are provided by your callbacks <tt>facetMatches</tt>
-      and <tt>valueMatches</tt> can now preserve the order of items you give them. Simply pass an
-      options hash with <tt>preserveOrder: true</tt> as the second argument to the callback. See
-      <a href="demo.html">the demo page</a> for an example.
-    </p>
-    <p>
-      <b class="header">0.2.0</b> <i>August 10th, 2011</i><br />
-      Multiple instances of VisualSearch on a single page. <tt>VS.init</tt> now returns
-      a reference to the instance. The <tt>search</tt> callback now contains both the
-      serialized search query and a reference to the search query collection (as a 
-      <a href="http://documentcloud.github.com/backbone/#Collection">Backbone.Collection</a>), 
-      which can be used to manipulate each facet directly. See 
-      <a href="docs/search_query.html">the source code for search_query.js</a> for available 
-      methods on the collection.
-    </p>
-    <p>
-      <b class="header">0.1.0</b> <i>June 23rd, 2011</i><br />
-      Initial release of VisualSearch.js.
-    </p>
-
-    <p>
-      <a href="http://documentcloud.org/" title="A DocumentCloud Project" style="background:none;">
-        <img src="http://jashkenas.s3.amazonaws.com/images/a_documentcloud_project.png" alt="A DocumentCloud Project" />
-      </a>
-    </p>
-
-  </div>
-
-</body>
-</html>

From ebea74aa2512e4534410a3a9d494fa3d3b01c3dc Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 16 May 2012 12:42:48 +0200
Subject: [PATCH 304/452] [IMP] move deletion button for custom filters to the
 extreme right of the filter's line

apr reco, looks better and less likely to be mistakenly clicked

bzr revid: xmo@openerp.com-20120516104248-j6sbyv0985xf1n88
---
 addons/web/static/src/css/base.css  | 17 ++++++++++++++++-
 addons/web/static/src/css/base.sass | 19 +++++++++++++++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 1824c3e745d..0a7bfa352a8 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1307,7 +1307,7 @@
 }
 .openerp .oe_searchview .oe_searchview_drawer button, .openerp .oe_searchview .oe_searchview_drawer .button {
   border: none;
-  background: white;
+  background: transparent;
   padding: 0 2px;
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
@@ -1340,6 +1340,7 @@
   list-style: none;
   padding: 3px 6px;
   height: 14px;
+  line-height: 14px;
   color: inherit;
   cursor: pointer;
 }
@@ -1360,6 +1361,20 @@
   font-size: 20px;
   color: #404040;
 }
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom li {
+  cursor: pointer;
+  position: relative;
+  line-height: 1.2em;
+  padding: 2px 20px 2px 10px;
+}
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom li:hover {
+  background-color: #f0f0fa;
+}
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom li button {
+  position: absolute;
+  top: 0;
+  right: 5px;
+}
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced form {
   display: none;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index cb7f0e30f9e..e97663eadb2 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -4,6 +4,7 @@
 $section-title-color: #8786b7
 $facets-border: #afafb6
 $facets-border-selected: #a6a6fe
+$hover-background: #f0f0fa
 $colour4: #8a89ba
 // }}}
 // Mixins {{{
@@ -1066,7 +1067,7 @@ $colour4: #8a89ba
 
             button, .button
                 border: none
-                background: white
+                background: transparent
                 padding: 0 2px
                 @include box-shadow(none)
                 @include radius(0)
@@ -1093,11 +1094,12 @@ $colour4: #8a89ba
                     list-style: none
                     padding: 3px 6px
                     height: 14px
+                    line-height: 14px
                     color: inherit
                     cursor: pointer
 
                     &:hover
-                        background-color: #f0f0fa
+                        background-color: $hover-background
 
             .oe_searchview_custom
                 form
@@ -1105,6 +1107,19 @@ $colour4: #8a89ba
 
                     button
                         @include text-to-icon("S")
+                li
+                    cursor: pointer
+                    position: relative
+                    line-height: 1.2em
+                    padding: 2px 20px 2px 10px
+
+                    &:hover
+                        background-color: $hover-background
+
+                    button
+                        position: absolute
+                        top: 0
+                        right: 5px
 
             .oe_searchview_advanced
                 form

From 5bd32b9373aaaff2753b73af14e3ff4a4d473699 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 16 May 2012 13:00:49 +0200
Subject: [PATCH 305/452] [IMP] open/close arrow-like thingie for the drawer:
 have it toggle as in title

bzr revid: xmo@openerp.com-20120516110049-ofl4pvkl1l7veo2h
---
 addons/web/static/src/css/base.css  | 7 +++++--
 addons/web/static/src/css/base.sass | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 0a7bfa352a8..8978dd3fc95 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1194,7 +1194,7 @@
   top: 0;
   right: 0;
   height: 100%;
-  line-height: 2em;
+  line-height: 2.5em;
   padding: 0 7px 0 4px;
   color: #cccccc;
   cursor: pointer;
@@ -1203,7 +1203,7 @@
   color: #999999;
 }
 .openerp .oe_searchview .oe_searchview_unfold_drawer:before {
-  content: "▾";
+  content: "◀";
 }
 .openerp .oe_searchview .oe_searchview_facets:before {
   color: #cccccc;
@@ -1274,6 +1274,9 @@
 .openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer {
   display: block;
 }
+.openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_unfold_drawer:before {
+  content: "▼";
+}
 .openerp .oe_searchview .oe_searchview_drawer {
   position: absolute;
   z-index: 1;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e97663eadb2..84ac7cda6fa 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -962,14 +962,14 @@ $colour4: #8a89ba
             top: 0
             right: 0
             height: 100%
-            line-height: 2em
+            line-height: 2.5em
             padding: 0 7px 0 4px
             color: #ccc
             cursor: pointer
             &:hover
                 color: #999
             &:before
-                content: "▾"
+                content: "◀"
 
         .oe_searchview_facets
             &:before
@@ -1035,6 +1035,8 @@ $colour4: #8a89ba
         &.oe_searchview_open_drawer
             .oe_searchview_drawer
                 display: block
+            .oe_searchview_unfold_drawer:before
+                content: "▼"
 
         .oe_searchview_drawer
             position: absolute

From 5ca8f4239670345c517335559fb67e626bb92bef Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Wed, 16 May 2012 14:25:22 +0200
Subject: [PATCH 306/452] [IMP] Fixed kanban view problems

bzr revid: mit@openerp.com-20120516122522-du590ixokm32z19r
---
 addons/web/static/src/css/base.css              | 9 ++++++++-
 addons/web/static/src/css/base.sass             | 7 ++++++-
 addons/web_kanban/static/src/js/kanban.js       | 2 +-
 addons/web_kanban/static/src/xml/web_kanban.xml | 4 ++--
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 5d2102630cb..6f5296315ae 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1942,6 +1942,14 @@
 .openerp .oe-listview-content .numeric input {
   text-align: right;
 }
+.openerp .oe_kanban_view {
+  position: absolute;
+  top: 110px;
+  bottom: 0;
+}
+.openerp .oe_kanban_groups {
+  height: 100%;
+}
 .openerp .oe_kanban_group_title {
   margin: 1px 1px 4px;
   font-size: 15px;
@@ -1949,7 +1957,6 @@
   text-shadow: 0 1px 0 white;
 }
 .openerp .oe_kanban_column, .openerp .oe_kanban_group_header {
-  width: 240px;
   vertical-align: top;
   padding: 6px 7px 6px 6px;
   background: #f0eeee;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 567732ed080..071d5b3eeca 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1614,13 +1614,18 @@ $colour4: #8a89ba
                 text-align: right
     // }}}
     // KanbanView {{{
+    .oe_kanban_view
+        position: absolute
+        top: 110px
+        bottom: 0
+    .oe_kanban_groups
+        height: 100%
     .oe_kanban_group_title
         margin: 1px 1px 4px
         font-size: 15px
         font-weight: bold
         text-shadow: 0 1px 0 white
     .oe_kanban_column, .oe_kanban_group_header
-        width: 240px
         vertical-align: top
         padding: 6px 7px 6px 6px
         background: #f0eeee
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 0fec031d4da..19f1bdcf10a 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -371,7 +371,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
             if (self.quick) { return; }
             self.quick = new instance.web_kanban.QuickCreate(this)
                 .on('added', self, self.proxy('quick_add'));
-            self.quick.appendTo(self.$element.find('.oe_kanban_group_header'));
+            self.quick.appendTo(self.$element.find('.oe_kanban_header'));
         });
         this.$records.find('.oe_kanban_show_more').click(this.do_show_more);
         if (this.state.folded) {
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index e5e0dffba93..cec843d8aff 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -16,9 +16,9 @@
     </t>
 </div>
 <t t-name="KanbanView.group_header">
-    <td>
+    <td class="oe_kanban_group_header">
         <t t-if="widget.view.group_by">
-            <div class="oe_kanban_group_header">
+            <div class="oe_kanban_header">
                 <div class="oe_kanban_fold_icon"></div>
                 <div class="oe_kanban_add"></div>
                 <div class="oe_fold_column">

From 378100e3aca931d8072027963869ae10d0e4e574 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 16 May 2012 14:25:51 +0200
Subject: [PATCH 307/452] [IMP] cleanup advanced search fields

bzr revid: xmo@openerp.com-20120516122551-c670k5lrqxnyx5ej
---
 addons/web/static/src/js/search.js | 58 +++++++++++-------------------
 addons/web/static/src/xml/base.xml | 13 +++----
 doc/search-view.rst                | 18 ++++++++--
 3 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index f4620e84309..2ac062e96f3 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1772,22 +1772,18 @@ instance.web.search.ExtendedSearchProposition = instance.web.OldWidget.extend(/*
         }
 
         var type = field.type;
-        var obj = instance.web.search.custom_filters.get_object(type);
-        if(obj === null) {
-            obj = instance.web.search.custom_filters.get_object("char");
-        }
-        this.value = new (obj) (this);
-        if(this.value.set_field) {
-            this.value.set_field(field);
+        var Field = instance.web.search.custom_filters.get_object(type);
+        if(!Field) {
+            Field = instance.web.search.custom_filters.get_object("char");
         }
+        this.value = new Field(this, field);
         _.each(this.value.operators, function(operator) {
             $('<option>', {value: operator.value})
                 .text(String(operator.text))
                 .appendTo(self.$element.find('.searchview_extended_prop_op'));
         });
-        this.$element.find('.searchview_extended_prop_value').html(
-            this.value.render({}));
-        this.value.start();
+        var $value_loc = this.$element.find('.searchview_extended_prop_value').empty();
+        this.value.appendTo($value_loc);
 
     },
     get_proposition: function() {
@@ -1800,9 +1796,10 @@ instance.web.search.ExtendedSearchProposition = instance.web.OldWidget.extend(/*
     }
 });
 
-instance.web.search.ExtendedSearchProposition.Field = instance.web.OldWidget.extend({
-    start: function () {
-        this.$element = $("#" + this.element_id);
+instance.web.search.ExtendedSearchProposition.Field = instance.web.Widget.extend({
+    init: function (parent, field) {
+        this._super(parent);
+        this.field = field;
     }
 });
 instance.web.search.ExtendedSearchProposition.Char = instance.web.search.ExtendedSearchProposition.Field.extend({
@@ -1827,33 +1824,23 @@ instance.web.search.ExtendedSearchProposition.DateTime = instance.web.search.Ext
         {value: ">=", text: _lt("greater or equal than")},
         {value: "<=", text: _lt("less or equal than")}
     ],
+    /**
+     * Date widgets live in view_form which is not yet loaded when this is
+     * initialized -_-
+     */
+    widget: function () { return instance.web.DateTimeWidget; },
     get_value: function() {
         return this.datewidget.get_value();
     },
     start: function() {
-        this._super();
-        this.datewidget = new instance.web.DateTimeWidget(this);
-        this.datewidget.prependTo(this.$element);
+        var ready = this._super();
+        this.datewidget = new (this.widget())(this);
+        this.datewidget.appendTo(this.$element);
+        return ready;
     }
 });
-instance.web.search.ExtendedSearchProposition.Date = instance.web.search.ExtendedSearchProposition.Field.extend({
-    template: 'SearchView.extended_search.proposition.empty',
-    operators: [
-        {value: "=", text: _lt("is equal to")},
-        {value: "!=", text: _lt("is not equal to")},
-        {value: ">", text: _lt("greater than")},
-        {value: "<", text: _lt("less than")},
-        {value: ">=", text: _lt("greater or equal than")},
-        {value: "<=", text: _lt("less or equal than")}
-    ],
-    get_value: function() {
-        return this.datewidget.get_value();
-    },
-    start: function() {
-        this._super();
-        this.datewidget = new instance.web.DateWidget(this);
-        this.datewidget.prependTo(this.$element);
-    }
+instance.web.search.ExtendedSearchProposition.Date = instance.web.search.ExtendedSearchProposition.DateTime.extend({
+    widget: function () { return instance.web.DateWidget; }
 });
 instance.web.search.ExtendedSearchProposition.Integer = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.integer',
@@ -1900,9 +1887,6 @@ instance.web.search.ExtendedSearchProposition.Selection = instance.web.search.Ex
         {value: "=", text: _lt("is")},
         {value: "!=", text: _lt("is not")}
     ],
-    set_field: function(field) {
-        this.field = field;
-    },
     get_value: function() {
         return this.$element.val();
     }
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a6dc137d7c7..2919aaeea42 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -975,11 +975,12 @@
     </div>
 </t>
 <t t-name="web.datetimepicker">
+    <t t-set="placeholder" t-value="widget.getParent().node and widget.getParent().node.attrs.placeholder"/>
     <div class="oe_datepicker_root oe_form_field_datetime">
         <input type="text" class="oe_datepicker_container" disabled="disabled" style="display: none;"/>
         <input type="text"
             t-att-name="widget.name"
-            t-att-placeholder="widget.getParent().node.attrs.placeholder"
+            t-att-placeholder="placeholder"
             t-attf-class="oe_datepicker_master field_#{widget.type_of_date} oe_form_field_#{widget.type_of_date}"
         /><img class="oe_input_icon oe_datepicker_trigger" t-att-src='_s + "/web/static/src/img/ui/field_calendar.png"'
              title="Select date" width="16" height="16" border="0"/>
@@ -1513,21 +1514,21 @@
     </li>
 </t>
 <t t-name="SearchView.extended_search.proposition.char">
-    <input t-att-id="widget.element_id" class="field_char"/>
+    <input class="field_char"/>
 </t>
 <t t-name="SearchView.extended_search.proposition.empty">
-    <span t-att-id="widget.element_id"></span>
+    <span/>
 </t>
 <t t-name="SearchView.extended_search.proposition.integer">
-    <input type="number" t-att-id="widget.element_id" class="field_integer" step="1"/>
+    <input type="number" class="field_integer" step="1"/>
 </t>
 <t t-name="SearchView.extended_search.proposition.float">
-    <input type="number" t-att-id="widget.element_id" class="field_float" step="0.01"/>
+    <input type="number" class="field_float" step="0.01"/>
 </t>
 <t t-name="SearchView.extended_search.proposition.boolean">
 </t>
 <t t-name="SearchView.extended_search.proposition.selection">
-    <select t-att-id="widget.element_id">
+    <select>
         <t t-foreach="widget.field.selection" t-as="element">
         <option t-att-value="element[0]"><t t-esc="element[1]"/></option>
         </t>
diff --git a/doc/search-view.rst b/doc/search-view.rst
index 66ad38d7d91..0fb7657cf2f 100644
--- a/doc/search-view.rst
+++ b/doc/search-view.rst
@@ -462,9 +462,21 @@ Many To One
 Advanced Search
 +++++++++++++++
 
-The advanced search is now a more standard
-:js:class:`~openerp.web.search.Input` configured to be rendered in the
-drawer.
+* The advanced search is now a more standard
+  :js:class:`~openerp.web.search.Input` configured to be rendered in
+  the drawer.
+
+* :js:class:`~openerp.web.search.ExtendedSearchProposition.Field` are
+  now standard widgets, with the "right" behaviors (they don't rebind
+  their ``$element`` in ``start()``)
+
+* The ad-hoc optional setting of the openerp field descriptor on a
+  :js:class:`~openerp.web.search.ExtendedSearchProposition.Field` has
+  been removed, the field descriptor is now passed as second argument
+  to the
+  :js:class:`~openerp.web.search.ExtendedSearchProposition.Field`'s
+  constructor, and bound to its
+  :js:attr:`~openerp.web.search.ExtendedSearchProposition.Field.field`.
 
 .. [#previous]
 

From aa3ef52416b9b5a3d4ebd1d9ccc9f0b9aab40911 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 16 May 2012 15:22:37 +0200
Subject: [PATCH 308/452] [FIX] make display of advanced filters look less
 purely technical and more human-readable

* Use field strings
* Use operator labels
* If applicable, use human-readable version of field values

bzr revid: xmo@openerp.com-20120516132237-z6zacy34sq7ujhg0
---
 addons/web/static/src/js/search.js | 54 +++++++++++++++++++++++-------
 doc/search-view.rst                |  6 ++++
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 2ac062e96f3..118eff17374 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1690,20 +1690,15 @@ instance.web.search.Advanced = instance.web.search.Input.extend({
         var self = this;
         // Get domain sections from all propositions
         var children = this.getChildren();
-        var domain = _.invoke(children, 'get_proposition');
-        var vals = _(domain).map(function (section) {
-            return {
-                label: _.str.sprintf('%s(%s)%s', section[0], section[1], section[2]),
-                value: null
-            }
-        });
+        var propositions = _.invoke(children, 'get_proposition');
+        var domain = _(propositions).pluck('value');
         for (var i = domain.length; --i;) {
             domain.unshift('|');
         }
 
         this.view.query.add({
             category: _t("Advanced"),
-            values: vals,
+            values: propositions,
             field: {
                 get_context: function () { },
                 get_domain: function () { return domain;},
@@ -1789,10 +1784,21 @@ instance.web.search.ExtendedSearchProposition = instance.web.OldWidget.extend(/*
     get_proposition: function() {
         if ( this.attrs.selected == null)
             return null;
-        var field = this.attrs.selected.name;
-        var op =  this.$element.find('.searchview_extended_prop_op').val();
-        var value = this.value.get_value();
-        return [field, op, value];
+        var field = this.attrs.selected;
+        var op = this.$element.find('.searchview_extended_prop_op')[0];
+        var operator = op.options[op.selectedIndex];
+        return {
+            label: _.str.sprintf(_t('%(field)s %(operator)s "%(value)s"'), {
+                field: field.string,
+                // According to spec, HTMLOptionElement#label should return
+                // HTMLOptionElement#text when not defined/empty, but it does
+                // not in older Webkit (between Safari 5.1.5 and Chrome 17) and
+                // Gecko (pre Firefox 7) browsers, so we need a manual fallback
+                // for those
+                operator: operator.label || operator.text,
+                value: this.value}),
+            value: [field.name, operator.value, this.value.get_value()]
+        };
     }
 });
 
@@ -1800,6 +1806,18 @@ instance.web.search.ExtendedSearchProposition.Field = instance.web.Widget.extend
     init: function (parent, field) {
         this._super(parent);
         this.field = field;
+    },
+    /**
+     * Returns a human-readable version of the value, in case the "logical"
+     * and the "semantic" values of a field differ (as for selection fields,
+     * for instance).
+     *
+     * The default implementation simply returns the value itself.
+     *
+     * @return {String} human-readable version of the value
+     */
+    toString: function () {
+        return this.get_value();
     }
 });
 instance.web.search.ExtendedSearchProposition.Char = instance.web.search.ExtendedSearchProposition.Field.extend({
@@ -1852,6 +1870,9 @@ instance.web.search.ExtendedSearchProposition.Integer = instance.web.search.Exte
         {value: ">=", text: _lt("greater or equal than")},
         {value: "<=", text: _lt("less or equal than")}
     ],
+    toString: function () {
+        return this.$element.val();
+    },
     get_value: function() {
         try {
             return instance.web.parse_value(this.$element.val(), {'widget': 'integer'});
@@ -1873,6 +1894,9 @@ instance.web.search.ExtendedSearchProposition.Float = instance.web.search.Extend
         {value: ">=", text: _lt("greater or equal than")},
         {value: "<=", text: _lt("less or equal than")}
     ],
+    toString: function () {
+        return this.$element.val();
+    },
     get_value: function() {
         try {
             return instance.web.parse_value(this.$element.val(), {'widget': 'float'});
@@ -1887,6 +1911,11 @@ instance.web.search.ExtendedSearchProposition.Selection = instance.web.search.Ex
         {value: "=", text: _lt("is")},
         {value: "!=", text: _lt("is not")}
     ],
+    toString: function () {
+        var select = this.$element[0];
+        var option = select.options[select.selectedIndex];
+        return option.label || option.text;
+    },
     get_value: function() {
         return this.$element.val();
     }
@@ -1897,6 +1926,7 @@ instance.web.search.ExtendedSearchProposition.Boolean = instance.web.search.Exte
         {value: "=", text: _lt("is true")},
         {value: "!=", text: _lt("is false")}
     ],
+    toString: function () { return ''; },
     get_value: function() {
         return true;
     }
diff --git a/doc/search-view.rst b/doc/search-view.rst
index 0fb7657cf2f..02a239924e5 100644
--- a/doc/search-view.rst
+++ b/doc/search-view.rst
@@ -478,6 +478,12 @@ Advanced Search
   constructor, and bound to its
   :js:attr:`~openerp.web.search.ExtendedSearchProposition.Field.field`.
 
+* Instead of its former domain triplet ``(field, operator, value)``,
+  :js:func:`~openerp.web.search.ExtendedSearchProposition.get_proposition`
+  now returns an object with two fields ``label`` and ``value``,
+  respectively a human-readable version of the proposition and the
+  corresponding domain triplet for the proposition.
+
 .. [#previous]
 
     the original view was implemented on top of a monkey-patched

From e994580e1dd25452ae0841d37da86891759e7a46 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Wed, 16 May 2012 18:01:59 +0200
Subject: [PATCH 309/452] some improvements to kanban view

bzr revid: mit@openerp.com-20120516160159-pnb6twf5oox356gs
---
 addons/web/static/src/css/base.sass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 071d5b3eeca..670696e025d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1616,7 +1616,7 @@ $colour4: #8a89ba
     // KanbanView {{{
     .oe_kanban_view
         position: absolute
-        top: 110px
+        top: 111px
         bottom: 0
     .oe_kanban_groups
         height: 100%
@@ -1631,6 +1631,8 @@ $colour4: #8a89ba
         background: #f0eeee
         border-left: 1px solid #f0f8f8
         border-right: 1px solid #b9b9b9
+    .oe_kanban_column
+        height: 100%
     .oe_kanban_record
         position: relative
         display: block

From 86e83bfe0a4179b210659a10636236d1988693ef Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 17 May 2012 11:10:03 +0530
Subject: [PATCH 310/452] [IMP]project : improve menutip,tooltip & string

bzr revid: cha@tinyerp.com-20120517054003-mtvu5x3qnbr6ppkb
---
 addons/project/project_view.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0c9a92ecc31..8e8408ffc89 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -268,7 +268,7 @@
             <field name="view_id" ref="view_project_kanban"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
             <field name="context">{}</field>
-            <field name="help">A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section.</field>
+            <field name="help">You have no project.  Projects are used to classify company activities: tasks, issues and timesheets.  Click on button "Create" to create one.</field>
         </record>
 
         <record id="open_view_template_project" model="ir.actions.act_window">
@@ -588,12 +588,10 @@
                         <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="project_id" context="{'project_id':self}">
-                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
-                        </field>
+                        <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
                         <field name="user_id">
-                            <filter domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
+                            <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
+                            <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
                         </field>
                     </group>
                     <newline/>
@@ -621,9 +619,9 @@
             <field name="view_mode">kanban,tree,form,calendar,gantt,graph</field>
             <field eval="False" name="filter"/>
             <field name="view_id" eval="False"/>
-            <field name="context">{"search_default_project_id": project_id}</field>
+            <field name="context">{"search_default_project": 1}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
-            <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field>
+            <field name="help">Tasks allow you to organize your work into a project. Click on button "Create" to create a new task.</field>
         </record>
         <record id="open_view_task_list_kanban" model="ir.actions.act_window.view">
             <field name="sequence" eval="0"/>

From 99e1ebfcd7a96cc6d9348b01462bb16c73f91e05 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 17 May 2012 12:58:53 +0530
Subject: [PATCH 311/452] [FIX]: New event page view

bzr revid: atp@tinyerp.com-20120517072853-is1te37zsy3be4y6
---
 addons/event/__openerp__.py |   3 +
 addons/event/event_view.xml | 119 +++++++++++++++++++++++++++++++++++-
 2 files changed, 120 insertions(+), 2 deletions(-)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index ea0e4316ef5..e05754eb992 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -1,3 +1,4 @@
+
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
@@ -53,6 +54,8 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
+  #  'js': ['static/src/js/google_map.js'],
+    'qweb': ['static/src/xml/event_address.xml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
     'application': True,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 7a41153acd8..c6e16a240ae 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -47,7 +47,7 @@
 
 <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
-        <record model="ir.ui.view" id="view_event_form">
+<!--         <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="type">form</field>
@@ -132,7 +132,119 @@
                     </notebook>
             </form>
             </field>
-        </record>
+        </record> -->
+
+    <record model="ir.ui.view" id="view_event_form">
+        <field name="name">Events</field>
+        <field name="model">event.event</field>
+        <field name="type">form</field>
+        <field name="priority">20</field>
+        <field name="arch" type="xml">
+            <form string="Preview" layout="manual">
+                <div class="oe_form_topbar">
+                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                        <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet layout="auto">
+                <group colspan="4" col="2">
+                        <field name="name" class="oe_form_title" width="60%%" nolabel="1"/>
+                </group>
+                <group colspan="4" col="5" class="oe_form_group_label_border" style="margin-top: 20px;">
+                     <field name="address_id" widget ="geo_address" string="Venue"/> 
+                 </group>
+                 <group colspan="2" col="2" class="oe-listview-content">    
+                    <label string="Ticket Description"/>
+                     <label string="Quantity"/>
+                     <field nolabel="1" name="full_name" />
+                      <field nolabel="1" name="register_max" />
+                     </group>   
+                     <newline/>
+                     <group colspan="2">
+                        <button name="order_now" string="Order Now" type="object" icon="gtk-apply" align="Right"/>
+                      </group>                
+ <!--                <notebook colspan="4">
+                    <page string="Event">
+                        <separator string="Description" colspan="4"/>
+                        <field name="note" colspan="4" nolabel="1"/>
+                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                            <tree string="Registration" editable="top">
+                                <field name="name" />
+                                <field name="email" />
+                                <field name="phone"/>
+                                <field name="nb_register" />
+                                <field name="state"/>
+                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                            </tree>
+                            <form string="Registration">
+                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
+                                <field name="name"/>
+                                <group colspan="4" col="4">
+                                <field name="email"/>
+                                <field name="phone"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                    <field name="nb_register"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                </group>
+                                    <group col="8" colspan="4">
+                                        <separator string="" colspan="4"/>
+                                        <newline/>
+                                        <field name="state" select="1" colspan="2"/>
+                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                    </group>
+                            </form>
+                            </field>
+                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                        <group col="4" colspan="2">
+                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                        </group>
+                    </page>
+                    <page string="Speakers">
+                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
+                        <field name="speaker_confirmed"/>
+                        <separator string="Other Speakers" colspan="4"/>
+                        <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Extra Info">
+                        <group col="2" colspan="2">
+                            <separator string="Registrations" colspan="2"/>
+                            <field name="register_min"/>
+                            <field name="register_max"/>
+                            <field name="register_prospect"/>
+                            <field name="register_current"/>
+                            <field name="register_attended"/>
+                            <field name="location_id"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator string="Emails" colspan="2"/>
+                            <field name="reply_to"/>
+                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
+                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
+                        </group>
+                    </page>
+
+                </notebook> -->
+                      <separator colspan="4" string="Details"/>
+                    <field name="note" nolabel="1" colspan="4"/>
+                 </sheet>
+
+            </form>
+        </field>
+    </record>
+
 
 
         <!-- Event tree view -->
@@ -160,6 +272,7 @@
                 </tree>
             </field>
         </record>
+
         
         <!-- Event Kanban View -->
 	
@@ -211,6 +324,7 @@
                                   <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
                                   <span >Subscribe</span>
                                   </button>
+                                <a string="Edit" icon="gtk-edit" type="edit"/>                                  
                               </t>
                             </t>
                             <t t-if="record.is_subscribed.raw_value">
@@ -218,6 +332,7 @@
                                 <span>Subscribed</span>
                                 <span class="unsubscribe">Unsubscribe</span>
                               </button>
+                                                              
                             </t>
                         </div>
                       </div>

From 08cd412d78a55cc86d841bf9220920ef576dd3d8 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 17 May 2012 13:00:46 +0530
Subject: [PATCH 312/452] [ADD]: Add event google map file.

bzr revid: atp@tinyerp.com-20120517073046-i47jypr9p6ndckox
---
 addons/event/static/src/js/google_map.js      | 69 +++++++++++++++++++
 addons/event/static/src/xml/event_address.xml |  9 +++
 2 files changed, 78 insertions(+)
 create mode 100644 addons/event/static/src/js/google_map.js
 create mode 100644 addons/event/static/src/xml/event_address.xml

diff --git a/addons/event/static/src/js/google_map.js b/addons/event/static/src/js/google_map.js
new file mode 100644
index 00000000000..2209001f29d
--- /dev/null
+++ b/addons/event/static/src/js/google_map.js
@@ -0,0 +1,69 @@
+openerp.event = function(instance){
+    instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
+    instance.event.GoogleMapConnecter = instance.web.Class.extend({
+    	init : function(){
+//    		call ajex to render map load
+    		
+    	},
+        render_map: function(address){
+            var geocoder = new google.maps.Geocoder();
+            geocoder.geocode( { 'address': address}, function(results, status){
+                if (status == google.maps.GeocoderStatus.OK){
+                    var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
+                    var myOptions = {
+                    zoom: 17,
+                    center:  new google.maps.LatLng(lat,lng),
+                    mapTypeId: google.maps.MapTypeId.ROADMAP
+                }
+                return new google.maps.Marker({
+                    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
+                    position: new google.maps.LatLng(lat,lng)
+                });
+                }
+            });
+            map_load: function() {
+                var self = this;
+                if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
+                    googleMapsCallback = function () {
+                    self.googleMapsLoaded.resolve();
+                };
+                $.ajax({
+                    url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
+                    dataType: "script"
+                }).fail(self.googleMapsLoaded.reject);
+                return this.googleMapsLoaded.promise();
+            },
+            
+    }),
+    
+    instance.event.GeoAddress = instance.web.form.Many2OneField.extend(_.extend({}, {
+        init : function(){
+            this._super();
+            this.googleMapsLoaded = $.Deferred();
+        },
+
+
+        set_value:function(value){
+            var self = this;
+            this.get_address(value).done(function(value){
+            if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
+            var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
+            var defer = self.map_load();
+            defer.done(function(){
+                return self.render_map(address);	
+            });
+            });
+        },
+        get_address:function(value){
+            if (!value || value.length == 0){
+                return $.Deferred().reject();
+            }
+            return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
+        },
+
+        },
+        get_value:function(){
+        }
+
+    }));
+};
\ No newline at end of file
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event/static/src/xml/event_address.xml
new file mode 100644
index 00000000000..14c7051cf7d
--- /dev/null
+++ b/addons/event/static/src/xml/event_address.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	
+	<template>
+		<td id = "address_text" t-name="address">
+			<t t-esc="record.street"/> <br/>
+			<t t-esc="record.city"/> <br/>
+			<t t-esc="record.country_id[1]"/>
+		</td>
+	</template>
\ No newline at end of file

From c8f335a3559e5bf95184d734b7dadd2139a2841f Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 17 May 2012 14:09:30 +0530
Subject: [PATCH 313/452] [IMP]board: set reporting dashboard menu

bzr revid: dbr@tinyerp.com-20120517083930-2h17u5phzolz9ywe
---
 addons/board/board_data_admin.xml     | 2 +-
 addons/crm/board_crm_view.xml         | 6 ++++--
 addons/sale/board_sale_view.xml       | 4 +++-
 addons/sale/sale_view.xml             | 2 +-
 addons/stock/board_warehouse_view.xml | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml
index dd236532eb1..eaf6819e2a5 100644
--- a/addons/board/board_data_admin.xml
+++ b/addons/board/board_data_admin.xml
@@ -53,7 +53,7 @@
         </record>
 
         <!-- add a menu item in adminitration/reporting/dashboards -->
-        <menuitem id="base.menu_reporting_admin_dashboard" parent="base.menu_reporting_dashboard" action="open_board_administration_form" groups="base.group_system"/>
+        <menuitem id="base.menu_reporting_admin_dashboard" sequence="0" parent="base.menu_reporting_dashboard" action="open_board_administration_form" groups="base.group_system"/>
 
     </data>
 </openerp>
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index b8e05b68cf5..747f8fb46ff 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -194,11 +194,13 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_crm_statistical_form"/>
         </record>
+        <menuitem id="menu_dashboard_crm" name="CRM"  sequence="20" parent="base.menu_reporting_dashboard"/>
         <menuitem 
             id="menu_board_statistics_dash"
-            parent="base.menu_reporting_dashboard"
+            parent="menu_dashboard_crm"
+            icon="terp-graph"
             action="open_board_statistical_dash"
-            sequence="11"
+            sequence="1"
             groups="base.group_sale_manager"/>
 
     </data>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 07fb3834405..510a7ac28f7 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -82,7 +82,9 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_sales_form"/>
         </record>
-        <menuitem id="menu_board_sales" parent="base.menu_reporting_dashboard" action="open_board_sales" sequence="15" groups="base.group_sale_salesman"/>
+        
+        <menuitem id="menu_dashboard_sales" name="Sales"  sequence="20" parent="base.menu_reporting_dashboard"/>
+        <menuitem action="open_board_sales" icon="terp-graph" groups="base.group_sale_salesman"  id="menu_board_sales" parent="menu_dashboard_sales" sequence="1"/>
 
         <!-- Sale manager dashboard -->
         <record id="board_sales_manager_form" model="ir.ui.view">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 8604d000c87..3a8270f7bf3 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,6 +1,6 @@
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager" action="base.action_partner_form"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager" action="base.action_partner_form"/>
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 
 
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 50384f3ea44..e3555dacc1a 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -68,7 +68,7 @@
             <field name="view_id" ref="board_warehouse_form"/>
         </record>
 
-        <menuitem id="menu_dashboard_stock" name="Warehouse"  sequence="10" parent="base.menu_reporting_dashboard"/>
+        <menuitem id="menu_dashboard_stock" name="Warehouse"  sequence="20" parent="base.menu_reporting_dashboard"/>
         <menuitem action="open_board_warehouse" icon="terp-graph"  groups="group_stock_manager"  id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
 
     </data>

From 96fde61acf012673b4f0a197b7a9b62d10ee9b5e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 17 May 2012 16:09:41 +0530
Subject: [PATCH 314/452] [ADD]: Event page

bzr revid: atp@tinyerp.com-20120517103941-6ngwqfkiow8f4ugq
---
 addons/event/event.py       | 39 ++++++++++++++++++++--
 addons/event/event_view.xml | 66 ++++++++++++++-----------------------
 2 files changed, 62 insertions(+), 43 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 38ad0027c9d..d029ba22acd 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -218,7 +218,8 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
-        'location_id': fields.many2one('res.partner','Organization Address', readonly=False, states={'done': [('readonly', True)]}),
+        'available_qty': fields.integer('Availabel Quantity'),
+      
     }
 
     _defaults = {
@@ -226,7 +227,41 @@ class event_event(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'event.event', context=c),
         'user_id': lambda obj, cr, uid, context: uid,
     }
-
+    
+    def order_now(self, cr, uid, ids, context=None):
+          register_pool = self.pool.get('event.registration')
+          user_pool = self.pool.get('res.users')
+          data_obj = self.pool.get('ir.model.data')
+          user = user_pool.browse(cr, uid, uid, context=context)
+          for event in self.browse(cr, uid, ids, context):
+              self.check_registration_limits_before(cr, uid, ids, event.available_qty, context=context)
+              curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , event.id)])
+        #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe
+              print "event.curre_reg_ids",event.available_qty
+              if not curr_reg_ids and event.available_qty > 0:
+                print "cccccccccccc",event.available_qty  
+                curr_reg_ids = [register_pool.create(cr, 1, {'event_id': event.id ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': event.available_qty})]
+              elif event.available_qty > 0:
+                print "mmmmmmm",event.available_qty
+                register_pool.write(cr, uid, curr_reg_ids, {'nb_register': event.available_qty}, context=context)
+              if event.available_qty > 0:  
+                register_pool.confirm_registration(cr, 1, curr_reg_ids, context=context)      
+          view_id = data_obj._get_id(cr, uid, 'event', 'view_event_registration_form')
+          if view_id:
+              res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+          res = {
+                    'name': _('Registration'),
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'event.registration',
+                    'res_id': curr_reg_ids[0],
+                    'views':[(res_id,'form'), (False, 'tree')],
+                    'type': 'ir.actions.act_window',
+                    'nodestroy': True,
+                    'target': 'current',
+          }
+          return res
+         
     def subscribe_to_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index c6e16a240ae..27ff18d1457 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -152,25 +152,33 @@
                 </div>
                 <sheet layout="auto">
                 <group colspan="4" col="2">
-                        <field name="name" class="oe_form_title" width="60%%" nolabel="1"/>
+                        <field name="name" class="oe_form_title" width="80%%" nolabel="1"/>
                 </group>
-                <group colspan="4" col="5" class="oe_form_group_label_border" style="margin-top: 20px;">
+                <group colspan="2" col="2"  class="oe_form_group_label_border">
                      <field name="address_id" widget ="geo_address" string="Venue"/> 
                  </group>
-                 <group colspan="2" col="2" class="oe-listview-content">    
-                    <label string="Ticket Description"/>
-                     <label string="Quantity"/>
-                     <field nolabel="1" name="full_name" />
-                      <field nolabel="1" name="register_max" />
-                     </group>   
-                     <newline/>
-                     <group colspan="2">
-                        <button name="order_now" string="Order Now" type="object" icon="gtk-apply" align="Right"/>
-                      </group>                
- <!--                <notebook colspan="4">
+                 <newline/>
+                     <group colspan="2" col="2" class="oe-listview-content">    
+                        <label string="Ticket Description"/>
+                        <label string="Quantity"/>
+                        <field nolabel="1" name="full_name" />
+                        <field nolabel="1" name="available_qty" />
+                     </group> 
+                 <newline/>
+                 <group colspan="2" col="2">
+                        <button name="order_now" string="Order Now" type="object" icon="gtk-apply" />
+                 </group>                
+                 <notebook colspan="4">
                     <page string="Event">
-                        <separator string="Description" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
+                         <group colspan="2" col="2" class="oe_form_group_label_border">
+                            <field name="register_min"/>
+                            <field name="register_max"/>
+                        </group>
+                        <group colspan="2" col="2" class="oe_form_group_label_border">
+                            <field name="register_current"/> 
+                            <field name="register_prospect"/>
+                            <field name="register_attended"/>
+                        </group>
                         <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
@@ -204,39 +212,15 @@
                                     </group>
                             </form>
                             </field>
-                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                        <group col="4" colspan="2">
-                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        </group>
                     </page>
+                
                     <page string="Speakers">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
                         <field name="speaker_confirmed"/>
                         <separator string="Other Speakers" colspan="4"/>
                         <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Extra Info">
-                        <group col="2" colspan="2">
-                            <separator string="Registrations" colspan="2"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                            <field name="register_prospect"/>
-                            <field name="register_current"/>
-                            <field name="register_attended"/>
-                            <field name="location_id"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator string="Emails" colspan="2"/>
-                            <field name="reply_to"/>
-                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
-                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
-                        </group>
-                    </page>
-
-                </notebook> -->
+                </notebook>
                       <separator colspan="4" string="Details"/>
                     <field name="note" nolabel="1" colspan="4"/>
                  </sheet>

From 1b09de07e8faf35534315ee1ccc2487aa21cfcf0 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 17 May 2012 16:29:02 +0530
Subject: [PATCH 315/452] [FIX]hr_holidays: Iprove the search for get perfect
 days

bzr revid: dbr@tinyerp.com-20120517105902-9wxxvlxd9csy80pb
---
 addons/hr_holidays/hr_holidays.py       | 16 ++++++++++++----
 addons/hr_holidays/hr_holidays_view.xml |  6 ++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 92becaff923..60e56833c98 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -22,6 +22,7 @@
 ##############################################################################
 
 import datetime, time
+from datetime import datetime
 from itertools import groupby
 from operator import itemgetter
 
@@ -484,18 +485,23 @@ class hr_employee(osv.osv):
                 remaining[employee_id] = 0.0
         return remaining
 
-    def _get_leave_status(self, cr, uid, ids, name, args, context=None):
-        holidays_id = self.pool.get('hr.holidays').search(cr, uid, 
-           [('employee_id', 'in', ids), ('date_from','<=',time.strftime('%Y-%m-%d %H:%M:%S')), 
-            ('type','=','remove'),('state','not in',('cancel','refuse'))],
+    def _get_leave_status(self, cr, uid, ids, name, args, context=None):       
+        holidays_obj = self.pool.get('hr.holidays')
+        holidays_id = holidays_obj.search(cr, uid, 
+           [('employee_id', 'in', ids), ('date_from','<=',time.strftime('%Y-%m-%d')),
+           ('date_to','>=',time.strftime('%Y-%m-%d')),('type','=','remove'),('state','not in',('cancel','refuse'))],
            context=context)
         result = {}
         for id in ids:
             result[id] = {
                 'current_leave_state': False,
                 'current_leave_id': False,
+                'date_from':False,
+                'date_to':False,
             }
         for holiday in self.pool.get('hr.holidays').browse(cr, uid, holidays_id, context=context):
+            result[holiday.employee_id.id]['date_from'] = holiday.date_from
+            result[holiday.employee_id.id]['date_to'] = holiday.date_to
             result[holiday.employee_id.id]['current_leave_state'] = holiday.state
             result[holiday.employee_id.id]['current_leave_id'] = holiday.holiday_status_id.id
         return result
@@ -506,6 +512,8 @@ class hr_employee(osv.osv):
             selection=[('draft', 'New'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
             ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')]),
         'current_leave_id': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Type",type='many2one', relation='hr.holidays.status'),
+        'date_from': fields.function(_get_leave_status, multi='leave_status', type='date', string='From Date'),
+        'date_to': fields.function(_get_leave_status, multi='leave_status', type='date', string='To Date'),        
         'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1)
     }
 
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9f8f998cbd9..ec00643a926 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -498,7 +498,7 @@
             <field name="arch" type="xml">
                 <field name="coach_id" position="after">
                     <field name="remaining_leaves"/>
-                    <field name="current_leave_id"/>
+                    <field name="current_leave_id"/>                    
                     <field name="current_leave_state" attrs="{'invisible':[('current_leave_id','=',False)]}"/>
                 </field>
             </field>
@@ -512,11 +512,13 @@
                 <xpath expr="//templates" position="before">
                     <field name="current_leave_state"/>
                     <field name="last_login"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
                 </xpath>
                 <xpath expr="//div[@class='oe_employee_details']/ul/li" position="before">
                     <li t-if="record.current_leave_id.raw_value || record.last_login.raw_value">
                         <span t-if="record.current_leave_id.raw_value" t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_color_3':'oe_kanban_color_2'">
-                            <span class="oe_kanban_button" style="font-size: 100%%">
+                            <span class="oe_kanban_button" style="font-size: 100%%" t-att-title="record.date_to.raw_value" >
                                 <field name="current_leave_id"/>
                             </span>
                         </span>

From f33d8657dc94987a4111df659bd041d1cd0d1e15 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 17 May 2012 18:41:56 +0530
Subject: [PATCH 316/452] [FIX]hr_holidays: yml error

bzr revid: dbr@tinyerp.com-20120517131156-3mnula9bxi79zj3s
---
 addons/hr_holidays/test/test_hr_holiday.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
index 9228a7a381e..4a808406ea2 100644
--- a/addons/hr_holidays/test/test_hr_holiday.yml
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -6,8 +6,8 @@
   !record {model: hr.holidays, id: hr_holiday1}:
     name: Sick Leave
     holiday_status_id: holiday_status_cl
-    date_from: !eval time.strftime('%Y-%m-10 10:00:00')
-    date_to: !eval time.strftime('%Y-%m-11 19:00:00')
+    date_from: !eval time.strftime('%Y-%m-10 00:00:00')
+    date_to: !eval time.strftime('%Y-%m-11 00:00:00')
     employee_id: hr.employee_fp
     type: remove
 -

From ea859f54c8f17105f9d3e416393814398929beb0 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 18 May 2012 10:56:05 +0530
Subject: [PATCH 317/452] [IMP]all: remove a complexity in openerp and move
 asset management and Payroll in extra modules

bzr revid: mma@tinyerp.com-20120518052605-e6sdmicwtb4kcoq0
---
 addons/account/__openerp__.py                    | 1 -
 addons/account_accountant/__openerp__.py         | 1 -
 addons/account_analytic_analysis/__openerp__.py  | 1 -
 addons/account_analytic_default/__openerp__.py   | 1 -
 addons/account_analytic_plans/__openerp__.py     | 1 -
 addons/account_anglo_saxon/__openerp__.py        | 1 -
 addons/account_asset/__openerp__.py              | 2 +-
 addons/account_budget/__openerp__.py             | 1 -
 addons/account_cancel/__openerp__.py             | 1 -
 addons/account_coda/__openerp__.py               | 1 -
 addons/account_followup/__openerp__.py           | 1 -
 addons/account_invoice_layout/__openerp__.py     | 1 -
 addons/account_payment/__openerp__.py            | 1 -
 addons/account_sequence/__openerp__.py           | 1 -
 addons/account_voucher/__openerp__.py            | 1 -
 addons/anonymization/__openerp__.py              | 1 -
 addons/association/__openerp__.py                | 1 -
 addons/auction/__openerp__.py                    | 1 -
 addons/base_calendar/__openerp__.py              | 1 -
 addons/base_crypt/__openerp__.py                 | 1 -
 addons/base_iban/__openerp__.py                  | 1 -
 addons/base_report_designer/__openerp__.py       | 1 -
 addons/base_setup/__openerp__.py                 | 1 -
 addons/base_tools/__openerp__.py                 | 1 -
 addons/base_vat/__openerp__.py                   | 1 -
 addons/board/__openerp__.py                      | 1 -
 addons/caldav/__openerp__.py                     | 1 -
 addons/crm/__openerp__.py                        | 1 -
 addons/crm_caldav/__openerp__.py                 | 1 -
 addons/crm_claim/__openerp__.py                  | 1 -
 addons/crm_fundraising/__openerp__.py            | 1 -
 addons/crm_helpdesk/__openerp__.py               | 1 -
 addons/crm_partner_assign/__openerp__.py         | 1 -
 addons/crm_profiling/__openerp__.py              | 1 -
 addons/crm_todo/__openerp__.py                   | 1 -
 addons/decimal_precision/__openerp__.py          | 1 -
 addons/delivery/__openerp__.py                   | 1 -
 addons/document/__openerp__.py                   | 1 -
 addons/document_ftp/__openerp__.py               | 1 -
 addons/document_webdav/__openerp__.py            | 1 -
 addons/edi/__openerp__.py                        | 1 -
 addons/email_template/__openerp__.py             | 1 -
 addons/event/__openerp__.py                      | 1 -
 addons/event_moodle/__openerp__.py               | 1 -
 addons/event_project/__openerp__.py              | 1 -
 addons/event_sale/__openerp__.py                 | 1 -
 addons/event_sale_layout/__openerp__.py          | 1 -
 addons/hr/__openerp__.py                         | 1 -
 addons/hr_attendance/__openerp__.py              | 1 -
 addons/hr_contract/__openerp__.py                | 1 -
 addons/hr_evaluation/__openerp__.py              | 1 -
 addons/hr_expense/__openerp__.py                 | 1 -
 addons/hr_holidays/__openerp__.py                | 1 -
 addons/hr_payroll/__openerp__.py                 | 3 +--
 addons/hr_payroll_account/__openerp__.py         | 1 -
 addons/hr_recruitment/__openerp__.py             | 1 -
 addons/hr_timesheet/__openerp__.py               | 1 -
 addons/idea/__openerp__.py                       | 1 -
 addons/knowledge/__openerp__.py                  | 1 -
 addons/l10n_uy/__openerp__.py                    | 1 -
 addons/lunch/__openerp__.py                      | 1 -
 addons/mail/__openerp__.py                       | 1 -
 addons/marketing/__openerp__.py                  | 1 -
 addons/marketing_campaign/__openerp__.py         | 1 -
 addons/mrp_jit/__openerp__.py                    | 1 -
 addons/mrp_operations/__openerp__.py             | 1 -
 addons/multi_company/__openerp__.py              | 1 -
 addons/pad/__openerp__.py                        | 1 -
 addons/pad_project/__openerp__.py                | 1 -
 addons/plugin/__openerp__.py                     | 1 -
 addons/product_expiry/__openerp__.py             | 1 -
 addons/product_manufacturer/__openerp__.py       | 1 -
 addons/product_visible_discount/__openerp__.py   | 1 -
 addons/profile_tools/__openerp__.py              | 1 -
 addons/project/__openerp__.py                    | 1 -
 addons/project_gtd/__openerp__.py                | 1 -
 addons/project_issue/__openerp__.py              | 1 -
 addons/project_mailgate/__openerp__.py           | 1 -
 addons/project_messages/__openerp__.py           | 1 -
 addons/project_mrp/__openerp__.py                | 1 -
 addons/project_planning/__openerp__.py           | 1 -
 addons/project_retro_planning/__openerp__.py     | 1 -
 addons/project_scrum/__openerp__.py              | 1 -
 addons/purchase/__openerp__.py                   | 1 -
 addons/purchase_double_validation/__openerp__.py | 1 -
 addons/purchase_requisition/__openerp__.py       | 1 -
 addons/report_designer/__openerp__.py            | 1 -
 addons/sale/__openerp__.py                       | 1 -
 addons/sale_crm/__openerp__.py                   | 1 -
 addons/sale_journal/__openerp__.py               | 1 -
 addons/sale_layout/__openerp__.py                | 1 -
 addons/sale_mrp/__openerp__.py                   | 1 -
 addons/sale_order_dates/__openerp__.py           | 1 -
 addons/share/__openerp__.py                      | 1 -
 addons/stock/__openerp__.py                      | 1 -
 addons/stock_invoice_directly/__openerp__.py     | 1 -
 addons/stock_location/__openerp__.py             | 1 -
 addons/stock_planning/__openerp__.py             | 1 -
 addons/users_ldap/__openerp__.py                 | 1 -
 addons/warning/__openerp__.py                    | 1 -
 addons/web_livechat/__openerp__.py               | 1 -
 addons/web_shortcuts/__openerp__.py              | 1 -
 addons/web_uservoice/__openerp__.py              | 1 -
 addons/wiki/__openerp__.py                       | 1 -
 addons/wiki_faq/__openerp__.py                   | 1 -
 addons/wiki_quality_manual/__openerp__.py        | 1 -
 addons/wiki_sale_faq/__openerp__.py              | 1 -
 107 files changed, 2 insertions(+), 108 deletions(-)

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 27aca6fb9fa..cd19c730a3f 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -23,7 +23,6 @@
     "version" : "1.1",
     "author" : "OpenERP SA",
     "category": 'Accounting & Finance',
-    'complexity': "easy",
     "description": """
 Accounting and Financial Management.
 ====================================
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index 915d72a15f8..f1155311f39 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -24,7 +24,6 @@
     "author" : "OpenERP SA",
     "category": 'Accounting & Finance',
     "sequence": 10,
-    'complexity': "normal",
     "description": """
 Accounting Access Rights.
 =========================
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index f9c6c0dde25..4f25ece5954 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Contracts Management',
     'version': '1.1',
     'category': 'Sales Management',
-    'complexity': "normal",
     'description': """
 This module is for modifying account analytic view to show important data to project manager of services companies.
 ===================================================================================================================
diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py
index 63f17e7bf62..e02f477d1af 100644
--- a/addons/account_analytic_default/__openerp__.py
+++ b/addons/account_analytic_default/__openerp__.py
@@ -23,7 +23,6 @@
     'name'      : 'Account Analytic Defaults',
     'version'   : '1.0',
     "category": 'Accounting & Finance',
-    'complexity': "normal",
     'description': """Set default values for your analytic accounts
 Allows to automatically select analytic accounts based on criterions:
 =====================================================================
diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index 1669bd277d3..6e53c5452ee 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Multiple Analytic Plans',
     'version': '1.0',
     'category': 'Accounting & Finance',
-    'complexity': "normal",
     'description': """
 This module allows to use several analytic plans, according to the general journal.
 ===================================================================================
diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py
index 2c10fcc7a19..78b2ff825c6 100644
--- a/addons/account_anglo_saxon/__openerp__.py
+++ b/addons/account_anglo_saxon/__openerp__.py
@@ -23,7 +23,6 @@
     "version": "1.2",
     "author": "OpenERP SA, Veritos",
     "website": "http://tinyerp.com - http://veritos.nl",
-    'complexity': "normal",
     "description": """
 This module supports the Anglo-Saxon accounting methodology by changing the accounting logic with stock transactions.
 =====================================================================================================================
diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
index f26a8ada1b9..4b7379d8a6a 100644
--- a/addons/account_asset/__openerp__.py
+++ b/addons/account_asset/__openerp__.py
@@ -51,7 +51,7 @@
     ],
     "auto_install": False,
     "installable": True,
-    "application": True,
+    "application": False,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index 261f359f26e..89d06dccdca 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Budgets Management',
     'version': '1.0',
     'category': 'Accounting & Finance',
-    'complexity': "normal",
     'description': """
 This module allows accountants to manage analytic and crossovered budgets.
 ==========================================================================
diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
index a17958151b3..6749cef0c8e 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -24,7 +24,6 @@
     "version" : "1.1",
     "author" : "OpenERP SA",
     "category": 'Accounting & Finance',
-    'complexity': "normal",
     "description": """
 Allows cancelling accounting entries.
 =====================================
diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py
index 126027a41a7..06a0a59d2c6 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/account_coda/__openerp__.py
@@ -24,7 +24,6 @@
     "version": '2.1',
     "author": 'Noviat',
     "category": 'Accounting & Finance',
-    "complexity": "normal",
     "description": '''
 Module to import CODA bank statements.
 ======================================
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 425754d1c09..ed397668148 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -23,7 +23,6 @@
     'name': 'Followup Management',
     'version': '1.0',
     'category': 'Accounting & Finance',
-    'complexity': "normal",
     'description': """
 Module to automate letters for unpaid invoices, with multi-level recalls.
 ==========================================================================
diff --git a/addons/account_invoice_layout/__openerp__.py b/addons/account_invoice_layout/__openerp__.py
index 83fe193fac4..dfc2f7a8db4 100644
--- a/addons/account_invoice_layout/__openerp__.py
+++ b/addons/account_invoice_layout/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Invoice Layouts',
     'version': '1.0',
     "category": 'Accounting & Finance',
-    'complexity': "easy",
     'description': """
 This module provides some features to improve the layout of the invoices.
 =========================================================================
diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index 83c179801ab..1959d71da74 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -24,7 +24,6 @@
     "version": "1.1",
     "author": "OpenERP SA",
     "category": "Accounting & Finance",
-    'complexity': "easy",
     "description": """
 Module to manage the payment of your supplier invoices.
 =======================================================
diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py
index 301afa3be4d..0f860d400e9 100644
--- a/addons/account_sequence/__openerp__.py
+++ b/addons/account_sequence/__openerp__.py
@@ -23,7 +23,6 @@
     'name': 'Entries Sequence Numbering',
     'version': '1.1',
     "category": 'Accounting & Finance',
-    'complexity': "easy",
     'description': """
 This module maintains internal sequence number for accounting entries.
 ======================================================================
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 1c4005b7be0..a7899338b8e 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -23,7 +23,6 @@
     "name" : "eInvoicing & Payments",
     "version" : "1.0",
     "author" : 'OpenERP SA',
-    'complexity': "normal",
     "description": """
 Account Voucher module includes all the basic requirements of Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc.
 ====================================================================================================================================
diff --git a/addons/anonymization/__openerp__.py b/addons/anonymization/__openerp__.py
index 1674109f63a..60ed423049d 100644
--- a/addons/anonymization/__openerp__.py
+++ b/addons/anonymization/__openerp__.py
@@ -25,7 +25,6 @@
     'name': 'Database Anonymization',
     'version': '1.0',
     'category': 'Tools',
-    'complexity': "easy",
     'description': """
 This module allows you to anonymize a database.
 ===============================================
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index f75a33a8ff1..00683d18333 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Associations Management',
     'version': '0.1',
     'category': 'Specific Industry Applications',
-    'complexity': "normal",
     'description': """
 This module is to configure modules related to an association.
 ==============================================================
diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index dfb79ca643f..46466c209a6 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Auction Houses',
     'version': '1.0',
     'category': 'Specific Industry Applications',
-    'complexity': "normal",
     'description': """
 This module manages the records of artists, auction articles, buyers and sellers.
 =================================================================================
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 09b9fdc3794..1c8d35099b8 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -23,7 +23,6 @@
     "name": "Calendar Layer",
     "version": "1.0",
     "depends": ["base", "mail"],
-    'complexity': "easy",
     'description': """
 This is a full-featured calendar system.
 ========================================
diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py
index 6407e9855a2..369a55bb278 100644
--- a/addons/base_crypt/__openerp__.py
+++ b/addons/base_crypt/__openerp__.py
@@ -25,7 +25,6 @@
     "maintainer" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "category" : "Tools",
-    'complexity': "easy",
     "description": """
 Replaces cleartext passwords in the database with a secure hash
 ===============================================================
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index c5925f9a52c..d31f2f4ade5 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -22,7 +22,6 @@
     'name': 'IBAN Bank Accounts',
     'version': '1.0',
     "category": 'Hidden/Dependency',
-    'complexity': "easy",
     'description': """
 This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity.
 =====================================================================================================================
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index c50ecdd3597..3b46389184d 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'OpenOffice Report Designer',
     'version': '0.1',
     'category': 'Reporting',
-    'complexity': "normal",
     'description': """
 This module is used along with OpenERP OpenOffice Plugin.
 =========================================================
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index 343ca8cb286..9e2be5976f6 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Initial Setup Tools',
     'version': '1.0',
     'category': 'Hidden',
-    'complexity': "easy",
     'description': """
 This module helps to configure the system at the installation of a new database.
 ================================================================================
diff --git a/addons/base_tools/__openerp__.py b/addons/base_tools/__openerp__.py
index d2cd2aad742..747ecf64e83 100644
--- a/addons/base_tools/__openerp__.py
+++ b/addons/base_tools/__openerp__.py
@@ -5,7 +5,6 @@
     "version": "1.0",
     "depends": ["base"],
     "category" : "Hidden/Dependency",
-    'complexity': "easy",
     'description': """
 Common base for tools modules.
 ==============================
diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index 7625ec6dee7..ef46cd800d9 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -23,7 +23,6 @@
     'name': 'VAT Number Validation',
     'version': '1.0',
     "category": 'Hidden/Dependency',
-    'complexity': "easy",
     'description': """
 VAT validation for Partners' VAT numbers
 ========================================
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index e61c9d9d2ff..e54c08d2291 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -23,7 +23,6 @@
     'name': 'Dashboards',
     'version': '1.0',
     'category': 'Hidden',
-    'complexity': "normal",
     'description': """
 Lets the user create a custom dashboard.
 ========================================
diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
index 5302f3c6fe6..ffcfd7a6308 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -23,7 +23,6 @@
 {
     "name": "Share Calendar using CalDAV",
     "version": "1.1",
-    'complexity': "normal",
     "depends": [
                     "base",
                     "document_webdav",
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 460e6493552..2049b3a8cc9 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -25,7 +25,6 @@
     'version': '1.0',
     'category': 'Customer Relationship Management',
     "sequence": 2,
-    'complexity': "easy",
     'description': """
 The generic OpenERP Customer Relationship Management.
 =====================================================
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index c85080470ad..ce3193a595d 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -25,7 +25,6 @@
     'name': 'Meetings Synchronization',
     'version': '1.1',
     'category': 'Customer Relationship Management',
-    'complexity': "normal",
     'description': """
 Caldav features in Meeting.
 ===========================
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 2423bdcea7a..9e7848eb6c3 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Claims Management',
     'version': '1.0',
     'category': 'Customer Relationship Management',
-    'complexity': "easy",
     'description': """
 This modules allows you to track your customers/suppliers claims and grievances.
 ================================================================================
diff --git a/addons/crm_fundraising/__openerp__.py b/addons/crm_fundraising/__openerp__.py
index 7c6e25df4fa..ed7208cca65 100644
--- a/addons/crm_fundraising/__openerp__.py
+++ b/addons/crm_fundraising/__openerp__.py
@@ -24,7 +24,6 @@
     'category': 'Customer Relationship Management', 
     'name': 'Fundraising',
     'version': '1.0',
-    'complexity': "easy",
     'description': """
 Fundraising.
 ============
diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
index e5c4efd5b79..7e8b69bbc4c 100644
--- a/addons/crm_helpdesk/__openerp__.py
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -24,7 +24,6 @@
     'category': 'Customer Relationship Management', 
     'name': 'Helpdesk',
     'version': '1.0',
-    'complexity': "easy",
     'description': """
 Helpdesk Management.
 ====================
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index 8213e8fa8ef..f27420e54f8 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Partners Geo-Localization',
     'version': '1.0',
     'category': 'Customer Relationship Management',
-    'complexity': "normal",
     'description': """
 This is the module used by OpenERP SA to redirect customers to its partners, based on geolocalization.
 ======================================================================================================
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index f3c1b30bb59..52fcf1173ed 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Customer Profiling',
     'version': '1.3',
     'category': 'Marketing',
-    'complexity': "easy",
     'description': """
 This module allows users to perform segmentation within partners.
 =================================================================
diff --git a/addons/crm_todo/__openerp__.py b/addons/crm_todo/__openerp__.py
index 674f5bc9373..824dac13c21 100644
--- a/addons/crm_todo/__openerp__.py
+++ b/addons/crm_todo/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Tasks on CRM',
     'version': '1.0',
     "category": 'Customer Relationship Management',
-    'complexity': "easy",
     'description': """
 Todo list for CRM leads and opportunities.
     """,
diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py
index 0aafef9fe1f..53c05e4dd63 100644
--- a/addons/decimal_precision/__openerp__.py
+++ b/addons/decimal_precision/__openerp__.py
@@ -31,7 +31,6 @@ The decimal precision is configured per company.
     "version": "0.1",
     "depends": ["base"],
     "category" : "Hidden/Dependency",
-    'complexity': "easy",
     "init_xml": [],
     "update_xml": [
         'decimal_precision_view.xml',
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 3a190bffd89..52d4eacda5e 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Delivery Costs',
     'version': '1.0',
     'category': 'Sales Management',
-    'complexity': "normal",
     'description': """
 Allows you to add delivery methods in sale orders and picking.
 ==============================================================
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 6691ab53da3..d8e42703efc 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Document Management System',
     'version': '2.1',
     'category': 'Knowledge Management',
-    'complexity': "normal",
     'description': """
 This is a complete document management system.
 ==============================================
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index f6ab4616b2d..17275eaebbd 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Shared Repositories (FTP)',
     'version': '1.99',
     'category': 'Knowledge Management',
-    'complexity': "normal",
     'description': """
 This is a support FTP Interface with document management system.
 ================================================================
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index 82541b742c4..ec50d9301dc 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -33,7 +33,6 @@
         "version" : "2.3",
         "author" : "OpenERP SA",
         "category" : "Knowledge Management",
-        'complexity': "normal",
         "website": "http://www.openerp.com",
         "description": """
 With this module, the WebDAV server for documents is activated.
diff --git a/addons/edi/__openerp__.py b/addons/edi/__openerp__.py
index c4595e69112..580b838d155 100644
--- a/addons/edi/__openerp__.py
+++ b/addons/edi/__openerp__.py
@@ -22,7 +22,6 @@
     'name': 'Electronic Data Interchange (EDI)',
     'version': '1.0',
     'category': 'Tools',
-    'complexity': "easy",
     'description': """
 Provides a common EDI platform that other Applications can use
 ==============================================================
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index 10f5be678b8..dbe53b3d547 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -26,7 +26,6 @@
     "author" : "OpenERP,OpenLabs",
     "website" : "http://openerp.com",
     "category" : "Marketing",
-    'complexity': "expert",
     "depends" : ['mail'],
     "description": """
 Email Templating (simplified version of the original Power Email by Openlabs)
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index ea0e4316ef5..5a829f63f43 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Events Organisation',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
     'description': """
 Organization and management of Events.
 ======================================
diff --git a/addons/event_moodle/__openerp__.py b/addons/event_moodle/__openerp__.py
index f6367aaa40b..82fccad0914 100644
--- a/addons/event_moodle/__openerp__.py
+++ b/addons/event_moodle/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Event Moodle',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
     'description': """
     Configure your moodle server 
 
diff --git a/addons/event_project/__openerp__.py b/addons/event_project/__openerp__.py
index f7af0301de6..a843188de55 100644
--- a/addons/event_project/__openerp__.py
+++ b/addons/event_project/__openerp__.py
@@ -23,7 +23,6 @@
     'name': 'Retro-Planning on Events',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
     'description': """
 Organization and management of events.
 ======================================
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index d8f689986e2..d06e964c483 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Events Sales',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
     'description': """
 Creating registration with sale orders.
 =======================================
diff --git a/addons/event_sale_layout/__openerp__.py b/addons/event_sale_layout/__openerp__.py
index c81c4c83c7b..1d850a0d4fd 100644
--- a/addons/event_sale_layout/__openerp__.py
+++ b/addons/event_sale_layout/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Events Sales layout',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
     'description': """
     This module ensures the compatibility of the changes made on the sale.order.line form view in event_sale with the sale_layout module (that is replacing the whole field in the view by another one). Its installation is automatically triggered when both modules are installed.
     """,
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index 482eaaafda0..d7fb8b0e91a 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -25,7 +25,6 @@
     "author": "OpenERP SA",
     "category": "Human Resources",
     "sequence": 12,
-    'complexity': "easy",
     "website": "http://www.openerp.com",
     "description": """
 Module for human resource management.
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index c903a87abc4..a1ba099d012 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Attendances',
     'version': '1.1',
     'category': 'Human Resources',
-    'complexity': "easy",
     'description': """
 This module aims to manage employee's attendances.
 ==================================================
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
index 9ad1c4aebe3..d3fa464fb58 100644
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -24,7 +24,6 @@
     'name': "Employee Contracts",
     'version': '1.0',
     'category': 'Human Resources',
-    'complexity': "easy",
     'description': """
 Add all information on the employee form to manage contracts.
 =============================================================
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 4d62e9e0fd5..231f4593868 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -24,7 +24,6 @@
     "version": "0.1",
     "author": "OpenERP SA",
     "category": "Human Resources",
-    'complexity': "easy",
     "website": "http://www.openerp.com",
     "images": ["images/hr_evaluation_analysis.jpeg","images/hr_evaluation.jpeg"],
     "depends": ["hr","base_calendar","survey"],
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index eede2be39e0..cbf8b322b36 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -25,7 +25,6 @@
     'version': '1.0',
     'category': 'Human Resources',
     "sequence": 30,
-    'complexity': "easy",
     'description': """
 This module aims to manage employee's expenses.
 ===============================================
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 71c91136f97..e60f53d7d1e 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -26,7 +26,6 @@
     "author": "OpenERP SA",
     "category": "Human Resources",
     "sequence": 28,
-    'complexity': "easy",
     "website": "http://www.openerp.com",
     "description": """
 This module allows you to manage leaves and leaves' requests.
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 560bec7093c..dc50c530927 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -24,7 +24,6 @@
     'version': '1.0',
     'category': 'Human Resources',
     "sequence": 38,
-    'complexity': "normal",
     'description': """
 Generic Payroll system.
 =======================
@@ -73,7 +72,7 @@ Generic Payroll system.
     'installable': True,
     'auto_install': False,
     'certificate' : '001046261404562128861',
-    'application': True,
+    'application': False,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index 42695c61e29..9ea8a10bbb8 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -23,7 +23,6 @@
     'name': 'Payroll Accounting',
     'version': '1.0',
     'category': 'Human Resources',
-    'complexity': "expert",
     'description': """
 Generic Payroll system Integrated with Accountings.
 ===================================================
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 4b6e3fb48b2..4a29befbfaf 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -24,7 +24,6 @@
     'version': '1.0',
     'category': 'Human Resources',
     "sequence": 24,
-    'complexity': "easy",
     'description': """
 Manages job positions and the recruitment process.
 ==================================================
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index f641432cdb6..6b8e618116e 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Timesheets',
     'version': '1.0',
     "category": "Human Resources",
-    'complexity': "easy",
     'description': """
 This module implements a timesheet system.
 ==========================================
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 9fdb3e8fffe..8f65ea2eaa0 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Ideas',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
     'description': """
 This module allows your user to easily and efficiently participate in enterprise innovation.
 ============================================================================================
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index edefd6655ea..dca620b0f07 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -26,7 +26,6 @@
     "depends" : ["base","base_setup"],
     "author" : "OpenERP SA",
     'category': 'Hidden/Dependency',
-    'complexity': "easy",
     "description": """
 Installer for knowledge-based Hidden.
 =====================================
diff --git a/addons/l10n_uy/__openerp__.py b/addons/l10n_uy/__openerp__.py
index b68c6e9cb18..4edfe22e1e8 100644
--- a/addons/l10n_uy/__openerp__.py
+++ b/addons/l10n_uy/__openerp__.py
@@ -34,7 +34,6 @@ General Chart of Accounts
 Provide Templates for Chart of Accounts, Taxes for Uruguay
 
 """,
-    "complexity": "normal",
     "license"   : "AGPL-3",
     "depends"   : [
                     "account",
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index 363b0b3a2c2..4ce4eaf3d6b 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -22,7 +22,6 @@
 {
     "name": "Lunch Orders",
     "author": "OpenERP SA",
-    'complexity': "easy",
     "Description": """
     The lunch module is for keeping a record of the order placed and payment of the orders.
     =======================================================================================
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 81719794f69..39413a80bed 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -23,7 +23,6 @@
     'name': 'Emails Management',
     'version': '1.0',
     'category': 'Hidden/Dependency',
-    'complexity': "easy",
     'description': """
 A generic email subsystem with message storage and queuing
 ==========================================================
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index 8088a0a1a1b..81751891e66 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -26,7 +26,6 @@
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
     "category": 'Hidden/Dependency',
-    'complexity': "expert",
     "description": """
 Menu for Marketing.
 ===================
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 9064f28fe41..3544145411c 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -30,7 +30,6 @@
                 ],
     "author" : "OpenERP SA",
     "category": 'Marketing',
-    'complexity': "expert",
     "description": """
 This module provides leads automation through marketing campaigns (campaigns can in fact be defined on any resource, not just CRM Leads).
 =========================================================================================================================================
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index 4985970ded6..3cd0f2a8774 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Just In Time Scheduling',
     'version': '1.0',
     'category': 'Manufacturing',
-    'complexity': "easy",
     'description': """
 This module allows Just In Time computation of procurement orders.
 ==================================================================
diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index 01391d9fb0b..0dba1828d9a 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Manufacturing Operations',
     'version': '1.0',
     'category': 'Manufacturing',
-    'complexity': "easy",
     'description': """
 This module adds state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
 =============================================================================================================
diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py
index 5281be71a43..c8e06b5cf2b 100644
--- a/addons/multi_company/__openerp__.py
+++ b/addons/multi_company/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Multi-Company',
     'version': '1.0',
     'category': 'Tools',
-    'complexity': "expert",
     'description': """
 This module is for managing a multicompany environment.
 =======================================================
diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index 0077a5ae061..267f595c7e5 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -3,7 +3,6 @@
     'name': 'Collaborative Pads',
     'version': '2.0',
     "category": "Project Management",
-    'complexity': "easy",
     'description': """
 Adds enhanced support for (Ether)Pad attachments in the web client.
 ===================================================================
diff --git a/addons/pad_project/__openerp__.py b/addons/pad_project/__openerp__.py
index 0d2e829d740..8ca761d2737 100644
--- a/addons/pad_project/__openerp__.py
+++ b/addons/pad_project/__openerp__.py
@@ -23,7 +23,6 @@
     'name': 'Specifications on PADs',
     'version': '1.0',
     "category": "Project Management",
-    'complexity': "easy",
     'description': """
 This module adds a PAD in all project kanban views
 ==================================================
diff --git a/addons/plugin/__openerp__.py b/addons/plugin/__openerp__.py
index 3d527918953..dba41649ff6 100644
--- a/addons/plugin/__openerp__.py
+++ b/addons/plugin/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'CRM Plugins',
     'version': '1.0',
     'category': 'Hidden/Dependency',
-    'complexity': "easy",
     'description': """
 The common interface for pugin.
 =====================================================
diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py
index 981e0c6c2b9..29e30bf380d 100644
--- a/addons/product_expiry/__openerp__.py
+++ b/addons/product_expiry/__openerp__.py
@@ -22,7 +22,6 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "category" : "Specific Industry Applications",
-    'complexity': "easy",
     "depends" : ["stock"],
     "init_xml" : [],
     "demo_xml" : ["product_expiry_demo.xml"],
diff --git a/addons/product_manufacturer/__openerp__.py b/addons/product_manufacturer/__openerp__.py
index 56f4b4725d1..98cf8d2d8de 100644
--- a/addons/product_manufacturer/__openerp__.py
+++ b/addons/product_manufacturer/__openerp__.py
@@ -22,7 +22,6 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     'category': 'Purchase Management',
-    'complexity': "easy",
     "depends" : ["stock"],
     "init_xml" : [],
     "demo_xml" : [],
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index c4aec85a004..d957c6d87ed 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -22,7 +22,6 @@
     "version": "1.0",
     "author": "OpenERP SA",
     'category': 'Sales Management',
-    'complexity': "easy",
     "description": """
 This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.
 ===============================================================================================================
diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py
index 54e101df38c..4ba0298346e 100644
--- a/addons/profile_tools/__openerp__.py
+++ b/addons/profile_tools/__openerp__.py
@@ -26,7 +26,6 @@
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
     "category" : "Hidden/Dependency",
-    'complexity': "easy",
     "description": """
 Installer for extra Hidden like lunch, survey, idea, share, etc.
 ================================================================
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 68c85ffb836..924bf40c50a 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -27,7 +27,6 @@
     "website": "http://www.openerp.com",
     "category": "Project Management",
     "sequence": 8,
-    'complexity': "easy",
     "images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"],
     "depends": ["base_setup", "product", "analytic", "board",  "mail", "resource","web_kanban"],
     "description": """
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index fce6a3d7298..d6fa568977a 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -25,7 +25,6 @@
     'version': '1.0',
     'category': 'Project Management',
     "sequence": 20,
-    'complexity': "easy",
     'description': """
 This module implements all concepts defined by the Getting Things Done methodology.
 ===================================================================================
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 6ddbfb07ea4..fc88372fe90 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -25,7 +25,6 @@
     'version': '1.0',
     'category': 'Project Management',
     "sequence": 22,
-    'complexity': "easy",
     'description': """
 This module provides Issues/Bugs Management in Project.
 =======================================================
diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py
index f2ac59c9fb1..4679f5b65ca 100644
--- a/addons/project_mailgate/__openerp__.py
+++ b/addons/project_mailgate/__openerp__.py
@@ -26,7 +26,6 @@
     "author": "OpenERP SA",
     "website": "http://www.openerp.com",
     "category": "Project Management",
-    'complexity': "easy",
     "images": ["images/project_mailgate_task.jpeg"],
     "depends": ["project", "mail"],
     "description": """
diff --git a/addons/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py
index 9185e16fdec..5c7eeb52579 100644
--- a/addons/project_messages/__openerp__.py
+++ b/addons/project_messages/__openerp__.py
@@ -27,7 +27,6 @@
     "depends": ["project"],
     "author": "OpenERP SA",
     "category": "Project Management",
-    'complexity': "easy",
     "description": """
 This module provides the functionality to send messages within a project.
 =========================================================================
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index 2d64f2b6dd8..9992bd3b2b7 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Create Tasks on SO',
     'version': '1.0',
     "category": "Project Management",
-    'complexity': "easy",
     'description': """
 Automatically creates project tasks from procurement lines
 ==========================================================
diff --git a/addons/project_planning/__openerp__.py b/addons/project_planning/__openerp__.py
index 22923b1ed68..008ac1b577c 100644
--- a/addons/project_planning/__openerp__.py
+++ b/addons/project_planning/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Resources Planing',
     'version': '1.0',
     "category": "Project Management",
-    'complexity': "expert",
     'description': """Keep track of your planning
 This module helps you to manage your plannings.
 ===============================================
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
index 7bed53bd0f5..d334a421de4 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -23,7 +23,6 @@
     'name': 'Project Retro-planning',
     'version': '0.1',
     'category': 'Project Management',
-    'complexity': "expert",
     'description': """
 Changes dates according to change in project End Date.
 ======================================================
diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index 9b1bf8a319a..5e6b360b2fa 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Methodology: SCRUM',
     'version': '1.0',
     'category': 'Project Management',
-    'complexity': "normal",
     'description': """
 This module implements all concepts defined by the scrum project management methodology for IT companies.
 =========================================================================================================
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index c0fb0b8f74d..d84408a690d 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -25,7 +25,6 @@
     'version': '1.1',
     'category': 'Purchase Management',
     "sequence": 19,
-    'complexity': "easy",
     'description': """
 Purchase module is for generating a purchase order for purchase of goods from a supplier.
 =========================================================================================
diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py
index ca79aa551fa..fe05cbd412f 100644
--- a/addons/purchase_double_validation/__openerp__.py
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -23,7 +23,6 @@
     "name" : "Double Validation on Purchases",
     "version" : "1.1",
     'category': 'Purchase Management',
-    'complexity': "easy",
     "images" : ["images/purchase_validation.jpeg"],
     "depends" : ["base","purchase"],
     "author" : 'OpenERP SA',
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index 0364b70dfd2..e6ca746841b 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -22,7 +22,6 @@
     "version" : "0.1",
     "author" : "OpenERP SA",
     "category" : "Purchase Management",
-    'complexity': "normal",
     "images" : ['images/purchase_requisitions.jpeg'],
     "website" : "http://www.openerp.com",
     "description": """
diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py
index f0559d8800c..8a8c6c3b7bb 100644
--- a/addons/report_designer/__openerp__.py
+++ b/addons/report_designer/__openerp__.py
@@ -25,7 +25,6 @@
     "version" : "1.0",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "complexity" : "expert",
     "category": "Tools",
     "description": """
 Installer for reporting Hidden.
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index c121739166a..e5b99f1b9c9 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -24,7 +24,6 @@
     'version': '1.0',
     'category': 'Sales Management',
     "sequence": 14,
-    'complexity': "easy",
     'description': """
 The base module to manage quotations and sales orders.
 ======================================================
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 8da96384d0a..92b4491d449 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -23,7 +23,6 @@
     'name': 'Opportunity to Quotation',
     'version': '1.0',
     'category': 'Hidden',
-    'complexity': "easy",
     'description': """
 This module adds a shortcut on one or several opportunity cases in the CRM.
 ===========================================================================
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index 1abd71b4139..c104ae19d97 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -23,7 +23,6 @@
     'name': 'Invoicing Journals',
     'version': '1.0',
     'category': 'Sales Management',
-    'complexity': "normal",
     'description': """
 The sales journal modules allows you to categorise your sales and deliveries (picking lists) between different journals.
 ========================================================================================================================
diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py
index 0eb44e574fb..d2006ed1d9e 100644
--- a/addons/sale_layout/__openerp__.py
+++ b/addons/sale_layout/__openerp__.py
@@ -24,7 +24,6 @@
     "images" : ["images/sale_layout.jpeg"],
     "depends" : ["sale", "account_invoice_layout"],
     "author" : "OpenERP SA",
-    'complexity': "easy",
     "description": """
 This module provides features to improve the layout of the Sales Order.
 =======================================================================
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index 59c6f14d546..2d7ed96cca4 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Sales and MRP Management',
     'version': '1.0',
     'category': 'Hidden',
-    'complexity': "easy",
     'description': """
 This module provides facility to the user to install mrp and sales modulesat a time.
 ====================================================================================
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
index bd3f0baf1ed..f5ccef7ffe5 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Dates on Sales Order',
     'version': '1.0',
     'category': 'Sales Management',
-    'complexity': "easy",
     'description': """
 Add additional date information to the sales order.
 ===================================================
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 7a78783348c..608c41a4909 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -27,7 +27,6 @@
     "depends" : ["base", "mail"],
     "author" : "OpenERP SA",
     "category": 'Tools',
-    'complexity': "easy",
     "description": """
 This module adds generic sharing tools to your current OpenERP database.
 ========================================================================
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 102d54ae9ed..50bcb23df7b 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -23,7 +23,6 @@
     "name" : "Warehouse Management",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    'complexity': "easy",
     "description" : """
 OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations.
 ======================================================================================================
diff --git a/addons/stock_invoice_directly/__openerp__.py b/addons/stock_invoice_directly/__openerp__.py
index b5a2a99d9d9..4ae8d518d83 100644
--- a/addons/stock_invoice_directly/__openerp__.py
+++ b/addons/stock_invoice_directly/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Invoice Picking Directly',
     'version': '1.0',
     "category" : "Warehouse Management",
-    'complexity': "easy",
     'description': """
 Invoice Wizard for Delivery.
 ============================
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index b038f429f30..53189727f0e 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -94,7 +94,6 @@ You can use the demo data as follow:
         'stock_location_demo_cpu1.xml',
         'stock_location_demo_cpu3.yml',
     ],
-    'complexity': 'expert',
     'installable': True,
     'test':[
             'test/stock_location_pull_flow.yml',
diff --git a/addons/stock_planning/__openerp__.py b/addons/stock_planning/__openerp__.py
index 497b6f78c53..df373f59097 100644
--- a/addons/stock_planning/__openerp__.py
+++ b/addons/stock_planning/__openerp__.py
@@ -26,7 +26,6 @@
     "category" : "Manufacturing",
     "images": ["images/master_procurement_schedule.jpeg","images/sales_forecast.jpeg","images/stock_planning_line.jpeg","images/stock_sales_period.jpeg"],
     "depends": ["crm", "stock","sale"],
-    "complexity": "expert",
     "description": """
 MPS allows to create a manual procurement plan apart of the normal MRP scheduling, which works automatically based on minimum stock rules
 =========================================================================================================================================
diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py
index f8733a7b261..e6cd59e8131 100644
--- a/addons/users_ldap/__openerp__.py
+++ b/addons/users_ldap/__openerp__.py
@@ -24,7 +24,6 @@
     "depends" : ["base"],
     "images" : ["images/ldap_configuration.jpeg"],
     "author" : "OpenERP SA",
-    'complexity': "expert",
     "description": """
 Adds support for authentication by LDAP server.
 ===============================================
diff --git a/addons/warning/__openerp__.py b/addons/warning/__openerp__.py
index 9ed6a7aadcf..2391020d20c 100644
--- a/addons/warning/__openerp__.py
+++ b/addons/warning/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Warning Messages and Alerts',
     'version': '1.0',
     'category': 'Tools',
-    'complexity': "easy",
     'description': """
 Module to trigger warnings in OpenERP objects.
 ==============================================
diff --git a/addons/web_livechat/__openerp__.py b/addons/web_livechat/__openerp__.py
index 4be4ff1d1e8..860b7b162a9 100644
--- a/addons/web_livechat/__openerp__.py
+++ b/addons/web_livechat/__openerp__.py
@@ -22,7 +22,6 @@
     'name': 'Live Chat Support',
     'version': '2.0',
     'category': 'Tools',
-    'complexity': "easy",
     'description': """
 Enable live chat support for those who have a maintenance contract.
 ===================================================================
diff --git a/addons/web_shortcuts/__openerp__.py b/addons/web_shortcuts/__openerp__.py
index 150b30909e9..ca3119294ed 100644
--- a/addons/web_shortcuts/__openerp__.py
+++ b/addons/web_shortcuts/__openerp__.py
@@ -22,7 +22,6 @@
     'name': 'Web Shortcuts',
     'version': '1.0',
     'category': 'Tools',
-    'complexity': "easy",
     'description': """
 Enable shortcuts feature in the web client
 ==========================================
diff --git a/addons/web_uservoice/__openerp__.py b/addons/web_uservoice/__openerp__.py
index 8385b97ccaf..5c0f21fb07c 100644
--- a/addons/web_uservoice/__openerp__.py
+++ b/addons/web_uservoice/__openerp__.py
@@ -22,7 +22,6 @@
     'name': 'Receive User Feedback',
     'version': '2.0',
     'category': 'Tools',
-    'complexity': "easy",
     'description': """
 Add Feedback button in header.
 ==============================
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index ac08c6a4e5f..4c413b6050b 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -23,7 +23,6 @@
     'name': 'Wiki',
     'version': '1.0.1',
     'category': 'Knowledge Management',
-    'complexity': "normal",
     'description': """
 The base module to manage documents(wiki).
 ==========================================
diff --git a/addons/wiki_faq/__openerp__.py b/addons/wiki_faq/__openerp__.py
index 32715e86439..5568372d76d 100644
--- a/addons/wiki_faq/__openerp__.py
+++ b/addons/wiki_faq/__openerp__.py
@@ -23,7 +23,6 @@
     'name': 'Wiki: Internal FAQ',
     'version': '1.0',
     'category': 'Knowledge Management',
-    'complexity': "easy",
     'description': """
 This module provides a Wiki FAQ Template.
 =========================================
diff --git a/addons/wiki_quality_manual/__openerp__.py b/addons/wiki_quality_manual/__openerp__.py
index e85eb27be82..92512f9e093 100644
--- a/addons/wiki_quality_manual/__openerp__.py
+++ b/addons/wiki_quality_manual/__openerp__.py
@@ -23,7 +23,6 @@
     'name': 'Wiki: Quality Manual',
     'version': '1.0',
     'category': 'Knowledge Management',
-    'complexity': "easy",
     'description': """
 Quality Manual Template.
 ========================
diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py
index f361d634755..e2a502527b7 100644
--- a/addons/wiki_sale_faq/__openerp__.py
+++ b/addons/wiki_sale_faq/__openerp__.py
@@ -23,7 +23,6 @@
     'name': 'Wiki: Sale FAQ',
     'version': '1.0',
     'category': 'Customer Relationship Management',
-    'complexity': "easy",
     'description': """
 This module provides a Wiki Sales FAQ Template.
 ===============================================

From 7c06e4a5b641cd8f10280f22e084104e5714085f Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 18 May 2012 10:59:39 +0530
Subject: [PATCH 318/452] [IMP]module: improve tree and form view and remove
 complexity field from ir.module object

bzr revid: mma@tinyerp.com-20120518052939-51ps201qaq51g2bp
---
 openerp/addons/base/module/module.py       |  9 +---
 openerp/addons/base/module/module_view.xml | 50 ++++++++++------------
 openerp/modules/db.py                      |  6 +--
 openerp/modules/module.py                  |  1 -
 4 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 575a965fa11..e04e4e4a02b 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -161,9 +161,9 @@ class module(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char("Name", size=128, readonly=True, required=True, select=True),
+        'name': fields.char("Technical Name", size=128, readonly=True, required=True, select=True),
         'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True),
-        'shortdesc': fields.char('Short Description', size=256, readonly=True, translate=True),
+        'shortdesc': fields.char('Name', size=256, readonly=True, translate=True),
         'description': fields.text("Description", readonly=True, translate=True),
         'author': fields.char("Author", size=128, readonly=True),
         'maintainer': fields.char('Maintainer', size=128, readonly=True),
@@ -211,9 +211,6 @@ class module(osv.osv):
         'certificate' : fields.char('Quality Certificate', size=64, readonly=True),
         'application': fields.boolean('Application', readonly=True),
         'icon': fields.char('Icon URL', size=128),
-        'complexity': fields.selection([('easy','Easy'), ('normal','Normal'), ('expert','Expert')],
-            string='Complexity', readonly=True,
-            help='Level of difficulty of module. Easy: intuitive and easy to use for everyone. Normal: easy to use for business experts. Expert: requires technical skills.'),
     }
 
     _defaults = {
@@ -221,7 +218,6 @@ class module(osv.osv):
         'sequence': 100,
         'demo': False,
         'license': 'AGPL-3',
-        'complexity': 'normal',
     }
     _order = 'sequence,name'
 
@@ -464,7 +460,6 @@ class module(osv.osv):
             'website': terp.get('website', ''),
             'license': terp.get('license', 'AGPL-3'),
             'certificate': terp.get('certificate') or False,
-            'complexity': terp.get('complexity', ''),
             'sequence': terp.get('sequence', 100),
             'application': terp.get('application', False),
             'auto_install': terp.get('auto_install', False),
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 13f330753ff..e22f6ce3fc3 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -77,7 +77,6 @@
                   <field name="icon"/>
                   <field name="name"/>
                   <field name="state"/>
-                  <field name="complexity"/>
                   <templates>
                     <t t-name="kanban-box">
                       <div class="oe_module_vignette">
@@ -90,7 +89,6 @@
                           <p>
                              <field name="category_id"/><br/>
                              <field name="name"/><br/>
-                             <span t-if="record.complexity.raw_value == 'Expert'" class="oe_label oe_warning">Complex</span>
                            </p>
                           <button type="object" name="button_immediate_install" states="uninstalled" class="oe_button">Install</button>
                           <button t-if="installed" class="oe_button" disabled="disabled">Installed</button>
@@ -125,15 +123,25 @@
             <field name="model">ir.module.module</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Module">
-                    <group colspan="4" col="6">
-                        <field name="name"/>
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object" class="oe_form_button_hi"/>
+                    <button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object" class="oe_form_button_hi"/>
+                    <button name="button_uninstall" states="installed" string="Uninstall (beta)"
+                                        icon="terp-dialog-close" type="object"
+                                        confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
+                    <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
+                    <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" icon="gtk-cancel" type="object"/>
+                    <button name="button_install_cancel" states="to install" string="Cancel Install" icon="gtk-cancel" type="object"/>
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="uninstalled,installed"/>
+                </div>
+                </div>
+                <sheet string="Module" layout="auto">
+                    <group colspan="4" col="6" class="oe_form_header">
                         <field name="shortdesc"/>
                         <field name="certificate" />
                         <field name="category_id"/>
-                        <field name="complexity"/>
-                        <field name="demo"/>
-                        <field name="application"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Module">
@@ -147,26 +155,15 @@
                                 <group colspan="2" col="2">
                                     <separator string="Version" colspan="2"/>
                                     <field name="installed_version"/>
-                                    <field name="latest_version"/>
-                                    <field name="published_version"/>
                                 </group>
                             </group>
                             <separator string="Description" colspan="4"/>
                             <field colspan="4" name="description" select="2" nolabel="1"/>
-                            <newline/>
-                            <field name="state"/>
-                            <group col="6" colspan="2">
-                                <button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object"/>
-                                <button name="button_install_cancel" states="to install" string="Cancel Install" icon="gtk-cancel" type="object"/>
-                                <button name="button_uninstall" states="installed" string="Uninstall (beta)"
-                                        icon="terp-dialog-close" type="object"
-                                        confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
-                                <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
-                                <button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object"/>
-                                <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" icon="gtk-cancel" type="object"/>
-                            </group>
                         </page>
-                        <page string="Dependencies">
+                        <page string="Technical Data">
+                            <field name="name"/>
+                            <field name="demo"/>
+                            <field name="application"/>
                             <field colspan="4" name="dependencies_id" nolabel="1">
                                 <tree string="Dependencies">
                                     <field name="name"/>
@@ -183,6 +180,7 @@
                             <field colspan="2" name="reports_by_module" nolabel="1"/>
                         </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -192,15 +190,11 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state=='to upgrade' or state=='to install';red:state=='uninstalled';grey:state=='uninstallable';black:state=='installed'" string="Modules">
-                    <field name="name"/>
-                    <field name="category_id"/>
+                    <field name="name" groups="base.group_no_one"/>
                     <field name="shortdesc"/>
-                    <field name="complexity"/>
                     <field name="author"/>
                     <field name="installed_version"/>
-                    <field name="latest_version"/>
                     <field name="state"/>
-                    <button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object"/>
                 </tree>
             </field>
         </record>
diff --git a/openerp/modules/db.py b/openerp/modules/db.py
index 1fb26971ff1..2449efc7fcd 100644
--- a/openerp/modules/db.py
+++ b/openerp/modules/db.py
@@ -77,15 +77,15 @@ def initialize(cr):
 
         cr.execute('INSERT INTO ir_module_module \
                 (author, website, name, shortdesc, description, \
-                    category_id, auto_install, state, certificate, web, license, complexity, application, icon, sequence) \
-                VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
+                    category_id, auto_install, state, certificate, web, license, application, icon, sequence) \
+                VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
             info['author'],
             info['website'], i, info['name'],
             info['description'], category_id,
             info['auto_install'], state, info['certificate'],
             info['web'],
             info['license'],
-            info['complexity'], info['application'], info['icon'],
+            info['application'], info['icon'],
             info['sequence']))
         id = cr.fetchone()[0]
         cr.execute('INSERT INTO ir_model_data \
diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index bc8e21bee7e..e226b69a6fc 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -329,7 +329,6 @@ def load_information_from_description_file(module):
                 'auto_install': False,
                 'category': 'Uncategorized',
                 'certificate': None,
-                'complexity': 'normal',
                 'depends': [],
                 'description': '',
                 'icon': get_module_icon(module),

From bf406c4af7f30d0d80b35a1fc70ae2ef05272d44 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 18 May 2012 15:25:44 +0530
Subject: [PATCH 319/452] [IMP]hr_holidays: remove extra import

bzr revid: dbr@tinyerp.com-20120518095544-u0qrrgaaqmc4cbhg
---
 addons/hr_holidays/hr_holidays.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 60e56833c98..dd5a3cf8243 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -22,7 +22,6 @@
 ##############################################################################
 
 import datetime, time
-from datetime import datetime
 from itertools import groupby
 from operator import itemgetter
 

From d42c1b7fad00b13962710371121d7348082c0cb3 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 18 May 2012 16:09:41 +0530
Subject: [PATCH 320/452] [IMP]stock: remove conflicts

bzr revid: dbr@tinyerp.com-20120518103941-9mwsya999g1vmslc
---
 addons/stock/stock_view.xml | 189 +-----------------------------------
 1 file changed, 1 insertion(+), 188 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c91c676267e..0129914f64d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1047,131 +1047,6 @@
             <field name="inherit_id" ref="view_picking_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-<<<<<<< TREE
-                <form string="Input Picking List">
-                    <group colspan="4" col="6">
-                        <group colspan="4" col="4">
-                            <field name="name" readonly="1"/>
-                            <field name="origin"/>
-                            <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4"/>
-                            <field name="invoice_state" string="Invoice Control"/>
-                            <field name="backorder_id" readonly="1"/>
-                        </group>
-                        <group colspan="2" col="2">
-                            <field name="date"/>
-                            <field name="min_date" readonly="1"/>
-                            <field name="stock_journal_id" widget="selection"/>
-                        </group>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="General Information">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': partner_id, 'picking_type': type}" >
-                                <tree colors="grey:scrapped==True" string="Stock Moves">
-                                    <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" string="UoM" groups="product.group_uom"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <field name="scrapped" invisible="1"/>
-                                    <field name="prodlot_id" groups="stock.group_production_lot"/>
-                                    <button
-                                           name="%(stock.track_line)d"
-                                           string="Split in production lots"
-                                           groups="stock.group_production_lot"
-                                           type="action" icon="terp-stock_effects-object-colorize"
-                                           states="draft,waiting,confirmed,assigned" />
-                                    <field name="tracking_id" groups="stock.group_tracking_lot"/>
-                                    <button name="setlast_tracking" string="Put in current pack" type="object"
-                                        groups="stock.group_tracking_lot"
-                                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                        states="draft,assigned,confirmed"/>
-                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                        groups="product.group_stock_packaging"
-                                        icon="terp-stock_effects-object-colorize"
-                                        states="draft,assigned,confirmed"/>
-                                    <field name="location_dest_id"/>
-                                    <field name="state"/>
-                                </tree>
-                                <form string="Stock Moves">
-                                    <group colspan="2" col="4">
-                                        <separator colspan="4" string="Move Information"/>
-                                        <field name="name" invisible="1" colspan="4"/>
-                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)" colspan="4"/>
-                                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
-                                        <button name="%(stock.move_scrap)d"
-                                                string="Scrap" type="action"
-                                                icon="gtk-convert" context="{'scrap': True}"
-                                                states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" colspan="4"/>
-                                        <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
-                                        <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
-                                        <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
-                                    </group>
-
-                                    <group colspan="2" col="2">
-                                        <separator string="Locations" colspan="2" />
-                                        <field name="location_id" domain="[('usage','&lt;&gt;','view')]" />
-                                        <field name="location_dest_id" domain="[('usage','=','internal')]" />
-                                    </group>
-
-                                    <group colspan="2" col="2">
-                                        <separator string="Dates" colspan="2" />
-                                        <field name="create_date" invisible="1"/>
-                                        <field name="date"/>
-                                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                    </group>
-
-                                    <group colspan="2" col="4">
-                                        <separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
-                                        <field name="tracking_id" groups="stock.group_tracking_lot" colspan="3" />
-                                        <button name="%(split_into)d" string="New Pack" type="action"
-                                              groups="product.group_stock_packaging"
-                                              icon="terp-stock_effects-object-colorize"
-                                              states="draft,assigned,confirmed" colspan="1"/>
-                                        <field name="prodlot_id" groups="stock.group_production_lot"
-                                            context="{'location_id':location_id, 'product_id':product_id}"
-                                            domain="[('product_id','=?',product_id)]"
-                                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
-                                        <button name="%(track_line)d"
-                                              groups="stock.group_tracking_lot"
-                                              states="draft,waiting,confirmed,assigned"
-                                              string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
-                                    </group>
-                                    <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"/>
-                                    </group>
-                                </form>
-                            </field>
-                            <group col="10" colspan="4">
-                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
-                                <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
-                                <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
-                                <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_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
-                                <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
-                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
-                            </group>
-                        </page>
-                        <page string="Additional Info">
-                            <field name="type"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        </page>
-                        <page string="Notes">
-                            <field colspan="4" name="note" nolabel="1"/>
-                        </page>
-                    </notebook>
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
-                </form>
-=======
                 <data>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='%(act_stock_return_picking)d']" position="replace">
                         <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="terp-gtk-go-back-rtl" />
@@ -1191,7 +1066,7 @@
                         </div>
                     </xpath>
                 </data>
->>>>>>> MERGE-SOURCE
+
             </field>
         </record>
 
@@ -1261,71 +1136,9 @@
         </record>
         <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_warehouse_mgmt" sequence="1"/>
 
-<<<<<<< TREE
-        <record id="view_picking_internal_search" model="ir.ui.view">
-            <field name="name">stock.picking.internal.search</field>
-            <field name="model">stock.picking</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Internal Picking List">
-                    <group>
-                        <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
-                        <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="origin"/>
-                        <field name="product_id"/>
-                        <field name="stock_journal_id" widget="selection"/>
-                        <field name="company_id" widget="selection"/>
-                    </group>
-                    <newline/>
-                    <group expand="0" string="Group By...">
-                        <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'}"/>
-                        <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                        <separator orientation="vertical" />
-                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="action_picking_tree6" model="ir.actions.act_window">
-            <field name="name">Internal Moves</field>
-            <field name="res_model">stock.picking</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar</field>
-            <field name="domain">[('type','=','internal')]</field>
-            <field name="context">{'default_type': 'internal', 'contact_display': 'partner_address', 'search_default_available': 1}</field>
-            <field name="search_view_id" ref="view_picking_internal_search"/>
-            <field name="help">Internal Moves display all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has his own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your preconfigured logistics rules, but you can also record manual stock operations.</field>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_picking_tree6_tree_view">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="vpicktree"/>
-            <field name="act_window_id" ref="action_picking_tree6"/>
-        </record>
-        <record model="ir.actions.act_window.view" id="action_picking_tree6_form_view">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_picking_form"/>
-            <field name="act_window_id" ref="action_picking_tree6"/>
-        </record>
-
-=======
-
-
-
 <!--
               STOCK MOVES
 -->
->>>>>>> MERGE-SOURCE
 
 
         <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>

From ffbd7480a419c52f2a2ec5409277e4a45a76e069 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 18 May 2012 13:12:02 +0200
Subject: [PATCH 321/452] [ADD] 'locked' icon on non-public custom filters

Icon is kind-of crummy, but none of the iconic font's icons work,
they're too small to work correctly (especially when using both locked
and unlocked, they can't be distinguished below a font size of ~48)

bzr revid: xmo@openerp.com-20120518111202-3h19grpq5cxgejg0
---
 addons/web/static/src/css/base.css  | 5 ++++-
 addons/web/static/src/css/base.sass | 6 +++++-
 addons/web/static/src/js/search.js  | 4 +---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 8978dd3fc95..5dcc1f3b8a9 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1368,7 +1368,10 @@
   cursor: pointer;
   position: relative;
   line-height: 1.2em;
-  padding: 2px 20px 2px 10px;
+  padding: 2px 20px 2px 25px;
+}
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom li.oe_searchview_custom_private {
+  background: url(/web/static/src/img/icons/terp-locked.png) 5px center no-repeat;
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom li:hover {
   background-color: #f0f0fa;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 84ac7cda6fa..ecade4ff30e 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1113,7 +1113,10 @@ $colour4: #8a89ba
                     cursor: pointer
                     position: relative
                     line-height: 1.2em
-                    padding: 2px 20px 2px 10px
+                    padding: 2px 20px 2px 25px
+
+                    &.oe_searchview_custom_private
+                        background: url(/web/static/src/img/icons/terp-locked.png) 5px center no-repeat
 
                     &:hover
                         background-color: $hover-background
@@ -1123,6 +1126,7 @@ $colour4: #8a89ba
                         top: 0
                         right: 5px
 
+
             .oe_searchview_advanced
                 form
                     display: none
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 118eff17374..7d3f31f18de 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1597,9 +1597,7 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
             };
             // FIXME: current context?
             return self.model.call('create_or_replace', [filter]).then(function (id) {
-                if (id) {
-                    filter.id = id;
-                }
+                filter.id = id;
                 self.append_filter(filter);
                 self.$element
                     .removeClass('oe_opened')

From 38d3044665abe75fbe6750090ee896550cf82d3e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 18 May 2012 17:15:50 +0530
Subject: [PATCH 322/452] [IMP]hr_holidays:Improve leave tooltip for date

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

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index ec00643a926..ffc25a221cb 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -518,7 +518,7 @@
                 <xpath expr="//div[@class='oe_employee_details']/ul/li" position="before">
                     <li t-if="record.current_leave_id.raw_value || record.last_login.raw_value">
                         <span t-if="record.current_leave_id.raw_value" t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_color_3':'oe_kanban_color_2'">
-                            <span class="oe_kanban_button" style="font-size: 100%%" t-att-title="record.date_to.raw_value" >
+                            <span class="oe_kanban_button" style="font-size: 100%%" t-att-title="record.date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.date_to.raw_value.toString('ddd dS MMM')" >
                                 <field name="current_leave_id"/>
                             </span>
                         </span>

From a49e0e43db1298ae43ad5ba01745f28affeaa265 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 18 May 2012 14:52:03 +0200
Subject: [PATCH 323/452] Restyling of kanban column header

bzr revid: mit@openerp.com-20120518125203-1vc4k0s5vr9pwbwy
---
 addons/web/static/src/css/base.sass         |  2 ++
 addons/web_kanban/static/src/css/kanban.css | 15 ---------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 670696e025d..cba50aa6279 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1633,6 +1633,8 @@ $colour4: #8a89ba
         border-right: 1px solid #b9b9b9
     .oe_kanban_column
         height: 100%
+    .oe_kanban_aggregates
+        padding: 0
     .oe_kanban_record
         position: relative
         display: block
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index c74b038d1a6..73e7d060632 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -70,20 +70,6 @@
 .openerp .oe_kanban_group_folded .oe_kanban_fold_icon {
     background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat;
 }
-
-.openerp ul.oe_kanban_aggregates {
-    padding: 0;
-    margin: 0 0 0 22px;
-}
-.openerp ul.oe_kanban_aggregates li {
-    list-style: circle;
-    font-style: italic;
-}
-.openerp ul.oe_kanban_aggregates span {
-    text-decoration: underline;
-    font-size: 90%;
-}
-
 .openerp .oe_kanban_action_button {
     height: 22px;
     margin: 0;
@@ -91,7 +77,6 @@
 .openerp .oe_kanban_action_a {
     text-decoration: none;
 }
-
 .openerp .oe_kanban_box {
     background: #FFF;
     border: 2px solid #CCC;

From ce18f726b4b9694181ba2e84f36bea98ca049ce7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 18 May 2012 16:00:01 +0200
Subject: [PATCH 324/452] [IMP] move manage_filters to viewmanager's debug menu

bzr revid: xmo@openerp.com-20120518140001-jbocagvn7weqlqq3
---
 addons/web/static/src/js/search.js | 11 -----------
 addons/web/static/src/js/views.js  | 11 +++++++++++
 addons/web/static/src/xml/base.xml |  1 +
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 7d3f31f18de..2532dead00d 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -665,17 +665,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         case 'add_to_dashboard':
             this.on_add_to_dashboard();
             break;
-        case 'manage_filters':
-            this.do_action({
-                res_model: 'ir.filters',
-                views: [[false, 'list'], [false, 'form']],
-                type: 'ir.actions.act_window',
-                context: {"search_default_user_id": this.session.uid,
-                "search_default_model_id": this.dataset.model},
-                target: "current",
-                limit : 80
-            });
-            break;
         case '':
             this.do_clear();
         }
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index d2387c1ba3f..abc62f8fcd7 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -607,6 +607,17 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
             case 'edit':
                 this.do_edit_resource($option.data('model'), $option.data('id'), { name : $option.text() });
                 break;
+            case 'manage_filters':
+                this.do_action({
+                    res_model: 'ir.filters',
+                    views: [[false, 'list'], [false, 'form']],
+                    type: 'ir.actions.act_window',
+                    context: {
+                        search_default_my_filters: true,
+                        search_default_model_id: this.dataset.model
+                    }
+                });
+                break;
             default:
                 if (val) {
                     console.log("No debug handler for ", val);
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 2919aaeea42..f37dbbddc04 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -453,6 +453,7 @@
     <option t-if="view_manager.active_view === 'form'" value="toggle_layout_outline">Toggle Form Layout Outline</option>
     <option value="fields">View Fields</option>
     <option value="fvg">Fields View Get</option>
+    <option value="manage_filters">Manage Filters</option>
     <t t-if="view_manager.session.uid === 1">
         <option value="manage_views">Manage Views</option>
         <option value="edit" data-model="ir.ui.view" t-att-data-id="view.fields_view.view_id">Edit <t t-esc="_.str.capitalize(view.fields_view.type)"/>View</option>

From 1568d25eb06648d7963fa4fffa06e519b5af2eae Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 18 May 2012 17:23:42 +0200
Subject: [PATCH 325/452] [ADD] marking of currently selected filters in the
 drawer

Visually hints to users currently manipulating the drawer that a given
filter is currently selected.

bzr revid: xmo@openerp.com-20120518152342-xmqhwlml0bsgodhq
---
 addons/web/static/src/css/base.css  |  5 +++-
 addons/web/static/src/css/base.sass |  6 ++++-
 addons/web/static/src/js/search.js  | 36 +++++++++++++++++++++++++----
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 5dcc1f3b8a9..37b4de1dd32 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1341,12 +1341,15 @@
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li {
   list-style: none;
-  padding: 3px 6px;
+  padding: 3px 6px 3px 18px;
   height: 14px;
   line-height: 14px;
   color: inherit;
   cursor: pointer;
 }
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li.oe_selected {
+  background: url(/web/static/src/img/icons/gtk-apply.png) left center no-repeat;
+}
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li:hover {
   background-color: #f0f0fa;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index ecade4ff30e..67e2399069b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1094,15 +1094,19 @@ $colour4: #8a89ba
 
                 li
                     list-style: none
-                    padding: 3px 6px
+                    padding: 3px 6px 3px 18px
                     height: 14px
                     line-height: 14px
                     color: inherit
                     cursor: pointer
 
+                    &.oe_selected
+                        background: url(/web/static/src/img/icons/gtk-apply.png) left center no-repeat
+                    // after oe_selected so background color is not overridden
                     &:hover
                         background-color: $hover-background
 
+
             .oe_searchview_custom
                 form
                     display: none
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 2532dead00d..91423b5c53e 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -644,8 +644,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         // load defaults
         var defaults_fetched = $.when.apply(null, _(this.inputs).invoke(
             'facet_for_defaults', this.defaults)).then(function () {
-                self.query.reset(_(arguments).compact(), {silent: true});
-                self.renderFacets();
+                self.query.reset(_(arguments).compact(), {preventSearch: true});
             });
 
         return $.when(drawer_started, defaults_fetched)
@@ -800,7 +799,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
      *
      * @param e jQuery event object coming from the "Search" button
      */
-    do_search: function () {
+    do_search: function (_query, options) {
+        if (options && options.preventSearch) {
+            return;
+        }
         var search = this.build_search_data();
         if (!_.isEmpty(search.errors)) {
             this.on_invalid(search.errors);
@@ -1009,11 +1011,34 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
         }
         this._super(view);
         this.filters = filters;
+        this.view.query.on('add remove change reset', this.proxy('search_change'));
     },
     start: function () {
         this.$element.on('click', 'li', this.proxy('toggle_filter'));
         return $.when(null);
     },
+    /**
+     * Handles change of the search query: any of the group's filter which is
+     * in the search query should be visually checked in the drawer
+     */
+    search_change: function () {
+        var self = this;
+        var $filters = this.$element.find('> li').removeClass('oe_selected');
+        var facet = this.view.query.find(_.bind(this.match_facet, this));
+        if (!facet) { return; }
+        facet.values.each(function (v) {
+            var i = _(self.filters).indexOf(v.get('value'));
+            if (i === -1) { return; }
+            $filters.eq(i).addClass('oe_selected');
+        });
+    },
+    /**
+     * Matches the group to a facet, in order to find if the group is
+     * represented in the current search query
+     */
+    match_facet: function (facet) {
+        return facet.get('field') === this;
+    },
     make_facet: function (values) {
         return {
             category: _t("Filter"),
@@ -1130,7 +1155,7 @@ instance.web.search.GroupbyGroup = instance.web.search.FilterGroup.extend({
         this._super(filters, view);
         // Not flanders: facet unicity is handled through the
         // (category, field) pair of facet attributes. This is all well and
-        // good for regular filter groups where a group matche a facet, but for
+        // good for regular filter groups where a group matches a facet, but for
         // groupby we want a single facet. So cheat: add an attribute on the
         // view which proxies to the first GroupbyGroup, so it can be used
         // for every GroupbyGroup and still provides the various methods needed
@@ -1144,6 +1169,9 @@ instance.web.search.GroupbyGroup = instance.web.search.FilterGroup.extend({
             }
         }
     },
+    match_facet: function (facet) {
+        return facet.get('field') === this.getParent()._s_groupby;
+    },
     make_facet: function (values) {
         return {
             category: _t("GroupBy"),

From 3e5f595f17a26d0c3cf93926c0bae86df464fa16 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 18 May 2012 18:44:13 +0200
Subject: [PATCH 326/452] [IMP] kaban css improvement

bzr revid: al@openerp.com-20120518164413-7wzidpc6m71oz47s
---
 addons/web/static/src/css/base.css  | 98 ++++++++++++++++++++++++++++-
 addons/web/static/src/css/base.sass | 68 ++++++++++++++++----
 2 files changed, 152 insertions(+), 14 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6f5296315ae..2f85065aa38 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -1944,7 +1944,7 @@
 }
 .openerp .oe_kanban_view {
   position: absolute;
-  top: 110px;
+  top: 111px;
   bottom: 0;
 }
 .openerp .oe_kanban_groups {
@@ -1963,6 +1963,12 @@
   border-left: 1px solid #f0f8f8;
   border-right: 1px solid #b9b9b9;
 }
+.openerp .oe_kanban_column {
+  height: 100%;
+}
+.openerp .oe_kanban_aggregates {
+  padding: 0;
+}
 .openerp .oe_kanban_record {
   position: relative;
   display: block;
@@ -2002,6 +2008,94 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
   -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
+.openerp .oe_kanban_view {
+  position: absolute;
+  top: 111px;
+  bottom: 0;
+}
+.openerp .oe_kanban_card {
+  position: relative;
+  display: block;
+  min-height: 50px;
+  background: white;
+  border: 1px solid #d8d8d8;
+  border-bottom-color: #b9b9b9;
+  padding: 6px;
+  margin: 6px 0;
+  display: block;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+}
+.openerp .oe_kanban_card:last-child {
+  margin-bottom: 0;
+}
+.openerp .oe_kanban_card:hover {
+  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
+  -box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
+}
+.openerp .oe_kanban_card:hover .oe_kanban_menuaction {
+  display: block;
+}
+.openerp .oe_kanban_card h3 {
+  margin: 0 16px 0 0;
+}
+.openerp .oe_kanban_star {
+  float: left;
+  position: inline-block;
+  margin: 0 4px 0 0;
+}
+.openerp a.oe_kanban_menuaction {
+  position: absolute;
+  right: 4px;
+  display: none;
+  color: #4c4c4c;
+  cursor: pointer;
+}
+.openerp a.oe_kanban_menuaction:hover {
+  text-decoration: none;
+}
+.openerp .oe_kanban_avatar {
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+.openerp .oe_kanban_status {
+  display: inline-block;
+  height: 12px;
+  width: 12px;
+  margin: 4px auto;
+  -moz-border-radius: 6px;
+  -webkit-border-radius: 6px;
+  border-radius: 6px;
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
+  -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
+}
+.openerp .oe_kanban_status_green {
+  background: green;
+  background-position: center center;
+  background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44aa44 40%, #339933 100%);
+  background-image: -moz-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
+  background-image: -ms-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
+  background-image: radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
+}
+.openerp .oe_kanban_status_red {
+  background: red;
+  background-position: center center;
+  background-image: -webkit-radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%);
+  background-image: -moz-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
+  background-image: -ms-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
+  background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
+}
+.openerp .oe_kanban_text_red {
+  background: red;
+  color: black;
+}
 .openerp .oe_trad_field.touched {
   border: 1px solid green !important;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index cba50aa6279..c5434d51ce4 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -853,18 +853,6 @@ $colour4: #8a89ba
             content: "k"
         .oe_vm_switch_diagram:after
             content: "f"
-        //.oe_vm_switch_list:after, .oe_vm_switch_tree:after
-            //content: "ö"
-        //.oe_vm_switch_graph:after
-            //content: "ó"
-        //.oe_vm_switch_gantt:after
-            //content: "y"
-        //.oe_vm_switch_calendar:after
-            //content: "b"
-        //.oe_vm_switch_kanban:after
-            //content: "ó"
-        //.oe_vm_switch_diagram:after
-            //content: "}"
     // }}}
     // ViewManager.sidebar {{{
     .oe_form_dropdown_section
@@ -1659,6 +1647,62 @@ $colour4: #8a89ba
         border-color: #e5e5e5 #dbdbdb #d2d2d2
         @include radius(3px)
         @include box-shadow(0 1px 2px rgba(0,0,0,0.2))
+    .oe_kanban_view
+        position: absolute
+        top: 111px
+        bottom: 0
+    .oe_kanban_card
+        position: relative
+        display: block
+        min-height: 50px
+        background: white
+        border: 1px solid #d8d8d8
+        border-bottom-color: #b9b9b9
+        padding: 6px
+        margin: 6px 0
+        display: block
+        @include radius(4px)
+        &:last-child
+            margin-bottom: 0
+        &:hover
+            @include box-shadow(0 0 3px rgba(0,0,0,0.6))
+            .oe_kanban_menuaction
+                display: block
+        h3
+            margin: 0 16px 0 0
+    .oe_kanban_star
+        float: left
+        position: inline-block
+        margin: 0 4px 0 0
+    a.oe_kanban_menuaction
+        position: absolute
+        right: 4px
+        display: none
+        color: #4c4c4c
+        cursor: pointer
+        &:hover
+            text-decoration: none
+    .oe_kanban_avatar
+        @include radius(4px)
+        @include box-shadow(0 1px 2px rgba(0,0,0,0.2))
+    //.oe_kanban_footer_left
+    //   float: left
+    .oe_kanban_status
+        display: inline-block
+        height: 12px
+        width: 12px
+        margin: 4px auto
+        @include radius(6px)
+        @include box-shadow(0 1px 3px rgba(0,0,0,0.6))
+    .oe_kanban_status_green
+        background: green
+        @include radial-gradient((#55dd55 0%, #44aa44 40%, #339933 100%))
+    .oe_kanban_status_red
+        background: red
+        @include radial-gradient((#ee7777 0%, #cc3333 40%, #bb0808 100%))
+    .oe_kanban_text_red
+        background: red
+        color: #000
     // }}}
     // Translation {{{
     .oe_trad_field.touched

From 9f68a37a3213d3ad8f558936b6a516596ff02438 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 18 May 2012 18:45:17 +0200
Subject: [PATCH 327/452] crm.lead kanban view part1

bzr revid: al@openerp.com-20120518164517-onrofcuwdu1tubxc
---
 addons/crm/crm_lead_view.xml | 87 +++++++++++++++++++++---------------
 1 file changed, 51 insertions(+), 36 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9c3bd07562c..fcd1cdd777c 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -251,46 +251,60 @@
                         </ul>
                     </t>
                     <t t-name="kanban-box">
-                        <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="border">oe_kanban_color_red</t>
+
+                        <div class="oe_kanban_card oe_kanban_draghandle">
+                            <a class="oe_kanban_menuaction oe_i">B</a>
+                            <ul class="oe_kanban_menu" style="display:none;">
+                                <li>item1</li>
+                                <li>item2</li>
+                            </ul>
+                            <div class="oe_kanban_content">
+                                <h3>
+                                    <field name="partner_id"/>
+                                    <t t-if="record.planned_revenue.raw_value">
+                                        - <t t-esc="Math.round(record.planned_revenue.value)"/>
+                                        <field name="company_currency"/>
+                                    </t>
+
+                                </h3>
+                                <div>
+                                    <b> <field name="partner_address_name"/> </b>
+                                </div>
+                                <div>
+                                    <field name="name"/>
+                                </div>
+                                <div style="padding-left: 0.5em">
+                                    <i>
+                                        <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
+                                        <span t-attf-class="#{red || ''}">
+                                            <field name="date_action"/>
+                                        </span>
+                                        <t t-if="record.date_action.raw_value"> : </t>
+                                        <field name="title_action"/>
+                                    </i>
+                                </div>
+                                <div class="oe_right">
+                                    <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
+                                    <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.7; filter:alpha(opacity=70);"/>
+                                    <!--
+                                    <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kaban_status_red</t>
+                                    <span t-attf-class="oe_kanban_status #{red}"> </span>
+                                    -->
+                                    <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                </div>
+                                <div class="oe_kanban_footer_left">
+                                </div>
+                            </div>
+                            <div class="oe_clear"></div>
+                        </div>
+
+                        <!--
                         <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}">
                             <div class="oe_kanban_box oe_kanban_color_border">
-                                <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
-                                <tr>
-                                    <td align="left" valign="middle" width="16">
-                                        <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
-                                        <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
-                                    </td>
-                                    <td align="left" valign="middle" class="oe_kanban_title" tooltip="lead_details">
-                                        <field name="partner_id"/>
-                                        <t t-if="record.planned_revenue.raw_value">
-                                            - <t t-esc="Math.round(record.planned_revenue.value)"/>
-                                            <field name="company_currency"/>
-                                        </t>
-                                    </td>
-                                    <td valign="top" width="22">
-                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])"  t-att-title="record.user_id.value"
-                                        width="22" height="22" class="oe_kanban_gravatar"/>
-                                    </td>
-                                </tr>
+                                <table class="oe_kanban_draghandle">
                                 </table>
-
-                                <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
-                                    <div>
-                                        <b>
-                                            <a t-if="record.partner_address_email.raw_value" t-attf-href="mailto:#{record.partner_address_email.raw_value}">
-                                                <field name="partner_address_name"/>
-                                            </a>
-                                            <field t-if="!record.partner_address_email.raw_value" name="partner_address_name"/>
-                                        </b>
-                                    </div>
-                                    <div>
-                                        <field name="name"/>
-                                    </div>
-                                    <div style="padding-left: 0.5em">
-                                        <i><field name="date_action"/><t t-if="record.date_action.raw_value"> : </t><field name="title_action"/></i>
-                                    </div>
+                                <div class="oe_kanban_box_show_onclick_trigger">
                                 </div>
-
                                 <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
                                     <div class="oe_kanban_left">
                                         <a string="Edit" icon="gtk-edit" type="edit"/>
@@ -310,6 +324,7 @@
                                 </div>
                             </div>
                         </div>
+                        -->
                     </t>
                 </templates>
             </kanban>

From c97ac0e91dae069887de3de8b23d01d48099de46 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 21 May 2012 11:47:29 +0530
Subject: [PATCH 328/452] [IMP]module: remove category_id in kanban and add
 Gray colour in technical name

bzr revid: mma@tinyerp.com-20120521061729-3k5877bdmfnk86gj
---
 openerp/addons/base/module/module_view.xml     | 1 -
 openerp/addons/base/static/src/css/modules.css | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index e22f6ce3fc3..71a3a93e864 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -87,7 +87,6 @@
                         <div class="oe_module_desc">
                           <h4><a type="edit"><field name="shortdesc"/></a></h4>
                           <p>
-                             <field name="category_id"/><br/>
                              <field name="name"/><br/>
                            </p>
                           <button type="object" name="button_immediate_install" states="uninstalled" class="oe_button">Install</button>
diff --git a/openerp/addons/base/static/src/css/modules.css b/openerp/addons/base/static/src/css/modules.css
index 47460a0972b..ed20ec0907d 100644
--- a/openerp/addons/base/static/src/css/modules.css
+++ b/openerp/addons/base/static/src/css/modules.css
@@ -36,6 +36,7 @@
 
 .oe_module_desc p {
   margin: 3px 0 5px;
+  color: #808080;
 }
 
 .oe_module_desc .oe_button {

From 1c09d982bc5dc993d185e0a3a2195b531723ab39 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 21 May 2012 09:25:00 +0200
Subject: [PATCH 329/452] [ADD] note about non-standard fields in facets and
 facet values

bzr revid: xmo@openerp.com-20120521072500-bzjlrybvtepgryq2
---
 doc/search-view.rst | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/doc/search-view.rst b/doc/search-view.rst
index 02a239924e5..f94132bf3bd 100644
--- a/doc/search-view.rst
+++ b/doc/search-view.rst
@@ -376,8 +376,17 @@ necessarily having to reimplement all of
     or ``@filter_domain``. ``"="`` for
     :js:class:`~openerp.web.search.Field`
 
-Converting to facet objects
----------------------------
+Arbitrary data storage
+++++++++++++++++++++++
+
+:js:class:`~openerp.web.search.Facet` and
+:js:class:`~openerp.web.search.FacetValue` objects (and structures)
+provided by your widgets should never be altered by the search view
+(or an other widget). This means you are free to add arbitrary fields
+in these structures if you need to (because you have more complex
+needs than the attributes described in this document).
+
+Ideally this should be avoided, but the possibility remains.
 
 Changes
 -------

From 7af2e71817714f5221b85982b8c9e192c1f74404 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 21 May 2012 09:38:51 +0200
Subject: [PATCH 330/452] [FIX] fields: remove leftover print statement from
 r.4160

bzr revid: odo@openerp.com-20120521073851-0e9k8ujhexysg95v
---
 openerp/osv/fields.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 4fc5b911f4b..2a6d0d6e3eb 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1176,7 +1176,6 @@ class related(function):
                 # name_get as root, as seeing the name of a related
                 # object depends on access right of source document,
                 # not target, so user may not have access.
-                print self._obj, self.string
                 ng = dict(obj.pool.get(self._obj).name_get(cr, 1, ids, context=context))
                 for r in res:
                     if res[r]:

From dc293abcb531bdb7a9830c7eb4776ac19920e22a Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 21 May 2012 14:10:52 +0530
Subject: [PATCH 331/452] [IMP]:account_voucher:set statusbar at top and also
 improved code with indentation.

bzr revid: apa@tinyerp.com-20120521084052-aexwrj0zuxjkhrk3
---
 .../voucher_payment_receipt_view.xml          | 18 +++++-----
 .../voucher_sales_purchase_view.xml           | 35 ++++++++-----------
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index a20eb3b6bf1..f20ca4bdc32 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -144,14 +144,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                    <div class="oe_form_topbar">
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
-                <div class="oe_right">
+                    <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                </div>
+                    </div>
                 </div>
                 <sheet string="Bill Payment" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
@@ -298,13 +298,13 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
-                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile and cancel this record ?"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
-                <div class="oe_right">
+                    <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
+                    <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                </div>
+                    </div>
                 </div>
                 <sheet string="Customer Payment" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 75161eec3e4..0b83097fecb 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -82,17 +82,14 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
-                           <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                        </group>
-                        <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="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
-                <div class="oe_right">
+                    <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, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|','|',('pay_now','=','pay_now'),('state','!=','posted'), ('paid','=',True)]}"/>
+                    <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="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                </div>
+                    </div>
                 </div>
                 <sheet string="Sales Receipt" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
@@ -213,19 +210,17 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
-                            <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|', ('state','!=','posted'), ('paid','=',True)]}"/>
-                        </group>
-                        <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 ?"/>
-                        <field name="pay_now" invisible="1"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
-                <div class="oe_right">
+                    <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
+                    <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|','|',('pay_now','=','pay_now'),('state','!=','posted'), ('paid','=',True)]}"/>
+                    <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="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                </div>
+                    </div>
                 </div>
                 <sheet string="Supplier Voucher" layout="auto">
+                    <field name="pay_now" invisible="1"/>
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
                         <field name="date" string="Bill Date" select="1" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>

From 4fe1d0bc50de26ed087ed6277986e2aed3029edb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 21 May 2012 11:05:47 +0200
Subject: [PATCH 332/452] [FIX] in-drawer filter look in case of very long name

also, add help tooltip if the filter has an @help and an @string

bzr revid: xmo@openerp.com-20120521090547-99d7pom8k8dbw6z0
---
 addons/web/static/src/css/base.css  | 3 +--
 addons/web/static/src/css/base.sass | 3 +--
 addons/web/static/src/xml/base.xml  | 3 ++-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 37b4de1dd32..c101e1beb0b 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1342,13 +1342,12 @@
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li {
   list-style: none;
   padding: 3px 6px 3px 18px;
-  height: 14px;
   line-height: 14px;
   color: inherit;
   cursor: pointer;
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li.oe_selected {
-  background: url(/web/static/src/img/icons/gtk-apply.png) left center no-repeat;
+  background: url(/web/static/src/img/icons/gtk-apply.png) left 2px no-repeat;
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li:hover {
   background-color: #f0f0fa;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 67e2399069b..ca47ebf1edb 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1095,13 +1095,12 @@ $colour4: #8a89ba
                 li
                     list-style: none
                     padding: 3px 6px 3px 18px
-                    height: 14px
                     line-height: 14px
                     color: inherit
                     cursor: pointer
 
                     &.oe_selected
-                        background: url(/web/static/src/img/icons/gtk-apply.png) left center no-repeat
+                        background: url(/web/static/src/img/icons/gtk-apply.png) left 2px no-repeat
                     // after oe_selected so background color is not overridden
                     &:hover
                         background-color: $hover-background
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f37dbbddc04..43dd5ebbd24 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1378,7 +1378,8 @@
     <t t-esc="attrs.string"/>
 </button>
 <ul t-name="SearchView.filters">
-    <li t-foreach="widget.filters" t-as="filter">
+    <li t-foreach="widget.filters" t-as="filter"
+            t-att-title="filter.attrs.string ? filter.attrs.help : void 0">
         <t t-esc="filter.attrs.string or filter.attrs.help or filter.attrs.name or 'Ω'"/>
     </li>
 </ul>

From e95eee2bce720c24211c3f18e9dd796f0f25ad1f Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 21 May 2012 14:53:29 +0530
Subject: [PATCH 333/452] [IMP]:base_calendar:set statusbar at top

bzr revid: apa@tinyerp.com-20120521092329-usq1wbnmjlpkg5nf
---
 addons/base_calendar/base_calendar.py       |   9 +-
 addons/base_calendar/base_calendar_view.xml | 153 ++++++++++----------
 2 files changed, 85 insertions(+), 77 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 4dffd8bcbf8..f91ded74685 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -333,10 +333,10 @@ class calendar_attendee(osv.osv):
                     ('opt-participant', 'Optional Participation'), \
                     ('non-participant', 'For information Purpose')], 'Role', \
                     help='Participation role for the calendar user'),
-        'state': fields.selection([('tentative', 'Tentative'),
-                        ('needs-action', 'Needs Action'),
-                        ('accepted', 'Accepted'),
+        'state': fields.selection([('needs-action', 'Needs Action'),
+                        ('tentative', 'Tentative'),
                         ('declined', 'Declined'),
+                        ('accepted', 'Accepted'),
                         ('delegated', 'Delegated')], 'State', readonly=True, \
                         help="Status of the attendee's participation"),
         'rsvp':  fields.boolean('Required Reply?',
@@ -1036,8 +1036,9 @@ class calendar_event(osv.osv):
                                                 'Show as', states={'done': [('readonly', True)]}),
         'base_calendar_url': fields.char('Caldav URL', size=264),
         'state': fields.selection([('tentative', 'Tentative'),
+                        ('cancelled', 'Cancelled'),
                         ('confirmed', 'Confirmed'),
-                        ('cancelled', 'Cancelled')], 'State', readonly=True),
+                        ], 'State', readonly=True),
         'exdate': fields.text('Exception Date/Times', help="This property \
 defines the list of date/time exceptions for a recurring calendar component."),
         'exrule': fields.char('Exception Rule', size=352, help="Defines a \
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 8af1746b5e9..f24f206b107 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -8,59 +8,63 @@
             <field name="model">calendar.attendee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invitation details">
-                    <group col="6" colspan="4">
-                        <field name="email" string="Invitation To"/>
-                        <field name="cutype" string="Invitation Type" />
-                        <field name="rsvp" />
-                        <field name="role" string="Role" />
-                        <field name="sent_by_uid" string="Invitation From" />
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Invitation">
-                            <separator string="Invitation Detail" colspan="4" />
-                            <group colspan="4" col="4">
-                                <field name="user_id" string="Invited User"/>
-                                <newline/>
-                                <field name="partner_id"
-                                    string="Contact" />
-                            </group>
-                            <separator string="Event Detail" colspan="4" />
-                            <group colspan="4" col="4">
-                                <field name="event_date" />
-                                <field name="event_end_date" />
-                                <field name="language"/>
-                                <field name="ref" colspan="4" readonly="1"/>
-                            </group>
-                        </page>
-                        <page string="Delegation Info">
-                            <separator string="Delegated From" colspan="4" />
-                            <field name="parent_ids" nolabel="1"
-                                colspan="4" readonly="1" />
-                            <separator string="Delegated To" colspan="4" />
-                            <field name="child_ids" nolabel="1"
-                                colspan="4" readonly="1" />
-                        </page>
-                    </notebook>
-                    <group col="6" colspan="4">
-                            <field name="state" />
-                            <button name="do_tentative"
-                                states="needs-action,declined,accepted"
-                                string="Uncertain" type="object"
-                                icon="terp-crm" />
-                            <button name="do_accept" string="Accept"
-                                states="needs-action,tentative,declined"
-                                type="object" icon="gtk-apply" />
-                            <button name="do_decline" string="Decline"
-                                states="needs-action,tentative,accepted"
-                                type="object" icon="gtk-cancel" />
-                            <button
-                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                string="Delegate" type="action"
-                                icon="gtk-sort-descending"
-                                states="needs-action,tentative,declined,accepted"
-                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-                    </group>
+                <form layout="manual">
+                    <div class="oe_form_topbar">
+                        <button name="do_tentative"
+                            states="needs-action,declined,accepted"
+                            string="Uncertain" type="object"
+                            icon="terp-crm" />
+                        <button name="do_accept" string="Accept"
+                            states="needs-action,tentative,declined"
+                            type="object" icon="gtk-apply" />
+                        <button
+                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                            string="Delegate" type="action"
+                            icon="gtk-sort-descending"
+                            states="needs-action,tentative,declined,accepted"
+                            context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                        <button name="do_decline" string="Decline"
+                            states="needs-action,tentative,accepted"
+                            type="object" icon="gtk-cancel" />
+                        <div class="oe_right">
+                            <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
+                        </div>
+                    </div>
+                    <sheet string="Invitation details" layout="auto">
+                        <group col="6" colspan="4">
+                            <field name="email" string="Invitation To"/>
+                            <field name="cutype" string="Invitation Type" />
+                            <field name="rsvp" />
+                            <field name="role" string="Role" />
+                            <field name="sent_by_uid" string="Invitation From" />
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Invitation">
+                                <separator string="Invitation Detail" colspan="4" />
+                                <group colspan="4" col="4">
+                                    <field name="user_id" string="Invited User"/>
+                                    <newline/>
+                                    <field name="partner_id"
+                                        string="Contact" />
+                                </group>
+                                <separator string="Event Detail" colspan="4" />
+                                <group colspan="4" col="4">
+                                    <field name="event_date" />
+                                    <field name="event_end_date" />
+                                    <field name="language"/>
+                                    <field name="ref" colspan="4" readonly="1"/>
+                                </group>
+                            </page>
+                            <page string="Delegation Info">
+                                <separator string="Delegated From" colspan="4" />
+                                <field name="parent_ids" nolabel="1"
+                                    colspan="4" readonly="1" />
+                                <separator string="Delegated To" colspan="4" />
+                                <field name="child_ids" nolabel="1"
+                                    colspan="4" readonly="1" />
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -223,7 +227,28 @@
             <field name="model">calendar.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="do_confirm"
+                        string="Confirm"
+                        states="tentative,cancelled"
+                        type="object"
+                        icon="gtk-apply" />
+                    <button name="do_tentative"
+                        states="confirmed,cancelled"
+                        string="Uncertain"
+                        type="object"
+                        icon="terp-crm" />
+                    <button name="do_cancel"
+                        string="Cancel"
+                        states="tentative,confirmed"
+                        type="object"
+                        icon="gtk-cancel" />
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Events" layout="auto">
                     <group col="6" colspan="4">
                         <field name="name" select="1" string="Summary"
                             colspan="4" required="1" />
@@ -254,25 +279,6 @@
                         </group>
                         <separator string="Description" colspan="4" />
                         <field name="description" nolabel="1" colspan="4" />
-                        <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"
-                                   type="object"
-                                   icon="terp-crm" />
-                               <button name="do_confirm"
-                                   string="Confirm"
-                                   states="tentative,cancelled"
-                                   type="object"
-                                   icon="gtk-apply" />
-                           </group>
                         </page>
                         <page string="Invitation Detail">
                             <button string="Invite People"
@@ -397,6 +403,7 @@
 
                     </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>

From d117f3d4bddbbbffcaab7b096a65050880e9a68e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 21 May 2012 11:59:41 +0200
Subject: [PATCH 334/452] [imp] implemented quick_create_enabled an
 create_enabled

bzr revid: nicolas.vanhoren@openerp.com-20120521095941-qukymjtik97s5d1h
---
 addons/web_kanban/static/src/js/kanban.js      | 18 ++++++++++++++++--
 .../web_kanban/static/src/xml/web_kanban.xml   |  8 +++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 2a143934d2b..1b06fd91ce1 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -12,7 +12,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     view_type: "kanban",
     init: function (parent, dataset, view_id, options) {
         this._super(parent, dataset, view_id, options);
-        _.defaults(this.options, {"quick_creatable": true});
+        _.defaults(this.options, {"quick_creatable": true, "creatable": true});
         this.fields_view = {};
         this.fields_keys = [];
         this.group_by = null;
@@ -35,6 +35,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         this.add_group_mutex = new $.Mutex();
     },
     on_loaded: function(data) {
+        this.fields_view = data;
         this.$buttons = $(QWeb.render("KanbanView.buttons", {'widget': this}));
         if (this.options.$buttons) {
             this.$buttons.appendTo(this.options.$buttons);
@@ -44,12 +45,25 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         this.$buttons
             .on('click','button.oe_kanban_button_new', this.do_add_record);
         this.$groups = this.$element.find('.oe_kanban_groups tr');
-        this.fields_view = data;
         this.fields_keys = _.keys(this.fields_view.fields);
         this.add_qweb_template();
         this.has_been_loaded.resolve();
         return $.when();
     },
+    _is_quick_create_enabled: function() {
+        if (! this.options.quick_creatable)
+            return false;
+        if (this.fields_view.arch.attrs.quick_create !== undefined)
+            return JSON.parse(this.fields_view.arch.attrs.quick_create);
+        return !! this.group_by;
+    },
+    _is_create_enabled: function() {
+        if (! this.options.creatable)
+            return false;
+        if (this.fields_view.arch.attrs.create !== undefined)
+            return JSON.parse(this.fields_view.arch.attrs.create);
+        return true;
+    },
     add_qweb_template: function() {
         for (var i=0, ii=this.fields_view.arch.children.length; i < ii; i++) {
             var child = this.fields_view.arch.children[i];
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 9ab08957d51..4a193323ce5 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -12,7 +12,9 @@
 </t>
 <div t-name="KanbanView.buttons" class="oe_kanban_buttons">
     <t t-if="widget.options.action_buttons !== false">
-        <button type="button" class="oe_button oe_kanban_button_new oe_form_button_hi">Create</button>
+        <t t-if="widget._is_create_enabled()">
+            <button type="button" class="oe_button oe_kanban_button_new oe_form_button_hi">Create</button>
+        </t>
     </t>
 </div>
 <t t-name="KanbanView.group_header">
@@ -20,7 +22,7 @@
         <t t-if="widget.view.group_by">
             <div class="oe_kanban_group_header">
                 <div class="oe_kanban_fold_icon"></div>
-                <t t-if="widget.view.options.quick_creatable">
+                <t t-if="widget.view._is_quick_create_enabled()">
                     <div class="oe_kanban_add"></div>
                 </t>
                 <div class="oe_fold_column">
@@ -37,7 +39,7 @@
                 <p t-if="widget.title" class="oe_kanban_group_title_vertical"><t t-esc="widget.title"/></p>
             </div>
         </t>
-        <t t-if="! widget.view.group_by &amp;&amp; widget.view.options.quick_creatable">
+        <t t-if="! widget.view.group_by &amp;&amp; widget.view._is_quick_create_enabled()">
             <span class="oe_kanban_no_group_qc_placeholder"/>
         </t>
     </td>

From c47dc13048bf049c4f6084e473067fd2f60afab7 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 21 May 2012 12:02:04 +0200
Subject: [PATCH 335/452] [imp] modified rng of kanban view to add
 quick_create/create flags

bzr revid: nicolas.vanhoren@openerp.com-20120521100204-maa76010h4ugz6oz
---
 openerp/addons/base/rng/view.rng | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index e96c83f44bf..5991b57e529 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -206,6 +206,8 @@
                      grouping is selected in the search view -->
                 <rng:attribute name="default_group_by" />
             </rng:optional>
+            <rng:optional><rng:attribute name="create" /></rng:optional>
+            <rng:optional><rng:attribute name="quick_create" /></rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field"/>
             </rng:zeroOrMore>

From ddd8c6ef9609185c21d7af1f0896d235511b56d2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 21 May 2012 12:07:31 +0200
Subject: [PATCH 336/452] [FIX] bloody goat

bzr revid: xmo@openerp.com-20120521100731-zi6bkkwtj1w3cc1i
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 43dd5ebbd24..86b2f67cf62 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1379,7 +1379,7 @@
 </button>
 <ul t-name="SearchView.filters">
     <li t-foreach="widget.filters" t-as="filter"
-            t-att-title="filter.attrs.string ? filter.attrs.help : void 0">
+            t-att-title="filter.attrs.string ? filter.attrs.help : undefined">
         <t t-esc="filter.attrs.string or filter.attrs.help or filter.attrs.name or 'Ω'"/>
     </li>
 </ul>

From da0fbecf5338eb24007446f21f21d3ac95f8b3e7 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 21 May 2012 15:57:44 +0530
Subject: [PATCH 337/452] [IMP]:account_vouchar:improved domain for attrs.

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

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 0b83097fecb..f9317190b23 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -83,7 +83,7 @@
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <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, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|','|',('pay_now','=','pay_now'),('state','!=','posted'), ('paid','=',True)]}"/>
+                    <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
                     <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="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
@@ -211,7 +211,7 @@
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                    <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|','|',('pay_now','=','pay_now'),('state','!=','posted'), ('paid','=',True)]}"/>
+                    <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
                     <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="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>

From a83e6221c857eecd4e540056081d2904779c9490 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 21 May 2012 12:43:34 +0200
Subject: [PATCH 338/452] [FIX] stupid mistype/wrong variable name in
 Date/DateTime's Facet -> domain conversion

bzr revid: xmo@openerp.com-20120521104334-1zfyjdjbxeajgg2c
---
 addons/web/static/src/js/search.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 91423b5c53e..e569e44df28 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1451,7 +1451,7 @@ instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/**
  */
 instance.web.search.DateField = instance.web.search.Field.extend(/** @lends instance.web.search.DateField# */{
     value_from: function (facetValue) {
-        return openerp.web.date_to_str(facetValue.get('value'));
+        return instance.web.date_to_str(facetValue.get('value'));
     },
     complete: function (needle) {
         var d = Date.parse(needle);
@@ -1484,7 +1484,7 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst
  */
 instance.web.search.DateTimeField = instance.web.search.DateField.extend(/** @lends instance.web.search.DateTimeField# */{
     value_from: function (facetValue) {
-        return openerp.web.datetime_to_str(facetValue.get('value'));
+        return instance.web.datetime_to_str(facetValue.get('value'));
     }
 });
 instance.web.search.ManyToOneField = instance.web.search.CharField.extend({

From f2b5d602bcdb167393038bd7159d21e47e3c5144 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 21 May 2012 13:40:38 +0200
Subject: [PATCH 339/452] [ADD] QWeb2: added 'void' reserved keyword

bzr revid: fme@openerp.com-20120521114038-tz48ac3cgg8zjmti
---
 addons/web/static/lib/qweb/qweb2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js
index d4f7781e88b..c9b065ee69f 100644
--- a/addons/web/static/lib/qweb/qweb2.js
+++ b/addons/web/static/lib/qweb/qweb2.js
@@ -4,7 +4,7 @@
 // TODO: t-set + t-value + children node == scoped variable ?
 var QWeb2 = {
     expressions_cache: {},
-    RESERVED_WORDS: 'true,false,NaN,null,undefined,debugger,console,in,instanceof,new,function,return,this,typeof,eval,Math,RegExp,Array,Object,Date'.split(','),
+    RESERVED_WORDS: 'true,false,NaN,null,undefined,debugger,console,in,instanceof,new,function,return,this,typeof,eval,void,Math,RegExp,Array,Object,Date'.split(','),
     ACTIONS_PRECEDENCE: 'foreach,if,call,set,esc,escf,raw,rawf,js,debug,log'.split(','),
     WORD_REPLACEMENT: {
         'and': '&&',

From 791061b067c787cf00a3a3a24d2c756a80957e28 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 21 May 2012 13:47:27 +0200
Subject: [PATCH 340/452] [IMP] Merge previous fp's base.css changes in
 base.sass

bzr revid: fme@openerp.com-20120521114727-ou14pali2255am6w
---
 addons/web/static/src/css/base.css  |  5 +----
 addons/web/static/src/css/base.sass | 13 ++++---------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index a2fefddb32a..7682f92fcc6 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -517,6 +517,7 @@
   border-right: 1px solid #afafb6;
   text-shadow: 0 1px 1px white;
   padding-bottom: 16px;
+  line-height: 18px;
 }
 .openerp a.oe_logo {
   width: 220px;
@@ -729,10 +730,6 @@
 .openerp .oe_menu_more_container .oe_menu_more li a {
   white-space: nowrap;
 }
-.oe_leftbar {
-  line-height: 18px;
-}
-
 .openerp .oe_secondary_menu_section {
   font-weight: bold;
   margin-left: 8px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index d7e42639254..f10224522c5 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -105,7 +105,6 @@ $colour4: #8a89ba
                 border-right: none
     th, td
         padding: 0
-        line-height: 18px
         text-align: left
     th
         font-weight: bold
@@ -423,6 +422,7 @@ $colour4: #8a89ba
         border-right: 1px solid #afafb6
         text-shadow: 0 1px 1px white
         padding-bottom: 16px
+        line-height: 18px
     a.oe_logo
         width: 220px
         display: block
@@ -784,11 +784,6 @@ $colour4: #8a89ba
         .oe_view_manager_buttons
             white-space: nowrap
     // }}}
-    // ViewManager.body {{{
-    .oe_view_manager_body
-        h4
-            margin: 8px 0
-    // }}}
     // ViewManager.pager {{{
     .oe_view_manager_pager
         line-height: 26px
@@ -1112,11 +1107,12 @@ $colour4: #8a89ba
     .oe_view_nocontent
         > img
             float: left
-            margin-right: 1.5em
+            margin: 1.5em
         > div
             // don't encroach on my arrow
             overflow: hidden
-            padding: 6px
+            padding: 35px 0px 0px 0px
+            max-width: 700px
             font-size: 125%
     .oe_view_topbar
         border-bottom: 1px solid #cacaca
@@ -1308,7 +1304,6 @@ $colour4: #8a89ba
             padding-left: 8px
             @include box-shadow(none)
             @include radius(0px)
-            color: #666
         .oe_form_field_many2one input,
         .oe_form_field_binary input,
         .oe_form_field_binary input,

From cd9614cfdb7e6c29ea0d2fc4a76db221606c8b8f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 21 May 2012 13:50:59 +0200
Subject: [PATCH 341/452] [ADD] Added oe_form_bottom class

bzr revid: fme@openerp.com-20120521115059-ouw03odyc3bhpbls
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 7682f92fcc6..4a426e13e39 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1495,7 +1495,7 @@
   padding: 8px 0;
   border-bottom: 1px solid #dddddd;
 }
-.openerp .oe_application .oe_form_sheet_width {
+.openerp .oe_application .oe_form_sheet_width, .openerp .oe_application .oe_form_bottom {
   min-width: 650px;
   max-width: 980px;
   margin: 0 auto;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index f10224522c5..f128d93c4c1 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1216,7 +1216,7 @@ $colour4: #8a89ba
             background: url(/web/static/src/img/form_sheetbg.png)
             padding: 8px 0
             border-bottom: 1px solid #ddd 
-        .oe_form_sheet_width
+        .oe_form_sheet_width, .oe_form_bottom
             min-width: 650px
             max-width: 980px
             margin: 0 auto

From 2a0d2178568f4bf623c24c747f44a92f5c4d9560 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 21 May 2012 13:53:56 +0200
Subject: [PATCH 342/452] [IMP] Improved some form views. Use oe_form_bottom
 class instead of oe_form_sheet_width

bzr revid: fme@openerp.com-20120521115356-c8a854lifxongy95
---
 addons/crm/crm_lead_view.xml                  | 4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 addons/mail/res_users_view.xml                | 2 +-
 addons/project/project_view.xml               | 4 ++--
 addons/sale/sale_view.xml                     | 2 +-
 addons/stock/stock_view.xml                   | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9c3bd07562c..5295695369d 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -155,7 +155,7 @@
                  </page>
                 </notebook>
                 </sheet>
-                <div class="oe_form_sheet_width">
+                <div class="oe_form_bottom">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
             </form>
@@ -530,7 +530,7 @@
                 </page>
                 </notebook>
                 </sheet>
-                <div class="oe_form_sheet_width">
+                <div class="oe_form_bottom">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
             </form>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 5d175bd16f5..00098a4a766 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -145,7 +145,7 @@
                  </page>
                 </notebook>
             </sheet>
-            <div class="oe_form_sheet_width">
+            <div class="oe_form_bottom">
                 <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
             </div>
             </form>
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 072f2fc3ba5..0411bd418dc 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -27,7 +27,7 @@
                     <field name="notification_email_pref"/>
                 </field>
                 <xpath expr="/form/sheet" position="after">
-                    <div class="oe_form_sheet_width">
+                    <div class="oe_form_bottom">
                         <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                     </div>
                 </xpath>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d1e58193aa8..6266258046c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -100,7 +100,7 @@
                     </notebook>
                     <newline/>
                 </sheet>
-                <div class="oe_form_sheet_width">
+                <div class="oe_form_bottom">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
                 </form>
@@ -405,7 +405,7 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <div class="oe_form_sheet_width">
+                    <div class="oe_form_bottom">
                         <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                     </div>
                 </form>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index eef3713fcb4..0d466dd21fc 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -265,7 +265,7 @@
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_form_sheet_width">
+                <div class="oe_form_bottom">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
                 </form>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 907d8146a7c..35baed85186 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -942,7 +942,7 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Customer"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
-                        <div class="oe_form_sheet_width">
+                        <div class="oe_form_bottom">
                             <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                         </div>
                     </xpath>
@@ -1058,7 +1058,7 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
-                        <div class="oe_form_sheet_width">
+                        <div class="oe_form_bottom">
                             <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                         </div>
                     </xpath>

From 5feabe936f519760ad34884ee611e0b3e0cc9cca Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 21 May 2012 15:09:14 +0200
Subject: [PATCH 343/452] [IMP] Project Kanban: jslint and code indentation

bzr revid: fme@openerp.com-20120521130914-c2iijoifs763am83
---
 addons/project/static/src/css/project.css | 296 ++++++++++++----------
 addons/project/static/src/js/project.js   |  37 ++-
 2 files changed, 179 insertions(+), 154 deletions(-)

diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 93437c878ba..7a354d5a801 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,42 +1,50 @@
 .project_fields {
-  margin-top: 1px;
-  margin-bottom: 1px;
-  font-size: 11px;
-  padding-left: 0px;
-  }
+    margin-top: 1px;
+    margin-bottom: 1px;
+    font-size: 11px;
+    padding-left: 0px;
+}
 .project_fields td {
     border: none;
-    padding: 2px 0 2px 8px; }
+    padding: 2px 0 2px 8px;
+}
 .project_fields th {
     padding: 0;
     border-right: 1px solid #dddddd;
     vertical-align: top;
-    margin-right: 8px; }
+    margin-right: 8px;
+}
 .project_vignettes{
-  padding: 4px !important }
-  .project_vignettes li {
+    padding: 4px !important;
+}
+.project_vignettes li {
     float: left;
-    }
-  .project_vignettes .project_avatar {
+}
+.project_vignettes .project_avatar {
     width: 30px;
     height: 30px;
-    padding-left: 0px; }
-  .project_vignettes .project_fields {
-    width: 100%; }
-    .project_vignettes .project_fields th {
-      width: 120px;
-      font-weight: normal; }
-    .project_vignettes .project_fields td {
-      color: #888888; }
-  .project_vignettes h4 a {
-    color: #4c4c4c; }
-  .project_vignettes > li h4 {
+    padding-left: 0px;
+}
+.project_vignettes .project_fields {
+    width: 100%;
+}
+.project_vignettes .project_fields th {
+    width: 120px;
+    font-weight: normal;
+}
+.project_vignettes .project_fields td {
+    color: #888888;
+}
+.project_vignettes h4 a {
+    color: #4c4c4c;
+}
+.project_vignettes > li h4 {
     margin-bottom: 2px;
-    padding-left: 2px; }
-    
+    padding-left: 2px;
+}
 .oe_project_buttons {
     padding: 2px 2px !important;
-    background: none !important; 
+    background: none !important;
     background-color: transparent !important;
     border: hidden !important;
     color: #8A89BA !important;
@@ -51,8 +59,8 @@
   border-radius: 4px;
   -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); 
-  }
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
 .click_button {
     background: none !important;
     background-color: transparent !important;
@@ -68,54 +76,60 @@
     -webkit-box-align:  baseline;
 }
 
-
 .click_button:hover {
     cursor: default !important;
 }
 .dropdown-menu {
-  display: none;
-  position: absolute; }
+    display: none;
+    position: absolute;
+}
 .dropdown {
-  position: relative; }
+    position: relative;
+}
 .dropdown-toggle:after {
-  width: 0;
-  height: 0;
-  display: inline-block;
-  content: "&darr";
-  text-indent: -99999px;
-  vertical-align: top;
-  margin-top: 8px;
-  margin-left: 4px;
-  border-left: 4px solid transparent;
-  border-right: 4px solid transparent;
-  border-top: 4px solid white;
-  filter: alpha(opacity=50);
-  -khtml-opacity: 0.5;
-  -moz-opacity: 0.5;
-  opacity: 0.5; }
- .oe_project_kanban_vignette .dropdown-menu .color-chooser {
-  padding: 0 3px; }
-  .oe_project_kanban_vignette .dropdown-menu .color-chooser li {
-    float: left; }
-    .oe_project_kanban_vignette .dropdown-menu .color-chooser li a {
-      padding: 2px; }
+    width: 0;
+    height: 0;
+    display: inline-block;
+    content: "&darr";
+    text-indent: -99999px;
+    vertical-align: top;
+    margin-top: 8px;
+    margin-left: 4px;
+    border-left: 4px solid transparent;
+    border-right: 4px solid transparent;
+    border-top: 4px solid white;
+    filter: alpha(opacity=50);
+    -khtml-opacity: 0.5;
+    -moz-opacity: 0.5;
+    opacity: 0.5;
+}
+.oe_project_kanban_vignette .dropdown-menu .color-chooser {
+    padding: 0 3px;
+}
+.oe_project_kanban_vignette .dropdown-menu .color-chooser li {
+    float: left;
+}
+.oe_project_kanban_vignette .dropdown-menu .color-chooser li a {
+    padding: 2px;
+}
 a.oe_project_kanban_action {
-  position: absolute;
-  right: 0;
-  display: none;
-   }
-  a.oe_project_kanban_action:hover {
-    text-decoration: none; }
-  a.oe_project_kanban_action .oe_i {
-    color: #4c4c4c; }
-    
-.square {
-  display: inline-block;
-  width: 18px;
-  height: 18px;
-  border:1px solid grey;
- }
+    position: absolute;
+    right: 0;
+    display: none;
+}
+a.oe_project_kanban_action:hover {
+    text-decoration: none;
+}
+a.oe_project_kanban_action .oe_i {
+    color: #4c4c4c;
+}
 
+.square {
+    display: inline-block;
+    width: 18px;
+    height: 18px;
+    border:1px solid grey;
+}
 .oe_kanban_color_0 {
     background: white;
 }
@@ -136,85 +150,97 @@ a.oe_project_kanban_action {
 }
 
 .open {
-  display: block;
-  }
-  .open .dropdown-menu {
-    display: block; }
+    display: block;
+}
+.open .dropdown-menu {
+    display: block;
+}
 
 a.oe_project_kanban_action {
-  position: absolute;
-  right: 0;
- }
-  a.oe_project_kanban_action:hover {
+    position: absolute;
+    right: 0;
+}
+a.oe_project_kanban_action:hover {
     text-decoration: none;
-    }
-  a.oe_project_kanban_action .eo_i {
-    color: #4c4c4c; }
+}
+a.oe_project_kanban_action .eo_i {
+    color: #4c4c4c;
+}
 
 .oe_project_kanban_vignette {
-  position: relative;
-  min-height: 50px;
-  /*background: white;*/
-  border: 1px solid #d8d8d8;
-  border-bottom-color: #b9b9b9;
-  padding: 6px;
-  margin: 6px 0;
-  display: inline-block;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px; 
-
+    position: relative;
+    min-height: 50px;
+    /*background: white;*/
+    border: 1px solid #d8d8d8;
+    border-bottom-color: #b9b9b9;
+    padding: 6px;
+    margin: 6px 0;
+    display: inline-block;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px; 
 }
-  .oe_project_kanban_vignette:last-child {
-    margin-bottom: 0; }
-  .oe_project_kanban_vignette:hover {
+.oe_project_kanban_vignette:last-child {
+    margin-bottom: 0;
+}
+.oe_project_kanban_vignette:hover {
     -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
     -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
-    -box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); }
-  .oe_project_kanban_vignette h4 {
-    margin: 0 0 2px; }
+    -box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
+}
+.oe_project_kanban_vignette h4 {
+    margin: 0 0 2px;
+}
 
 .oe_project_kanban_vignette .dropdown-menu {
-  top: 30px;
-  right: -140px;
-  padding: 4px;
-  border: 1px solid #afafb6;
-  width: 160px;
-  overflow-x: hidden;
-  z-index: 900;
-  background: white;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-  -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); }
-  .oe_project_kanban_vignette .dropdown-menu p {
-    margin-left: 12px; }
-  .oe_project_kanban_vignette .dropdown-menu li {
+    top: 30px;
+    right: -140px;
+    padding: 4px;
+    border: 1px solid #afafb6;
+    width: 160px;
+    overflow-x: hidden;
+    z-index: 900;
+    background: white;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+    -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+}
+.oe_project_kanban_vignette .dropdown-menu p {
+    margin-left: 12px;
+}
+.oe_project_kanban_vignette .dropdown-menu li {
     float: none;
     display: block;
-    background-color: none; }
-    .oe_project_kanban_vignette .dropdown-menu li a {
-      display: block;
-      padding: 3px 6px;
-      clear: both;
-      font-weight: normal;
-      line-height: 14px;
-      color: #4c4c4c;
-      text-decoration: none; }
-      .oe_project_kanban_vignette .dropdown-menu li a:hover {
-        background: #f0f0fa;
-        background: -moz-linear-gradient(#f0f0fa, #eeeef6);
-        background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
-        background: -webkit-linear-gradient(#f0f0fa, #eeeef6);
-        -moz-box-shadow: none;
-        -webkit-box-shadow: none;
-        -box-shadow: none; }
+    background-color: none;
+}
+.oe_project_kanban_vignette .dropdown-menu li a {
+    display: block;
+    padding: 3px 6px;
+    clear: both;
+    font-weight: normal;
+    line-height: 14px;
+    color: #4c4c4c;
+    text-decoration: none;
+}
+.oe_project_kanban_vignette .dropdown-menu li a:hover {
+    background: #f0f0fa;
+    background: -moz-linear-gradient(#f0f0fa, #eeeef6);
+    background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
+    background: -webkit-linear-gradient(#f0f0fa, #eeeef6);
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    -box-shadow: none;
+}
 
 .oe_project_kanban_vignette .dropdown-menu .color-chooser {
-  padding: 0 3px; }
-  .oe_project_kanban_vignette .dropdown-menu .color-chooser li {
-    float: left; }
-    .oe_project_kanban_vignette .dropdown-menu .color-chooser li a {
-      padding: 2px; }
+    padding: 0 3px;
+}
+.oe_project_kanban_vignette .dropdown-menu .color-chooser li {
+    float: left;
+}
+.oe_project_kanban_vignette .dropdown-menu .color-chooser li a {
+    padding: 2px;
+}
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index 09a7c9eb256..8d806fb0605 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -3,31 +3,30 @@ openerp.project = function(openerp) {
         bind_events: function() {
             var self = this;
             self._super();
-            if(this.view.dataset.model == 'project.project') {
-                                
+            if (this.view.dataset.model == 'project.project') {
                 /*set avatar title for members.
                 In many2many fields, returns only list of ids.
                 we can implement return value of m2m fields like [(1,"Adminstration"),...].
                 */
-                _.each($(this.$element).find('.project_avatar'),function(avatar){
+                _.each($(this.$element).find('.project_avatar'), function(avatar) {
                     var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.id]]);
-                    dataset.read_slice(['name']).then(function(result){
-                    avatar.setAttribute("title",result[0].name)
+                    dataset.read_slice(['name']).then(function(result) {
+                        avatar.setAttribute("title",result[0].name);
                     });
-                 });
-                
+                });
+
                 // set sequence like Tasks,Issues,Timesheets and Phases
-                var my_list = $("#list a")
+                var my_list = $("#list a");
                 my_list.sort(function (a, b) {
-                    var aValue = parseInt(a.id);
-                    var bValue = parseInt(b.id);
+                    var aValue = parseInt(a.id, 10);
+                    var bValue = parseInt(b.id, 10);
                     return aValue == bValue ? 0 : aValue < bValue ? -1 : 1;
-                  });
+                });
                 $('#list').replaceWith(my_list);
-                
+
                 // when vignette is clicked, it opens the first action in sequence
-                if (my_list.length != 0) {
-                    var click_button = $(this.$element).find('.click_button')
+                if (my_list.length !== 0) {
+                    var click_button = $(this.$element).find('.click_button');
                     click_button.attr('data-name', my_list[0].getAttribute('data-name'));
                     click_button.attr('data-type', "action");
                 }
@@ -36,13 +35,13 @@ openerp.project = function(openerp) {
                   we can do other way to implement new widget.
                   because we need to rpc call for that.
                 */
-                this.$element.find('.bgcolor').click(function(){
-                    var color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16))
-                    var color_class = $(this).find('span').attr('class').split(' ')[0]
+                this.$element.find('.bgcolor').click(function() {
+                    var color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16), 10);
+                    var color_class = $(this).find('span').attr('class').split(' ')[0];
                     $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(color_class + ' oe_project_kanban_vignette');
-                    self.view.dataset.write(parseInt(this.id), {color:color});
+                    self.view.dataset.write(parseInt(this.id, 10), {color:color});
                 });
             }
         }
     });
-}
+};

From 4a02e98d42678b9becec3bacf4d65906596bfdf7 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 21 May 2012 18:54:58 +0530
Subject: [PATCH 344/452] [FIX]: Add osv memory wizard for event
 preview.Refactor code as per new specification.

bzr revid: atp@tinyerp.com-20120521132458-xozrh3vcz4wbo6t5
---
 addons/event/__openerp__.py                |   3 +-
 addons/event/event.py                      |  37 +----
 addons/event/event_view.xml                | 110 +------------
 addons/event/static/src/css/event.css      | 181 ++++++++++++++-------
 addons/event/static/src/js/google_map.js   |  87 +++++-----
 addons/event/wizard/__init__.py            |   1 +
 addons/event/wizard/event_preview.py       |  56 +++++++
 addons/event/wizard/event_preview_view.xml |  67 ++++++++
 addons/event_sale/event_sale_view.xml      |   2 +-
 addons/mail/static/src/css/mail.css        |   1 +
 10 files changed, 300 insertions(+), 245 deletions(-)
 create mode 100644 addons/event/wizard/event_preview.py
 create mode 100644 addons/event/wizard/event_preview_view.xml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index e05754eb992..577a9ba9f3c 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -46,6 +46,7 @@ Note that:
         'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_confirm_view.xml',
+         'wizard/event_preview_view.xml',
         'event_view.xml',
         'report/report_event_registration_view.xml',
         'board_association_view.xml',
@@ -54,7 +55,7 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
-  #  'js': ['static/src/js/google_map.js'],
+    'js': ['static/src/js/google_map.js'],
     'qweb': ['static/src/xml/event_address.xml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
diff --git a/addons/event/event.py b/addons/event/event.py
index d029ba22acd..dfa35ad50b2 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -219,49 +219,14 @@ class event_event(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
         'available_qty': fields.integer('Availabel Quantity'),
+         'sale_end_date': fields.datetime('SalesEnd'),
       
     }
-
     _defaults = {
         'state': 'draft',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'event.event', context=c),
         'user_id': lambda obj, cr, uid, context: uid,
     }
-    
-    def order_now(self, cr, uid, ids, context=None):
-          register_pool = self.pool.get('event.registration')
-          user_pool = self.pool.get('res.users')
-          data_obj = self.pool.get('ir.model.data')
-          user = user_pool.browse(cr, uid, uid, context=context)
-          for event in self.browse(cr, uid, ids, context):
-              self.check_registration_limits_before(cr, uid, ids, event.available_qty, context=context)
-              curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , event.id)])
-        #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe
-              print "event.curre_reg_ids",event.available_qty
-              if not curr_reg_ids and event.available_qty > 0:
-                print "cccccccccccc",event.available_qty  
-                curr_reg_ids = [register_pool.create(cr, 1, {'event_id': event.id ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': event.available_qty})]
-              elif event.available_qty > 0:
-                print "mmmmmmm",event.available_qty
-                register_pool.write(cr, uid, curr_reg_ids, {'nb_register': event.available_qty}, context=context)
-              if event.available_qty > 0:  
-                register_pool.confirm_registration(cr, 1, curr_reg_ids, context=context)      
-          view_id = data_obj._get_id(cr, uid, 'event', 'view_event_registration_form')
-          if view_id:
-              res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
-          res = {
-                    'name': _('Registration'),
-                    'view_type': 'form',
-                    'view_mode': 'form',
-                    'res_model': 'event.registration',
-                    'res_id': curr_reg_ids[0],
-                    'views':[(res_id,'form'), (False, 'tree')],
-                    'type': 'ir.actions.act_window',
-                    'nodestroy': True,
-                    'target': 'current',
-          }
-          return res
-         
     def subscribe_to_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 27ff18d1457..730f6cb6573 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -47,7 +47,7 @@
 
 <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
-<!--         <record model="ir.ui.view" id="view_event_form">
+        <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="type">form</field>
@@ -120,7 +120,6 @@
                             <field name="register_prospect"/>
                             <field name="register_current"/>
                             <field name="register_attended"/>
-                            <field name="location_id"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator string="Emails" colspan="2"/>
@@ -132,104 +131,7 @@
                     </notebook>
             </form>
             </field>
-        </record> -->
-
-    <record model="ir.ui.view" id="view_event_form">
-        <field name="name">Events</field>
-        <field name="model">event.event</field>
-        <field name="type">form</field>
-        <field name="priority">20</field>
-        <field name="arch" type="xml">
-            <form string="Preview" layout="manual">
-                <div class="oe_form_topbar">
-                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                    </div>
-                </div>
-                <sheet layout="auto">
-                <group colspan="4" col="2">
-                        <field name="name" class="oe_form_title" width="80%%" nolabel="1"/>
-                </group>
-                <group colspan="2" col="2"  class="oe_form_group_label_border">
-                     <field name="address_id" widget ="geo_address" string="Venue"/> 
-                 </group>
-                 <newline/>
-                     <group colspan="2" col="2" class="oe-listview-content">    
-                        <label string="Ticket Description"/>
-                        <label string="Quantity"/>
-                        <field nolabel="1" name="full_name" />
-                        <field nolabel="1" name="available_qty" />
-                     </group> 
-                 <newline/>
-                 <group colspan="2" col="2">
-                        <button name="order_now" string="Order Now" type="object" icon="gtk-apply" />
-                 </group>                
-                 <notebook colspan="4">
-                    <page string="Event">
-                         <group colspan="2" col="2" class="oe_form_group_label_border">
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                        </group>
-                        <group colspan="2" col="2" class="oe_form_group_label_border">
-                            <field name="register_current"/> 
-                            <field name="register_prospect"/>
-                            <field name="register_attended"/>
-                        </group>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
-                            <tree string="Registration" editable="top">
-                                <field name="name" />
-                                <field name="email" />
-                                <field name="phone"/>
-                                <field name="nb_register" />
-                                <field name="state"/>
-                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            </tree>
-                            <form string="Registration">
-                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
-                                <field name="name"/>
-                                <group colspan="4" col="4">
-                                <field name="email"/>
-                                <field name="phone"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                    <field name="nb_register"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                </group>
-                                    <group col="8" colspan="4">
-                                        <separator string="" colspan="4"/>
-                                        <newline/>
-                                        <field name="state" select="1" colspan="2"/>
-                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                    </group>
-                            </form>
-                            </field>
-                    </page>
-                
-                    <page string="Speakers">
-                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                        <field name="speaker_confirmed"/>
-                        <separator string="Other Speakers" colspan="4"/>
-                        <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
-                    </page>
-                </notebook>
-                      <separator colspan="4" string="Details"/>
-                    <field name="note" nolabel="1" colspan="4"/>
-                 </sheet>
-
-            </form>
-        </field>
-    </record>
-
-
+        </record>
 
         <!-- Event tree view -->
 
@@ -257,6 +159,7 @@
             </field>
         </record>
 
+
         
         <!-- Event Kanban View -->
 	
@@ -308,7 +211,9 @@
                                   <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
                                   <span >Subscribe</span>
                                   </button>
-                                <a string="Edit" icon="gtk-edit" type="edit"/>                                  
+                                 <button name="%(action_event_preview)d" type="action">
+                                 <span>Preview</span>
+                                 </button>
                               </t>
                             </t>
                             <t t-if="record.is_subscribed.raw_value">
@@ -316,7 +221,6 @@
                                 <span>Subscribed</span>
                                 <span class="unsubscribe">Unsubscribe</span>
                               </button>
-                                                              
                             </t>
                         </div>
                       </div>
@@ -584,7 +488,7 @@
           <field name="view_mode">tree,form,calendar,graph</field>
           <field name="context">{}</field>
           <field name="search_view_id" ref="view_registration_search"/>
-        </record>
+        </record>view_
 
         <menuitem
             name="Registrations"
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 4a2d8d558fb..cdf92810392 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -33,69 +33,25 @@ div.oe_fold_column{
   padding:0px !important;
 }
 .oe_event_button_subscribe {
-    display: inline-block;
-    border: 1px solid #ababab;
-    color: #404040;
-    font-size: 12px;
-    padding: 0px !important;
-    text-align: center;
-    -o-background-size: 100% 100%;
-    -moz-background-size: 100% 100%;
-    -webkit-background-size: auto auto !important;
-    background-size: 100% 100%;
-    background: #d8d8d8 none;
-    background: none, -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
-    background: none, -webkit-linear-gradient(#efefef, #d8d8d8);
-    background: none, -moz-linear-gradient(#efefef, #d8d8d8);
-    background: none, -o-linear-gradient(top, #efefef, #d8d8d8);
-    background: none, -khtml-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
-    background: -ms-linear-gradient(top, #efefef, #d8d8d8);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#efefef', endColorstr='#d8d8d8',GradientType=0 );
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    -o-border-radius: 3px;
-    -ms-border-radius: 3px;
-    border-radius: 3px;
-    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    -o-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
-    -webkit-font-smoothing: antialiased;
-    outline: none;
+  color: white;
+  background-color: #8a89ba;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
+  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);
 }
 
 .oe_event_button_unsubscribe {
-  display: inline-block;
-    border: 1px solid #AAA;
-    color: #404040;
-    font-size: 12px;
-    padding: 3px 10px;
-    text-align: center;
-    -o-background-size: 100% 100%;
-    -moz-background-size: 100% 100%;
-    -webkit-background-size: auto auto !important;
-    background-size: 100% 100%;
-    background: #AAA none;
-    background: none, -webkit-gradient(linear, left top, left bottom, from(#AAA), to(#AAA));
-    background: none, -webkit-linear-gradient(#AAA, #AAA);
-    background: none, -moz-linear-gradient(#AAA, #AAA);
-    background: none, -o-linear-gradient(top, #AAA, #AAA);
-    background: none, -khtml-gradient(linear, left top, left bottom, from(#AAA), to(#AAA));
-    background: -ms-linear-gradient(top, #AAA, #AAA);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#AAA, endColorstr='#AAA',GradientType=0 );
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    -o-border-radius: 3px;
-    -ms-border-radius: 3px;
-    border-radius: 3px;
-    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    -o-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
-    -webkit-font-smoothing: antialiased;
-    outline: none;
+  color: white;
+  background-color: #8a89ba;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
+  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);;
 }
 .oe_event_button_subscribe:hover {
   cursor: pointer;
@@ -120,3 +76,108 @@ div.oe_fold_column{
     width:35px;
     
  }
+ .oe_event_title{
+  font-size: 25px;
+}
+.oe_sub1
+{
+    float:left;
+    height:50px;
+    border-right: 1px solid black;
+    border-color: #DCDCDC;
+}
+.oe_mapbox
+{ 
+    width:auto;
+    height:200px;
+    margin-left:auto; 
+    margin-right:auto; 
+    text-align: right;
+}
+.oe_td_border
+{
+    width: 7em;
+    padding: 5px;
+    border-right: 1px solid black;
+    text-align: right;
+    border-color: #DCDCDC;
+    border-spacing:5em
+}
+.oe_td_date_border
+{
+    border-right:1px solid black;
+    border-color: #DCDCDC;
+}
+
+td.oe_sale_end_date
+{
+    padding:5px;
+}
+td.oe_qty
+{
+    width: 80px;
+    text-align:right;
+    padding:5px;
+}
+
+.oe_order_button
+{
+    height:25px;
+    position: absolute;
+    left:330px;
+    padding: 5px;
+}
+ 
+.oe_a
+{
+    position: absolute;
+    left: 22%;
+}
+
+td.oe_b
+{
+    position:relative;
+    left: 60%;
+}
+
+textarea.field_text
+{
+    width: 765px;
+    height: 318px;
+}
+
+td.oe_form_group_nested
+{
+    padding: 5px;
+}
+.oe_event_title{
+  font-size: 25px;
+}
+.oe_sub1
+{
+    float:left;
+    height:50px;
+    border-right: 1px solid black;
+    border-color: #DCDCDC;
+}
+.oe_mapbox
+{ 
+    width:auto;
+    height:200px;
+    margin-left:auto; 
+    margin-right:auto; 
+    text-align: right;
+}
+.oe_td_border
+{
+    width: 5em;
+    padding: 2px;
+    border-right: 1px solid black;
+    text-align: center;
+    border-color: #DCDCDC;
+}
+.oe_td_date_border
+{
+    border-right:1px solid black;
+    border-color: #DCDCDC;
+}
diff --git a/addons/event/static/src/js/google_map.js b/addons/event/static/src/js/google_map.js
index 2209001f29d..7d2681a7369 100644
--- a/addons/event/static/src/js/google_map.js
+++ b/addons/event/static/src/js/google_map.js
@@ -1,11 +1,24 @@
 openerp.event = function(instance){
-    instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
-    instance.event.GoogleMapConnecter = instance.web.Class.extend({
-    	init : function(){
-//    		call ajex to render map load
-    		
-    	},
-        render_map: function(address){
+    instance.web.form.widgets.add('many2one_Geo_address', 'instance.event.Many2OneAddress');
+    
+    instance.web.GoogleMapConnector = instance.web.Class.extend({
+        init: function(){
+            this.googleMapsLoaded = $.Deferred();
+            this.map_load();
+        },
+        map_load: function() {
+            var self = this;
+            if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
+                googleMapsCallback = function () {
+                self.googleMapsLoaded.resolve();
+            };
+            $.ajax({
+                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
+                dataType: "script"
+            }).fail(self.googleMapsLoaded.reject);
+            return this.googleMapsLoaded.promise();
+        },
+        render_map: function(address,$element){
             var geocoder = new google.maps.Geocoder();
             geocoder.geocode( { 'address': address}, function(results, status){
                 if (status == google.maps.GeocoderStatus.OK){
@@ -16,54 +29,40 @@ openerp.event = function(instance){
                     mapTypeId: google.maps.MapTypeId.ROADMAP
                 }
                 return new google.maps.Marker({
-                    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
+                    map : new google.maps.Map($element,myOptions),
                     position: new google.maps.LatLng(lat,lng)
                 });
                 }
             });
-            map_load: function() {
-                var self = this;
-                if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
-                    googleMapsCallback = function () {
-                    self.googleMapsLoaded.resolve();
-                };
-                $.ajax({
-                    url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
-                    dataType: "script"
-                }).fail(self.googleMapsLoaded.reject);
-                return this.googleMapsLoaded.promise();
-            },
-            
-    }),
-    
-    instance.event.GeoAddress = instance.web.form.Many2OneField.extend(_.extend({}, {
-        init : function(){
-            this._super();
-            this.googleMapsLoaded = $.Deferred();
         },
-
-
-        set_value:function(value){
-            var self = this;
-            this.get_address(value).done(function(value){
-            if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
-            var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
-            var defer = self.map_load();
-            defer.done(function(){
-                return self.render_map(address);	
-            });
-            });
+    });
+    instance.event.Many2OneAddress = instance.web.form.FieldMany2One.extend({
+        init: function(field_manager, node){
+          this._super(field_manager, node);
+          this.map = new instance.web.GoogleMapConnector(); 
         },
         get_address:function(value){
+            var self = this;
             if (!value || value.length == 0){
                 return $.Deferred().reject();
             }
-            return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
+            (value instanceof Array)?value = parseInt(value[0]):false;
+            var data = new instance.web.DataSet(this,this.field.relation, this.build_context());
+            data.read_ids(value,["street","city","country_id"]).done(function(value){
+                var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
+                self.map.googleMapsLoaded.done(function(){
+                    self.map.render_map(address,document.getElementById("oe_mapbox"));
+                })
+            });
+        },
+        set_value:function(value){
+            this._super(value);
+            this.get_address(value);
         },
 
-        },
-        get_value:function(){
+        render_value:function(no_recurse){
+            this.get_address(this.get("value"));
+            this._super(no_recurse);
         }
-
-    }));
+    });
 };
\ No newline at end of file
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
index 92e33960484..d1350fb43b8 100644
--- a/addons/event/wizard/__init__.py
+++ b/addons/event/wizard/__init__.py
@@ -21,4 +21,5 @@
 
 
 import event_confirm
+import event_preview
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/event_preview.py b/addons/event/wizard/event_preview.py
new file mode 100644
index 00000000000..4a490ad930e
--- /dev/null
+++ b/addons/event/wizard/event_preview.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+
+    
+class event_preview(osv.osv_memory):
+    _name = 'event.preview'
+    _inherit= 'event.event'
+    _columns = {
+     'qty': fields.integer('Quantity'),
+     'sale_end_date': fields.datetime('SalesEnd'),
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        event_pool = self.pool.get('event.event')
+        data_obj = self.pool.get('ir.model.data')
+        res_id = data_obj._get_id(cr, uid, 'event', 'view_event_preview')
+        if res_id:
+            event_preview_id = data_obj.browse(cr, uid, res_id, context=context).res_id
+
+        record_ids = context and context.get('active_ids', []) or []
+        res = {}
+        for event in event_pool.browse(cr, uid, record_ids, context=context):
+            if 'name' in fields:
+                res.update({'name': event.name})
+            if 'date_begin' in fields:
+                res.update({'date_begin': event.date_begin or False})
+            if 'address_id' in fields:
+                res.update({'address_id': event.address_id and event.address_id.id or False})
+            if 'date_end' in fields:
+                res.update({'date_end': event.date_end})
+            if 'note' in fields:
+                res.update({'note': event.note})
+        return res
+    
+event_preview()   
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/wizard/event_preview_view.xml b/addons/event/wizard/event_preview_view.xml
new file mode 100644
index 00000000000..1d2aead8b28
--- /dev/null
+++ b/addons/event/wizard/event_preview_view.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>  
+<openerp>
+    <data>
+
+    <record model="ir.ui.view" id="view_event_preview">
+        <field name="name">Events</field>
+        <field name="model">event.preview</field>
+        <field name="type">form</field>
+        <field name="priority">20</field>
+        <field name="arch" type="xml">
+            <form string="Preview" layout="manual">
+                <div class="oe_form_topbar">
+                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                        <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet layout="auto">
+                    <group colspan="4" col="2">
+                            <field name="name"  nolabel="1" class="oe_form_title" width="60%%" />
+		                     <div id = "oe_mapbox" class="oe_mapbox"> </div>
+		                     <table>
+		                       <tr>
+		                         <td width="70px" class="oe_td_border">
+		                             Where
+		                         </td>
+		                         <td width="auto">
+		                             <field name="address_id" widget ="many2one_Geo_address" nolabel="1"/>
+		                         </td>
+		                         <td width="210px">
+		                             <table align="right">
+		                              <tr>
+		                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
+		                              </tr>
+		                              <tr>
+		                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
+		                              </tr>
+		                            </table>
+		                         </td>
+		                         
+		                       </tr>
+		                     </table>
+
+                        <group colspan="2">
+                        </group>
+                    </group> 
+                      <separator colspan="4" string="Details" nolabel="1"/>
+                    <field name="note" colspan="4" nolabel="1"/>
+                 </sheet>
+            </form>
+        </field>
+    </record>
+    
+    <record model="ir.actions.act_window" id="action_event_preview">
+            <field name="name">Preview</field>
+            <field name="res_model">event.preview</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">current</field>
+        </record>
+
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index faaa157d356..d0e00c9a8bf 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -57,7 +57,7 @@
                       <newline/>
                       <group colspan="4" name="venue">
                             <div class="oe_sub1"> Venue   : </div> 
-                              <field name="location_id" nolabel="1" readonly="1"/> 
+                              <field name="address_id_id" nolabel="1"/> 
                       </group>
                        <field name="event_item_ids" nolabel="1">
                          <tree editable="top" string="Event Items">
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 895ca575f08..554f8085fb5 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -1,3 +1,4 @@
+
 /* ------------------------------ */
 /* Wall                           */
 /* ------------------------------ */

From 14c5ecc056c041c84128b76f84889a7091689d49 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 21 May 2012 15:55:56 +0200
Subject: [PATCH 345/452] [FIX] correct default values from yaml import

bzr revid: chs@openerp.com-20120521135556-xa1jifioz3boxhqt
---
 openerp/tools/yaml_import.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 082b6487baa..136d1bcee7b 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -323,12 +323,11 @@ class YamlInterpreter(object):
                 self.cr.commit()
 
     def _create_record(self, model, fields, view=False, parent={}, default=True):
-        allfields = model.fields_get(self.cr, 1, context=self.context)
         if view is not False:
-            defaults = default and model.default_get(self.cr, 1, allfields, context=self.context) or {}
+            defaults = default and model._add_missing_default_values(self.cr, 1, {}, context=self.context) or {}
             fg = model.fields_get(self.cr, 1, context=self.context)
         else:
-            default = {}
+            defaults = {}
             fg = {}
         record_dict = {}
         fields = fields or {}

From 70a1ed47d317a3e4193cd5a374e28860244d3f68 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 21 May 2012 15:58:56 +0200
Subject: [PATCH 346/452] [IMP] Removing context_XXX_id for default searches;
 replaced by save as default search in the new search widget

bzr revid: fp@tinyerp.com-20120521135856-hc0kzrpgrxozpq9r
---
 addons/crm/crm.py                         | 21 +-----------------
 addons/crm/crm_view.xml                   | 26 ----------------------
 addons/hr/hr_department.py                |  9 --------
 addons/hr/hr_department_view.xml          | 22 ------------------
 addons/import_sugarcrm/import_sugarcrm.py |  1 -
 addons/project/project.py                 |  7 ------
 addons/project/project_view.xml           | 27 +----------------------
 addons/project_issue/project_issue.py     |  7 ------
 8 files changed, 2 insertions(+), 118 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 467ea64e633..8ab1e6e4ef0 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -224,10 +224,7 @@ class crm_base(object):
         return uid
 
     def _get_section(self, cr, uid, context=None):
-        """Gives section id for current User
-        """
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        return user.context_section_id.id or False
+        return False
 
     def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
         """This function returns value of partner email based on Partner Address
@@ -605,20 +602,4 @@ def _links_get(self, cr, uid, context=None):
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
     return [(r['object'], r['name']) for r in res]
 
-class users(osv.osv):
-    _inherit = 'res.users'
-    _description = "Users"
-    _columns = {
-        'context_section_id': fields.many2one('crm.case.section', 'Sales Team'),
-    }
-
-    def create(self, cr, uid, vals, context=None):
-        res = super(users, self).create(cr, uid, vals, context=context)
-        section_obj=self.pool.get('crm.case.section')
-        if vals.get('context_section_id'):
-            section_obj.write(cr, uid, [vals['context_section_id']], {'member_ids':[(4, res)]}, context)
-        return res
-
-users()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 22f999188e7..dd24ef38911 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -376,32 +376,6 @@
             groups="base.group_no_one" sequence="15"
             parent="base.menu_base_config" />
 
-        <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
-            <field name="name">view.users.form.crm.modif.inherited1</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form_simple_modif" />
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <group name="default_filters" position="inside">
-                    <field name="context_section_id" completion="1"
-                        readonly="0"/>
-                </group>
-            </field>
-        </record>
-
-        <record id="view_users_form_simple_modif_inherited2" model="ir.ui.view">
-                <field name="name">view.users.form.crm.modif.inherited2</field>
-                <field name="model">res.users</field>
-                <field name="type">form</field>
-                <field name="inherit_id" ref="base.view_users_form"/>
-                <field eval="18" name="priority"/>
-                <field name="arch" type="xml">
-                    <group name="default_filters" position="inside">
-                        <field name="context_section_id" completion="1"/>
-                    </group>
-                </field>
-        </record>
-
         <!-- menu for the working time -->
         <menuitem action="resource.action_resource_calendar_form" id="menu_action_resource_calendar_form" parent="resource.menu_resource_config" sequence="1"/>
 
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index 3332207cb17..e0ad03721d6 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -105,14 +105,5 @@ class ir_action_window(osv.osv):
 
 ir_action_window()
 
-class res_users(osv.osv):
-    _inherit = 'res.users'
-    _description = 'User'
-
-    _columns = {
-        'context_department_id': fields.many2one('hr.department', 'Departments'),
-    }
-
-res_users()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 0171b41e881..0a66fd478b9 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -57,27 +57,5 @@
 
        <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_configuration" sequence="5"/>
 
-       <record model="ir.ui.view" id="view_users_form_inherit">
-            <field name="name">res.users.form</field>
-            <field name="type">form</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <group name="default_filters" position="inside">
-                    <field name="context_department_id" completion="1" widget="selection" string="Department"/>
-                </group>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="view_department_form_simple_modif_inherited1">
-            <field name="name">view.department.form.hr.inherited1</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form_simple_modif" />
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <group name="default_filters" position="inside">
-                    <field name="context_department_id" widget="selection" readonly="0"/>
-                </group>
-            </field>
-        </record>
         </data>
 </openerp>
diff --git a/addons/import_sugarcrm/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py
index 3ff14bcf1c7..11d3c26a207 100644
--- a/addons/import_sugarcrm/import_sugarcrm.py
+++ b/addons/import_sugarcrm/import_sugarcrm.py
@@ -898,7 +898,6 @@ class sugar_import(import_framework):
                 'context_lang' : 'context_lang',
                 'password' : 'password',
                 '.id' : '.id',
-                'context_department_id/id': self.get_users_department,
                 'user_email' : 'email1',
             }
         }
diff --git a/addons/project/project.py b/addons/project/project.py
index 10ab7987774..7c8b3462668 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -504,13 +504,6 @@ def Project():
     
 project()
 
-class users(osv.osv):
-    _inherit = 'res.users'
-    _columns = {
-        'context_project_id': fields.many2one('project.project', 'Project')
-    }
-users()
-
 class task(osv.osv):
     _name = "project.task"
     _description = "Task"
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6266258046c..344942cb3d5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -745,31 +745,6 @@
         </record>
 
       <!--     User Form-->
-      <record id="view_project_users_form_simple" model="ir.ui.view">
-          <field name="name">res.users.project.form1</field>
-          <field name="model">res.users</field>
-          <field name="type">form</field>
-          <field name="inherit_id" ref="base.view_users_form"/>
-          <field eval="18" name="priority"/>
-          <field name="arch" type="xml">
-              <group name="default_filters" position="inside">
-                   <field name="context_project_id"/>
-              </group>
-          </field>
-     </record>
-
-     <record model="ir.ui.view" id="view_users_form_project_modif_inherited1">
-         <field name="name">view.users.form.project.modif.inherited1</field>
-         <field name="model">res.users</field>
-         <field name="inherit_id" ref="base.view_users_form_simple_modif" />
-         <field name="type">form</field>
-         <field eval="18" name="priority"/>
-         <field name="arch" type="xml">
-            <group name="default_filters" position="inside">
-                <field name="context_project_id" context="{'user_preference':True}" widget="selection" readonly="0"/>
-            </group>
-       </field>
-    </record>
-    <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
+        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
     </data>
 </openerp>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 5a792ac4d28..1b208bc3796 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -140,12 +140,6 @@ class project_issue(crm.crm_case, osv.osv):
             res[issue.id] = {'progress' : progress}
         return res
 
-    def _get_project(self, cr, uid, context=None):
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if user.context_project_id:
-            return user.context_project_id.id
-        return False
-
     def on_change_project(self, cr, uid, ids, project_id, context=None):
         return {}
 
@@ -233,7 +227,6 @@ class project_issue(crm.crm_case, osv.osv):
         'section_id': crm.crm_case._get_section,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
-        'project_id':_get_project,
         'categ_id' : lambda *a: False,
          }
 

From 9e165e6dae78eda72e40f3d12f152a5c232e824c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 21 May 2012 16:25:13 +0200
Subject: [PATCH 347/452] [IMP] improvement in burndown chart computation for
 companies not using the planned/remaining hours

bzr revid: fp@tinyerp.com-20120521142513-8hnu35e2nbkh8f5d
---
 addons/project/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 7c8b3462668..7f4e104db81 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1335,7 +1335,7 @@ class project_task_history_cumulative(osv.osv):
                     id as history_id,
                     date+generate_series(0, CAST((coalesce(end_date,DATE 'tomorrow')::date - date)AS integer)-1) as date,
                     task_id, type_id, user_id, kanban_state, state,
-                    remaining_hours, planned_hours
+                    greatest(remaining_hours,1) as remaining_hours, greatest(planned_hours,1) as planned_hours
                 FROM
                     project_task_history
             ) as history

From 7bc2664663d637bcbb56b6fd0c9bc557290511aa Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 21 May 2012 16:38:13 +0200
Subject: [PATCH 348/452] [IMP] view.rng: allow @groups for <label> element

bzr revid: abo@openerp.com-20120521143813-2p9fflonbt38ftat
---
 openerp/addons/base/rng/view.rng | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index 5991b57e529..54d08edc596 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -293,6 +293,7 @@
     <rng:define name="label">
         <rng:element name="label">
             <rng:ref name="overload"/>
+            <rng:ref name="access_rights"/>
             <rng:optional><rng:attribute name="align"/></rng:optional>
             <rng:optional><rng:attribute name="nolabel"/></rng:optional>
             <rng:optional><rng:attribute name="colspan"/></rng:optional>

From ca6283de8efc7d790fe1d6d843ec264777b3ae47 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 21 May 2012 17:35:30 +0200
Subject: [PATCH 349/452] [IMP] Widget.$ shortcut

bzr revid: al@openerp.com-20120521153530-g3anzkkkhs75psk5
---
 addons/web/static/src/js/corelib.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index b30350a9502..93796ab4282 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -709,6 +709,12 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
             this.$element = elem;
         }
     },
+    /**
+     * Shortcut for $element.find() like backbone
+     */
+    "$": function() {
+        return this.$element.find.apply(this.$element,arguments);
+    },
     /**
      * Informs the action manager to do an action. This supposes that
      * the action manager can be found amongst the ancestors of the current widget.

From c31a54334cdf247c8381112689da18ed21233fd1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 21 May 2012 18:07:45 +0200
Subject: [PATCH 350/452] [FIX] fixing default_context

bzr revid: fp@tinyerp.com-20120521160745-4bir71koyn0vqgww
---
 addons/account/wizard/account_financial_report_view.xml | 2 +-
 addons/crm/crm_lead_menu.xml                            | 4 ++--
 addons/crm/crm_lead_view.xml                            | 4 ++--
 addons/crm/crm_phonecall_menu.xml                       | 6 +++---
 addons/crm/crm_phonecall_view.xml                       | 4 ++--
 addons/crm_claim/crm_claim_menu.xml                     | 2 +-
 addons/crm_fundraising/crm_fundraising_menu.xml         | 2 +-
 addons/crm_fundraising/crm_fundraising_view.xml         | 2 +-
 addons/crm_helpdesk/crm_helpdesk_menu.xml               | 2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml               | 2 +-
 addons/hr/hr_view.xml                                   | 6 ++----
 addons/hr_expense/hr_expense_view.xml                   | 3 ---
 addons/hr_holidays/hr_holidays_view.xml                 | 6 +++---
 addons/hr_recruitment/hr_recruitment_menu.xml           | 2 +-
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml   | 6 +-----
 addons/l10n_be/account_financial_report.xml             | 2 +-
 addons/project/project.py                               | 8 ++++----
 addons/project/project_view.xml                         | 2 +-
 addons/project_issue/project_issue_menu.xml             | 2 +-
 19 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/addons/account/wizard/account_financial_report_view.xml b/addons/account/wizard/account_financial_report_view.xml
index f587141da1e..39c4fac83fd 100644
--- a/addons/account/wizard/account_financial_report_view.xml
+++ b/addons/account/wizard/account_financial_report_view.xml
@@ -53,7 +53,7 @@
              <field name="view_mode">form</field>
              <field name="view_id" ref="accounting_report_view"/>
              <field name="target">new</field>
-             <field name="context"></field>
+             <field name="context">{}</field>
              <field name="context" eval="{'default_account_report_id':ref('account.account_financial_report_profitandloss0')}"/>
         </record>
         <menuitem icon="STOCK_PRINT" name="Profit And Loss" action="action_account_report_pl" id="menu_account_report_pl" parent="final_accounting_reports"/>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 3cd45fd5cd1..02fc3369041 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -9,7 +9,7 @@
         <field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
-        <field name="context">{'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead'}</field>
+        <field name="context">{'default_type':'lead', 'stage_type':'lead'}</field>
         <field name="help">
             &lt;img src="http://www.thaicrmsoftware.com/wp-content/uploads/2011/11/lead-conversion.jpg" align="right" style="padding: 6px" width="306" height="223"&gt;
             &lt;h2&gt;Create your first OpenERP Lead &lt;/h2&gt;
@@ -66,7 +66,7 @@
           <field name="res_model">crm.lead</field>
           <field name="view_mode">kanban,tree,form,graph,calendar</field>
           <field name="domain">[('type','=','opportunity')]</field>
-          <field name="context">{'search_default_new':1, 'search_default_open':1, 'search_default_section_id':section_id, 'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
+          <field name="context">{'search_default_new':1, 'search_default_open':1, 'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
           <field name="view_id" eval="False"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
           <field name="help">With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 5295695369d..6241b831b66 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -358,7 +358,7 @@
                     context="{'invisible_section': False}">
                     <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
-                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         help="My Sales Team(s)"/>
                     <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
@@ -605,7 +605,7 @@
                     context="{'invisible_section': False}"
                     widget="selection">
                     <filter icon="terp-personal+"
-                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         context="{'invisible_section': False}"
                         help="My Sales Team(s)" />
                     <filter icon="terp-personal+"
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 693ed981325..c6fc9b404a4 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -31,7 +31,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
+        <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
@@ -67,7 +67,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_inbound_phone_tree_view"/>
         <field name="domain">[]</field>
-        <field name="context" eval="'{\'search_default_section_id\':section_id}'"/>
+        <field name="context">{}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
         <field name="help">This tool allows you to log your inbound calls on the fly. Each call you get will appear on the partner form to trace every contact you have with a partner. From the phone call form, you can trigger a request for another call, a meeting or an opportunity.</field>
 
@@ -105,7 +105,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain">[('state','!=','done')]</field>
-        <field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\'}'"/>
+        <field name="context" eval="'{\'default_state\':\'open\'}'"/>
         <field name="search_view_id" ref="crm.view_crm_case_scheduled_phonecalls_filter"/>
         <field name="help">Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
     </record>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index af49956eda8..136af4cf51e 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -211,7 +211,7 @@
                <field name="section_id"
                    widget="selection" string="Sales Team">
                    <filter icon="terp-personal+"
-                       domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                       domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="My Sales Team(s)" />
                </field>
                <newline/>
@@ -261,7 +261,7 @@
                <field name="section_id"
                    widget="selection" string="Sales Team">
                    <filter icon="terp-personal+"
-                       domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                       domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="My Sales Team(s)" />
                </field>
                <newline/>
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 2f87da24b4c..734302fa7f9 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -20,7 +20,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,calendar,form</field>
             <field name="view_id" ref="crm_case_claims_tree_view"/>
-            <field name="context">{'search_default_section_id': section_id,"search_default_user_id":uid, "stage_type":'claim'}</field>
+            <field name="context">{"search_default_user_id":uid, "stage_type":'claim'}</field>
             <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
             <field name="help">Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.</field>
         </record>
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index ae758a58392..38187ed1d4d 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -13,7 +13,7 @@
         <field name="res_model">crm.fundraising</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
-        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
+        <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="crm_fundraising.view_crm_case_fund_filter"/>
         <field name="help">If you need to collect money for your organization or a campaign, Fund Raising allows you to track all your fund raising activities. In the search list, filter by funds description, email, history and probability of success.</field>
     </record>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 48eb1aa3072..41a4a4ed4fc 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -234,7 +234,7 @@
                             </field>
                             <field name="section_id" widget="selection" string="Sales Team">
                                 <filter icon="terp-personal+"
-                                    domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                                    domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                     help="My Sales Team(s)" />
                             </field>
                         </group>
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index b2c7337b7d3..f5c36eb1ab1 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -17,7 +17,7 @@
             <field name="view_mode">tree,calendar,form</field>
             <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
             <field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
-            <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="help">Helpdesk and Support allow you to track your interventions. Select a customer, add notes and categorize interventions with partners if necessary. You can also assign a priority level. Use the OpenERP Issues system to manage your support activities. Issues can be connected to the email gateway: new emails may create issues, each of them automatically gets the history of the conversation with the customer.</field>
         </record>
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 48681357660..fb58c2dd058 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -232,7 +232,7 @@
                     <field name="user_id" widget="selection"/>
                     <field name="section_id" widget="selection" string="Sales Team">
                         <filter icon="terp-personal+"
-                            domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="My Sales Team(s)" />
                     </field>
                     <newline/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 4147ebc30a9..a69be2e974a 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -106,7 +106,6 @@
                 <search string="Employees">
                     <field name="name"/>
                     <field name="department_id" widget="selection">
-                    <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]" string="My Departments Employee"/>
                     </field>
                     <field name="job_id" widget="selection"/>
                     <field name="category_ids" select="1"/>
@@ -182,7 +181,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
             <field name="domain">[]</field>
-            <field name="context">{"search_default_department_id": department_id}</field>
+            <field name="context">{}</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_employee_filter"/>
             <field name="help">Here you can manage your work force by creating employees and assigning them specific properties in the system. Maintain all employee related information and keep track of anything that needs to be recorded for them. The personal information tab will help you maintain their identity data. The Categories tab gives you the opportunity to assign them related employee categories depending on their position and activities within the company. A category can be a seniority level within the company or a department. The Timesheets tab allows to assign them a specific timesheet and analytic journal where they will be able to enter time through the system. In the note tab, you can enter text data that should be recorded for a specific employee.</field>
@@ -410,7 +409,6 @@
                     <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="department_id" widget="selection">
-                      <filter icon="terp-personal+" domain="[('department_id', '=', context.get('department_id', False))]" help="My Departments Jobs"/>
                     </field>
                     <newline />
                     <group expand="0" string="Group By...">
@@ -428,7 +426,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,"search_default_department_id": department_id}</field>
+            <field name="context">{"search_default_Current":1}</field>
             <field name="help">Job Positions are used to define jobs and their requirements. You can keep track of the number of employees you have per job position and how many you expect in the future. You can also attach a survey to a job position that will be used in the recruitment 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 a62a9026ecf..1d4a3162f42 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -148,12 +148,9 @@
                       <field name="employee_id"/>
                       <field name="date"/>
                       <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>
                       <field name="name"/>
                       <field name="user_id"  string="User">
-                      <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]"
-                            string="Expenses of My Department"/>
                       </field>
                 </group>
                 <newline />
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9f8f998cbd9..a00deb5bcd4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -262,7 +262,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">{}</field>
             <field name="domain">[('type','=','remove')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help">Leave 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>
@@ -295,7 +295,7 @@
             <field name="name">Requests Approve</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
-            <field name="context">{'default_type': 'add', 'search_default_approve':1,"search_default_department_id": department_id}</field>
+            <field name="context">{'default_type': 'add', 'search_default_approve':1}</field>
             <field name="domain">[('type','=','remove')]</field>
             <field name="view_id" ref="edit_holiday_new"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
@@ -321,7 +321,7 @@
             <field name="name">Allocation Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
-            <field name="context">{'default_type':'add',"search_default_department_id": department_id}</field>
+            <field name="context">{'default_type':'add'}</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"/>
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 04d73dcd2a8..426185abf86 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">kanban,tree,form,graph,calendar</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{'search_default_filter_inprogress':1,'search_default_filter_new':1,"search_default_department_id": department_id}</field>            
+            <field name="context">{'search_default_filter_inprogress':1,'search_default_filter_new':1}</field>            
             <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
             <field name="help">From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content.</field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index d822f10d944..f6323ffbc29 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -165,11 +165,7 @@
                         <separator orientation="vertical"/>
                         <field name="employee_id"/>
                         <field name="date_from"/>
-                        <field name="department_id" widget="selection">
-                            <filter icon="terp-personal+"
-                                domain="[('department_id','=',context.get('department_id',False))]"
-                                help="My Departments Timesheet"/>
-                        </field>
+                        <field name="department_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/l10n_be/account_financial_report.xml b/addons/l10n_be/account_financial_report.xml
index 6f386b89184..ccc118d30ae 100644
--- a/addons/l10n_be/account_financial_report.xml
+++ b/addons/l10n_be/account_financial_report.xml
@@ -738,7 +738,7 @@
              <field name="view_mode">form</field>
              <field name="view_id" ref="account.accounting_report_view"/>
              <field name="target">new</field>
-             <field name="context"></field>
+             <field name="context">{}</field>
              <field name="context" eval="{'default_account_report_id':ref('account_financial_report_belgiumpl0')}"/>
         </record>
         <menuitem icon="STOCK_PRINT" name="Profit And Loss" action="action_account_report_be_pl" id="menu_account_report_be_pl" parent="menu_finance_belgian_statement" sequence="2"/>
diff --git a/addons/project/project.py b/addons/project/project.py
index 7f4e104db81..ef58c0c5466 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -517,11 +517,11 @@ class task(osv.osv):
            context key, or None if it cannot be resolved to a single project.
         """
         if context is None: context = {}
-        if type(context.get('project_id')) in (int, long):
-            project_id = context['project_id']
+        if type(context.get('default_project_id')) in (int, long):
+            project_id = context['default_project_id']
             return project_id
-        if isinstance(context.get('project_id'), basestring):
-            project_name = context['project_id']
+        if isinstance(context.get('default_project_id'), basestring):
+            project_name = context['default_project_id']
             project_ids = self.pool.get('project.project').name_search(cr, uid, name=project_name)
             if len(project_ids) == 1:
                 return project_ids[0][0]
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 344942cb3d5..61a445d4c59 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -624,7 +624,7 @@
             <field name="view_mode">kanban,tree,form,calendar,gantt,graph</field>
             <field eval="False" name="filter"/>
             <field name="view_id" eval="False"/>
-            <field name="context">{"search_default_project_id": project_id}</field>
+            <field name="context">{}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field>
         </record>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 1c4cecfe439..4c3be9e1327 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -12,7 +12,7 @@
         <field name="view_mode">kanban,tree,calendar</field>
         <field name="view_id" eval="False"/>
         <field name="domain" eval=""/>
-        <field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1,"search_default_project_id":project_id}</field>
+        <field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
         <field name="help">Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)</field>
     </record>

From 8c3a0788b0b96d6036090265d886839a99cdfc93 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 22 May 2012 11:15:55 +0530
Subject: [PATCH 351/452] [IMP]:auction: revert changes in auction

bzr revid: mma@tinyerp.com-20120522054555-oxeex1o5i9ui13d1
---
 addons/auction/__openerp__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index 46466c209a6..dfb79ca643f 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -24,6 +24,7 @@
     'name': 'Auction Houses',
     'version': '1.0',
     'category': 'Specific Industry Applications',
+    'complexity': "normal",
     'description': """
 This module manages the records of artists, auction articles, buyers and sellers.
 =================================================================================

From 9cee8fdd9366039dd4fca773784fe5ee4d71d21e Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 22 May 2012 11:20:47 +0530
Subject: [PATCH 352/452] [IMP]:project_message: revert changes in 
 project_messgae

bzr revid: mma@tinyerp.com-20120522055047-nlbuqzt9un79fdxc
---
 addons/project_messages/__openerp__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py
index 5c7eeb52579..9185e16fdec 100644
--- a/addons/project_messages/__openerp__.py
+++ b/addons/project_messages/__openerp__.py
@@ -27,6 +27,7 @@
     "depends": ["project"],
     "author": "OpenERP SA",
     "category": "Project Management",
+    'complexity': "easy",
     "description": """
 This module provides the functionality to send messages within a project.
 =========================================================================

From 174362aac03f2d19b655568c96fdc8aadb20826a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 May 2012 08:46:07 +0200
Subject: [PATCH 353/452] [FIX] display issue with boolean fields in drawer's
 advanced search

bzr revid: xmo@openerp.com-20120522064607-2umxpgnltysjnmhq
---
 addons/web/static/src/js/search.js | 2 +-
 addons/web/static/src/xml/base.xml | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index e569e44df28..c70cf2ab470 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1936,7 +1936,7 @@ instance.web.search.ExtendedSearchProposition.Selection = instance.web.search.Ex
     }
 });
 instance.web.search.ExtendedSearchProposition.Boolean = instance.web.search.ExtendedSearchProposition.Field.extend({
-    template: 'SearchView.extended_search.proposition.boolean',
+    template: 'SearchView.extended_search.proposition.empty',
     operators: [
         {value: "=", text: _lt("is true")},
         {value: "!=", text: _lt("is false")}
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 86b2f67cf62..28cba6062d7 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1527,8 +1527,6 @@
 <t t-name="SearchView.extended_search.proposition.float">
     <input type="number" class="field_float" step="0.01"/>
 </t>
-<t t-name="SearchView.extended_search.proposition.boolean">
-</t>
 <t t-name="SearchView.extended_search.proposition.selection">
     <select>
         <t t-foreach="widget.field.selection" t-as="element">

From d38c63e656f38e94ae79dc23fb1a68d0d7466ce3 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 22 May 2012 12:32:28 +0530
Subject: [PATCH 354/452] [IMP]stock: Instead of stock.picking set stock.move
 for product kanban links Reception & Deliveries

bzr revid: dbr@tinyerp.com-20120522070228-fzxz0j11qhivkb73
---
 addons/stock/product.py       | 24 +++++++++--------
 addons/stock/product_view.xml | 50 ++++++++++++++++++++---------------
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 71fa7922754..d42da373e79 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -26,16 +26,18 @@ import decimal_precision as dp
 class product_product(osv.osv):
     _inherit = "product.product"
 
-    def _stock_picking_count(self, cr, uid, ids, field_name, arg, context=None):
+    def _stock_move_count(self, cr, uid, ids, field_name, arg, context=None):
         res = dict([(id, {'reception_count': 0, 'delivery_count': 0}) for id in ids])
-        picking_pool=self.pool.get('stock.picking')
-        picking_ids = picking_pool.search(cr, uid, [('move_lines.product_id', 'in', ids)])
-        for picking in picking_pool.browse(cr, uid, picking_ids, context):
-            field = 'reception_count' if picking.type == 'in' else 'delivery_count'
-            product_ids = set([line.product_id.id for line in picking.move_lines])
-            for product_id in product_ids:
-                if product_id in ids:
-                    res[product_id][field] += 1
+        move_pool=self.pool.get('stock.move')
+        move_ids = move_pool.search(cr, uid, [('product_id', 'in', ids)])
+        for move in move_pool.browse(cr, uid, move_ids, context):
+            product_id = move.product_id.id
+            if product_id in ids:
+                if move.picking_id.type == 'in':
+                    field = 'reception_count' 
+                elif move.picking_id.type == 'out':
+                    field = 'delivery_count'
+                res[product_id][field] += 1
         return res
 
     def get_product_accounts(self, cr, uid, product_id, context=None):
@@ -343,8 +345,8 @@ class product_product(osv.osv):
         return res
 
     _columns = {
-        'reception_count': fields.function(_stock_picking_count, string="Reception", type='integer', multi='pickings'),
-        'delivery_count': fields.function(_stock_picking_count, string="Delivery", type='integer', multi='pickings'),
+        'reception_count': fields.function(_stock_move_count, string="Reception", type='integer', multi='pickings'),
+        'delivery_count': fields.function(_stock_move_count, string="Delivery", type='integer', multi='pickings'),
         'qty_available': fields.function(_product_available, multi='qty_available',
             type='float',  digits_compute=dp.get_precision('Product Unit of Measure'),
             string='Quantity On Hand',
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 68b731872f5..5e1b27520f8 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -125,26 +125,32 @@
                 </group>
             </field>
         </record>
-
-        <act_window
-            id="act_product_2_reception"
-            name="Receptions"
-            view_mode="tree,form,calendar"
-            res_model="stock.picking"
-            src_model="product.product"
-            context="{'search_default_product_id': [active_id]}"
-            domain="[('type','=','in')]"
-            />
-
-        <act_window
-            id="act_product_2_delivery"
-            name="Deliveries"
-            view_mode="tree,form,calendar"
-            res_model="stock.picking"
-            src_model="product.product"
-            context="{'search_default_product_id': [active_id]}"
-            domain="[('type', '=', 'out')]"
-            />
+        
+        <record id="action_receive_move" model="ir.actions.act_window">
+            <field name="name">Receive Products</field>
+            <field name="res_model">stock.move</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('picking_id.type','=','in')]</field>
+            <field name="view_id" ref="view_move_tree_reception_picking"/>
+            <field name="context" eval="'{\'search_default_product_id\': [active_id]}'"/>
+            <field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
+            <field name="help">Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line.</field>
+        </record>
+       
+        <record id="action_deliver_move" model="ir.actions.act_window">
+            <field name="name">Receive Products</field>
+            <field name="res_model">stock.move</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('picking_id.type','=','out')]</field>
+            <field name="view_id" ref="view_move_tree_reception_picking"/>
+            <field name="context" eval="'{\'search_default_product_id\': [active_id]}'"/>
+            <field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
+            <field name="help">You will find in this list all products you have to deliver to your customers. You can process the deliveries directly from this list using the buttons on the right of each line. You can filter the products to deliver by customer, products or sale order (using the Origin field).</field>
+        </record>
 
         <record model="ir.ui.view" id="product.product_kanban_view">
             <field name="name">Product Kanban</field>
@@ -173,10 +179,10 @@
                                         <li>Price: <field name="lst_price"></field></li>
                                         <li>Cost: <field name="standard_price"></field></li>
                                     </ul>
-                                    <a name="%(act_product_2_reception)d" type="action">
+                                    <a name="%(action_receive_move)d" type="action">
                                         <t t-if="record.reception_count.value">Receptions(<t t-esc="record.reception_count.value"/>)</t>
                                     </a>
-                                    <a name="%(act_product_2_delivery)d" type="action">
+                                    <a name="%(action_deliver_move)d" type="action">
                                         <t t-if="record.delivery_count.value">Deliveries(<t t-esc="record.delivery_count.value"/>)</t>
                                     </a>
                                 </div>

From b3fa4ccf5cd03f1cfcac069ef7092affb362fc8b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 22 May 2012 11:14:45 +0200
Subject: [PATCH 355/452] [IMP] removed icons from topbar

bzr revid: fp@tinyerp.com-20120522091445-mpiknieg2v8sd31f
---
 addons/account/account_invoice_view.xml       | 24 ++++-----
 addons/account/account_view.xml               | 28 +++++-----
 addons/account_asset/account_asset_view.xml   |  6 +--
 addons/account_budget/account_budget_view.xml | 10 ++--
 .../account_payment/account_payment_view.xml  |  8 +--
 .../account_voucher/account_voucher_view.xml  |  8 +--
 .../voucher_payment_receipt_view.xml          | 16 +++---
 .../voucher_sales_purchase_view.xml           | 20 +++----
 addons/base_calendar/base_calendar_view.xml   | 14 ++---
 addons/crm/crm_lead_view.xml                  | 26 ++++-----
 addons/crm/crm_phonecall_view.xml             | 10 ++--
 addons/crm_claim/crm_claim_view.xml           | 10 ++--
 .../crm_fundraising/crm_fundraising_view.xml  | 12 ++---
 addons/crm_helpdesk/crm_helpdesk_view.xml     | 12 ++---
 addons/event/event_view.xml                   | 16 +++---
 addons/hr/hr_view.xml                         |  6 +--
 addons/hr_evaluation/hr_evaluation_view.xml   | 10 ++--
 addons/hr_expense/hr_expense_view.xml         | 10 ++--
 addons/hr_holidays/hr_holidays_view.xml       | 20 +++----
 addons/hr_payroll/hr_payroll_view.xml         | 16 +++---
 addons/hr_recruitment/hr_recruitment_view.xml | 10 ++--
 .../hr_timesheet_invoice_view.xml             |  8 +--
 .../hr_timesheet_sheet_view.xml               |  8 +--
 addons/idea/idea_view.xml                     |  6 +--
 addons/lunch/lunch_view.xml                   |  4 +-
 .../marketing_campaign_view.xml               | 22 ++++----
 addons/mrp/mrp_view.xml                       | 14 ++---
 addons/mrp_operations/mrp_operations_view.xml | 12 ++---
 addons/mrp_repair/mrp_repair_view.xml         | 22 ++++----
 addons/point_of_sale/point_of_sale_view.xml   |  6 +--
 addons/procurement/procurement_view.xml       |  8 +--
 addons/project/project_view.xml               | 28 +++++-----
 addons/project_issue/project_issue_view.xml   | 12 ++---
 .../project_long_term_view.xml                | 10 ++--
 .../project_planning_view.xml                 |  8 +--
 addons/project_scrum/project_scrum_view.xml   | 22 ++++----
 addons/purchase/purchase_view.xml             | 18 +++----
 .../purchase_requisition_view.xml             |  8 +--
 addons/sale/sale_view.xml                     | 28 +++++-----
 addons/stock/stock_view.xml                   | 54 +++++++++----------
 addons/stock_planning/stock_planning_view.xml |  6 +--
 addons/subscription/subscription_view.xml     |  6 +--
 addons/survey/survey_view.xml                 | 14 ++---
 43 files changed, 308 insertions(+), 308 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8fe6624525c..1306f75a717 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -146,11 +146,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
-                    <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' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
-                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+                    <button name="invoice_open" states="draft,proforma2" string="Approve"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid'/>
+                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                     </div>
@@ -262,13 +262,13 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_proforma_invoices"/>
-                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
-                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
-                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
+                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
+                    <button name="invoice_open" states="draft,proforma2" string="Validate"/>
+                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                    <button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid'/>
+                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                     </div>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 4801d785e0a..b7bd4e55ce5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -13,8 +13,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="create_period" states="draft" string="Create Monthly Periods" type="object" icon="terp-document-new"/>
-                    <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" icon="terp-document-new"/>
+                    <button name="create_period" states="draft" string="Create Monthly Periods" type="object"/>
+                    <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" />
                     </div>
@@ -98,7 +98,7 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" groups="account.group_account_manager"/>
+                    <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1"/>
                     </div>
@@ -606,9 +606,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
-                    <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
-                    <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
+                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
+                    <button name="button_dummy" states="draft" string="Compute" type="object"/>
+                    <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
@@ -671,9 +671,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
-                    <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
-                    <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
+                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
+                    <button name="button_dummy" states="draft" string="Compute" type="object"/>
+                    <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
                     <div class="oe_right">
                         <field name="state"  widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
@@ -1367,8 +1367,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_validate" states="draft" string="Post" 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="Post" type="object"/>
+                    <button name="button_cancel" states="posted" string="Cancel" type="object"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" />
                     </div>
@@ -2641,9 +2641,9 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <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="gtk-go-forward" type="object"/>
-                    <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" type="object"/>
+                    <button name="button_open" states="draft" string="Open CashBox" type="object"/>
+                    <button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 19df7653d86..1affcf7a85c 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -80,9 +80,9 @@
         <field name="arch" type="xml">
            <form layout="manual">
            <div class="oe_form_topbar">
-               <button name="validate" states="draft" string="Confirm Asset" type="object" icon="terp-camera_test"/>
-               <button name="set_to_close" states="open" string="Set to Close" type="object" icon="gtk-close"/>
-               <button name="set_to_draft" states="open" string="Set to Draft" type="object" icon="gtk-convert"/> 
+               <button name="validate" states="draft" string="Confirm Asset" type="object"/>
+               <button name="set_to_close" states="open" string="Set to Close" type="object"/>
+               <button name="set_to_draft" states="open" string="Set to Draft" type="object"/> 
                <div class="oe_right">
                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                </div>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index a4239054567..13c97ca32d6 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -106,11 +106,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <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 name="draft" states="cancel" string="Reset to Draft" type="workflow" icon="terp-stock_effects-object-colorize"/>
-                    <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" />
+                    <button string="Approve" name="validate" states="confirm" type="workflow"/>
+                    <button string="Done" name="done" states="validate" type="workflow"   />
+                    <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
+                    <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 33c94ba1412..285b5983b1a 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -102,10 +102,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
-                    <button name="set_done" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
-                    <button name="set_to_draft" states="cancel" string="Set to draft" type="object" icon="gtk-convert"/>
-                    <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
+                    <button name="open" states="draft" string="Confirm Payments" />
+                    <button name="set_done" states="open" string="Make Payments" type="object"/>
+                    <button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
+                    <button name="cancel" states="draft,open" string="Cancel"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                     </div>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 58319743a99..9b5f9ad901c 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -42,10 +42,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                   <div class="oe_form_topbar">
-                      <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
-                      <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="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
-                      <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                      <button name="proforma_voucher" string="Post" states="draft"/>
+                      <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record ?"/>
+                      <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
+                      <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                       <div class="oe_right">
                           <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                       </div>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 56a156ac68e..864ed8df941 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -145,10 +145,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
-                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
-                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                     </div>
@@ -299,10 +299,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
-                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
-                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile and cancel this record ?"/>
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                     </div>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 24a20b34dcb..d3bb60230c6 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -82,11 +82,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <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, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
-                    <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="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    <button name="proforma_voucher" string="Validate" states="draft"/>
+                    <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
+                    <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                     </div>
@@ -211,11 +211,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                    <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
-                    <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="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    <button name="proforma_voucher" string="Validate" states="draft"/>
+                    <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
+                    <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                     </div>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 055b2237a34..76304c7da8a 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -13,19 +13,19 @@
                         <button name="do_tentative"
                             states="needs-action,declined,accepted"
                             string="Uncertain" type="object"
-                            icon="terp-crm" />
+                            />
                         <button name="do_accept" string="Accept"
                             states="needs-action,tentative,declined"
-                            type="object" icon="gtk-apply" />
+                            type="object" />
                         <button
                             name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
                             string="Delegate" type="action"
-                            icon="gtk-sort-descending"
+                           
                             states="needs-action,tentative,declined,accepted"
                             context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                         <button name="do_decline" string="Decline"
                             states="needs-action,tentative,accepted"
-                            type="object" icon="gtk-cancel" />
+                            type="object" />
                         <div class="oe_right">
                             <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
                         </div>
@@ -234,17 +234,17 @@
                         string="Confirm"
                         states="tentative,cancelled"
                         type="object"
-                        icon="gtk-apply" />
+                        />
                     <button name="do_tentative"
                         states="confirmed,cancelled"
                         string="Uncertain"
                         type="object"
-                        icon="terp-crm" />
+                        />
                     <button name="do_cancel"
                         string="Cancel"
                         states="tentative,confirmed"
                         type="object"
-                        icon="gtk-cancel" />
+                        />
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
                     </div>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 17fd154e8a3..e609c8808ef 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -53,12 +53,12 @@
         <field name="arch" type="xml">
             <form string="Leads Form" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
-                    <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause" />
-                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
-                    <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" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" />
+                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" />
+                    <button name="case_pending" string="Pending" states="open" type="object" />
+                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
@@ -402,13 +402,13 @@
         <field name="arch" type="xml">
             <form string="Opportunities" layout="manual">
                 <div class="oe_form_topbar oe_form_topbar_hifirst">
-                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
-                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
-                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
-                    <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
+                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" />
+                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" />
+                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
+                    <button name="case_cancel" string="Cancel" states="draft" type="object" />
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index fb41c0b22c3..55d8d8c9a64 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -60,11 +60,11 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to" />
-                <button name="case_open" string="Todo" states="pending" type="object" icon="gtk-go-forward" />
-                <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause" />
-                <button name="case_reset" string="Reset to Todo" states="cancel" type="object" icon="gtk-convert" />
-                <button name="case_cancel" string="Cancel" states="open,pending" type="object" icon="gtk-cancel" />
+                <button name="case_close" string="Held" states="open,pending" type="object" />
+                <button name="case_open" string="Todo" states="pending" type="object" />
+                <button name="case_pending" string="Not Held" states="open" type="object" />
+                <button name="case_reset" string="Reset to Todo" states="cancel" type="object" />
+                <button name="case_cancel" string="Cancel" states="open,pending" type="object" />
                 <div class="oe_right">
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done" statusbar_colors='{"pending":"red"}' select="1"/>
                 </div>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6e26416f2ff..2ed988df02a 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -68,11 +68,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_close" string="Done" states="open,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_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
-                    <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" />
+                    <button name="case_close" string="Done" states="open,pending" type="object" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
                     <div class="oe_right">
                         <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index d622355aa73..f46b24171de 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -79,12 +79,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_close" string="Done" states="open,pending" type="object" icon="gtk-close" />
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <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" groups="base.group_extended" icon="gtk-go-up" />
-                    <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" />
+                    <button name="case_close" string="Done" states="open,pending" type="object" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" />
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index b5b6f0dd0d0..d36ea8db8c5 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -30,12 +30,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_close" states="open,pending" string="Close" type="object" icon="gtk-jump-to" />
-                    <button name="case_open" states="draft,pending" string="Open" type="object" icon="gtk-go-forward" />
-                    <button name="case_pending" states="draft,open" string="Pending" type="object" icon="gtk-media-pause" />
-                    <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
-                    <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" icon="gtk-go-up" />
-                    <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" />
+                    <button name="case_close" states="open,pending" string="Close" type="object" />
+                    <button name="case_open" states="draft,pending" string="Open" type="object" />
+                    <button name="case_pending" states="draft,open" string="Pending" type="object" />
+                    <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" />
+                    <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" />
+                    <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" />
                     <div class="oe_right">
                         <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ea286aafaec..ecad0182982 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -52,10 +52,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object"/>
+                    <button string="Mark Done" name="button_done" states="confirm" type="object"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object"/>
+                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
                     <div class="oe_right">
                         <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                     </div>
@@ -360,10 +360,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                    <button name="button_reg_close" string="Attended" states="open" type="object" icon="gtk-apply"/>
-                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                    <button name="registration_open" string="Confirm" states="draft" type="object"/>
+                    <button name="button_reg_close" string="Attended" states="open" type="object"/>
+                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object"/>
+                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                     <div class="oe_right">
                         <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                     </div>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 14745f72419..1e07a4c81c6 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -347,9 +347,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <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"/>
+                    <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
+                    <button name="job_open" string="In Position" states="old,recruit" type="object"/>
+                    <button name="job_old" string="Mark as Old" states="open,recruit" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="recruit,open"/>
                     </div>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 2e8c23082fd..d87b44aa2be 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -156,11 +156,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object" icon="gtk-execute"/>
-                    <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object" icon="gtk-go-forward"/>
-                    <button name="button_done" string="Done" states="progress" type="object" icon="gtk-jump-to"/>
-                    <button name="button_draft" string="Reset to Draft" states="cancel" type="object" icon="terp-stock_effects-object-colorize"/>
-                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object" icon="gtk-cancel"/>
+                    <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object"/>
+                    <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object"/>
+                    <button name="button_done" string="Done" states="progress" type="object"/>
+                    <button name="button_draft" string="Reset to Draft" states="cancel" type="object"/>
+                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,wait,done" statusbar_colors='{"progress":"blue"}'/>
                     </div>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index cdfa5485158..d82f89930ef 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -67,11 +67,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="confirm" states="draft" string="Submit to Manager" type="workflow" icon="gtk-apply"/>
-                    <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
-                    <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_user"/>
-                    <button name="invoice" states="accepted" string="Invoice" type="object" icon="gtk-go-forward" groups="base.group_hr_user"/>
-                    <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
+                    <button name="confirm" states="draft" string="Submit to Manager" type="workflow"/>
+                    <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
+                    <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user"/>
+                    <button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user"/>
+                    <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                     </div>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9cfd2706cef..57756c5cb35 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -65,11 +65,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
-                    <button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Approved" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager"/>
+                    <button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                     </div>
@@ -117,11 +117,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
-                    <button string="Set to Draft" name="set_to_draft" states="cancel,validate,refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Approved" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Set to Draft" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                     </div>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 0e59dd393ca..93e875b61be 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -262,11 +262,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Confirm" icon="terp-camera_test" name="hr_verify_sheet" states="draft"/>
-                    <button string="Refund" icon="gtk-execute" name="refund_sheet" states="confirm,done" type='object'/>
-                    <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft" states="cancel"/>
-                    <button string="Compute Sheet" icon="terp-stock_format-scientific" name="compute_sheet" type="object" states="draft"/>
-                    <button string="Cancel" icon="terp-dialog-close" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
+                    <button string="Confirm" name="hr_verify_sheet" states="draft"/>
+                    <button string="Refund" name="refund_sheet" states="confirm,done" type='object'/>
+                    <button string="Set to Draft" name="draft" states="cancel"/>
+                    <button string="Compute Sheet" name="compute_sheet" type="object" states="draft"/>
+                    <button string="Cancel" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
@@ -726,9 +726,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="close_payslip_run" type="object" icon="terp-camera_test" string="Close" states="draft"/>
-                    <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" icon="gtk-execute" string="Generate Payslips" />
-                    <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft_payslip_run" type="object" states="close"/>
+                    <button name="close_payslip_run" type="object" string="Close" states="draft"/>
+                    <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" />
+                    <button string="Set to Draft" name="draft_payslip_run" type="object" states="close"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1"/>
                     </div>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index b11bc9af3cd..ab58a167f06 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -76,11 +76,11 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
-                <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
-                <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
-                <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action"/>
+                <button name="case_open" string="In Progress" states="draft,pending" type="object"/>
+                <button name="case_pending" string="Pending" states="open" type="object"/>
+                <button name="case_reset" string="Reset to New" states="done,cancel" type="object"/>
+                <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object"/>
                 <div class="oe_right">
                     <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </div>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 1444f8191f3..43ca7a4004e 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -24,10 +24,10 @@
                 </group>
                 <xpath expr="/form/sheet" position='before'>
                     <div class="oe_form_topbar">
-                        <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-                        <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
-                        <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
-                        <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+                        <button name="set_pending" string="Pending" type="object" states="open"/>
+                        <button name="set_close" string="Close" type="object" states="open,pending"/>
+                        <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft"/>
+                        <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                         <div class="oe_right">
                             <field name="state" readonly="1" widget="statusbar" nolabel="1"
                             statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index bcd13aaa296..aa815df5337 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -62,10 +62,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_confirm" states="draft" string="Submited to Manager" type="object" icon="terp-check"/>
-                    <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>
-                    <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" groups="base.group_hr_user"/>
+                    <button name="button_confirm" states="draft" string="Submited to Manager" type="object"/>
+                    <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
+                    <button name="action_set_to_draft" states="done" string="Set to Draft" type="object"/>
+                    <button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="new,confirm,done"/>
                     </div>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index a1adbd19f4a..a3a1f2937ec 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -184,9 +184,9 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
-                <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
-                <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/>
+                <button name="idea_open" string="Open" states="draft"/>
+                <button name="idea_close" string="Accept" states="open"/>
+                <button name="idea_cancel" string="Refuse" states="open" />
                 <div class="oe_right">
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,close"/>
                 </div>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 8201d93da5a..adfccfc2041 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -25,8 +25,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok" attrs="{'invisible':[('state','=','confirmed')]}"/>
-                    <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel"/>
+                    <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" attrs="{'invisible':[('state','=','confirmed')]}"/>
+                    <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed"/>
                     </div>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index b6146ebcd66..fbc36701cd0 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -17,10 +17,10 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
-                <button name="state_done_set" string="Done" states="running" icon="terp-dialog-close"/>
-                <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
-                <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
+                <button name="state_running_set" string="Run" states="draft"/>
+                <button name="state_done_set" string="Done" states="running"/>
+                <button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
+                <button name="state_cancel_set" string="Cancel" states="running"/>
                 <div class="oe_right">
                     <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,running,done"/>
                 </div>
@@ -141,10 +141,10 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <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_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
-                <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
+                <button name="state_running_set" string="Run" states="draft"/>
+                <button name="state_done_set" string="Close" states="running"/>
+                <button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
+                <button name="state_cancel_set" string="Cancel" states="running"/>
                 <div class="oe_right">
                     <field name="state" readonly="1" nolabel="1" widget="statusbar" statusbar_visible="draft,running,done"/>
                 </div>
@@ -366,9 +366,9 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
-                <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
-                <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
+                <button string="Process" states="todo" name="process" type="object"/>
+                <button string="Reset" states="exception,cancelled" name="button_draft" type="object"/>
+                <button string="Cancel" states="todo,exception" name="button_cancel" type="object"/>
                 <div class="oe_right">
                     <field name="state" readonly="True" nolabel="1" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
                 </div>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 18915dac2e9..ebfd5b31bdd 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -633,13 +633,13 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <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_recreate" states="picking_except" string="Recreate Picking" icon="terp-document-new"/>
-                    <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
-                    <button name="action_cancel" type="object" states="confirmed" string="Cancel" icon="gtk-stop"/>
+                    <button name="button_confirm" states="draft" string="Confirm Production"/>
+                    <button name="button_produce" states="ready" string="Start Production"/>
+                    <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" type="action"/>
+                    <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object"/>
+                    <button name="button_recreate" states="picking_except" string="Recreate Picking"/>
+                    <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel"/>
+                    <button name="action_cancel" type="object" states="confirmed" string="Cancel"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
                     </div>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index c206ee7f165..aedac905be5 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -73,12 +73,12 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <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_done" string="Finished" states="startworking" icon="terp-check"/>
-                <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause"/>
-                <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
-                <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
+                <button name="button_start_working" string="Start" states="draft"/>
+                <button name="button_resume" string="Resume" states="pause"/>
+                <button name="button_done" string="Finished" states="startworking"/>
+                <button name="button_pause" string="Pending" states="startworking"/>
+                <button name="button_draft" string="Set Draft" states="cancel"/>
+                <button name="button_cancel" string="Cancel" states="draft,startworking"/>
                 <div class="oe_right">
                      <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,startworking"/>
                 </div>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 01f9d3d84b6..c089b4d9fa2 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -29,17 +29,17 @@
         <field name="arch" type="xml">
             <form layout="manual">
                <div class="oe_form_topbar">
-                   <button name="repair_confirm" states="draft" string="Confirm Repair" icon="terp-camera_test"/>
-                   <button name="repair_ready" states="confirmed" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
-                   <button name="action_repair_start" states="ready" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
-                   <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                   <button name="action_repair_end" states="under_repair" string="End Repair" icon="terp-dialog-close"/>
-                   <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" icon="terp-dolar"/>
-                   <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="terp-dolar"/>
-                   <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="terp-emblem-important"/>
-                   <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action" icon="gtk-stop"/>
-                   <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" icon="gtk-stop"/>
-                   <button name="cancel" states="draft" string="Cancel Repair" icon="gtk-stop"/>
+                   <button name="repair_confirm" states="draft" string="Confirm Repair"/>
+                   <button name="repair_ready" states="confirmed" string="Start Repair"/>
+                   <button name="action_repair_start" states="ready" string="Start Repair"/>
+                   <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                   <button name="action_repair_end" states="under_repair" string="End Repair"/>
+                   <button name="action_invoice_create" states="2binvoiced" string="Make Invoice"/>
+                   <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
+                   <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
+                   <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action"/>
+                   <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action"/>
+                   <button name="cancel" states="draft" string="Cancel Repair"/>
                    <div class="oe_right">
                          <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed,ready" />
                    </div>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 5d81bbb708d..785c8d7d664 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -18,9 +18,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="%(action_pos_payment)d" string="Payment" icon="gtk-apply" type="action" states="draft"/>
-                    <button name="%(action_report_pos_receipt)d" string="Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
-                    <button name="refund" string="Return Products" type="object" icon="gtk-ok"
+                    <button name="%(action_pos_payment)d" string="Payment" type="action" states="draft"/>
+                    <button name="%(action_report_pos_receipt)d" string="Reprint" type="action" states="paid,done,invoiced"/>
+                    <button name="refund" string="Return Products" type="object"
                         attrs="{'invisible':[('state','=','draft')]}"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index f543235633b..141d1509944 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -48,10 +48,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                     <div class="oe_form_topbar">
-                        <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
-                        <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
-                        <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_confirm" states="draft" string="Confirm"/>
+                        <button name="button_check" states="confirmed" string="Run Procurement"/>
+                        <button name="button_restart" states="exception" string="Retry"/>
+                        <button name="button_cancel" states="draft,exception,waiting" string="Cancel"/>
                         <div class="oe_right">
                             <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed" />
                         </div>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index aee5982f49e..278bd50f45a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,13 +20,13 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
-                    <button name="set_open" string="Re-open 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_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
-                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
-                    <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
-                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+                    <button name="set_done" string="Done" type="object" states="open,pending"/>
+                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close"/>
+                    <button name="set_pending" string="Pending" type="object" states="open"/>
+                    <button name="set_template" string="Set as Template" type="object" states="open"/>
+                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}"/>
+                    <button name="reset_project" string="Reset as Project" type="object" states="template"/>
+                    <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
                     </div>
@@ -321,13 +321,13 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                     <div class="oe_form_topbar">
-                        <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
-                        <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
-                        <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 name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
-                        <button name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
-                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
+                        <button name="action_close" states="pending,open" string="Done" type="object"/>
+                        <button name="do_open" states="pending,draft" string="Start Task" type="object"/>
+                        <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" context="{'button_reactivate':True}" />
+                        <button name="do_pending" states="open" string="Pending" type="object"/>
+                        <button name="do_draft" states="open" string="Draft" type="object"/>
+                        <button name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action"/>
+                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object"/>
                         <div class="oe_right">
                             <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
                         </div>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index c4cb9cf73d4..cf8c4040613 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -52,12 +52,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                    <button name="case_close" string="Done" 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_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
-                    <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"/>
+                    <button name="case_open" string="Open" states="draft,pending" type="object"/>
+                    <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
+                    <button name="case_pending" string="Pending" states="draft,open" type="object"/>
+                    <button name="case_reset" string="Reset to New" states="done,cancel" type="object"/>
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 9cbbfaf75f3..02412a20a1f 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -143,11 +143,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
-                    <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
-                    <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
-                    <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
-                    <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
+                    <button string="Start Phase" name="set_open" states="pending,draft"/>
+                    <button string="Done" name="set_done" states="pending,open"/>
+                    <button string="Pending" name="set_pending" states="open"/>
+                    <button string="Draft" name="set_draft" states="open"/>
+                    <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
                     </div>
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 419bdc2b0ad..11e9b057c06 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -28,10 +28,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <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_draft" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
-                    <button name="action_cancel" states="draft,open" string="Cancel" type="object" icon="gtk-cancel" />
+                    <button name="action_open" states="draft" string="Open" type="object" />
+                    <button name="action_done" states="open" string="Done" type="object" />
+                    <button name="action_draft" states="done,cancel" string="Reset to Draft" type="object" />
+                    <button name="action_cancel" states="draft,open" string="Cancel" type="object" />
                     <div class="oe_right">
                        <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                     </div>
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 54d71533ef8..4b8defc9a2b 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -58,12 +58,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
-                    <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
-                    <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
-                    <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
-                    <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="draft,open,pending" icon="gtk-stop"/>
+                    <button type="object" string="Open" name="button_open" states="draft,pending"/>
+                    <button type="object" string="Close" name="button_close" states="open,pending"/>
+                    <button type="object" string="Pending" name="button_pending" states="open"/>
+                    <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending"/>
+                    <button type="object" string="Set to Draft" name="button_draft" states="cancel,done"/>
+                    <button type="object" string="Cancel" name="button_cancel" states="draft,open,pending"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                     </div>
@@ -239,12 +239,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
-                    <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
-                    <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
+                    <button type="object" string="Open" name="button_open" states="draft,pending"/>
+                    <button type="object" string="Close" name="button_close" states="open,pending"/>
+                    <button type="object" string="Pending" name="button_pending" states="open"/>
                     <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
-                                   string="Burndown Chart" type="action" icon="gtk-print"/>
-                    <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
+                                   string="Burndown Chart" type="action"/>
+                    <button type="object" string="Set to Draft" name="button_draft" states="cancel,done"/>
                     <div class="oe_right">
                         <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                     </div>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 9a024138beb..fe6c9b1d3f3 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -132,15 +132,15 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                    <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
-                    <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
-                    <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
-                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
-                    <button name="purchase_approve" states="confirmed" string="Approved" icon="gtk-go-forward"/>
-                    <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
-                    <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
-                    <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                    <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
+                    <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
+                    <button name="purchase_confirm" states="draft" string="Confirm Purchase"/>
+                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase"/>
+                    <button name="purchase_approve" states="confirmed" string="Approved"/>
+                    <button name="%(report_purchase_order)d" string="Print" states="approved" type="action"/>
+                    <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel" type="object"/>
+                    <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                     </div>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index b7740c99202..d09564f221e 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -48,10 +48,10 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="tender_in_progress" states="draft" string="Start" 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" />
+                <button name="tender_in_progress" states="draft" string="Start" type="object" />
+                <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
+                <button name="tender_done" states="in_progress" string="Done" type="object" />
+                <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" />
                 <div class="oe_right">
                     <field name="state" nolabel="1" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
                 </div>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 91b3abde65e..f19a6a58fec 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -96,20 +96,20 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
-                    <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
-                    <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
-                    <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
-                    <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
-                    <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
-                    <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
-                    <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="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
-                    <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
-                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
-                    <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
-                    <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
+                    <button name="order_confirm" states="draft" string="Confirm Order"/>
+                    <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object"/>
+                    <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
+                    <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
+                    <button name="ship_recreate" states="shipping_except" string="Recreate Packing"/>
+                    <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
+                    <button name="%(report_sale_order)d" string="Print Order" type="action" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
+                    <button name="ship_cancel" states="shipping_except" string="Cancel Order"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                    <button name="invoice_cancel" states="invoice_except" string="Cancel Order"/>
+                    <button name="%(report_sale_order)d" string="Print Quotation" type="action" states="draft"/>
+                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" states="draft,manual"/>
+                    <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object"/>
+                    <button name="cancel" states="draft" string="Cancel Order"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9365040aa0a..feff7d38e5d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -110,10 +110,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
-                    <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
-                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                    <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
+                    <button name="action_confirm" states="draft" string="Confirm Inventory" type="object"/>
+                    <button name="action_done" states="confirm" string="Validate Inventory" type="object"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                    <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object"/>
                     <div class="oe_right">
                          <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
@@ -710,14 +710,14 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="draft_force_assign" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                    <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" icon="gtk-media-play"/>
-                    <!-- <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_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
-                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl" />
-                    <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" icon="terp-gtk-go-back-rtl" />
-                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
+                    <button name="draft_force_assign" states="draft" string="Confirm" type="object"/>
+                    <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object"/>
+                    <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
+                    <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                    <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object"/>
+                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" />
+                    <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" />
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>
@@ -930,12 +930,12 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='%(act_stock_return_picking)d']" position="replace">
-                        <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" icon="gtk-print" states="done"/>
-                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="terp-gtk-go-back-rtl" />
+                        <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done"/>
+                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
                     </xpath>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='draft_validate']" position="replace">
-                        <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object" icon="gtk-media-play"/>
-                        <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
+                        <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object"/>
+                        <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
                     </xpath>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='action_process']" position="replace">
                         <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward"/>
@@ -1051,13 +1051,13 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='%(act_stock_return_picking)d']" position="replace">
-                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="terp-gtk-go-back-rtl" />
+                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
                     </xpath>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='draft_validate']" position="replace">
-                        <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object" icon="gtk-media-play"/>
+                        <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object"/>
                     </xpath>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='action_process']" position="replace">
-                        <button name="action_process" states="assigned" string="Receive" type="object" icon="gtk-go-forward"/>
+                        <button name="action_process" states="assigned" string="Receive" type="object"/>
                     </xpath>
                     <xpath expr="/form/sheet/group/group/field[@name='partner_id']" position="replace">
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
@@ -1199,10 +1199,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
-                    <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
-                    <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
+                    <button name="action_confirm" states="draft" string="Process Later" type="object"/>
+                    <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object"/>
+                    <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
+                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                     </div>
@@ -1388,10 +1388,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
-                    <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                    <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" icon="gtk-go-forward"/>
-                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
+                    <button name="action_confirm" states="draft" string="Process Later" type="object"/>
+                    <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
+                    <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned"/>
+                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                     </div>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 969537a0005..e3e65d9fa0d 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -14,8 +14,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_open" string="Open" icon="gtk-ok" states="draft" type="object"/>
-                    <button name="button_close" string="Close" icon="gtk-stop" states="open" type="object"/>
+                    <button name="button_open" string="Open" states="draft" type="object"/>
+                    <button name="button_close" string="Close" states="open" type="object"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                     </div>
@@ -87,7 +87,7 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_validate" icon="gtk-apply" string="Approve" states="draft" type="object" />
+                    <button name="action_validate" string="Approve" states="draft" type="object" />
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1"/>
                     </div>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index f3bca1e6f0a..abc06c829bd 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -15,9 +15,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="set_process" states="draft" string="Process" type="object" icon="gtk-go-forward"/>
-                    <button name="set_done" states="running" string="Stop" type="object" icon="gtk-stop"/>
-                    <button name="set_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
+                    <button name="set_process" states="draft" string="Process" type="object"/>
+                    <button name="set_done" states="running" string="Stop" type="object"/>
+                    <button name="set_draft" states="done" string="Set to Draft" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,running"/>
                     </div>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 63d2fe6c8c0..644f5c76a2a 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -20,9 +20,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="survey_open" string="Open" states="cancel,close" 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"/>
+                    <button name="survey_open" string="Open" states="cancel,close" type="object"/>
+                    <button name="survey_close" string="Close" states="open" type="object"/>
+                    <button name="survey_cancel" string="Cancel" states="open" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,close"/>
                     </div>
@@ -1061,10 +1061,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
-                    <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" icon="gtk-new"/>
-                    <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
-                    <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object" icon="gtk-cancel"/>
+                    <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object"/>
+                    <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object"/>
+                    <button name="survey_req_done" string="Done" states="waiting_answer" type="object"/>
+                    <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,waiting_answer"/>
                     </div>

From e4d2620631f82a79a87412fa5cd693f04ead076c Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 22 May 2012 15:19:28 +0530
Subject: [PATCH 356/452] [IMP]: sale: removed unwanted new field advance,
 improved code and usability

bzr revid: rpa@tinyerp.com-20120522094928-qjmqaiwthsvt4sy3
---
 .../sale/wizard/sale_make_invoice_advance.py  | 30 +++++--------------
 .../sale/wizard/sale_make_invoice_advance.xml | 13 +++-----
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 237d0254a1a..0d826fe1efa 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -35,12 +35,10 @@ class sale_advance_payment_inv(osv.osv_memory):
         return product_id
 
     _columns = {
-        'product_id': fields.many2one('product.product', 'Advance Product', required=False,
-            help="Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."),
+        'product_id': fields.many2one('product.product', 'Advance Product', help="Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."),
         'amount': fields.float('Advance Amount', digits=(16, 2), required=True, help="The amount to be invoiced in advance."),
         'qtty': fields.float('Quantity', digits=(16, 2), required=True),
-        'advance_payment_method':fields.selection([('percentage','Percentage'), ('fixed','Fixed Price')], 'Pay Type', required=True),
-        'advance': fields.boolean('Advance'),
+        'advance_payment_method':fields.selection([('percentage','Percentage'), ('fixed','Fixed Price')], 'Type', required=True, help="Use Fixed Price if you want to give specific amound in Advance, Use Percentage if you want to give percentage of Total Invoice Amount."),
     }
 
     _defaults = {
@@ -49,27 +47,15 @@ class sale_advance_payment_inv(osv.osv_memory):
         'product_id': _default_product_id,
     }
 
-    def onchange_advance_payment_method(self, cr, uid, ids, advance_payment_method,product_id, context=None):
-        if not product_id:
-            return {'value': {'amount': 0}}
+    def onchange_advance_payment_method(self, cr, uid, ids, advance_payment_method, product_id, context=None):
         if advance_payment_method == 'percentage':
             return {'value': {'amount':0,'product_id':False }}
-        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-        return {'value': {'amount':product.list_price}}
+        else:
+            if not product_id:
+                return {'value': {'amount': 0}}
+            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            return {'value': {'amount': product.list_price}}
 
-    def onchange_advance_product(self, cr, uid, ids, product_id, context=None):
-        value = {}
-        value['advance'] = 'False'
-        if not product_id:
-            return {'value': {'amount': 0,'advance': False}}
-        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-        value['amount'] = product.list_price
-        try:
-            advance_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'sale', 'advance_product_0')[1]
-            if product.id ==  advance_id:
-                value['advance'] = 'True'
-        finally:
-            return {'value': value}
 
     def create_invoices(self, cr, uid, ids, context=None):
         """
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 01742712668..8ab55c67c17 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -7,16 +7,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Advance Invoice">
-                    <group colspan="2">
-                        <field name="product_id" on_change="onchange_advance_product(product_id)" context="{'search_default_services':1}" attrs="{'invisible': [('advance_payment_method','=','percentage')]}" />
-                    </group>
+                    <field name="advance_payment_method" on_change="onchange_advance_payment_method(advance_payment_method,product_id)"/>
                     <newline />
-                    <group colspan="2" col="6">
-                        <field name="qtty" invisible="1"/>
-                        <field name="amount"/>
-                        <field name="advance_payment_method" nolabel="1" attrs="{'readonly':[('advance','=','True')]}" on_change="onchange_advance_payment_method(advance_payment_method,product_id)"/>
-                        <field name="advance" invisible="1"/>
-                    </group>
+                    <field name="qtty" invisible="1"/>
+                    <field name="product_id" on_change="onchange_advance_payment_method(advance_payment_method,product_id)" context="{'search_default_services':1}" attrs="{'invisible': [('advance_payment_method','=','percentage')]}" colspan="2"/>
+                    <field name="amount" colspan="2"/>
                     <newline />
                     <separator string="" colspan="4"/>
                     <label string="" colspan="6" />

From 17f484574d73af27f541cf2ec9b71255ea4c64ef Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 22 May 2012 15:21:37 +0530
Subject: [PATCH 357/452] [IMP]stock: Specific condition

bzr revid: dbr@tinyerp.com-20120522095137-1658gnfqgostpcn2
---
 addons/stock/product.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index d42da373e79..d5324f08094 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -37,7 +37,8 @@ class product_product(osv.osv):
                     field = 'reception_count' 
                 elif move.picking_id.type == 'out':
                     field = 'delivery_count'
-                res[product_id][field] += 1
+                if field:
+                    res[product_id][field] += 1
         return res
 
     def get_product_accounts(self, cr, uid, product_id, context=None):

From 099e96b5afa7ff48ee30a1d5ae59ffae331d9fc8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 22 May 2012 12:38:37 +0200
Subject: [PATCH 358/452] [ADD] Converted kanban.sass to kanban.css

bzr revid: fme@openerp.com-20120522103837-1ypp34gx1cthx6h2
---
 addons/web_kanban/static/src/css/kanban.css  | 910 +++++++++----------
 addons/web_kanban/static/src/css/kanban.sass | 386 ++++++++
 2 files changed, 813 insertions(+), 483 deletions(-)
 create mode 100644 addons/web_kanban/static/src/css/kanban.sass

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index fcc246543b5..2e33f499749 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,485 +1,429 @@
+@charset "utf-8";
 .openerp .oe_kanban_view .ui-sortable-placeholder {
-    border: 1px dotted black;
-    visibility: visible !important;
-    height: 60px !important;
-}
-.openerp .oe_kanban_groups {
-    width: 100%;
-}
-.openerp .oe_kanban_group_header {
-    position: relative;
-}
-.openerp .oe_kanban_group_folded {
-    padding: 0 5px 0 5px;
-}
-.openerp .oe_kanban_group_folded .oe_kanban_group_title,
-.openerp .oe_kanban_group_folded.oe_kanban_column > *,
-.openerp .oe_kanban_group_folded .oe_kanban_aggregates {
-    display: none;
-}
-.openerp .oe_kanban_group_folded .oe_kanban_group_title_vertical {
-    display: block;
-}
-
-.openerp .oe_kanban_group_title {
-    font-size: 100%;
-    font-weight: bold;
-    padding-left: 2px;
-    color: #333333;
-}
-.openerp .oe_kanban_group_title_undefined {
-    color: #666666;
-}
-.openerp .oe_kanban_group_title_vertical {
-    writing-mode: tb-rl;
-    -webkit-transform: rotate(90deg);
-    -moz-transform: rotate(90deg);
-    -o-transform: rotate(90deg);
-    -ms-transform: rotate(90deg);
-    transform: rotate(90deg);
-    width: 30px;
-    height: 20px;
-    font-size: 24px;
-    white-space: nowrap;
-    display: none;
-    position: absolute;
-    top: 10px;
-}
-.openerp .oe_kanban_show_more {
-    clear: both;
-    text-align: center;
-}
-.openerp .oe_kanban_grouped .oe_kanban_show_more .oe_button {
-    width: 100%;
-}
-.openerp .oe_kanban_ungrouped .oe_kanban_record {
-    float: left;
-    padding: 2px;
-    box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-}
-.openerp .oe_kanban_fold_icon {
-    cursor: pointer;
-    float: left;
-    padding: 2px;
-    width: 16px;
-    height: 16px;
-    background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat;
-}
-.openerp .oe_kanban_group_folded .oe_kanban_fold_icon {
-    background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat;
-}
-.openerp .oe_kanban_action_button {
-    height: 22px;
-    margin: 0;
-}
-.openerp .oe_kanban_action_a {
-    text-decoration: none;
-}
-.openerp .oe_kanban_box {
-    background: #FFF;
-    border: 2px solid #CCC;
-    border-radius: 4px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    margin-bottom: 5px;
-}
-.openerp .oe_kanban_box_header {
-    background: #EEE;
-    border-bottom: 1px solid #CCC;
-}
-.openerp .oe_kanban_title {
-    font-size: 95%;
-    font-weight: bold;
-    padding: 0 4px 0 4px;
-}
-.openerp .oe_kanban_small {
-    font-size: 80%;
-    font-weight: normal;
-}
-.openerp .oe_kanban_table {
-    width: 100%;
-    border: none;
-    border-collapse: collapse;
-    margin: 0;
-    padding: 0;
-}
-.openerp .oe_kanban_table tr td {
-    padding: 0;
-}
-.openerp .oe_kanban_table tr td.oe_kanban_title {
-    padding: 2px;
-}
-.openerp .oe_kanban_gravatar {
-     display: block;
-}
-.openerp .oe_kanban_box_content {
-    padding: 4px;
-    font-size: 90%;
-}
-.openerp .oe_kanban_button {
-    border: 1px solid #8ec1da;
-    background-color: #ddeef6;
-    border-radius: 3px;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    color: #000000;
-    text-shadow: 0 1px #fff;
-    padding: 0 4px;
-    font-size: 85%;
-    margin: 1px;
-}
-.openerp a.oe_kanban_button:hover,
-.openerp button.oe_kanban_button:hover {
-    background-color: #eeddf6;
-}
-.openerp .oe_kanban_buttons_set {
-    border-top: 1px dotted;
-    white-space: nowrap;
-    padding-top: 2px;
-    position: relative;
-    clear: both;
-}
-.openerp .oe_kanban_buttons_set a {
-    padding: 2px;
-}
-.oe_kanban_color_picker {
-    position: absolute;
-    top: -10px;
-    border: 1px solid black;
-    -moz-box-shadow: 2px 2px 5px #666;
-    -webkit-box-shadow: 2px 2px 5px #666;
-    box-shadow: 2px 2px 5px #666;
-    z-index: 2;
-}
-.oe_kanban_color_picker a {
-    display: block;
-    width: 30px;
-    height: 30px;
-    border: 1px solid black;
-    text-align: center;
-    text-decoration: none;
-}
-.oe_kanban_color_picker a:hover {
-    border-color: white;
-}
-.oe_kanban_color_picker span {
-    border: none;
-    font-size: 120%;
-    font-weight: bold;
-    color: black;
-    line-height: 30px;
-}
-.openerp .oe_kanban_left {
-    float: left;
-}
-.openerp .oe_kanban_right {
-    float: right;
-}
-.openerp .oe_kanban_clear {
-    clear: both;
-}
-.openerp .oe_kanban_box_show_onclick {
-    display: none;
-}
-.openerp .oe_kanban_draghandle {
-    cursor: move;
-}
-.openerp .oe_kanban_color_border {
-    border-color: #CCCCCC;
-}
-.openerp .oe_kanban_color_border {
-    border-color: #CCCCCC;
-}
-.openerp .oe_kanban_tooltip ul,
-.openerp ul.oe_kanban_tooltip {
-    padding: 0 0 4px 0;
-    margin: 5px 0 0 15px;
-    list-style: circle;
-}
-.openerp .oe_kanban_highlight {
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-    padding: 1px 5px;
-    margin: 1px 4px;
-    white-space: nowrap;
-    display: inline-block;
-    line-height: 1em;
-}
-
-.openerp .oe_kanban_add {
-    cursor: pointer;
-    position: absolute;
-    top: 6px;
-    right: 6px;
-    width: 16px;
-    height: 16px;
-    background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat;
-}
-
-.openerp .oe_kanban_quick_create {
-    /* apply block formatting context */
-    overflow: hidden;
-}
-.openerp .oe_kanban_no_group .oe_kanban_quick_create {
-    width: 200px;
-    padding: 10px;
-}
-.openerp .oe_kanban_quick_create input {
-    display: block;
-    /* margins within width */
-    box-sizing: border-box;
-    width: 100%;
-}
-.openerp .oe_kanban_quick_create button {
-    float: right;
-}
-
-/* Custom colors are also present in kanban.js */
-/* Custom color#0 */
-.openerp .oe_kanban_color_0 .oe_kanban_color_bglight {
-    background: #FFFFFF;
-}
-.openerp .oe_kanban_color_0 .oe_kanban_color_bgdark {
-    background: #EEEEEE;
-}
-.openerp .oe_kanban_color_0 .oe_kanban_color_border {
-    border-color: #CCCCCC;
-}
-.openerp .oe_kanban_color_0 .oe_kanban_button {
-    background-color: #EEEEEE;
-    border-color: #CCCCCC;
-    text-shadow: 0 1px #FFFFFF;
-}
-.openerp .oe_kanban_color_0 .oe_kanban_button_active,
-.openerp .oe_kanban_color_0 a.oe_kanban_button:hover,
-.openerp .oe_kanban_color_0 button.oe_kanban_button:hover {
-    background-color: #999999;
-    color: #fff;
-    text-shadow: 0 1px #000;
-}
-
-/* Custom color#1 */
-.openerp .oe_kanban_color_1 .oe_kanban_color_bglight {
-    background: #CCCCCC;
-}
-.openerp .oe_kanban_color_1 .oe_kanban_color_bgdark {
-    background: #999999;
-}
-.openerp .oe_kanban_color_1 .oe_kanban_color_border {
-    border-color: #666666;
-}
-.openerp .oe_kanban_color_1 .oe_kanban_button {
-    background-color: #999999;
-    border-color: #666666;
-    text-shadow: 0 1px #CCCCCC;
-}
-.openerp .oe_kanban_color_1 .oe_kanban_button_active,
-.openerp .oe_kanban_color_1 a.oe_kanban_button:hover,
-.openerp .oe_kanban_color_1 button.oe_kanban_button:hover {
-    background-color: #666666;
-    color: #fff;
-    text-shadow: 0 1px #000;
-}
-
-/* Custom color#2 */
-.openerp .oe_kanban_color_2 .oe_kanban_color_bglight {
-    background: #FFC7C7;
-}
-.openerp .oe_kanban_color_2 .oe_kanban_color_bgdark {
-    background: #FF8F8F;
-}
-.openerp .oe_kanban_color_2 .oe_kanban_color_border {
-    border-color: #D97979;
-}
-.openerp .oe_kanban_color_2 .oe_kanban_button {
-    background-color: #FF8F8F;
-    border-color: #D97979;
-    text-shadow: 0 1px #FFC7C7;
-}
-.openerp .oe_kanban_color_2 .oe_kanban_button_active,
-.openerp .oe_kanban_color_2 a.oe_kanban_button:hover,
-.openerp .oe_kanban_color_2 button.oe_kanban_button:hover {
-    background-color: #CC5C5C;
-    color: #fff;
-    text-shadow: 0 1px #000;
-}
-
-/* Custom color#3 */
-.openerp .oe_kanban_color_3 .oe_kanban_color_bglight {
-    background: #FFF1C7;
-}
-.openerp .oe_kanban_color_3 .oe_kanban_color_bgdark {
-    background: #FFE38F;
-}
-.openerp .oe_kanban_color_3 .oe_kanban_color_border {
-    border-color: #D9C179;
-}
-.openerp .oe_kanban_color_3 .oe_kanban_button {
-    background-color: #FFE38F;
-    border-color: #D9C179;
-    text-shadow: 0 1px #FFF1C7;
-}
-.openerp .oe_kanban_color_3 .oe_kanban_button_active,
-.openerp .oe_kanban_color_3 a.oe_kanban_button:hover,
-.openerp .oe_kanban_color_3 button.oe_kanban_button:hover {
-    background-color: #CCB05C;
-    color: #fff;
-    text-shadow: 0 1px #000;
-}
-
-/* Custom color#4 */
-.openerp .oe_kanban_color_4 .oe_kanban_color_bglight {
-    background: #E3FFC7;
-}
-.openerp .oe_kanban_color_4 .oe_kanban_color_bgdark {
-    background: #C7FF8F;
-}
-.openerp .oe_kanban_color_4 .oe_kanban_color_border {
-    border-color: #A9D979;
-}
-.openerp .oe_kanban_color_4 .oe_kanban_button {
-    background-color: #C7FF8F;
-    border-color: #A9D979;
-    text-shadow: 0 1px #E3FFC7;
-}
-.openerp .oe_kanban_color_4 .oe_kanban_button_active,
-.openerp .oe_kanban_color_4 a.oe_kanban_button:hover,
-.openerp .oe_kanban_color_4 button.oe_kanban_button:hover {
-    background-color: #94CC5C;
-    color: #fff;
-    text-shadow: 0 1px #000;
-}
-
-/* Custom color#5 */
-.openerp .oe_kanban_color_5 .oe_kanban_color_bglight {
-    background: #C7FFD5;
-}
-.openerp .oe_kanban_color_5 .oe_kanban_color_bgdark {
-    background: #8FFFAB;
-}
-.openerp .oe_kanban_color_5 .oe_kanban_color_border {
-    border-color: #79D991;
-}
-.openerp .oe_kanban_color_5 .oe_kanban_button {
-    background-color: #8FFFAB;
-    border-color: #79D991;
-    text-shadow: 0 1px #C7FFD5;
-}
-.openerp .oe_kanban_color_5 .oe_kanban_button_active,
-.openerp .oe_kanban_color_5 a.oe_kanban_button:hover,
-.openerp .oe_kanban_color_5 button.oe_kanban_button:hover {
-    background-color: #5CCC78;
-    color: #fff;
-    text-shadow: 0 1px #000;
-}
-
-/* Custom color#6 */
-.openerp .oe_kanban_color_6 .oe_kanban_color_bglight {
-    background: #C7FFFF;
-}
-.openerp .oe_kanban_color_6 .oe_kanban_color_bgdark {
-    background: #8FFFFF;
-}
-.openerp .oe_kanban_color_6 .oe_kanban_color_border {
-    border-color: #79D9D9;
-}
-.openerp .oe_kanban_color_6 .oe_kanban_button {
-    background-color: #8FFFFF;
-    border-color: #79D9D9;
-    text-shadow: 0 1px #C7FFFF;
-}
-.openerp .oe_kanban_color_6 .oe_kanban_button_active,
-.openerp .oe_kanban_color_6 a.oe_kanban_button:hover,
-.openerp .oe_kanban_color_6 button.oe_kanban_button:hover {
-    background-color: #5CCCCC;
-    color: #fff;
-    text-shadow: 0 1px #000;
-}
-
-/* Custom color#7 */
-.openerp .oe_kanban_color_7 .oe_kanban_color_bglight {
-    background: #C7D5FF;
-}
-.openerp .oe_kanban_color_7 .oe_kanban_color_bgdark {
-    background: #8FABFF;
-}
-.openerp .oe_kanban_color_7 .oe_kanban_color_border {
-    border-color: #8FABFF;
-}
-.openerp .oe_kanban_color_7 .oe_kanban_button {
-    background-color: #8FABFF;
-    border-color: #7995E9;
-    text-shadow: 0 1px #C7D5FF;
-}
-.openerp .oe_kanban_color_7 .oe_kanban_button_active,
-.openerp .oe_kanban_color_7 a.oe_kanban_button:hover,
-.openerp .oe_kanban_color_7 button.oe_kanban_button:hover {
-    background-color: #5C78CC;
-    color: #fff;
-    text-shadow: 0 1px #000;
-}
-
-/* Custom color#8 */
-.openerp .oe_kanban_color_8 .oe_kanban_color_bglight {
-    background: #E3C7FF;
-}
-.openerp .oe_kanban_color_8 .oe_kanban_color_bgdark {
-    background: #C78FFF;
-}
-.openerp .oe_kanban_color_8 .oe_kanban_color_border {
-    border-color: #A979D9;
-}
-.openerp .oe_kanban_color_8 .oe_kanban_button {
-    background-color: #C78FFF;
-    border-color: #A979D9;
-    text-shadow: 0 1px #E3C7FF;
-}
-.openerp .oe_kanban_color_8 .oe_kanban_button_active,
-.openerp .oe_kanban_color_8 a.oe_kanban_button:hover,
-.openerp .oe_kanban_color_8 button.oe_kanban_button:hover {
-    background-color: #945CCC;
-    color: #fff;
-    text-shadow: 0 1px #000;
-}
-
-/* Custom color#9 */
-.openerp .oe_kanban_color_9 .oe_kanban_color_bglight {
-    background: #FFC7F1;
-}
-.openerp .oe_kanban_color_9 .oe_kanban_color_bgdark {
-    background: #FF8FE3;
-}
-.openerp .oe_kanban_color_9 .oe_kanban_color_border {
-    border-color: #D979C1;
-}
-.openerp .oe_kanban_color_9 .oe_kanban_button {
-    background-color: #FF8FE3;
-    border-color: #D979C1;
-    text-shadow: 0 1px #FFC7F1;
-}
-.openerp .oe_kanban_color_9 .oe_kanban_button_active,
-.openerp .oe_kanban_color_9 a.oe_kanban_button:hover,
-.openerp .oe_kanban_color_9 button.oe_kanban_button:hover {
-    background-color: #CC5CB0;
-    color: #fff;
-    text-shadow: 0 1px #000;
-}
-
-/* Red border */
-.openerp .oe_kanban_color_alert .oe_kanban_color_border,
-.openerp .oe_kanban_color_red .oe_kanban_color_border {
-    border-color: #c00 !important;
-}
-
-/* Green border */
-.openerp .oe_kanban_color_green .oe_kanban_color_border {
-    border-color: #0c0 !important;
-}
-
-/* Blue border */
-.openerp .oe_kanban_color_blue .oe_kanban_color_border {
-    border-color: #00c !important;
+  border: 1px dotted black;
+  visibility: visible !important;
+  height: 60px !important;
+}
+.openerp .oe_kanban_view .oe_kanban_left {
+  float: left;
+}
+.openerp .oe_kanban_view .oe_kanban_right {
+  float: right;
+}
+.openerp .oe_kanban_view .oe_kanban_clear {
+  clear: both;
+}
+.openerp .oe_kanban_view .oe_kanban_groups {
+  width: 100%;
+}
+.openerp .oe_kanban_view .oe_kanban_group_header {
+  position: relative;
+}
+.openerp .oe_kanban_view .oe_kanban_group_folded {
+  padding: 0 5px 0 5px;
+}
+.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title, .openerp .oe_kanban_view .oe_kanban_group_folded.oe_kanban_column > *, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_aggregates {
+  display: none;
+}
+.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title_vertical {
+  display: block;
+}
+.openerp .oe_kanban_view .oe_kanban_group_title {
+  font-size: 100%;
+  font-weight: bold;
+  padding-left: 2px;
+  color: #333333;
+}
+.openerp .oe_kanban_view .oe_kanban_group_title_undefined {
+  color: #666666;
+}
+.openerp .oe_kanban_view .oe_kanban_group_title_vertical {
+  writing-mode: tb-rl;
+  -webkit-transform: rotate(90deg);
+  -moz-transform: rotate(90deg);
+  -o-transform: rotate(90deg);
+  -ms-transform: rotate(90deg);
+  transform: rotate(90deg);
+  width: 30px;
+  height: 20px;
+  font-size: 24px;
+  white-space: nowrap;
+  display: none;
+  position: absolute;
+  top: 10px;
+}
+.openerp .oe_kanban_view .oe_kanban_fold_icon {
+  cursor: pointer;
+  float: left;
+  padding: 2px;
+  width: 16px;
+  height: 16px;
+  background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat;
+}
+.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_fold_icon {
+  background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat;
+}
+.openerp .oe_kanban_view .oe_kanban_add {
+  cursor: pointer;
+  position: absolute;
+  top: 6px;
+  right: 6px;
+  width: 16px;
+  height: 16px;
+  background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat;
+}
+.openerp .oe_kanban_view .oe_kanban_quick_create {
+  overflow: hidden;
+}
+.openerp .oe_kanban_view .oe_kanban_no_group .oe_kanban_quick_create {
+  width: 200px;
+  padding: 10px;
+}
+.openerp .oe_kanban_view .oe_kanban_quick_create input {
+  display: block;
+  box-sizing: border-box;
+  width: 100%;
+}
+.openerp .oe_kanban_view .oe_kanban_quick_create button {
+  float: right;
+}
+.openerp .oe_kanban_view .oe_kanban_box {
+  background: white;
+  border: 2px solid #cccccc;
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  margin-bottom: 5px;
+}
+.openerp .oe_kanban_view .oe_kanban_box_header {
+  background: #eeeeee;
+  border-bottom: 1px solid #cccccc;
+}
+.openerp .oe_kanban_view .oe_kanban_title {
+  font-size: 95%;
+  font-weight: bold;
+  padding: 0 4px 0 4px;
+}
+.openerp .oe_kanban_view .oe_kanban_small {
+  font-size: 80%;
+  font-weight: normal;
+}
+.openerp .oe_kanban_view .oe_kanban_show_more {
+  clear: both;
+  text-align: center;
+}
+.openerp .oe_kanban_view .oe_kanban_grouped .oe_kanban_show_more .oe_button {
+  width: 100%;
+}
+.openerp .oe_kanban_view .oe_kanban_ungrouped .oe_kanban_record {
+  float: left;
+  padding: 2px;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+.openerp .oe_kanban_view .oe_kanban_action_button {
+  height: 22px;
+  margin: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_action_a {
+  text-decoration: none;
+}
+.openerp .oe_kanban_view .oe_kanban_table {
+  width: 100%;
+  border: none;
+  border-collapse: collapse;
+  margin: 0;
+  padding: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_table tr td {
+  padding: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_table tr td.oe_kanban_title {
+  padding: 2px;
+}
+.openerp .oe_kanban_view .oe_kanban_gravatar {
+  display: block;
+}
+.openerp .oe_kanban_view .oe_kanban_box_content {
+  padding: 4px;
+  font-size: 90%;
+}
+.openerp .oe_kanban_view .oe_kanban_button {
+  border: 1px solid #8ec1da;
+  background-color: #ddeef6;
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  color: black;
+  text-shadow: 0 1px white;
+  padding: 0 4px;
+  font-size: 85%;
+  margin: 1px;
+}
+.openerp .oe_kanban_view a.oe_kanban_button:hover, .openerp .oe_kanban_view .openerp button.oe_kanban_button:hover {
+  background-color: #eeddf6;
+}
+.openerp .oe_kanban_view .oe_kanban_buttons_set {
+  border-top: 1px dotted;
+  white-space: nowrap;
+  padding-top: 2px;
+  position: relative;
+  clear: both;
+}
+.openerp .oe_kanban_view .oe_kanban_buttons_set a {
+  padding: 2px;
+}
+.openerp .oe_kanban_view .oe_kanban_box_show_onclick {
+  display: none;
+}
+.openerp .oe_kanban_view .oe_kanban_draghandle {
+  cursor: move;
+}
+.openerp .oe_kanban_view .oe_kanban_color_border {
+  border-color: #cccccc;
+}
+.openerp .oe_kanban_view .oe_kanban_color_border {
+  border-color: #cccccc;
+}
+.openerp .oe_kanban_view .oe_kanban_tooltip ul, .openerp .oe_kanban_view ul.oe_kanban_tooltip {
+  padding: 0 0 4px 0;
+  margin: 5px 0 0 15px;
+  list-style: circle;
+}
+.openerp .oe_kanban_view .oe_kanban_highlight {
+  border-radius: 2px;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  padding: 1px 5px;
+  margin: 1px 4px;
+  white-space: nowrap;
+  display: inline-block;
+  line-height: 1em;
+}
+.openerp .oe_kanban_view .oe_kanban_color_picker {
+  position: absolute;
+  top: -10px;
+  border: 1px solid black;
+  -moz-box-shadow: 2px 2px 5px #666666;
+  -webkit-box-shadow: 2px 2px 5px #666666;
+  box-shadow: 2px 2px 5px #666666;
+  z-index: 2;
+}
+.openerp .oe_kanban_view .oe_kanban_color_picker a {
+  display: block;
+  width: 30px;
+  height: 30px;
+  border: 1px solid black;
+  text-align: center;
+  text-decoration: none;
+}
+.openerp .oe_kanban_view .oe_kanban_color_picker a:hover {
+  border-color: white;
+}
+.openerp .oe_kanban_view .oe_kanban_color_picker span {
+  border: none;
+  font-size: 120%;
+  font-weight: bold;
+  color: black;
+  line-height: 30px;
+}
+.openerp .oe_kanban_view .oe_kanban_color_0 .oe_kanban_color_bglight {
+  background: white;
+}
+.openerp .oe_kanban_view .oe_kanban_color_0 .oe_kanban_color_bgdark {
+  background: #eeeeee;
+}
+.openerp .oe_kanban_view .oe_kanban_color_0 .oe_kanban_color_border {
+  border-color: #cccccc;
+}
+.openerp .oe_kanban_view .oe_kanban_color_0 .oe_kanban_button {
+  background-color: #eeeeee;
+  border-color: #cccccc;
+  text-shadow: 0 1px white;
+}
+.openerp .oe_kanban_view .oe_kanban_color_0 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_0 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_0 button.oe_kanban_button:hover {
+  background-color: #999999;
+  color: white;
+  text-shadow: 0 1px black;
+}
+.openerp .oe_kanban_view .oe_kanban_color_1 .oe_kanban_color_bglight {
+  background: #cccccc;
+}
+.openerp .oe_kanban_view .oe_kanban_color_1 .oe_kanban_color_bgdark {
+  background: #999999;
+}
+.openerp .oe_kanban_view .oe_kanban_color_1 .oe_kanban_color_border {
+  border-color: #666666;
+}
+.openerp .oe_kanban_view .oe_kanban_color_1 .oe_kanban_button {
+  background-color: #999999;
+  border-color: #666666;
+  text-shadow: 0 1px #cccccc;
+}
+.openerp .oe_kanban_view .oe_kanban_color_1 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_1 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_1 button.oe_kanban_button:hover {
+  background-color: #666666;
+  color: white;
+  text-shadow: 0 1px black;
+}
+.openerp .oe_kanban_view .oe_kanban_color_2 .oe_kanban_color_bglight {
+  background: #ffc7c7;
+}
+.openerp .oe_kanban_view .oe_kanban_color_2 .oe_kanban_color_bgdark {
+  background: #ff8f8f;
+}
+.openerp .oe_kanban_view .oe_kanban_color_2 .oe_kanban_color_border {
+  border-color: #d97979;
+}
+.openerp .oe_kanban_view .oe_kanban_color_2 .oe_kanban_button {
+  background-color: #ff8f8f;
+  border-color: #d97979;
+  text-shadow: 0 1px #ffc7c7;
+}
+.openerp .oe_kanban_view .oe_kanban_color_2 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_2 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_2 button.oe_kanban_button:hover {
+  background-color: #cc5c5c;
+  color: white;
+  text-shadow: 0 1px black;
+}
+.openerp .oe_kanban_view .oe_kanban_color_3 .oe_kanban_color_bglight {
+  background: #fff1c7;
+}
+.openerp .oe_kanban_view .oe_kanban_color_3 .oe_kanban_color_bgdark {
+  background: #ffe38f;
+}
+.openerp .oe_kanban_view .oe_kanban_color_3 .oe_kanban_color_border {
+  border-color: #d9c179;
+}
+.openerp .oe_kanban_view .oe_kanban_color_3 .oe_kanban_button {
+  background-color: #ffe38f;
+  border-color: #d9c179;
+  text-shadow: 0 1px #fff1c7;
+}
+.openerp .oe_kanban_view .oe_kanban_color_3 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_3 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_3 button.oe_kanban_button:hover {
+  background-color: #ccb05c;
+  color: white;
+  text-shadow: 0 1px black;
+}
+.openerp .oe_kanban_view .oe_kanban_color_4 .oe_kanban_color_bglight {
+  background: #e3ffc7;
+}
+.openerp .oe_kanban_view .oe_kanban_color_4 .oe_kanban_color_bgdark {
+  background: #c7ff8f;
+}
+.openerp .oe_kanban_view .oe_kanban_color_4 .oe_kanban_color_border {
+  border-color: #a9d979;
+}
+.openerp .oe_kanban_view .oe_kanban_color_4 .oe_kanban_button {
+  background-color: #c7ff8f;
+  border-color: #a9d979;
+  text-shadow: 0 1px #e3ffc7;
+}
+.openerp .oe_kanban_view .oe_kanban_color_4 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_4 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_4 button.oe_kanban_button:hover {
+  background-color: #94cc5c;
+  color: white;
+  text-shadow: 0 1px black;
+}
+.openerp .oe_kanban_view .oe_kanban_color_5 .oe_kanban_color_bglight {
+  background: #c7ffd5;
+}
+.openerp .oe_kanban_view .oe_kanban_color_5 .oe_kanban_color_bgdark {
+  background: #8fffab;
+}
+.openerp .oe_kanban_view .oe_kanban_color_5 .oe_kanban_color_border {
+  border-color: #79d991;
+}
+.openerp .oe_kanban_view .oe_kanban_color_5 .oe_kanban_button {
+  background-color: #8fffab;
+  border-color: #79d991;
+  text-shadow: 0 1px #c7ffd5;
+}
+.openerp .oe_kanban_view .oe_kanban_color_5 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_5 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_5 button.oe_kanban_button:hover {
+  background-color: #5ccc78;
+  color: white;
+  text-shadow: 0 1px black;
+}
+.openerp .oe_kanban_view .oe_kanban_color_6 .oe_kanban_color_bglight {
+  background: #c7ffff;
+}
+.openerp .oe_kanban_view .oe_kanban_color_6 .oe_kanban_color_bgdark {
+  background: #8fffff;
+}
+.openerp .oe_kanban_view .oe_kanban_color_6 .oe_kanban_color_border {
+  border-color: #79d9d9;
+}
+.openerp .oe_kanban_view .oe_kanban_color_6 .oe_kanban_button {
+  background-color: #8fffff;
+  border-color: #79d9d9;
+  text-shadow: 0 1px #c7ffff;
+}
+.openerp .oe_kanban_view .oe_kanban_color_6 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_6 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_6 button.oe_kanban_button:hover {
+  background-color: #5ccccc;
+  color: white;
+  text-shadow: 0 1px black;
+}
+.openerp .oe_kanban_view .oe_kanban_color_7 .oe_kanban_color_bglight {
+  background: #c7d5ff;
+}
+.openerp .oe_kanban_view .oe_kanban_color_7 .oe_kanban_color_bgdark {
+  background: #8fabff;
+}
+.openerp .oe_kanban_view .oe_kanban_color_7 .oe_kanban_color_border {
+  border-color: #8fabff;
+}
+.openerp .oe_kanban_view .oe_kanban_color_7 .oe_kanban_button {
+  background-color: #8fabff;
+  border-color: #7995e9;
+  text-shadow: 0 1px #c7d5ff;
+}
+.openerp .oe_kanban_view .oe_kanban_color_7 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_7 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_7 button.oe_kanban_button:hover {
+  background-color: #5c78cc;
+  color: white;
+  text-shadow: 0 1px black;
+}
+.openerp .oe_kanban_view .oe_kanban_color_8 .oe_kanban_color_bglight {
+  background: #e3c7ff;
+}
+.openerp .oe_kanban_view .oe_kanban_color_8 .oe_kanban_color_bgdark {
+  background: #c78fff;
+}
+.openerp .oe_kanban_view .oe_kanban_color_8 .oe_kanban_color_border {
+  border-color: #a979d9;
+}
+.openerp .oe_kanban_view .oe_kanban_color_8 .oe_kanban_button {
+  background-color: #c78fff;
+  border-color: #a979d9;
+  text-shadow: 0 1px #e3c7ff;
+}
+.openerp .oe_kanban_view .oe_kanban_color_8 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_8 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_8 button.oe_kanban_button:hover {
+  background-color: #945ccc;
+  color: white;
+  text-shadow: 0 1px black;
+}
+.openerp .oe_kanban_view .oe_kanban_color_9 .oe_kanban_color_bglight {
+  background: #ffc7f1;
+}
+.openerp .oe_kanban_view .oe_kanban_color_9 .oe_kanban_color_bgdark {
+  background: #ff8fe3;
+}
+.openerp .oe_kanban_view .oe_kanban_color_9 .oe_kanban_color_border {
+  border-color: #d979c1;
+}
+.openerp .oe_kanban_view .oe_kanban_color_9 .oe_kanban_button {
+  background-color: #ff8fe3;
+  border-color: #d979c1;
+  text-shadow: 0 1px #ffc7f1;
+}
+.openerp .oe_kanban_view .oe_kanban_color_9 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_9 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_9 button.oe_kanban_button:hover {
+  background-color: #cc5cb0;
+  color: white;
+  text-shadow: 0 1px black;
+}
+.openerp .oe_kanban_view .oe_kanban_color_alert .oe_kanban_color_border, .openerp .oe_kanban_view .oe_kanban_color_red .oe_kanban_color_border {
+  border-color: #cc0000 !important;
+}
+.openerp .oe_kanban_view .oe_kanban_color_green .oe_kanban_color_border {
+  border-color: #00cc00 !important;
+}
+.openerp .oe_kanban_view .oe_kanban_color_blue .oe_kanban_color_border {
+  border-color: #0000cc !important;
 }
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
new file mode 100644
index 00000000000..0206736ce6a
--- /dev/null
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -0,0 +1,386 @@
+@charset "utf-8"
+
+.openerp .oe_kanban_view
+    // KanbanView {{{
+    .ui-sortable-placeholder
+        border: 1px dotted black
+        visibility: visible !important
+        height: 60px !important
+    .oe_kanban_left
+        float: left
+    .oe_kanban_right
+        float: right
+    .oe_kanban_clear
+        clear: both
+    // }}}
+    // KanbanGroups {{{
+    .oe_kanban_groups
+        width: 100%
+    .oe_kanban_group_header
+        position: relative
+    .oe_kanban_group_folded
+        padding: 0 5px 0 5px
+    .oe_kanban_group_folded
+        .oe_kanban_group_title, &.oe_kanban_column > *, .oe_kanban_aggregates
+            display: none
+        .oe_kanban_group_title_vertical
+            display: block
+    .oe_kanban_group_title
+        font-size: 100%
+        font-weight: bold
+        padding-left: 2px
+        color: #333333
+    .oe_kanban_group_title_undefined
+        color: #666666
+    .oe_kanban_group_title_vertical
+        writing-mode: tb-rl
+        -webkit-transform: rotate(90deg)
+        -moz-transform: rotate(90deg)
+        -o-transform: rotate(90deg)
+        -ms-transform: rotate(90deg)
+        transform: rotate(90deg)
+        width: 30px
+        height: 20px
+        font-size: 24px
+        white-space: nowrap
+        display: none
+        position: absolute
+        top: 10px
+    .oe_kanban_fold_icon
+        cursor: pointer
+        float: left
+        padding: 2px
+        width: 16px
+        height: 16px
+        background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat
+    .oe_kanban_group_folded .oe_kanban_fold_icon
+        background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat
+    // }}}
+    // KanbanQuickCreate {{{
+    .oe_kanban_add
+        cursor: pointer
+        position: absolute
+        top: 6px
+        right: 6px
+        width: 16px
+        height: 16px
+        background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat
+    .oe_kanban_quick_create
+        // apply block formatting context
+        overflow: hidden
+    .oe_kanban_no_group .oe_kanban_quick_create
+        width: 200px
+        padding: 10px
+    .oe_kanban_quick_create input
+        display: block
+        // margins within width
+        box-sizing: border-box
+        width: 100%
+    .oe_kanban_quick_create button
+        float: right
+    // }}}
+    // KanbanRecords {{{
+    .oe_kanban_box
+        background: #FFF
+        border: 2px solid #CCC
+        border-radius: 4px
+        -moz-border-radius: 4px
+        -webkit-border-radius: 4px
+        margin-bottom: 5px
+    .oe_kanban_box_header
+        background: #EEE
+        border-bottom: 1px solid #CCC
+    .oe_kanban_title
+        font-size: 95%
+        font-weight: bold
+        padding: 0 4px 0 4px
+    .oe_kanban_small
+        font-size: 80%
+        font-weight: normal
+    .oe_kanban_show_more
+        clear: both
+        text-align: center
+    .oe_kanban_grouped .oe_kanban_show_more .oe_button
+        width: 100%
+    .oe_kanban_ungrouped .oe_kanban_record
+        float: left
+        padding: 2px
+        box-sizing: border-box
+        -moz-box-sizing: border-box
+        -webkit-box-sizing: border-box
+    .oe_kanban_action_button
+        height: 22px
+        margin: 0
+    .oe_kanban_action_a
+        text-decoration: none
+    .oe_kanban_table
+        width: 100%
+        border: none
+        border-collapse: collapse
+        margin: 0
+        padding: 0
+    .oe_kanban_table tr td
+        padding: 0
+    .oe_kanban_table tr td.oe_kanban_title
+        padding: 2px
+    .oe_kanban_gravatar
+        display: block
+    .oe_kanban_box_content
+        padding: 4px
+        font-size: 90%
+    .oe_kanban_button
+        border: 1px solid #8ec1da
+        background-color: #ddeef6
+        border-radius: 3px
+        -moz-border-radius: 3px
+        -webkit-border-radius: 3px
+        color: #000000
+        text-shadow: 0 1px #fff
+        padding: 0 4px
+        font-size: 85%
+        margin: 1px
+    a.oe_kanban_button:hover, .openerp button.oe_kanban_button:hover
+        background-color: #eeddf6
+    .oe_kanban_buttons_set
+        border-top: 1px dotted
+        white-space: nowrap
+        padding-top: 2px
+        position: relative
+        clear: both
+        a
+            padding: 2px
+    .oe_kanban_box_show_onclick
+        display: none
+    .oe_kanban_draghandle
+        cursor: move
+    .oe_kanban_color_border
+        border-color: #CCCCCC
+    .oe_kanban_color_border
+        border-color: #CCCCCC
+    .oe_kanban_tooltip ul, ul.oe_kanban_tooltip
+        padding: 0 0 4px 0
+        margin: 5px 0 0 15px
+        list-style: circle
+    .oe_kanban_highlight
+        border-radius: 2px
+        -moz-border-radius: 2px
+        -webkit-border-radius: 2px
+        padding: 1px 5px
+        margin: 1px 4px
+        white-space: nowrap
+        display: inline-block
+        line-height: 1em
+
+    // }}}
+    // KanbanColorPicker {{{
+    .oe_kanban_color_picker
+        position: absolute
+        top: -10px
+        border: 1px solid black
+        -moz-box-shadow: 2px 2px 5px #666
+        -webkit-box-shadow: 2px 2px 5px #666
+        box-shadow: 2px 2px 5px #666
+        z-index: 2
+        a
+            display: block
+            width: 30px
+            height: 30px
+            border: 1px solid black
+            text-align: center
+            text-decoration: none
+            &:hover
+                border-color: white
+        span
+            border: none
+            font-size: 120%
+            font-weight: bold
+            color: black
+            line-height: 30px
+    // }}}
+    // KanbanColors {{{
+    // Custom colors are also present in kanban.js
+    // Custom color#0
+    .oe_kanban_color_0
+        .oe_kanban_color_bglight
+            background: #FFFFFF
+        .oe_kanban_color_bgdark
+            background: #EEEEEE
+        .oe_kanban_color_border
+            border-color: #CCCCCC
+        .oe_kanban_button
+            background-color: #EEEEEE
+            border-color: #CCCCCC
+            text-shadow: 0 1px #FFFFFF
+        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
+            background-color: #999999
+            color: #fff
+            text-shadow: 0 1px #000
+
+    // Custom color#1
+    .oe_kanban_color_1
+        .oe_kanban_color_bglight
+            background: #CCCCCC
+        .oe_kanban_color_bgdark
+            background: #999999
+        .oe_kanban_color_border
+            border-color: #666666
+        .oe_kanban_button
+            background-color: #999999
+            border-color: #666666
+            text-shadow: 0 1px #CCCCCC
+        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
+            background-color: #666666
+            color: #fff
+            text-shadow: 0 1px #000
+
+    // Custom color#2
+    .oe_kanban_color_2
+        .oe_kanban_color_bglight
+            background: #FFC7C7
+        .oe_kanban_color_bgdark
+            background: #FF8F8F
+        .oe_kanban_color_border
+            border-color: #D97979
+        .oe_kanban_button
+            background-color: #FF8F8F
+            border-color: #D97979
+            text-shadow: 0 1px #FFC7C7
+        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
+            background-color: #CC5C5C
+            color: #fff
+            text-shadow: 0 1px #000
+
+    // Custom color#3
+    .oe_kanban_color_3
+        .oe_kanban_color_bglight
+            background: #FFF1C7
+        .oe_kanban_color_bgdark
+            background: #FFE38F
+        .oe_kanban_color_border
+            border-color: #D9C179
+        .oe_kanban_button
+            background-color: #FFE38F
+            border-color: #D9C179
+            text-shadow: 0 1px #FFF1C7
+        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
+            background-color: #CCB05C
+            color: #fff
+            text-shadow: 0 1px #000
+
+    // Custom color#4
+    .oe_kanban_color_4
+        .oe_kanban_color_bglight
+            background: #E3FFC7
+        .oe_kanban_color_bgdark
+            background: #C7FF8F
+        .oe_kanban_color_border
+            border-color: #A9D979
+        .oe_kanban_button
+            background-color: #C7FF8F
+            border-color: #A9D979
+            text-shadow: 0 1px #E3FFC7
+        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
+            background-color: #94CC5C
+            color: #fff
+            text-shadow: 0 1px #000
+
+    // Custom color#5
+    .oe_kanban_color_5
+        .oe_kanban_color_bglight
+            background: #C7FFD5
+        .oe_kanban_color_bgdark
+            background: #8FFFAB
+        .oe_kanban_color_border
+            border-color: #79D991
+        .oe_kanban_button
+            background-color: #8FFFAB
+            border-color: #79D991
+            text-shadow: 0 1px #C7FFD5
+        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
+            background-color: #5CCC78
+            color: #fff
+            text-shadow: 0 1px #000
+
+    // Custom color#6
+    .oe_kanban_color_6
+        .oe_kanban_color_bglight
+            background: #C7FFFF
+        .oe_kanban_color_bgdark
+            background: #8FFFFF
+        .oe_kanban_color_border
+            border-color: #79D9D9
+        .oe_kanban_button
+            background-color: #8FFFFF
+            border-color: #79D9D9
+            text-shadow: 0 1px #C7FFFF
+        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
+            background-color: #5CCCCC
+            color: #fff
+            text-shadow: 0 1px #000
+
+    // Custom color#7
+    .oe_kanban_color_7
+        .oe_kanban_color_bglight
+            background: #C7D5FF
+        .oe_kanban_color_bgdark
+            background: #8FABFF
+        .oe_kanban_color_border
+            border-color: #8FABFF
+        .oe_kanban_button
+            background-color: #8FABFF
+            border-color: #7995E9
+            text-shadow: 0 1px #C7D5FF
+        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
+            background-color: #5C78CC
+            color: #fff
+            text-shadow: 0 1px #000
+
+    // Custom color#8
+    .oe_kanban_color_8
+        .oe_kanban_color_bglight
+            background: #E3C7FF
+        .oe_kanban_color_bgdark
+            background: #C78FFF
+        .oe_kanban_color_border
+            border-color: #A979D9
+        .oe_kanban_button
+            background-color: #C78FFF
+            border-color: #A979D9
+            text-shadow: 0 1px #E3C7FF
+        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
+            background-color: #945CCC
+            color: #fff
+            text-shadow: 0 1px #000
+
+    // Custom color#9
+    .oe_kanban_color_9
+        .oe_kanban_color_bglight
+            background: #FFC7F1
+        .oe_kanban_color_bgdark
+            background: #FF8FE3
+        .oe_kanban_color_border
+            border-color: #D979C1
+        .oe_kanban_button
+            background-color: #FF8FE3
+            border-color: #D979C1
+            text-shadow: 0 1px #FFC7F1
+        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
+            background-color: #CC5CB0
+            color: #fff
+            text-shadow: 0 1px #000
+
+    // Red border
+    .oe_kanban_color_alert .oe_kanban_color_border, .oe_kanban_color_red .oe_kanban_color_border
+        border-color: #c00 !important
+
+    // Green border
+    .oe_kanban_color_green .oe_kanban_color_border
+        border-color: #0c0 !important
+
+    // Blue border
+    .oe_kanban_color_blue .oe_kanban_color_border
+        border-color: #00c !important
+    // }}}
+
+// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
+// vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:

From 9f976d242fa5a2450819b8d102a8812485f158ae Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 22 May 2012 12:53:39 +0200
Subject: [PATCH 359/452] [IMP] remove icon

bzr revid: fp@tinyerp.com-20120522105339-kmqrnbthhi4b43bb
---
 addons/sale_crm/sale_crm_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 61ced66c4cb..3151c910e2f 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//div[contains(@class,'oe_form_topbar')]/div[contains(@class,'oe_right')]" position="before">
-                        <button string="Convert to Quote" icon="gtk-go-forward" name="%(action_crm_make_sale)d" type="action"/>
+                        <button string="Convert to Quote" name="%(action_crm_make_sale)d" type="action"/>
                     </xpath>
                 </data>
             </field>

From 3239de442906cd09ea2c4be2e934cd79d3af30da Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 22 May 2012 16:34:44 +0530
Subject: [PATCH 360/452] [IMP]stock: Initialize variable

bzr revid: dbr@tinyerp.com-20120522110444-qf40n3faan9a75ei
---
 addons/stock/product.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index d5324f08094..6b742489761 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -28,6 +28,7 @@ class product_product(osv.osv):
 
     def _stock_move_count(self, cr, uid, ids, field_name, arg, context=None):
         res = dict([(id, {'reception_count': 0, 'delivery_count': 0}) for id in ids])
+        field = False
         move_pool=self.pool.get('stock.move')
         move_ids = move_pool.search(cr, uid, [('product_id', 'in', ids)])
         for move in move_pool.browse(cr, uid, move_ids, context):

From 83de35f1cf58de800a11e5df7d6eb8378aaa0fca Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 22 May 2012 13:30:57 +0200
Subject: [PATCH 361/452] [IMP] Merge kanban declarations from base.sass to
 kanban.sass

bzr revid: fme@openerp.com-20120522113057-7dfkcyiaxxbmnx9a
---
 addons/web/static/src/css/base.css           | 154 ------------------
 addons/web/static/src/css/base.sass          | 103 ------------
 addons/web_kanban/static/src/css/kanban.css  | 160 +++++++++++++++++--
 addons/web_kanban/static/src/css/kanban.sass | 127 +++++++++++++--
 4 files changed, 267 insertions(+), 277 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 60199338658..22559ca8aba 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1969,160 +1969,6 @@
 .openerp .oe-listview-content .numeric input {
   text-align: right;
 }
-.openerp .oe_kanban_view {
-  position: absolute;
-  top: 111px;
-  bottom: 0;
-}
-.openerp .oe_kanban_groups {
-  height: 100%;
-}
-.openerp .oe_kanban_group_title {
-  margin: 1px 1px 4px;
-  font-size: 15px;
-  font-weight: bold;
-  text-shadow: 0 1px 0 white;
-}
-.openerp .oe_kanban_column, .openerp .oe_kanban_group_header {
-  vertical-align: top;
-  padding: 6px 7px 6px 6px;
-  background: #f0eeee;
-  border-left: 1px solid #f0f8f8;
-  border-right: 1px solid #b9b9b9;
-}
-.openerp .oe_kanban_column {
-  height: 100%;
-}
-.openerp .oe_kanban_aggregates {
-  padding: 0;
-}
-.openerp .oe_kanban_record {
-  position: relative;
-  display: block;
-  min-height: 50px;
-  margin: 6px 0;
-  display: block;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-}
-.openerp .oe_kanban_record:last-child {
-  margin-bottom: 0;
-}
-.openerp .oe_kanban_record .oe_kanban_title {
-  font-weight: bold;
-  margin: 2px 4px;
-}
-.openerp .oe_kanban_gravatar {
-  width: 20px;
-  height: 20px;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-}
-.openerp .oe_kanban_avatar_toto {
-  height: 40px;
-  width: 40px;
-  border: 1px solid;
-  border-color: #e5e5e5 #dbdbdb #d2d2d2;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-}
-.openerp .oe_kanban_view {
-  position: absolute;
-  top: 111px;
-  bottom: 0;
-}
-.openerp .oe_kanban_card {
-  position: relative;
-  display: block;
-  min-height: 50px;
-  background: white;
-  border: 1px solid #d8d8d8;
-  border-bottom-color: #b9b9b9;
-  padding: 6px;
-  margin: 6px 0;
-  display: block;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-}
-.openerp .oe_kanban_card:last-child {
-  margin-bottom: 0;
-}
-.openerp .oe_kanban_card:hover {
-  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
-  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
-  -box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
-}
-.openerp .oe_kanban_card:hover .oe_kanban_menuaction {
-  display: block;
-}
-.openerp .oe_kanban_card h3 {
-  margin: 0 16px 0 0;
-}
-.openerp .oe_kanban_star {
-  float: left;
-  position: inline-block;
-  margin: 0 4px 0 0;
-}
-.openerp a.oe_kanban_menuaction {
-  position: absolute;
-  right: 4px;
-  display: none;
-  color: #4c4c4c;
-  cursor: pointer;
-}
-.openerp a.oe_kanban_menuaction:hover {
-  text-decoration: none;
-}
-.openerp .oe_kanban_avatar {
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-}
-.openerp .oe_kanban_status {
-  display: inline-block;
-  height: 12px;
-  width: 12px;
-  margin: 4px auto;
-  -moz-border-radius: 6px;
-  -webkit-border-radius: 6px;
-  border-radius: 6px;
-  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
-  -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
-}
-.openerp .oe_kanban_status_green {
-  background: green;
-  background-position: center center;
-  background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44aa44 40%, #339933 100%);
-  background-image: -moz-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
-  background-image: -ms-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
-  background-image: radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
-}
-.openerp .oe_kanban_status_red {
-  background: red;
-  background-position: center center;
-  background-image: -webkit-radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%);
-  background-image: -moz-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
-  background-image: -ms-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
-  background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
-}
-.openerp .oe_kanban_text_red {
-  background: red;
-  color: black;
-}
 .openerp .oe_trad_field.touched {
   border: 1px solid green !important;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 227bdac69a7..c345ca9235b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1619,109 +1619,6 @@ $colour4: #8a89ba
             input
                 text-align: right
     // }}}
-    // KanbanView {{{
-    .oe_kanban_view
-        position: absolute
-        top: 111px
-        bottom: 0
-    .oe_kanban_groups
-        height: 100%
-    .oe_kanban_group_title
-        margin: 1px 1px 4px
-        font-size: 15px
-        font-weight: bold
-        text-shadow: 0 1px 0 white
-    .oe_kanban_column, .oe_kanban_group_header
-        vertical-align: top
-        padding: 6px 7px 6px 6px
-        background: #f0eeee
-        border-left: 1px solid #f0f8f8
-        border-right: 1px solid #b9b9b9
-    .oe_kanban_column
-        height: 100%
-    .oe_kanban_aggregates
-        padding: 0
-    .oe_kanban_record
-        position: relative
-        display: block
-        min-height: 50px
-        margin: 6px 0
-        display: block
-        @include radius(4px)
-        &:last-child
-            margin-bottom: 0
-        .oe_kanban_title
-            font-weight: bold
-            margin: 2px 4px
-    .oe_kanban_gravatar
-        width: 20px
-        height: 20px
-        @include radius(3px)
-        @include box-shadow(0 1px 2px rgba(0,0,0,0.2))
-    .oe_kanban_avatar_toto
-        height: 40px
-        width: 40px
-        border: 1px solid
-        border-color: #e5e5e5 #dbdbdb #d2d2d2
-        @include radius(3px)
-        @include box-shadow(0 1px 2px rgba(0,0,0,0.2))
-    .oe_kanban_view
-        position: absolute
-        top: 111px
-        bottom: 0
-    .oe_kanban_card
-        position: relative
-        display: block
-        min-height: 50px
-        background: white
-        border: 1px solid #d8d8d8
-        border-bottom-color: #b9b9b9
-        padding: 6px
-        margin: 6px 0
-        display: block
-        @include radius(4px)
-        &:last-child
-            margin-bottom: 0
-        &:hover
-            @include box-shadow(0 0 3px rgba(0,0,0,0.6))
-            .oe_kanban_menuaction
-                display: block
-        h3
-            margin: 0 16px 0 0
-    .oe_kanban_star
-        float: left
-        position: inline-block
-        margin: 0 4px 0 0
-    a.oe_kanban_menuaction
-        position: absolute
-        right: 4px
-        display: none
-        color: #4c4c4c
-        cursor: pointer
-        &:hover
-            text-decoration: none
-    .oe_kanban_avatar
-        @include radius(4px)
-        @include box-shadow(0 1px 2px rgba(0,0,0,0.2))
-    //.oe_kanban_footer_left
-    //   float: left
-    .oe_kanban_status
-        display: inline-block
-        height: 12px
-        width: 12px
-        margin: 4px auto
-        @include radius(6px)
-        @include box-shadow(0 1px 3px rgba(0,0,0,0.6))
-    .oe_kanban_status_green
-        background: green
-        @include radial-gradient((#55dd55 0%, #44aa44 40%, #339933 100%))
-    .oe_kanban_status_red
-        background: red
-        @include radial-gradient((#ee7777 0%, #cc3333 40%, #bb0808 100%))
-    .oe_kanban_text_red
-        background: red
-        color: #000
-    // }}}
     // Translation {{{
     .oe_trad_field.touched
         border: 1px solid green !important
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 2e33f499749..539a6682925 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,4 +1,9 @@
 @charset "utf-8";
+.openerp .oe_kanban_view {
+  position: absolute;
+  top: 111px;
+  bottom: 0;
+}
 .openerp .oe_kanban_view .ui-sortable-placeholder {
   border: 1px dotted black;
   visibility: visible !important;
@@ -14,7 +19,28 @@
   clear: both;
 }
 .openerp .oe_kanban_view .oe_kanban_groups {
-  width: 100%;
+  height: 100%;
+}
+.openerp .oe_kanban_view .oe_kanban_group_title {
+  margin: 1px 1px 4px;
+  padding-left: 2px;
+  font-size: 100%;
+  font-weight: bold;
+  color: #333333;
+  text-shadow: 0 1px 0 white;
+}
+.openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
+  vertical-align: top;
+  padding: 6px 7px 6px 6px;
+  background: #f0eeee;
+  border-left: 1px solid #f0f8f8;
+  border-right: 1px solid #b9b9b9;
+}
+.openerp .oe_kanban_view .oe_kanban_column {
+  height: 100%;
+}
+.openerp .oe_kanban_view .oe_kanban_aggregates {
+  padding: 0;
 }
 .openerp .oe_kanban_view .oe_kanban_group_header {
   position: relative;
@@ -28,12 +54,6 @@
 .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title_vertical {
   display: block;
 }
-.openerp .oe_kanban_view .oe_kanban_group_title {
-  font-size: 100%;
-  font-weight: bold;
-  padding-left: 2px;
-  color: #333333;
-}
 .openerp .oe_kanban_view .oe_kanban_group_title_undefined {
   color: #666666;
 }
@@ -87,6 +107,46 @@
 .openerp .oe_kanban_view .oe_kanban_quick_create button {
   float: right;
 }
+.openerp .oe_kanban_view .oe_kanban_record {
+  position: relative;
+  display: block;
+  min-height: 50px;
+  margin: 6px 0;
+  display: block;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+}
+.openerp .oe_kanban_view .oe_kanban_record:last-child {
+  margin-bottom: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_record .oe_kanban_title {
+  font-weight: bold;
+  margin: 2px 4px;
+}
+.openerp .oe_kanban_view .oe_kanban_gravatar {
+  display: block;
+  width: 20px;
+  height: 20px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+.openerp .oe_kanban_view .oe_kanban_avatar_toto {
+  height: 40px;
+  width: 40px;
+  border: 1px solid;
+  border-color: #e5e5e5 #dbdbdb #d2d2d2;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
 .openerp .oe_kanban_view .oe_kanban_box {
   background: white;
   border: 2px solid #cccccc;
@@ -142,9 +202,6 @@
 .openerp .oe_kanban_view .oe_kanban_table tr td.oe_kanban_title {
   padding: 2px;
 }
-.openerp .oe_kanban_view .oe_kanban_gravatar {
-  display: block;
-}
 .openerp .oe_kanban_view .oe_kanban_box_content {
   padding: 4px;
   font-size: 90%;
@@ -201,6 +258,89 @@
   display: inline-block;
   line-height: 1em;
 }
+.openerp .oe_kanban_view .oe_kanban_card {
+  position: relative;
+  display: block;
+  min-height: 50px;
+  background: white;
+  border: 1px solid #d8d8d8;
+  border-bottom-color: #b9b9b9;
+  padding: 6px;
+  margin: 6px 0;
+  display: block;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+}
+.openerp .oe_kanban_view .oe_kanban_card:last-child {
+  margin-bottom: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_card:hover {
+  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
+  -box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
+}
+.openerp .oe_kanban_view .oe_kanban_card:hover .oe_kanban_menuaction {
+  display: block;
+}
+.openerp .oe_kanban_view .oe_kanban_card h3 {
+  margin: 0 16px 0 0;
+}
+.openerp .oe_kanban_view .oe_kanban_star {
+  float: left;
+  position: inline-block;
+  margin: 0 4px 0 0;
+}
+.openerp .oe_kanban_view a.oe_kanban_menuaction {
+  position: absolute;
+  right: 4px;
+  display: none;
+  color: #4c4c4c;
+  cursor: pointer;
+}
+.openerp .oe_kanban_view a.oe_kanban_menuaction:hover {
+  text-decoration: none;
+}
+.openerp .oe_kanban_view .oe_kanban_avatar {
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+.openerp .oe_kanban_view .oe_kanban_status {
+  display: inline-block;
+  height: 12px;
+  width: 12px;
+  margin: 4px auto;
+  -moz-border-radius: 6px;
+  -webkit-border-radius: 6px;
+  border-radius: 6px;
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
+  -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
+}
+.openerp .oe_kanban_view .oe_kanban_status_green {
+  background: green;
+  background-position: center center;
+  background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44aa44 40%, #339933 100%);
+  background-image: -moz-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
+  background-image: -ms-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
+  background-image: radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
+}
+.openerp .oe_kanban_view .oe_kanban_status_red {
+  background: red;
+  background-position: center center;
+  background-image: -webkit-radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%);
+  background-image: -moz-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
+  background-image: -ms-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
+  background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
+}
+.openerp .oe_kanban_view .oe_kanban_text_red {
+  background: red;
+  color: black;
+}
 .openerp .oe_kanban_view .oe_kanban_color_picker {
   position: absolute;
   top: -10px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 0206736ce6a..45357f04d2e 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -1,7 +1,29 @@
 @charset "utf-8"
 
+// Mixins {{{
+@mixin radial-gradient($gradient)
+    background-position: center center
+    background-image: -webkit-radial-gradient(circle, $gradient)
+    background-image: -moz-radial-gradient($gradient)
+    background-image: -ms-radial-gradient($gradient)
+    background-image: radial-gradient($gradient)
+
+@mixin radius($radius: 5px)
+    -moz-border-radius: $radius
+    -webkit-border-radius: $radius
+    border-radius: $radius
+
+@mixin box-shadow($bsval: 0px 1px 4px #777)
+    -moz-box-shadow: $bsval
+    -webkit-box-shadow: $bsval
+    -box-shadow: $bsval
+// }}}
+
 .openerp .oe_kanban_view
     // KanbanView {{{
+    position: absolute
+    top: 111px
+    bottom: 0
     .ui-sortable-placeholder
         border: 1px dotted black
         visibility: visible !important
@@ -15,21 +37,32 @@
     // }}}
     // KanbanGroups {{{
     .oe_kanban_groups
-        width: 100%
+        height: 100%
+    .oe_kanban_group_title
+        margin: 1px 1px 4px
+        padding-left: 2px
+        font-size: 100%
+        font-weight: bold
+        color: #333333
+        text-shadow: 0 1px 0 white
+    .oe_kanban_column, .oe_kanban_group_header
+        vertical-align: top
+        padding: 6px 7px 6px 6px
+        background: #f0eeee
+        border-left: 1px solid #f0f8f8
+        border-right: 1px solid #b9b9b9
+    .oe_kanban_column
+        height: 100%
+    .oe_kanban_aggregates
+        padding: 0
     .oe_kanban_group_header
         position: relative
     .oe_kanban_group_folded
         padding: 0 5px 0 5px
-    .oe_kanban_group_folded
         .oe_kanban_group_title, &.oe_kanban_column > *, .oe_kanban_aggregates
             display: none
         .oe_kanban_group_title_vertical
             display: block
-    .oe_kanban_group_title
-        font-size: 100%
-        font-weight: bold
-        padding-left: 2px
-        color: #333333
     .oe_kanban_group_title_undefined
         color: #666666
     .oe_kanban_group_title_vertical
@@ -80,6 +113,31 @@
         float: right
     // }}}
     // KanbanRecords {{{
+    .oe_kanban_record
+        position: relative
+        display: block
+        min-height: 50px
+        margin: 6px 0
+        display: block
+        @include radius(4px)
+        &:last-child
+            margin-bottom: 0
+        .oe_kanban_title
+            font-weight: bold
+            margin: 2px 4px
+    .oe_kanban_gravatar
+        display: block
+        width: 20px
+        height: 20px
+        @include radius(3px)
+        @include box-shadow(0 1px 2px rgba(0,0,0,0.2))
+    .oe_kanban_avatar_toto
+        height: 40px
+        width: 40px
+        border: 1px solid
+        border-color: #e5e5e5 #dbdbdb #d2d2d2
+        @include radius(3px)
+        @include box-shadow(0 1px 2px rgba(0,0,0,0.2))
     .oe_kanban_box
         background: #FFF
         border: 2px solid #CCC
@@ -123,8 +181,6 @@
         padding: 0
     .oe_kanban_table tr td.oe_kanban_title
         padding: 2px
-    .oe_kanban_gravatar
-        display: block
     .oe_kanban_box_content
         padding: 4px
         font-size: 90%
@@ -170,7 +226,58 @@
         white-space: nowrap
         display: inline-block
         line-height: 1em
-
+    .oe_kanban_card
+        position: relative
+        display: block
+        min-height: 50px
+        background: white
+        border: 1px solid #d8d8d8
+        border-bottom-color: #b9b9b9
+        padding: 6px
+        margin: 6px 0
+        display: block
+        @include radius(4px)
+        &:last-child
+            margin-bottom: 0
+        &:hover
+            @include box-shadow(0 0 3px rgba(0,0,0,0.6))
+            .oe_kanban_menuaction
+                display: block
+        h3
+            margin: 0 16px 0 0
+    .oe_kanban_star
+        float: left
+        position: inline-block
+        margin: 0 4px 0 0
+    a.oe_kanban_menuaction
+        position: absolute
+        right: 4px
+        display: none
+        color: #4c4c4c
+        cursor: pointer
+        &:hover
+            text-decoration: none
+    .oe_kanban_avatar
+        @include radius(4px)
+        @include box-shadow(0 1px 2px rgba(0,0,0,0.2))
+    //.oe_kanban_footer_left
+    //   float: left
+    .oe_kanban_status
+        display: inline-block
+        height: 12px
+        width: 12px
+        margin: 4px auto
+        @include radius(6px)
+        @include box-shadow(0 1px 3px rgba(0,0,0,0.6))
+    .oe_kanban_status_green
+        background: green
+        @include radial-gradient((#55dd55 0%, #44aa44 40%, #339933 100%))
+    .oe_kanban_status_red
+        background: red
+        @include radial-gradient((#ee7777 0%, #cc3333 40%, #bb0808 100%))
+    .oe_kanban_text_red
+        background: red
+        color: #000
     // }}}
     // KanbanColorPicker {{{
     .oe_kanban_color_picker

From 983b63f8edaaebbb1cc8c701e23912730fb2bf80 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 May 2012 15:23:21 +0200
Subject: [PATCH 362/452] [FIX] tests: FilterGroup now needs its view fake to
 have a query (with an on method)

bzr revid: xmo@openerp.com-20120522132321-5x2gwps4gaj78agp
---
 addons/web/static/test/search.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index dddf813b9ab..e5beab22498 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -261,7 +261,7 @@ $(document).ready(function () {
             });
     });
     asyncTest('FilterGroup', 3, function () {
-        var view = {inputs: []};
+        var view = {inputs: [], query: {on: function () {}}};
         var filter_a = new instance.web.search.Filter(
             {attrs: {name: 'a'}}, view);
         var filter_b = new instance.web.search.Filter(
@@ -882,7 +882,7 @@ $(document).ready(function () {
     });
 
     asyncTest('FilterGroup', 6, function () {
-        var view = {inputs: []};
+        var view = {inputs: [], query: {on: function () {}}};
         var filter_a = new instance.web.search.Filter(
             {attrs: {name: 'a', context: 'c1', domain: 'd1'}}, view);
         var filter_b = new instance.web.search.Filter(

From df52a73fc7456a8f0c401b6789e6eb06a177f756 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 22 May 2012 15:39:44 +0200
Subject: [PATCH 363/452] [FIX] google docs new sidebar api

bzr revid: al@openerp.com-20120522133944-71thw8qolitv8ft8
---
 addons/google_docs/__openerp__.py           |  3 --
 addons/google_docs/static/src/js/gdocs.js   | 49 ++++++++-------------
 addons/google_docs/static/src/xml/gdocs.xml | 13 ------
 3 files changed, 19 insertions(+), 46 deletions(-)
 delete mode 100644 addons/google_docs/static/src/xml/gdocs.xml

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index b1cfd1490d5..1df94f34221 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -29,9 +29,6 @@
     'auto_install': False,
     'web': True,
     'js': ['static/src/js/gdocs.js'],
-    'qweb' : [
-        "static/src/xml/gdocs.xml",
-    ],
     'update_xml': [
         'res_config_user_view.xml'
     ],
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index a8e941f01f6..6fe830d383c 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -1,29 +1,19 @@
-openerp.google_docs = function(instance, session) {
-
-
-        instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({
-            init: function() {
-                this._super.apply(this, arguments);
-                this.$element.delegate('.oe_google_docs_text_button', 'click', this.on_add_text_gdoc);
-            },
-
-
-           on_attachments_loaded: function(attachments) {
-               this._super(attachments);
-               var config = new instance.web.DataSet(this, 'google.docs.config', this.view.dataset.get_context());
-               config.call('get_config', [[this.view.datarecord.id],this.view.dataset.model,this.view.dataset.get_context()], function(r) {
-               if (r == false){
-                    $('.oe_google_docs_text_button',this.$element).hide();
-               }
-               });
-           },
-
-            on_add_text_gdoc: function() {
-                var self = this;
-                var $gdocbtn = this.$element.find('.oe_google_docs_text_button');
-                $gdocbtn.attr('disabled', 'true').find('img, span').toggle();
-                var ds = new instance.web.DataSet(this, 'google.docs', this.view.dataset.get_context());
-                ds.call('doc_get', [this.view.dataset.model, [this.view.datarecord.id], 'text'], function(r) {
+openerp.google_docs = function(instance, m) {
+    instance.web.Sidebar = instance.web.Sidebar.extend({
+        on_attachments_loaded: function(attachments) {
+            self._super(attachements);
+            // if attachment contains a google doc url do nothing
+            // else
+            this.sidebar.add_items('other', [
+                { label: _t('Google Doc'), callback: self.on_google_doc },
+            ]);
+        },
+        on_google_doc: function() {
+            var self = this;
+            var form = self.getParent();
+            form.sidebar_context().then(function (context) {
+                var ds = new instance.web.DataSet(this, 'google.docs', context);
+                ds.call('doc_get', [form.view.dataset.model, [form.view.datarecord.id], 'text'], function(r) {
                     if (r == 'False') {
                         var params = {
                             error: response,
@@ -34,9 +24,8 @@ openerp.google_docs = function(instance, session) {
                             modal: true,
                         });
                     }
-                    self.do_update();
+                    view.reload();
                 });
-            },
-        });
+            }
+        }
 };
-
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
deleted file mode 100644
index 2de7efcbd43..00000000000
--- a/addons/google_docs/static/src/xml/gdocs.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
-<templates id="template" xml:space="preserve">
-    <t t-extend="FormView.sidebar.attachments">
-        <t t-jquery="div.oe-binary-file-set" t-operation="append">
-                <button class="oe_google_docs_text_button" type="button">
-                    <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
-                    <span>Goole Docs</span>
-                </button>
-        </t>
-    </t>
-</templates>

From 0aa18780d22eff54ec1dc1f8859ac1f472a82066 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 22 May 2012 15:40:49 +0200
Subject: [PATCH 364/452] [ADD] Kanban: add dropdown menu

bzr revid: fme@openerp.com-20120522134049-ciugahe41ytuqzet
---
 addons/web_kanban/static/src/css/kanban.css  | 58 ++++++++++++++++----
 addons/web_kanban/static/src/css/kanban.sass | 46 +++++++++++++---
 addons/web_kanban/static/src/js/kanban.js    | 31 +++++++++--
 3 files changed, 111 insertions(+), 24 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 539a6682925..ee0517807e6 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -291,16 +291,6 @@
   position: inline-block;
   margin: 0 4px 0 0;
 }
-.openerp .oe_kanban_view a.oe_kanban_menuaction {
-  position: absolute;
-  right: 4px;
-  display: none;
-  color: #4c4c4c;
-  cursor: pointer;
-}
-.openerp .oe_kanban_view a.oe_kanban_menuaction:hover {
-  text-decoration: none;
-}
 .openerp .oe_kanban_view .oe_kanban_avatar {
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -341,6 +331,54 @@
   background: red;
   color: black;
 }
+.openerp .oe_kanban_view a.oe_kanban_menuaction {
+  position: absolute;
+  top: 0px;
+  right: 3px;
+  display: none;
+  color: #4c4c4c;
+  cursor: pointer;
+}
+.openerp .oe_kanban_view a.oe_kanban_menuaction:hover {
+  text-decoration: none;
+}
+.openerp .oe_kanban_view .oe_kanban_menu {
+  display: none;
+  position: absolute;
+  top: 30px;
+  right: -140px;
+  padding: 4px;
+  border: 1px solid #afafb6;
+  width: 160px;
+  overflow-x: hidden;
+  z-index: 900;
+  background: white;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+  -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+}
+.openerp .oe_kanban_view .oe_kanban_menu p {
+  margin-left: 12px;
+}
+.openerp .oe_kanban_view .oe_kanban_menu li a {
+  display: block;
+  padding: 3px 6px;
+  line-height: 14px;
+  color: #4c4c4c;
+  text-decoration: none;
+}
+.openerp .oe_kanban_view .oe_kanban_menu li a:hover {
+  background: #f0f0fa;
+  background: -moz-linear-gradient(#f0f0fa, #eeeef6);
+  background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
+  background: -webkit-linear-gradient(#f0f0fa, #eeeef6);
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+  -box-shadow: none;
+}
 .openerp .oe_kanban_view .oe_kanban_color_picker {
   position: absolute;
   top: -10px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 45357f04d2e..0c1cabd8e05 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -249,14 +249,6 @@
         float: left
         position: inline-block
         margin: 0 4px 0 0
-    a.oe_kanban_menuaction
-        position: absolute
-        right: 4px
-        display: none
-        color: #4c4c4c
-        cursor: pointer
-        &:hover
-            text-decoration: none
     .oe_kanban_avatar
         @include radius(4px)
         @include box-shadow(0 1px 2px rgba(0,0,0,0.2))
@@ -279,6 +271,44 @@
         background: red
         color: #000
     // }}}
+    // KanbanDropDown {{{
+    a.oe_kanban_menuaction
+        position: absolute
+        top: 0px
+        right: 3px
+        display: none
+        color: #4c4c4c
+        cursor: pointer
+        &:hover
+            text-decoration: none
+    .oe_kanban_menu
+        display: none
+        position: absolute
+        top: 30px
+        right: -140px
+        padding: 4px
+        border: 1px solid #afafb6
+        width: 160px
+        overflow-x: hidden
+        z-index: 900
+        background: white
+        @include radius(3px)
+        @include box-shadow(0 1px 4px rgba(0,0,0,0.3))
+        p
+            margin-left: 12px
+        li a
+            display: block
+            padding: 3px 6px
+            line-height: 14px
+            color: #4c4c4c
+            text-decoration: none
+        li a:hover
+            background: #f0f0fa
+            background: -moz-linear-gradient(#f0f0fa, #eeeef6)
+            background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6))
+            background: -webkit-linear-gradient(#f0f0fa, #eeeef6)
+            @include box-shadow(none)
+    // }}}
     // KanbanColorPicker {{{
     .oe_kanban_color_picker
         position: absolute
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 1b06fd91ce1..c4d74e8d719 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -34,6 +34,25 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         this.limit = options.limit || 80;
         this.add_group_mutex = new $.Mutex();
     },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+        // Bind kanban cards dropdown menus
+        this.$element.on('click', '.oe_kanban_menuaction', function() {
+            var $menu = $(this).next('.oe_kanban_menu');
+            var toggle = $menu.is(':visible');
+            self.$element.find('.oe_kanban_menu').hide();
+            $menu.toggle(!toggle);
+            return false;
+        });
+        $('html').on('click', function() {
+            self.$element.find('.oe_kanban_menu').hide();
+        });
+    },
+    destroy: function() {
+        this._super.apply(this, arguments);
+        $('html').off('click');
+    },
     on_loaded: function(data) {
         this.fields_view = data;
         this.$buttons = $(QWeb.render("KanbanView.buttons", {'widget': this}));
@@ -359,7 +378,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
         if (!this.view.state.groups[key]) {
             this.view.state.groups[key] = {
                 folded: false
-            }
+            };
         }
         this.state = this.view.state.groups[key];
         this.$records = null;
@@ -534,8 +553,8 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
         });
     },
     bind_events: function() {
-        var self = this,
-            $show_on_click = self.$element.find('.oe_kanban_box_show_onclick');
+        var self = this;
+        var $show_on_click = self.$element.find('.oe_kanban_box_show_onclick');
         $show_on_click.toggle(this.state.folded);
         this.$element.find('.oe_kanban_box_show_onclick_trigger').click(function() {
             $show_on_click.toggle();
@@ -559,7 +578,8 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
             trigger: 'hover'
         });
 
-        this.$element.find('.oe_kanban_action').click(function() {
+        this.$element.find('.oe_kanban_action').click(function(ev) {
+            ev.preventDefault();
             var $action = $(this),
                 type = $action.data('type') || 'button',
                 method = 'do_action_' + (type === 'action' ? 'object' : type);
@@ -570,7 +590,6 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
             } else {
                 self.do_warn("Kanban: no action for type : " + type);
             }
-            return false;
         });
     },
     do_action_delete: function($action) {
@@ -600,7 +619,7 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
         $cpicker.mouseenter(function() {
             clearTimeout($cpicker.data('timeoutId'));
         }).mouseleave(function(evt) {
-            var timeoutId = setTimeout(function() { $cpicker.remove() }, 500);
+            var timeoutId = setTimeout(function() { $cpicker.remove(); }, 500);
             $cpicker.data('timeoutId', timeoutId);
         });
         $cpicker.find('a').click(function() {

From f5cbf44c0e06bb8d28a3846c0af744034acb9278 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 May 2012 16:13:42 +0200
Subject: [PATCH 365/452] [FIX] opening of 'set as default' dialog: old typo in
 form branch

bzr revid: xmo@openerp.com-20120522141342-vas8b2xo3nrseuem
---
 addons/web/static/src/js/view_form.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 23e1c9a3ab8..218ed5a3147 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -820,7 +820,7 @@ instance.web.FormView = instance.web.View.extend(_.extend({}, instance.web.form.
 
                 return {
                     name: name,
-                    string: field.node_atts.string,
+                    string: field.node.attrs.string,
                     value: value_,
                     displayed: displayed,
                     // convert undefined to false
@@ -828,7 +828,7 @@ instance.web.FormView = instance.web.View.extend(_.extend({}, instance.web.form.
                 }
             })
             .compact()
-            .sortBy(function (field) { return field.node_atts.string; })
+            .sortBy(function (field) { return field.string; })
             .value();
         var conditions = _.chain(fields)
             .filter(function (field) { return field.change_default; })

From 79c79e1d17964a65d20bd8ac1175c602d1095f8d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 May 2012 16:14:58 +0200
Subject: [PATCH 366/452] [IMP] use field string in set defaults dialog when no
 @string on XML node

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

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 218ed5a3147..3c55579df6f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -820,7 +820,7 @@ instance.web.FormView = instance.web.View.extend(_.extend({}, instance.web.form.
 
                 return {
                     name: name,
-                    string: field.node.attrs.string,
+                    string: field.node.attrs.string || field.field.string,
                     value: value_,
                     displayed: displayed,
                     // convert undefined to false

From 09bc1b0d3854d77246e9aab94237cb0b4ecdf4c2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 May 2012 16:16:49 +0200
Subject: [PATCH 367/452] [IMP] remove unneeded/redundant 'switch' cases,
 rename variable (remove unneeded trailing underscore)

bzr revid: xmo@openerp.com-20120522141649-e87xncspejpq3tgi
---
 addons/web/static/src/js/view_form.js | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3c55579df6f..3430f1dd703 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -794,34 +794,29 @@ instance.web.FormView = instance.web.View.extend(_.extend({}, instance.web.form.
         var self = this;
         var fields = _.chain(this.fields)
             .map(function (field, name) {
-                var value_ = field.get_value();
+                var value = field.get_value();
                 // ignore fields which are empty, invisible, readonly, o2m
                 // or m2m
-                if (!value_
+                if (!value
                         || field.get('invisible')
                         || field.get("readonly")
                         || field.field.type === 'one2many'
                         || field.field.type === 'many2many') {
                     return false;
                 }
-                var displayed;
-                switch(field.field.type) {
+                var displayed = value;
+                switch (field.field.type) {
                 case 'selection':
                     displayed = _(field.values).find(function (option) {
-                            return option[0] === value_;
+                            return option[0] === value;
                         })[1];
                     break;
-                case 'many2one':
-                    displayed = value_;
-                    break;
-                default:
-                    displayed = value_;
                 }
 
                 return {
                     name: name,
                     string: field.node.attrs.string || field.field.string,
-                    value: value_,
+                    value: value,
                     displayed: displayed,
                     // convert undefined to false
                     change_default: !!field.field.change_default

From cba255384f575dfa419bf1926af74861d996c5d5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 22 May 2012 16:32:35 +0200
Subject: [PATCH 368/452] [IMP] Kanban: If no draghandle is found, make the
 whole card as draghandle

bzr revid: fme@openerp.com-20120522143235-hores2mntqc82lde
---
 addons/web_kanban/static/src/js/kanban.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index c4d74e8d719..93a726d7dce 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -578,6 +578,11 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
             trigger: 'hover'
         });
 
+        // If no draghandle is found, make the whole card as draghandle
+        if (!this.$element.find('.oe_kanban_draghandle').length) {
+            this.$element.children(':first').addClass('oe_kanban_draghandle');
+        }
+
         this.$element.find('.oe_kanban_action').click(function(ev) {
             ev.preventDefault();
             var $action = $(this),

From 7569e3fc502e4f290ca0b0fc5ac4eae239921e71 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 22 May 2012 16:47:46 +0200
Subject: [PATCH 369/452] [IMP] adding a class

bzr revid: fp@tinyerp.com-20120522144746-4efqq0bikl3k4ngk
---
 openerp/addons/base/res/res_partner_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 842a5dcb15a..efc13262a1b 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -502,7 +502,7 @@
                                             <table class="oe_kanban_table">
                                                 <tr>
                                                     <td class="oe_kanban_title1" align="left" valign="middle">
-                                                        <h4><a type="edit"><field name="name"/></a>
+                                                        <h4 class="oe_partner_heading"><a type="edit"><field name="name"/></a>
                                                             <div t-if="record.parent_id.raw_value"><field name="parent_id"/></div>
                                                         </h4>
                                                             <i><div t-if="record.contact_address.raw_value"><field name="contact_address"/><br/></div>
@@ -545,7 +545,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,kanban</field>
+            <field name="view_mode">kanban,tree,form</field>
             <field name="context">{"search_default_customer":1}</field>
             <field name="search_view_id" ref="view_res_partner_filter"/>
             <field name="help">A customer is an entity you do business with, like a company or an organization. A customer can have several contacts or addresses which are the people working for this company. You can use the history tab, to follow all transactions related to a customer: sales order, emails, opportunities, claims, etc. If you use the email gateway, the Outlook or the Thunderbird plugin, don't forget to register emails to each contact so that the gateway will automatically attach incoming emails to the right partner.</field>
@@ -586,6 +586,7 @@
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
             <field name="domain">[]</field>
+            <field name="view_mode">kanban,tree,form</field>
             <field name="context">{'search_default_supplier': 1,'default_customer': 0,'default_supplier': 1}</field>
             <field name="filter" eval="True"/>
             <field name="help">You can access all information regarding your suppliers from the supplier form: accounting data, history of emails, meetings, purchases, etc. You can uncheck the 'Suppliers' filter button in order to search in all your partners, including customers and prospects.</field>

From a54a3d73c58cbed96c07b30fab61a41db2c57376 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 May 2012 16:48:27 +0200
Subject: [PATCH 370/452] [FIX] incorrect initialization of the DataGroup
 leading to a read_group being performed with nonsensical arguments, blowing
 up the listview on page reload

bzr revid: xmo@openerp.com-20120522144827-2ge9063bz8duwnnf
---
 addons/web/static/src/js/view_list.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index e1d2e4326cc..67c8ce0239e 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -69,8 +69,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
             this.groups.datagroup = new instance.web.DataGroup(
                 this, this.model,
                 dataset.get_domain(),
-                dataset.get_context(),
-                {});
+                dataset.get_context());
             this.groups.datagroup.sort = this.dataset._sort;
         }
 

From eb694a09eccacd54e731eaa2a544c427c16ad483 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 22 May 2012 16:50:05 +0200
Subject: [PATCH 371/452] [IMP] fix on inherited views

bzr revid: fp@tinyerp.com-20120522145005-4pgkcof0ldldtnxg
---
 addons/crm/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index b169f92680d..fe880d29bd3 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -71,7 +71,7 @@
                     <field name="opportunity_count"/>
                     <field name="meeting_count"/>
                 </field>
-                 <xpath expr="//div[@class='oe_partner_desc']//h4[@class='oe_partner_heading']" position="after">
+                 <xpath expr="//h4[@class='oe_partner_heading']" position="after">
                         <a name="%(act_res_partner_2_opportunity)d" type="action">
                             <t t-if="record.opportunity_count.value">Opportunities(<t t-esc="record.opportunity_count.value"/>)</t>
                         </a>

From 8d588acf49b3d5444b33b77310c0d34fb5b241d5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 22 May 2012 16:54:33 +0200
Subject: [PATCH 372/452] [IMP] views bugfixes

bzr revid: fp@tinyerp.com-20120522145433-ajupwx0tpgyp5il4
---
 addons/crm/res_partner.py  | 4 ++--
 addons/sale/res_partner.py | 1 +
 addons/stock/product.py    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index 86619aa9e77..fb33e08d386 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -37,9 +37,9 @@ class res_partner(osv.osv):
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
-            'Leads and Opportunities', domain="[('state','in', ('draft','open','pending'))]"),
+            'Leads and Opportunities', domain=[('state','in', ('draft','open','pending'))]),
         'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
-            'Meetings', domain="[('date','>=', time.strftime('%Y-%m-%d 00:00:00'))]"),
+            'Meetings'),
         'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
             'Phonecalls'),
         'opportunity_count': fields.function(_opportunity_meeting_count, string="Opportunity", type='integer', multi='opp_meet'),
diff --git a/addons/sale/res_partner.py b/addons/sale/res_partner.py
index 2122f88af5b..84c1a9c96ad 100644
--- a/addons/sale/res_partner.py
+++ b/addons/sale/res_partner.py
@@ -33,5 +33,6 @@ class res_partner(osv.osv):
 
     _columns = {
         'sale_order_count': fields.function(_sale_order_count, string='# of Sales Order', type='integer'),
+        'sale_order_ids': fields.one2many('sale.order','partner_id','Sales Order')
     }
 
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 426ae9cd9a4..62fdbb24ca2 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -36,7 +36,7 @@ class product_product(osv.osv):
         ], ['product_id'], ['product_id'])
         for move in moves:
             product_id = move['product_id'][0]
-            res[product_id][reception_count] = move['product_id_count']
+            res[product_id]['reception_count'] = move['product_id_count']
         moves = move_pool.read_group(cr, uid, [
             ('product_id', 'in', ids),
             ('picking_id.type', '=', 'out'),
@@ -44,7 +44,7 @@ class product_product(osv.osv):
         ], ['product_id'], ['product_id'])
         for move in moves:
             product_id = move['product_id'][0]
-            res[product_id][reception_count] = move['product_id_count']
+            res[product_id]['reception_count'] = move['product_id_count']
         return res
 
     def get_product_accounts(self, cr, uid, product_id, context=None):

From 84d7f79b9745330e0b9762bcb13bcc6185289134 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 22 May 2012 16:56:54 +0200
Subject: [PATCH 373/452] [IMP] view hr

bzr revid: fp@tinyerp.com-20120522145654-su2hud7tjoglo0bl
---
 addons/hr_holidays/hr_holidays_view.xml | 6 +++---
 addons/sale/sale_view.xml               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 5a93d50afab..9721c725650 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -526,13 +526,13 @@
                 <xpath expr="//templates" position="before">
                     <field name="current_leave_state"/>
                     <field name="last_login"/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
+                    <field name="leave_date_from"/>
+                    <field name="leave_date_to"/>
                 </xpath>
                 <xpath expr="//div[@class='oe_employee_details']/ul/li" position="before">
                     <li t-if="record.current_leave_id.raw_value || record.last_login.raw_value">
                         <span t-if="record.current_leave_id.raw_value" t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_color_3':'oe_kanban_color_2'">
-                            <span class="oe_kanban_button" style="font-size: 100%%" t-att-title="record.date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.date_to.raw_value.toString('ddd dS MMM')" >
+                            <span class="oe_kanban_button" style="font-size: 100%%" t-att-title="record.leave_date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.leave_date_to.raw_value.toString('ddd dS MMM')" >
                                 <field name="current_leave_id"/>
                             </span>
                         </span>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3d6549ff614..c8f519d4c37 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,6 +1,6 @@
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager" action="base.action_partner_form"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager"/>
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 
 

From 882f6dc58e0901f16c952799985e88c1f8d75dcd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 22 May 2012 17:43:00 +0200
Subject: [PATCH 374/452] [IMP] remove empty line

bzr revid: fp@tinyerp.com-20120522154300-qxdgor102vkropbq
---
 addons/project/project_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 278bd50f45a..b0bb8a2db24 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -171,7 +171,6 @@
             view_mode="kanban,tree,form,calendar,graph"
             view_type="form"/>
 
-        
         <record model="ir.ui.view" id="view_project_kanban">
             <field name="name">project.project.kanban</field>
             <field name="model">project.project</field>

From 9c0aa9b3d2be333ea14fdbc1b45cdb8398ac99f9 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 22 May 2012 17:57:02 +0200
Subject: [PATCH 375/452] [IMP] Improved kanban lead view

bzr revid: fme@openerp.com-20120522155702-itya61830sqpfic3
---
 addons/crm/crm_lead_view.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9061bc3e160..c2c4aa7756f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -251,12 +251,11 @@
                         </ul>
                     </t>
                     <t t-name="kanban-box">
-
-                        <div class="oe_kanban_card oe_kanban_draghandle">
+                        <div class="oe_kanban_card">
                             <a class="oe_kanban_menuaction oe_i">B</a>
-                            <ul class="oe_kanban_menu" style="display:none;">
-                                <li>item1</li>
-                                <li>item2</li>
+                            <ul class="oe_kanban_menu">
+                                <li><a type="edit" >Edit...</a></li>
+                                <li><a type="delete">Delete</a></li>
                             </ul>
                             <div class="oe_kanban_content">
                                 <h3>
@@ -265,7 +264,6 @@
                                         - <t t-esc="Math.round(record.planned_revenue.value)"/>
                                         <field name="company_currency"/>
                                     </t>
-
                                 </h3>
                                 <div>
                                     <b> <field name="partner_address_name"/> </b>

From 5ee2a8abde8739f8c0b72846f3c9634c1b0b48c4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 22 May 2012 17:58:15 +0200
Subject: [PATCH 376/452] [WIP] Kanban project cleanup

bzr revid: fme@openerp.com-20120522155815-y23ps3bs32i9vqlu
---
 addons/project/__openerp__.py                 |   2 +-
 addons/project/project_view.xml               |  74 +++--
 addons/project/static/src/css/project.css     | 257 ++----------------
 addons/project/static/src/js/dropdown.js      |  92 -------
 addons/project/static/src/js/project.js       |  53 +---
 addons/project_issue/project_issue_view.xml   |   6 +-
 .../project_long_term_view.xml                |   6 +-
 .../project_timesheet_view.xml                |  28 +-
 8 files changed, 89 insertions(+), 429 deletions(-)
 delete mode 100644 addons/project/static/src/js/dropdown.js

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 68c85ffb836..ade29be1445 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -71,7 +71,7 @@ Dashboard for project members that includes:
     'auto_install': False,
     'application': True,
     'css': ['static/src/css/project.css'],
-    'js': ['static/src/js/dropdown.js','static/src/js/project.js'],
+    'js': ['static/src/js/project.js'],
     'certificate': '0075116868317',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 61a445d4c59..026b2be0430 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -188,13 +188,12 @@
                     <field name="task_count"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div class="project_vignettes">
-                                <li t-attf-class="#{kanban_color(record.color.raw_value)} oe_project_kanban_vignette" id="oe_project_kanban_vignette">
-                                    <a href="#" class="oe_project_kanban_action dropdown-toggle"><span class="oe_i">B</span></a>
-                                    <ul class="dropdown-menu">
-                                      <li ><a type="edit" >Edit...</a></li>
-                                      <li ><a type="delete">Delete</a></li>
-                                      <li>
+                            <div t-attf-class="#{kanban_color(record.color.raw_value)} oe_kanban_card">
+                                <a class="oe_kanban_menuaction oe_i">B</a>
+                                <ul class="oe_kanban_menu">
+                                    <li><a type="edit" >Edit...</a></li>
+                                    <li><a type="delete">Delete</a></li>
+                                    <li>
                                         <ul class="color-chooser">
                                             <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_0 square"></span></a></li>
                                             <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_1 square"></span></a></li>
@@ -203,46 +202,37 @@
                                             <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_4 square"></span></a></li>
                                             <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_5 square"></span></a></li>
                                         </ul>
-                                      </li>
-                                    </ul>
-                                    <h4><t t-esc="record.name.value.substr(0,33)"/><t t-if="record.name.value.length > 33">...</t></h4>
-                                    <div id="list">
-                                        <a t-if="record.use_tasks.raw_value" class="oe_project_buttons"
-                                            id="1" name="%(act_project_project_2_project_task_all)d" type="action">
+                                    </li>
+                                </ul>
+                                <div class="oe_kanban_content">
+                                    <h3>
+                                        <!--<t t-esc="record.name.value.substr(0,33)"/><t t-if="record.name.value.length > 33">...</t>-->
+                                        <field name="name"/>
+                                    </h3>
+
+                                    <div class="oe_kanban_project_list">
+                                        <a t-if="record.use_tasks.raw_value"
+                                            name="%(act_project_project_2_project_task_all)d" type="action">
                                             Tasks(<field name="task_count"/>)</a>
                                     </div>
-                                    <br/>
-                                    <button class="click_button" name="dummy" type="object">
-                                        <table class="project_fields">
-                                            <tr id="deadline" t-if="record.date.raw_value">
-                                                <th align="left">Deadline</th>
-                                                <td align="left"><field name="date"/></td>
-                                            </tr>
-                                            <tr>
-                                                <th align="left" width="70px">Progress</th>
-                                                <td align="left">
-                                                    <t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                        <br/>
+
+                                    <div class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">
+                                        <div>Deadline</div>
+                                        <div><field name="date"/></div>
+                                    </div>
+
+                                    <div class="oe_kanban_project_fields oe_kanban_project_progress">
+                                        <div>Progress</div>
+                                        <div><t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></div>
+                                    </div>
+
+                                    <div class="oe_kanban_project_avatars">
                                         <t t-foreach="record.members.raw_value" t-as="member">
-                                            <img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-id="member" class="project_avatar"/>
+                                            <img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-data-member_id="member"/>
                                         </t>
-                                    </button>
-                                </li>
+                                    </div>
+                                </div>
                             </div>
-                            <script type="text/javascript">
-                                //open dropdwon when click on the icon.
-                                $('.dropdown-toggle').dropdown();
-                                
-                                //show and hide the dropdown icon when mouseover and mouseour.
-                                $('.oe_project_kanban_vignette').mouseover(function() {
-                                    return $(this).find('.oe_project_kanban_action').show();
-                                    }).mouseout(function() {
-                                    return $(this).find('.oe_project_kanban_action').hide();
-                                });
-                            </script>
                         </t>
                     </templates>
                 </kanban>
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 7a354d5a801..b429d4bf6ee 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,246 +1,39 @@
-.project_fields {
-    margin-top: 1px;
-    margin-bottom: 1px;
-    font-size: 11px;
-    padding-left: 0px;
+.oe_kanban_project_list {
+    margin: 8px 0 8px 0;
 }
-.project_fields td {
-    border: none;
-    padding: 2px 0 2px 8px;
+.oe_kanban_project_list a:not(:first-child):before {
+    content: ' - ';
 }
-.project_fields th {
-    padding: 0;
+.oe_kanban_project_fields div {
+    display: inline-block;
+    width: 49%;
+    box-sizing: border-box;
+    padding: 2px 0 2px 0;
+}
+.oe_kanban_project_fields div:nth-child(odd) {
     border-right: 1px solid #dddddd;
     vertical-align: top;
-    margin-right: 8px;
+    padding-right: 8px;
 }
-.project_vignettes{
-    padding: 4px !important;
+.oe_kanban_project_fields div:nth-child(even) {
+    padding-left: 8px;
+    color: #888888;
 }
-.project_vignettes li {
-    float: left;
+
+.oe_kanban_project_avatars {
+    padding-top: 1em;
+    text-align: center;
+    margin-top: 8px;
 }
-.project_vignettes .project_avatar {
+.oe_kanban_project_avatars img {
     width: 30px;
     height: 30px;
     padding-left: 0px;
-}
-.project_vignettes .project_fields {
-    width: 100%;
-}
-.project_vignettes .project_fields th {
-    width: 120px;
-    font-weight: normal;
-}
-.project_vignettes .project_fields td {
-    color: #888888;
-}
-.project_vignettes h4 a {
-    color: #4c4c4c;
-}
-.project_vignettes > li h4 {
-    margin-bottom: 2px;
-    padding-left: 2px;
-}
-.oe_project_buttons {
-    padding: 2px 2px !important;
-    background: none !important;
-    background-color: transparent !important;
-    border: hidden !important;
-    color: #8A89BA !important;
-}
-.oe_project_buttons:hover {
-   cursor: pointer;
-   color: #0000FF;
-}
-.project_avatar {
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-}
-.click_button {
-    background: none !important;
-    background-color: transparent !important;
-    border: hidden !important;
-    min-height: 155px;
-    min-width: 265px;
-    border: hidden;
-    /*margin-left: 6px !important;*/
-    margin-top: 3px !important;
-    text-align:  left;
-    vertical-align:  super;
-    font-size: 11px;
-    -webkit-box-align:  baseline;
-}
-
-.click_button:hover {
-    cursor: default !important;
-}
-.dropdown-menu {
-    display: none;
-    position: absolute;
-}
-.dropdown {
-    position: relative;
-}
-.dropdown-toggle:after {
-    width: 0;
-    height: 0;
-    display: inline-block;
-    content: "&darr";
-    text-indent: -99999px;
-    vertical-align: top;
-    margin-top: 8px;
-    margin-left: 4px;
-    border-left: 4px solid transparent;
-    border-right: 4px solid transparent;
-    border-top: 4px solid white;
-    filter: alpha(opacity=50);
-    -khtml-opacity: 0.5;
-    -moz-opacity: 0.5;
-    opacity: 0.5;
-}
-.oe_project_kanban_vignette .dropdown-menu .color-chooser {
-    padding: 0 3px;
-}
-.oe_project_kanban_vignette .dropdown-menu .color-chooser li {
-    float: left;
-}
-.oe_project_kanban_vignette .dropdown-menu .color-chooser li a {
-    padding: 2px;
-}
-a.oe_project_kanban_action {
-    position: absolute;
-    right: 0;
-    display: none;
-}
-a.oe_project_kanban_action:hover {
-    text-decoration: none;
-}
-a.oe_project_kanban_action .oe_i {
-    color: #4c4c4c;
-}
-
-.square {
-    display: inline-block;
-    width: 18px;
-    height: 18px;
-    border:1px solid grey;
-}
-.oe_kanban_color_0 {
-    background: white;
-}
-.oe_kanban_color_1 {
-    background: #B1DCFE;
-}
-.oe_kanban_color_2 {
-    background: #FF8E8E;
-}
-.oe_kanban_color_3 {
-    background: khaki;
-}
-.oe_kanban_color_4 {
-    background: thistle;
-}
-.oe_kanban_color_5 {
-    background: orange;
-}
-
-.open {
-    display: block;
-}
-.open .dropdown-menu {
-    display: block;
-}
-
-a.oe_project_kanban_action {
-    position: absolute;
-    right: 0;
-}
-a.oe_project_kanban_action:hover {
-    text-decoration: none;
-}
-a.oe_project_kanban_action .eo_i {
-    color: #4c4c4c;
-}
-
-.oe_project_kanban_vignette {
-    position: relative;
-    min-height: 50px;
-    /*background: white;*/
-    border: 1px solid #d8d8d8;
-    border-bottom-color: #b9b9b9;
-    padding: 6px;
-    margin: 6px 0;
-    display: inline-block;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
-    border-radius: 4px; 
-}
-.oe_project_kanban_vignette:last-child {
-    margin-bottom: 0;
-}
-.oe_project_kanban_vignette:hover {
-    -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
-    -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
-    -box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
-}
-.oe_project_kanban_vignette h4 {
-    margin: 0 0 2px;
+    border-radius: 4px;
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+    -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
 
-.oe_project_kanban_vignette .dropdown-menu {
-    top: 30px;
-    right: -140px;
-    padding: 4px;
-    border: 1px solid #afafb6;
-    width: 160px;
-    overflow-x: hidden;
-    z-index: 900;
-    background: white;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-    -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-}
-.oe_project_kanban_vignette .dropdown-menu p {
-    margin-left: 12px;
-}
-.oe_project_kanban_vignette .dropdown-menu li {
-    float: none;
-    display: block;
-    background-color: none;
-}
-.oe_project_kanban_vignette .dropdown-menu li a {
-    display: block;
-    padding: 3px 6px;
-    clear: both;
-    font-weight: normal;
-    line-height: 14px;
-    color: #4c4c4c;
-    text-decoration: none;
-}
-.oe_project_kanban_vignette .dropdown-menu li a:hover {
-    background: #f0f0fa;
-    background: -moz-linear-gradient(#f0f0fa, #eeeef6);
-    background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
-    background: -webkit-linear-gradient(#f0f0fa, #eeeef6);
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-    -box-shadow: none;
-}
-
-.oe_project_kanban_vignette .dropdown-menu .color-chooser {
-    padding: 0 3px;
-}
-.oe_project_kanban_vignette .dropdown-menu .color-chooser li {
-    float: left;
-}
-.oe_project_kanban_vignette .dropdown-menu .color-chooser li a {
-    padding: 2px;
-}
diff --git a/addons/project/static/src/js/dropdown.js b/addons/project/static/src/js/dropdown.js
deleted file mode 100644
index 54b61c5e9d0..00000000000
--- a/addons/project/static/src/js/dropdown.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ============================================================
- * bootstrap-dropdown.js v2.0.2
- * http://twitter.github.com/bootstrap/javascript.html#dropdowns
- * ============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function( $ ){
-
-  "use strict"
-
- /* DROPDOWN CLASS DEFINITION
-  * ========================= */
-
-  var toggle = '[data-toggle="dropdown"]'
-    , Dropdown = function ( element ) {
-        var $el = $(element).on('click.dropdown.data-api', this.toggle)
-        $('html').on('click.dropdown.data-api', function () {
-          $el.parent().removeClass('open')
-        })
-      }
-
-  Dropdown.prototype = {
-
-    constructor: Dropdown
-
-  , toggle: function ( e ) {
-      var $this = $(this)
-        , selector = $this.attr('data-target')
-        , $parent
-        , isActive
-
-      if (!selector) {
-        selector = $this.attr('href')
-        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-      }
-
-      $parent = $(selector)
-      $parent.length || ($parent = $this.parent())
-
-      isActive = $parent.hasClass('open')
-
-      clearMenus()
-      !isActive && $parent.toggleClass('open')
-
-      return false
-    }
-
-  }
-
-  function clearMenus() {
-    $(toggle).parent().removeClass('open')
-  }
-
-
-  /* DROPDOWN PLUGIN DEFINITION
-   * ========================== */
-
-  $.fn.dropdown = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('dropdown')
-      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  $.fn.dropdown.Constructor = Dropdown
-
-
-  /* APPLY TO STANDARD DROPDOWN ELEMENTS
-   * =================================== */
-
-  $(function () {
-    $('html').on('click.dropdown.data-api', clearMenus)
-    $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-  })
-
-}( window.jQuery );
\ No newline at end of file
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index 8d806fb0605..d73e49142a1 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -1,46 +1,23 @@
 openerp.project = function(openerp) {
-    openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({
-        bind_events: function() {
+    openerp.web_kanban.KanbanView.include({
+        on_groups_started: function() {
             var self = this;
-            self._super();
-            if (this.view.dataset.model == 'project.project') {
-                /*set avatar title for members.
-                In many2many fields, returns only list of ids.
-                we can implement return value of m2m fields like [(1,"Adminstration"),...].
+            self._super.apply(this, arguments);
+            if (this.dataset.model === 'project.project') {
+                /* Set avatar title for members.
+                   In many2many fields, returns only list of ids.
+                   we can implement return value of m2m fields like [(1,"Adminstration"),...].
                 */
-                _.each($(this.$element).find('.project_avatar'), function(avatar) {
-                    var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.id]]);
-                    dataset.read_slice(['name']).then(function(result) {
-                        avatar.setAttribute("title",result[0].name);
+                var members_ids = [];
+                this.$element.find('.project_avatar').each(function() {
+                    members_ids.push($(this).data('member_id'));
+                });
+                var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id', 'in', _.uniq(members_ids)]]);
+                dataset.read_slice(['id', 'name']).then(function(result) {
+                    _.each(result, function(v, k) {
+                        self.$element.find('.project_avatar[data-member_id=' + v.id + ']').attr('title', v.name).tipsy();
                     });
                 });
-
-                // set sequence like Tasks,Issues,Timesheets and Phases
-                var my_list = $("#list a");
-                my_list.sort(function (a, b) {
-                    var aValue = parseInt(a.id, 10);
-                    var bValue = parseInt(b.id, 10);
-                    return aValue == bValue ? 0 : aValue < bValue ? -1 : 1;
-                });
-                $('#list').replaceWith(my_list);
-
-                // when vignette is clicked, it opens the first action in sequence
-                if (my_list.length !== 0) {
-                    var click_button = $(this.$element).find('.click_button');
-                    click_button.attr('data-name', my_list[0].getAttribute('data-name'));
-                    click_button.attr('data-type', "action");
-                }
-
-                /* set background color.
-                  we can do other way to implement new widget.
-                  because we need to rpc call for that.
-                */
-                this.$element.find('.bgcolor').click(function() {
-                    var color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16), 10);
-                    var color_class = $(this).find('span').attr('class').split(' ')[0];
-                    $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(color_class + ' oe_project_kanban_vignette');
-                    self.view.dataset.write(parseInt(this.id, 10), {color:color});
-                });
             }
         }
     });
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 35a256be17e..cca73cbd382 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -373,9 +373,9 @@
                     <field name="use_issues"/>
                     <field name="issue_count" invisible="1"/>
                 </field>
-                <xpath expr="//div[@id='list']" position="inside">
-                    <a t-if="record.use_issues.raw_value" class="oe_project_buttons"
-                        id="2" name="%(act_project_project_2_project_issue_all)d" type="action">
+                <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
+                    <a t-if="record.use_issues.raw_value"
+                        name="%(act_project_project_2_project_issue_all)d" type="action">
                         Issues(<field name="issue_count"/>)</a>
                 </xpath>
             </field>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7e1b58745a6..2b2bda6bc43 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -129,9 +129,9 @@
                     <field name="use_phases"/>
                     <field name="phase_count"/>
                 </field>
-                <xpath expr="//div[@id='list']" position="inside">
-                    <a t-if="record.use_phases.raw_value" class="oe_project_buttons"
-                        id="4" name="%(act_project_phases)d" type="action">Phases(<field name="phase_count"/>)</a>
+                <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
+                    <a t-if="record.use_phases.raw_value"
+                        name="%(act_project_phases)d" type="action">Phases(<field name="phase_count"/>)</a>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index f0b2e2abc20..0a485470bc7 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -36,25 +36,17 @@
                     <field name="currency_id"/>
                     <field name="partner_id"/>
                 </field>
-                <xpath expr="//div[@id='list']" position="inside">
-                    <a t-if="record.use_timesheets.raw_value" class="oe_project_buttons"
-                        id="3" name="open_timesheets" type="object">Timesheets(<field name="timesheet_count"/>)</a>
+                <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
+                    <a t-if="record.use_timesheets.raw_value"
+                        name="open_timesheets" type="object">Timesheets(<field name="timesheet_count"/>)</a>
                 </xpath>
-                <xpath expr="//tr[@id='deadline']" position="before">
-                    <t t-if="record.partner_id.raw_value">
-                        <tr>
-                            <th align="left">Amount to invoice</th>
-                            <td align="left">
-                                <field name="amount_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/>
-                            </td>
-                        </tr>
-                        <tr>
-                            <th align="left">Time to Invoice</th>
-                            <td align="left">
-                                <field name="time_to_invoice"/> <field name="company_uom_id"/>
-                            </td>
-                        </tr>
-                    </t>
+                <xpath expr="//div[contains(@class, 'oe_kanban_project_deadline')]" position="before">
+                    <div class="oe_kanban_project_fields oe_kanban_project_invoice" t-if="record.partner_id.raw_value">
+                        <div>Amount to invoice</div>
+                        <div><field name="amount_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/></div>
+                        <div>Time to Invoice</div>
+                        <div><field name="time_to_invoice"/> <field name="company_uom_id"/></div>
+                    </div>
                 </xpath>
             </field>
         </record>

From 64240e7b0a97741e5f0fda7e85f7806f4ef85eff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 22 May 2012 17:59:03 +0200
Subject: [PATCH 377/452] [FIX] corelib: JsonRPC was missing a get_url() method

bzr revid: fva@openerp.com-20120522155903-i2oz7qkmn8i4vtt8
---
 addons/web/static/src/js/corelib.js   | 3 +++
 addons/web/static/src/js/coresetup.js | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 93796ab4282..a7ef3eb9b23 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -1347,6 +1347,9 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
     },
     on_rpc_error: function(error) {
     },
+    get_url: function (file) {
+        return this.prefix + file;
+    },
 });
 
 }
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 5a8a2b50722..37e80e44d35 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -284,9 +284,6 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
             }
         }
     },
-    get_url: function (file) {
-        return this.prefix + file;
-    },
     /**
      * Cooperative file download implementation, for ajaxy APIs.
      *

From 7bfa84837251ca8f2248d818b7d2bea3931017c2 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 22 May 2012 18:11:33 +0200
Subject: [PATCH 378/452] [IMP] chrome webclient and login refactoring

bzr revid: al@openerp.com-20120522161133-kjhhbl636evacnau
---
 addons/web/static/src/js/chrome.js | 82 +++++++++++++-----------------
 1 file changed, 36 insertions(+), 46 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 47983ed322d..a16b8e22edc 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -521,14 +521,7 @@ instance.web.Login =  instance.web.Widget.extend({
     do_login: function (db, login, password) {
         var self = this;
         this.$element.removeClass('oe_login_invalid');
-        this.session.on_session_invalid.add({
-            callback: function () {
-                self.$element.addClass("oe_login_invalid");
-            },
-            unique: true
-        });
         this.session.session_authenticate(db, login, password).then(function() {
-            self.$element.removeClass("oe_login_invalid");
             if (self.has_local_storage) {
                 if(self.remember_credentials) {
                     localStorage.setItem('last_db_login_success', db);
@@ -542,6 +535,9 @@ instance.web.Login =  instance.web.Widget.extend({
                     localStorage.setItem('last_password_login_success', '');
                 }
             }
+            self.trigger("login");
+        },function () {
+            self.$element.addClass("oe_login_invalid");
         });
     }
 });
@@ -849,47 +845,53 @@ instance.web.WebClient = instance.web.Widget.extend({
         var self = this;
         this.$element.addClass("openerp openerp-web-client-container");
         if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) {
-            this.$element.addClass("kitten-mode-activated");
-            this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) {
+            self.$element.addClass("kitten-mode-activated");
+            self.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) {
                 self.$element.toggleClass('clark-gable');
             });
         }
         this.session.session_bind().then(function() {
+            self.destroy_content();
+            self.show_common();
             if (!self.session.session_is_valid()) {
                 self.show_login();
-            }
-        });
-        this.session.on_session_valid.add(function() {
-            self.show_application();
-
-            if(self.action_manager)
-                self.action_manager.destroy();
-            self.action_manager = new instance.web.ActionManager(self);
-            self.action_manager.appendTo(self.$element.find('.oe_application'));
-            self.bind_hashchange();
-            var version_label = _t("OpenERP - Unsupported/Community Version");
-            if (!self.session.openerp_entreprise) {
-                self.$element.find('.oe_footer_powered').append(_.str.sprintf('<span> - <a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank">%s</a></span>', version_label));
-                document.title = version_label;
+            } else {
+                self.show_application();
             }
         });
         this.$element.on('mouseenter', '.oe_systray > div:not([data-tipsy=true])', function() {
             $(this).attr('data-tipsy', 'true').tipsy().trigger('mouseenter');
         });
     },
+    show_common: function() {
+        var self = this;
+        this.crashmanager =  new instance.web.CrashManager();
+        instance.connection.on_rpc_error.add(this.crashmanager.on_rpc_error);
+        window.onerror = function (message, file, line) {
+            self.crashmanager.on_traceback({
+                type: _t("Client Error"),
+                message: message,
+                data: {debug: file + ':' + line}
+            });
+        };
+        self.notification = new instance.web.Notification(this);
+        self.notification.appendTo(self.$element);
+        self.loading = new instance.web.Loading(self);
+        self.loading.appendTo(self.$element);
+        self.login = new instance.web.Login(self);
+        self.login.on("login",self,self.show_application);
+        self.$table = $(QWeb.render("WebClient", {}));
+        self.action_manager = new instance.web.ActionManager(self);
+        self.action_manager.appendTo(self.$table.find('.oe_application'));
+    },
     show_login: function() {
         var self = this;
-        this.destroy_content();
-        this.show_common();
-        self.login = new instance.web.Login(self);
         self.login.appendTo(self.$element);
     },
     show_application: function() {
         var self = this;
-        this.destroy_content();
-        this.show_common();
-        self.$table = $(QWeb.render("WebClient", {}));
         self.$element.append(self.$table);
+        self.login.$element.hide();
         self.menu = new instance.web.Menu(self);
         self.menu.replace(this.$element.find('.oe_menu_placeholder'));
         self.menu.on('menu_click', this, this.on_menu_action);
@@ -898,24 +900,12 @@ instance.web.WebClient = instance.web.Widget.extend({
         self.user_menu.on_menu_logout.add(this.proxy('on_logout'));
         self.user_menu.on_action.add(this.proxy('on_menu_action'));
         self.user_menu.do_update();
-    },
-    show_common: function() {
-        var self = this;
-        if (!this.crashmanager) {
-            this.crashmanager =  new instance.web.CrashManager();
-            instance.connection.on_rpc_error.add(this.crashmanager.on_rpc_error);
-            window.onerror = function (message, file, line) {
-                self.crashmanager.on_traceback({
-                    type: _t("Client Error"),
-                    message: message,
-                    data: {debug: file + ':' + line}
-                });
-            };
+        self.bind_hashchange();
+        var version_label = _t("OpenERP - Unsupported/Community Version");
+        if (!self.session.openerp_entreprise) {
+            self.$element.find('.oe_footer_powered').append(_.str.sprintf('<span> - <a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank">%s</a></span>', version_label));
+            document.title = version_label;
         }
-        this.notification = new instance.web.Notification(this);
-        this.notification.appendTo(this.$element);
-        this.loading = new instance.web.Loading(this);
-        this.loading.appendTo(this.$element);
     },
     destroy_content: function() {
         _.each(_.clone(this.getChildren()), function(el) {

From af78ec90eb9124f6ff4ecfb5bd9c95143978a177 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 22 May 2012 18:20:54 +0200
Subject: [PATCH 379/452] [IMP] login fadeout on sucess

bzr revid: al@openerp.com-20120522162054-yul76usv01918qqj
---
 addons/web/static/src/js/chrome.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index a16b8e22edc..eb2dcad8624 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -535,6 +535,7 @@ instance.web.Login =  instance.web.Widget.extend({
                     localStorage.setItem('last_password_login_success', '');
                 }
             }
+            self.$(".oe_login_pane").fadeOut("slow");
             self.trigger("login");
         },function () {
             self.$element.addClass("oe_login_invalid");

From 58b4853c7ec150effd3c982102fea8e8397e1969 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 22 May 2012 18:28:09 +0200
Subject: [PATCH 380/452] [FIX] bad merge

bzr revid: fp@tinyerp.com-20120522162809-ip04ohnzpz39omzz
---
 addons/marketing_campaign/marketing_campaign.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 3e19242e807..71e680cd2bc 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -277,14 +277,8 @@ class marketing_campaign_segment(osv.osv):
         'state': fields.selection([('draft', 'New'),
                                    ('cancelled', 'Cancelled'),
                                    ('running', 'Running'),
-<<<<<<< TREE
                                    ('done', 'Done')],
-                                   'State',),
-=======
-                                   ('done', 'Done'),
-                                   ('cancelled', 'Cancelled')],
                                    'Status',),
->>>>>>> MERGE-SOURCE
         'date_run': fields.datetime('Launch Date', help="Initial start date of this segment."),
         'date_done': fields.datetime('End Date', help="Date this segment was last closed or cancelled."),
         'date_next_sync': fields.function(_get_next_sync, string='Next Synchronization', type='datetime', help="Next time the synchronization job is scheduled to run automatically"),

From 3e8106fb3c2f01584b6895725947909683f2bbc5 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 22 May 2012 19:24:50 +0200
Subject: [PATCH 381/452] restyling of kanban vignette

bzr revid: mit@openerp.com-20120522172450-865u5cghip3v97zn
---
 addons/web/static/src/css/base.css           |  2 +-
 addons/web_kanban/static/src/css/kanban.sass | 22 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 22559ca8aba..72b264428fd 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 0c1cabd8e05..59db3fc8743 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -113,6 +113,28 @@
         float: right
     // }}}
     // KanbanRecords {{{
+    .oe_kanban_vignette
+        padding: 8px
+        min-height: 100px
+    .oe_kanban_image
+        display: inline-block
+        vertical-align: top
+        width: 64px
+        height: 64px
+        text-align: center
+        overflow: hidden
+        @include radius(3px)
+        @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.4))
+    .oe_kanban_details
+        display: inline-block
+        vertical-align: top
+        width: 240px
+        font-size: 13px
+        padding: 0 5px
+        color: #4c4c4c
+        min-height: 120px
+        h4
+            margin: 0 0 4px 0
     .oe_kanban_record
         position: relative
         display: block

From 42b96c577ac353fb32ccc19e53d835bd5a829e0f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 22 May 2012 20:09:36 +0200
Subject: [PATCH 382/452] [FIX] bad merge

bzr revid: fp@openerp.com-20120522180936-tzzmbc7ypfd471o3
---
 addons/marketing_campaign/marketing_campaign.py | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 71e680cd2bc..1e87925bdf3 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -115,15 +115,9 @@ With Manual Confirmation - the campaigns runs normally, but the user has to vali
 Normal - the campaign runs normally and automatically sends all emails and reports (be very careful with this mode, you're live!)"""),
         'state': fields.selection([('draft', 'New'),
                                    ('running', 'Running'),
-<<<<<<< TREE
                                    ('cancelled', 'Cancelled'),
                                    ('done', 'Done')],
-                                   'State',),
-=======
-                                   ('done', 'Done'),
-                                   ('cancelled', 'Cancelled'),],
                                    'Status',),
->>>>>>> MERGE-SOURCE
         'activity_ids': fields.one2many('marketing.campaign.activity',
                                        'campaign_id', 'Activities'),
         'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting.", digits_compute=dp.get_precision('Purchase Price')),
@@ -654,18 +648,11 @@ class marketing_campaign_workitem(osv.osv):
         'res_name': fields.function(_res_name_get, string='Resource Name', fnct_search=_resource_search, type="char", size=64),
         'date': fields.datetime('Execution Date', help='If date is not set, this workitem has to be run manually', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', select=1, readonly=True),
-<<<<<<< TREE
         'state': fields.selection([ ('todo', 'To Do'),
                                     ('cancelled', 'Cancelled'),
                                     ('exception', 'Exception'),
                                     ('done', 'Done'),
-                                   ], 'State', readonly=True),
-=======
-        'state': fields.selection([('todo', 'To Do'),
-                                   ('exception', 'Exception'), ('done', 'Done'),
-                                   ('cancelled', 'Cancelled')], 'Status', readonly=True),
->>>>>>> MERGE-SOURCE
-
+                                   ], 'Status', readonly=True),
         'error_msg' : fields.text('Error Message', readonly=True)
     }
     _defaults = {

From 4a79e569adc63aa370aa4cbd09e1db44180ba2b7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 22 May 2012 21:07:41 +0200
Subject: [PATCH 383/452] [FIX] bug inheritancies of views

bzr revid: fp@openerp.com-20120522190741-x190xwj2sej3jvt8
---
 addons/crm_partner_assign/res_partner_view.xml | 2 +-
 addons/membership/membership_view.xml          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index c7a60083e36..4bd768179a3 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -176,7 +176,7 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="base.view_res_partner_filter"/>
             <field name="arch" type="xml">
-                <filter string="Salesperson" position="after">
+                <filter string="Salesman" position="after">
                     <filter string="Activation" context="{'group_by' : 'activation'}" domain="[]" icon="terp-personal" />
                 </filter>
             </field>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index be18e2a3b50..58672e9a6cc 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -212,7 +212,6 @@
             <field name="act_window_id" ref="action_membership_members"/>
         </record>
 
-        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9" action="action_membership_members"/>
         <menuitem name="Members" parent="menu_membership" id="menu_members" sequence="2" action="action_membership_members"/>
 
         <!-- PARTNERS -->

From 33d750f0ba4be2f138e408e9e1a694c9650f2d8b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 22 May 2012 21:11:40 +0200
Subject: [PATCH 384/452] [IMP] removed action on root menu of feeds

bzr revid: fp@openerp.com-20120522191140-acy0f4kap3ftgwpi
---
 addons/mail/mail_thread_view.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 80f7e639fa2..6bac1a49f2e 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -6,9 +6,6 @@
         <menuitem id="mail_feeds_main" name="Feeds" sequence="0"
             web_icon="static/src/img/feeds.png"
             web_icon_hover="static/src/img/feeds-hover.png" />
-        <record id="mail_feeds_main" model="ir.ui.menu">
-            <field name="action" ref="action_mail_all_feeds"/>
-        </record>
 
         <!-- left-side menu: Feeds !-->
         <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/>

From 1eb004399ccfbfaa47b1b4a28468f1620dceb703 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 23 May 2012 10:46:08 +0530
Subject: [PATCH 385/452] [IMP]module: improve view of module

bzr revid: mma@tinyerp.com-20120523051608-38oi4hgokzei69db
---
 openerp/addons/base/module/module.py       |  2 +-
 openerp/addons/base/module/module_view.xml | 27 ++++++++--------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index e04e4e4a02b..469e83b57c1 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -163,7 +163,7 @@ class module(osv.osv):
     _columns = {
         'name': fields.char("Technical Name", size=128, readonly=True, required=True, select=True),
         'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True),
-        'shortdesc': fields.char('Name', size=256, readonly=True, translate=True),
+        'shortdesc': fields.char('Application Name', size=256, readonly=True, translate=True),
         'description': fields.text("Description", readonly=True, translate=True),
         'author': fields.char("Author", size=128, readonly=True),
         'maintainer': fields.char('Maintainer', size=128, readonly=True),
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 05c6286a49b..f1aca330c0d 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -133,30 +133,21 @@
                 </div>
                 </div>
                 <sheet string="Module" layout="auto">
-                    <group colspan="4" col="6" class="oe_form_header">
+                    <field name="icon" widget='image' nolabel="1" rowspan="6" colspan="1"/>
+                    <group colspan="2" col="2" class="oe_form_group_label_border">
                         <field name="shortdesc"/>
-                        <field name="certificate" />
                         <field name="category_id"/>
+                        <field name="author" select="2"/>
+                        <field name="license"/>
+                        <field name="website" select="2" widget="url" string="Author Website"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Module">
-                            <group colspan="4" col="4">
-                                <group colspan="2" col="2">
-                                    <separator string="Author" colspan="2"/>
-                                    <field name="author" select="2"/>
-                                    <field name="license"/>
-                                    <field name="website" select="2" widget="url" string="Author Website"/>
-                                </group>
-                                <group colspan="2" col="2">
-                                    <separator string="Version" colspan="2"/>
-                                    <field name="installed_version"/>
-                                </group>
-                            </group>
-                            <separator string="Description" colspan="4"/>
-                            <field colspan="4" name="description" select="2" nolabel="1"/>
+                        <page string="Description">
+                            <field colspan="4" name="description" select="2" nolabel="1" rowspan="6"/>
                         </page>
                         <page string="Technical Data">
                             <field name="name"/>
+                            <field name="certificate" />
                             <field name="demo"/>
                             <field name="application"/>
                             <field colspan="4" name="dependencies_id" nolabel="1">
@@ -185,8 +176,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state=='to upgrade' or state=='to install';red:state=='uninstalled';grey:state=='uninstallable';black:state=='installed'" string="Modules">
-                    <field name="name" groups="base.group_no_one"/>
                     <field name="shortdesc"/>
+                    <field name="name" groups="base.group_no_one"/>
                     <field name="author"/>
                     <field name="installed_version"/>
                     <field name="state"/>

From f3436404939e86e933b2aef62cbc6201d1c37d80 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 23 May 2012 11:22:00 +0530
Subject: [PATCH 386/452] [IMP]module: improve name

bzr revid: mma@tinyerp.com-20120523055200-30ho9igzv3jsu8cj
---
 openerp/addons/base/module/module.py       | 2 +-
 openerp/addons/base/module/module_view.xml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 469e83b57c1..e04e4e4a02b 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -163,7 +163,7 @@ class module(osv.osv):
     _columns = {
         'name': fields.char("Technical Name", size=128, readonly=True, required=True, select=True),
         'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True),
-        'shortdesc': fields.char('Application Name', size=256, readonly=True, translate=True),
+        'shortdesc': fields.char('Name', size=256, readonly=True, translate=True),
         'description': fields.text("Description", readonly=True, translate=True),
         'author': fields.char("Author", size=128, readonly=True),
         'maintainer': fields.char('Maintainer', size=128, readonly=True),
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index f1aca330c0d..934d6e2771d 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -135,11 +135,12 @@
                 <sheet string="Module" layout="auto">
                     <field name="icon" widget='image' nolabel="1" rowspan="6" colspan="1"/>
                     <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <field name="shortdesc"/>
+                        <field name="shortdesc" string="Application Name"/>
                         <field name="category_id"/>
                         <field name="author" select="2"/>
                         <field name="license"/>
                         <field name="website" select="2" widget="url" string="Author Website"/>
+                        <field name="installed_version"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Description">

From a6ace4bc79c69df6a413588a08d302d3e2fd480b Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 23 May 2012 11:35:49 +0530
Subject: [PATCH 387/452] [IMP]module: improve statusbar_visible

bzr revid: mma@tinyerp.com-20120523060549-z4rcsnip92mtdox2
---
 openerp/addons/base/module/module_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 934d6e2771d..8c01520142f 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -129,7 +129,7 @@
                     <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" icon="gtk-cancel" type="object"/>
                     <button name="button_install_cancel" states="to install" string="Cancel Install" icon="gtk-cancel" type="object"/>
                 <div class="oe_right">
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="uninstalled,installed"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="uninstalled"/>
                 </div>
                 </div>
                 <sheet string="Module" layout="auto">

From d96f7a232da31d9b5f87ff2d958c6c74f2cd48f1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 23 May 2012 09:32:50 +0200
Subject: [PATCH 388/452] [IMP] better menu for base_synchro

bzr revid: fp@tinyerp.com-20120523073250-ki5aa78heqrtjr1v
---
 addons/base_synchro/base_synchro_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/base_synchro/base_synchro_view.xml b/addons/base_synchro/base_synchro_view.xml
index ab0591269f1..2522d69cf36 100644
--- a/addons/base_synchro/base_synchro_view.xml
+++ b/addons/base_synchro/base_synchro_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-	<menuitem id="synch_config" name="Synchronization" parent="base.menu_config" sequence="60"/>
         <record id="view_transfer_line_tree" model="ir.ui.view">
             <field name="name">base.synchro.obj.line.tree</field>
             <field name="model">base.synchro.obj.line</field>
@@ -197,7 +196,7 @@
             <field name="view_type">form</field>
         </record>
 
-        <menuitem action="action_base_synchro_server_tree" id="synchro_server_tree_menu_id" parent="base_synchro.synch_config"/>
+        <menuitem action="action_base_synchro_server_tree" id="synchro_server_tree_menu_id" parent="base_synchro.next_id_62"/>
 
 <!--view_base_synchro_server end -->
 

From 15e41cb171508c80fbec0f354b9eb75822af4984 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 23 May 2012 10:53:58 +0200
Subject: [PATCH 389/452] [ADD] Added Kanban oe_kanban_auto_height class.

bzr revid: fme@openerp.com-20120523085358-03mfl919f3b2w8yz
---
 addons/web_kanban/static/src/js/kanban.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 93a726d7dce..e6f9b23258f 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -424,18 +424,23 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
         this.$element.data('widget', this);
         this.$records.data('widget', this);
         this.$has_been_started.resolve();
-        this.compute_cards_height();
+        this.compute_cards_auto_height();
         return def;
     },
-    compute_cards_height: function() {
+    compute_cards_auto_height: function() {
+        // oe_kanban_auto_height is an empty class used by the kanban view in order
+        // to normalize height amongst kanban cards. (by group)
         var self = this;
         var min_height = 0;
+        var els = [];
         _.each(this.records, function(r) {
-            min_height = Math.max(min_height, r.$element.outerHeight());
-        });
-        _.each(this.records, function(r) {
-            r.$element.css('min-height', min_height);
+            var $e = r.$element.find('.oe_kanban_auto_height').first();
+            if ($e.length) {
+                els.push($e[0]);
+                min_height = Math.max(min_height, $e.outerHeight());
+            }
         });
+        $(els).css('min-height', min_height);
     },
     destroy: function() {
         this._super();

From 2477e2a7e87fe43a843d9a322623f00c55f223a7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 23 May 2012 10:55:14 +0200
Subject: [PATCH 390/452] [IMP] Kanban project improvements

bzr revid: fme@openerp.com-20120523085514-ku1h80z88xbcg3cs
---
 addons/project/project_view.xml           | 2 +-
 addons/project/static/src/css/project.css | 7 +++++--
 addons/project/static/src/js/project.js   | 6 ++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 026b2be0430..a68a7217275 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -188,7 +188,7 @@
                     <field name="task_count"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="#{kanban_color(record.color.raw_value)} oe_kanban_card">
+                            <div t-attf-class="#{kanban_color(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height">
                                 <a class="oe_kanban_menuaction oe_i">B</a>
                                 <ul class="oe_kanban_menu">
                                     <li><a type="edit" >Edit...</a></li>
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index b429d4bf6ee..1d8f04aea65 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,9 +1,12 @@
+.oe_kanban_project {
+    width: 300px;
+}
 .oe_kanban_project_list {
     margin: 8px 0 8px 0;
 }
-.oe_kanban_project_list a:not(:first-child):before {
+/*.oe_kanban_project_list a:not(:first-child):before {
     content: ' - ';
-}
+}*/
 .oe_kanban_project_fields div {
     display: inline-block;
     width: 49%;
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index d73e49142a1..297aa7184b9 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -9,13 +9,15 @@ openerp.project = function(openerp) {
                    we can implement return value of m2m fields like [(1,"Adminstration"),...].
                 */
                 var members_ids = [];
-                this.$element.find('.project_avatar').each(function() {
+                this.$element.find('.oe_kanban_project_avatars img').each(function() {
                     members_ids.push($(this).data('member_id'));
                 });
                 var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id', 'in', _.uniq(members_ids)]]);
                 dataset.read_slice(['id', 'name']).then(function(result) {
                     _.each(result, function(v, k) {
-                        self.$element.find('.project_avatar[data-member_id=' + v.id + ']').attr('title', v.name).tipsy();
+                        self.$element.find('.oe_kanban_project_avatars img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({
+                            offset: 10
+                        });
                     });
                 });
             }

From 6d452e2319491b2c59ce9504ab0a13cab778993e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 23 May 2012 11:00:58 +0200
Subject: [PATCH 391/452] [IMP] Kanban project title : do not wrap, hide
 overflow with ellipsis

bzr revid: fme@openerp.com-20120523090058-mod53pxt0at65wry
---
 addons/project/static/src/css/project.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 1d8f04aea65..ad57708687e 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,6 +1,11 @@
 .oe_kanban_project {
     width: 300px;
 }
+.oe_kanban_project h3 {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 .oe_kanban_project_list {
     margin: 8px 0 8px 0;
 }

From ab372e3dcf79744856ee658a0a4107b6cec7395c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 23 May 2012 11:51:36 +0200
Subject: [PATCH 392/452] [IMP] google_docs: reviewed code. Overall cleaning of
 methods, better documentation, refactoring, fix of some glitches and so on...

bzr revid: qdp-launchpad@openerp.com-20120523095136-vj1n9ekukdxibzr2
---
 .../google_base_account_view.xml              |   2 +-
 .../wizard/google_login.py                    |  12 +-
 addons/google_docs/google_docs.py             | 136 +++++++++---------
 addons/google_docs/static/src/js/gdocs.js     |  34 +++--
 4 files changed, 99 insertions(+), 85 deletions(-)

diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
index 3f228a6dee8..73dddcdf0f5 100644
--- a/addons/google_base_account/google_base_account_view.xml
+++ b/addons/google_base_account/google_base_account_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//notebook[last()]" position="inside">
                     <page string=" Synchronization ">
-                        <separator string="Google Account" colspan="4" />
+                        <separator string="Google Account" colspan="4"/>
                         <field name="gmail_user"/>
                         <field name="gmail_password" password="True"/>
                     </page>
diff --git a/addons/google_base_account/wizard/google_login.py b/addons/google_base_account/wizard/google_login.py
index ab1c34f1329..b6cb4f185b9 100644
--- a/addons/google_base_account/wizard/google_login.py
+++ b/addons/google_base_account/wizard/google_login.py
@@ -37,18 +37,18 @@ class google_login(osv.osv_memory):
     }
 
     def google_login(self, user, password, type='', context=None):
-        if type == 'group': 
+        if type == 'group':
             gd_client = gdata.contacts.client.ContactsClient(source='OpenERP')
-        if type == 'contact' :   
+        if type == 'contact':
             gd_client = gdata.contacts.service.ContactsService()
         if type == 'calendar':
             gd_client = gdata.calendar.service.CalendarService()
         if type =='docs_client':
             gd_client = gdata.docs.client.DocsClient()
         else:
-            gd_client = gdata.contacts.service.ContactsService()     
-        try:    
-            gd_client.ClientLogin(user, password,gd_client.source)
+            gd_client = gdata.contacts.service.ContactsService()
+        try:
+            gd_client.ClientLogin(user, password, gd_client.source)
         except Exception:
             return False
         return gd_client
@@ -62,7 +62,7 @@ class google_login(osv.osv_memory):
         if 'password' in fields:
             res.update({'password': user_obj.gmail_password})
         return res
-    
+
     def login(self, cr, uid, ids, context=None):
         data = self.read(cr, uid, ids)[0]
         user = data['user']
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 5a6d33e9725..1eeb8d2fff2 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -19,6 +19,7 @@
 ##############################################################################
 
 from osv import osv, fields
+from tools.translate import _
 try:
     import gdata.docs.data
     import gdata.docs.client
@@ -31,95 +32,102 @@ except ImportError:
 class google_docs_ir_attachment(osv.osv):
     _inherit = 'ir.attachment'
 
-    def _auth(self, cr, uid,context=None):
+    def _auth(self, cr, uid, context=None):
         '''
         Connexion with google base account
         @return client object for connexion
         '''
         #pool the google.login in google_base_account
         google_pool = self.pool.get('google.login')
-        
-        #get gmail password and login
-        user_config = google_pool.default_get( cr, uid, {'user' : '' , 'password' : ''},context=context)
+        #get gmail password and login. We use default_get() instead of a create() followed by a read() on the 
+        # google.login object, because it is easier. The keys 'user' and 'password' ahve to be passed in the dict
+        # but the values will be replaced by the user gmail password and login.
+        user_config = google_pool.default_get( cr, uid, {'user' : '' , 'password' : ''}, context=context)
         #login gmail account
         client = google_pool.google_login( user_config['user'], user_config['password'], type='docs_client', context=context)
         if not client:
-            raise osv.except_osv(('Google Docs Error!'),("Check your google configuration in users/synchronization") )
+            raise osv.except_osv( _('Google Docs Error!'), _("Check your google configuration in users/synchronization"))
         return client
 
-    def create_empty_google_doc(self, cr, uid, name_gdocs, model, ids, type_doc,context=None):
-        '''Associate a copy of the gdoc identified by 'gdocs_res_id' to the current entity.
-           @param cr: the current row from the database cursor.
-           @param uid: the current user ID, for security checks.
-           @param model: the current model name.
-           @param type_doc: text, spreadsheet or slide.
-           @return the document object.
-           @return False if the google_base_account hasn't been configured yet.
+    def create_empty_google_doc(self, cr, uid, res_model, res_id, context=None):
+        '''Create a new google document, empty and with a default type (txt)
+           :param res_model: the object for which the google doc is created
+           :param res_id: the Id of the object for which the google doc is created
+           :return: the ID of the google document object created
         '''
         #login with the base account google module
-        client = self._auth(cr, uid,context=context)
+        client = self._auth(cr, uid, context=context)
         # create the document in google docs
         local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
         #create a new doc in Google Docs 
         gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
-        # register into the db
+        # create an ir.attachment into the db
         self.create(cr, uid, {
-            'res_model': model,
-            'res_id': ids[0],
+            'res_model': res_model,
+            'res_id': res_id,
             'type': 'url',
-            'name': 'Google Doc',
+            'name': _('Google Doc'),
             'url': gdocs_resource.get_alternate_link().href,
-        },context=context)
-        
-        
-        return 1
+        }, context=context)
+        return gdocs_resource.resource_id.text
 
-    def copy_gdoc(self, cr, uid, name_gdocs, model, google_res_id, ids,context=None):
+    def copy_gdoc(self, cr, uid, res_model, res_id, name_gdocs, gdoc_template_id, context=None):
         '''
         copy an existing document in google docs
+           :param res_model: the object for which the google doc is created
+           :param res_id: the Id of the object for which the google doc is created
+           :param name_gdocs: the name of the future ir.attachment that will be created. Based on the google doc template foun.
+           :param gdoc_template_id: the id of the google doc document to copy
+           :return: the ID of the google document object created
         '''
+        #login with the base account google module
         client = self._auth(cr, uid)
         # fetch and copy the original document
         try:
-            original_resource = client.get_resource_by_id(google_res_id)
+            original_resource = client.get_resource_by_id(gdoc_template_id)
             #copy the document you choose in the configuration
-            copy_resource = client.copy_resource(original_resource,'copy_%s' % original_resource.title.text)
+            copy_resource = client.copy_resource(original_resource, 'copy_%s' % original_resource.title.text)
         except:
-            raise osv.except_osv(('Google Docs Error!'),("Your ressource id is not correct. You can find the id in the google docs URL") )
-        # register into the db
+            raise osv.except_osv(_('Google Docs Error!'), _("Your resource id is not correct. You can find the id in the google docs URL"))
+        # create an ir.attachment
         self.create(cr, uid, {
-            'res_model': model,
-            'res_id': ids[0],
+            'res_model': res_model,
+            'res_id': res_id,
             'type': 'url',
             'name': name_gdocs,
             'url': copy_resource.get_alternate_link().href
-        },context=context)
+        }, context=context)
+        return copy_resource.resource_id.text
 
-        return copy_resource
-
-class google_docs(osv.osv):
-    _name = 'google.docs'
-
-    def doc_get(self, cr, uid, model, id, type_doc,context=None):
-        ir_attachment_ref = self.pool.get('ir.attachment')
+    def google_doc_get(self, cr, uid, res_model, ids, context=None):
+        '''
+        Function called by the js, when no google doc are yet associated with a record, with the aim to create one. It
+        will first seek for a google.docs.config associated with the model `res_model` to find out what's the template
+        of google doc to copy (this is usefull if you want to start with a non-empty document, a type or a name 
+        different than the default values). If no config is associated with the `res_model`, then a blank text document
+        with a default name is created.
+          :param res_model: the object for which the google doc is created
+          :param ids: the list of ids of the objects for which the google doc is created. This list is supposed to have
+            a length of 1 element only (batch processing is not supported in the code, though nothing really prevent it)
+          :return: the google document object created
+        '''
+        assert len(ids) == 1, 'Creating google docs may only be done by one at a time'
+        res_id = ids[0]
+        pool_ir_attachment = self.pool.get('ir.attachment')
         pool_gdoc_config = self.pool.get('google.docs.config')
-        google_docs_config = pool_gdoc_config.search(cr, uid, [('model_id', '=', model)])
-        name_gdocs=''
-        model_fields_dic = self.pool.get(model).read(cr,uid,id,[])
-        
-        if google_docs_config:
-            name_gdocs = pool_gdoc_config.browse(cr,uid,google_docs_config,context=context)[0].name_template
-            name_gdocs = name_gdocs % model_fields_dic[0]
-        
-        # check if a model is configurate with a template
-        if google_docs_config:
-            for google_config in self.pool.get('google.docs.config').browse(cr,uid,google_docs_config,context=context):
-                google_res_id = google_config.gdocs_resource_id
-            google_document = ir_attachment_ref.copy_gdoc(cr, uid,name_gdocs ,model,google_res_id, id)
-        else:
-            google_document = ir_attachment_ref.create_empty_google_doc(cr, uid,name_gdocs, model, id, type_doc)
-            return -1
+        name_gdocs = ''
+        model_fields_dic = self.pool.get(res_model).read(cr, uid, res_id, [], context=context)
 
+        # check if a model is configured with a template
+        google_docs_config = pool_gdoc_config.search(cr, uid, [('model_id', '=', res_model)], context=context)
+        if google_docs_config:
+            name_gdocs = pool_gdoc_config.browse(cr, uid, google_docs_config, context=context)[0].name_template
+            name_gdocs = name_gdocs % model_fields_dic
+            google_template_id = pool_gdoc_config.browse(cr, uid, google_docs_config[0], context=context).gdocs_resource_id
+            google_document = pool_ir_attachment.copy_gdoc(cr, uid, res_model, res_id, name_gdocs, google_template_id, context=context)
+        else:
+            google_document = pool_ir_attachment.create_empty_google_doc(cr, uid, res_model, res_id, context=context)
+        return google_document
 
 class config(osv.osv):
     _name = 'google.docs.config'
@@ -127,22 +135,18 @@ class config(osv.osv):
 
     _columns = {
         'model_id': fields.many2one('ir.model', 'Model'),
-        'gdocs_resource_id': fields.char('Google resource ID', size=64,help='This is the id of the template document you kind find it in the URL'),
+        'gdocs_resource_id': fields.char('Google resource ID', size=64,help='''
+This is the id of the template document, on google side. You can find thanks to its URL: 
+*for a text document with url like `https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is `document:123456789`
+*for a spreadsheet document with url like `https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, the ID is `spreadsheet:123456789`
+*for a presentation (slide show) document with url like `https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id.p`, the ID is `presentation:123456789`
+*for a drawing document with url like `https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is `drawings:123456789`
+...
+'''),
         'name_template': fields.char('GDoc name template ', size=64, help='This is the name which appears on google side'),
     }
 
     _defaults = {
-        'name_template': 'pr_%(name)s',
+        'name_template': 'gdoc_%(name)s',
     }
-    def get_config(self, cr, uid, ids, model,context=None):
-        '''
-        Method use with the js to hidde or show the add google doc button 
-        @return : list of configuration ids or false
-        '''
-        if self.pool.get('ir.attachment').search_count(cr,uid,[('url','like','https://docs.google.com/%'),('res_model','=',model),('res_id','=',ids[0])]) !=0:
-            return  False
-        else:
-            return True
 config()
-
-
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 6fe830d383c..8f41a9d7b21 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -1,31 +1,41 @@
 openerp.google_docs = function(instance, m) {
+var _t = instance.web._t;
+
     instance.web.Sidebar = instance.web.Sidebar.extend({
         on_attachments_loaded: function(attachments) {
-            self._super(attachements);
+            self = this
+            self._super(attachments);
             // if attachment contains a google doc url do nothing
-            // else
-            this.sidebar.add_items('other', [
-                { label: _t('Google Doc'), callback: self.on_google_doc },
-            ]);
+            // else display a button to create a google doc
+            var flag = false;
+            _.each(attachments, function(i) {
+                if (i.url && i.url.match('/docs.google.com/')) { flag = true; }
+            });
+            if (! flag) {
+                this.add_items('files', [
+                    { label: _t('Google Doc'), callback: self.on_google_doc },
+                ]);
+            }
         },
         on_google_doc: function() {
             var self = this;
             var form = self.getParent();
             form.sidebar_context().then(function (context) {
-                var ds = new instance.web.DataSet(this, 'google.docs', context);
-                ds.call('doc_get', [form.view.dataset.model, [form.view.datarecord.id], 'text'], function(r) {
+                var ds = new instance.web.DataSet(this, 'ir.attachment', context);
+                ds.call('google_doc_get', [form.dataset.model, [form.datarecord.id], context], function(r) {
                     if (r == 'False') {
                         var params = {
                             error: response,
-                            message: "The user google credentials are not set yet. Contact your administrator for help."
+                            message: _t("The user google credentials are not set yet. Contact your administrator for help.")
                         }
                         $(openerp.web.qweb.render("DialogWarning", params)).dialog({
-                            title: "User Google credentials are not yet set.",
+                            title: _t("User Google credentials are not yet set."),
                             modal: true,
                         });
                     }
-                    view.reload();
+                    form.reload();
                 });
-            }
+            })
         }
-};
+    })
+}

From 90bc5b9b329924a38fe559e73d79daaface03426 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 23 May 2012 13:02:15 +0200
Subject: [PATCH 393/452] [FIX] google_docs: typo in help tooltip

bzr revid: qdp-launchpad@openerp.com-20120523110215-5ek6vz6pa188r4do
---
 addons/google_docs/google_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 1eeb8d2fff2..659c86ad0d1 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -136,7 +136,7 @@ class config(osv.osv):
     _columns = {
         'model_id': fields.many2one('ir.model', 'Model'),
         'gdocs_resource_id': fields.char('Google resource ID', size=64,help='''
-This is the id of the template document, on google side. You can find thanks to its URL: 
+This is the id of the template document, on google side. You can find it thanks to its URL: 
 *for a text document with url like `https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is `document:123456789`
 *for a spreadsheet document with url like `https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, the ID is `spreadsheet:123456789`
 *for a presentation (slide show) document with url like `https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id.p`, the ID is `presentation:123456789`

From dcd89bca6c47219c1688ae973e4c46213615fdb4 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Wed, 23 May 2012 14:15:17 +0200
Subject: [PATCH 394/452] [IMP] res.partner kaban

bzr revid: mit@openerp.com-20120523121517-1mpj5axeedl02t2d
---
 openerp/addons/base/res/res_partner_view.xml | 58 +++++++-------------
 1 file changed, 19 insertions(+), 39 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index efc13262a1b..43b7c4e4d1c 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -491,49 +491,28 @@
                     <field name="state_id"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <t t-set="color" t-value="kanban_color(record.color.raw_value)"/>
-                            <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
-                                <div class="oe_module_vignette">
+                            <div class="oe_kanban_vignette">
                                 <a type="edit">
-                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" width="64" height="64" class="oe_module_icon"/>
+                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_kanban_image"/>
                                 </a>
-                                    <div class="oe_module_desc">
-                                        <div class="oe_kanban_box_content oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
-                                            <table class="oe_kanban_table">
-                                                <tr>
-                                                    <td class="oe_kanban_title1" align="left" valign="middle">
-                                                        <h4 class="oe_partner_heading"><a type="edit"><field name="name"/></a>
-                                                            <div t-if="record.parent_id.raw_value"><field name="parent_id"/></div>
-                                                        </h4>
-                                                            <i><div t-if="record.contact_address.raw_value"><field name="contact_address"/><br/></div>
-                                                            <div t-if="record.email.raw_value">
-                                                            <field name="email"/><br/></div>
-                                                            <div t-if="record.mobile.raw_value">
-                                                            <field name="mobile"/><br/>
-                                                            </div>
-                                                            <div t-if="!record.mobile.raw_value and record.phone.raw_value">
-                                                            <field name="phone"/><br/>
-                                                            </div></i>
-                                                    </td>
-                                                    <td t-if="record.is_company.raw_value" valign="top" align="right">
-                                                        <!--img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_kanban_gravatar"/-->
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </div>
-                                        <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
-                                            <div class="oe_kanban_left">
-                                                <a string="Edit" icon="gtk-edit" type="edit"/>
-                                                <a string="Change Color" icon="color-picker" type="color" name="color"/>
-                                                <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
-                                                    <img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
-                                                </a>
-                                            </div>
-                                            <br class="oe_kanban_clear"/>
-                                    </div>
-                                    </div>
+                                <div class="oe_kanban_details">
+                                      <h4 class="oe_partner_heading"><a type="edit"><field name="name"/></a>
+                                      </h4>
+                                      <ul>
+                                          <li t-if="record.parent_id.raw_value and !record.function.raw_value"><field name="parent_id"/></li>
+                                          <li t-if="!record.parent_id.raw_value and record.function.raw_value"><field name="function"/></li>
+                                          <li t-if="record.parent_id.raw_value and record.function.raw_value"><field name="function"/> at <field name="parent_id"/></li>
+                                          <li t-if="record.city.raw_value and !record.country.raw_value"><field name="city"/></li>
+                                          <li t-if="!record.city.raw_value and record.country.raw_value"><field name="country"/></li>
+                                          <li t-if="record.city.raw_value and record.country.raw_value"><field name="city"/>, <field name="country"/></li>
+                                          <li t-if="record.mobile.raw_value"><field name="mobile"/></li>
+                                          <li t-if="record.phone.raw_value">Tel: <field name="phone"/></li>
+                                          <li t-if="record.mobile.raw_value">Mobile: <field name="mobile"/></li>
+                                          <li t-if="record.email.raw_value"><a t-attf-href="mailto:#{record.email.raw_value}"><field name="email"/></a></li>
+                                      </ul>
                                 </div>
                             </div>
+
                         </t>
                     </templates>
                 </kanban>
@@ -717,3 +696,4 @@
 
     </data>
 </openerp>
+

From 1bee3848e16fe2c726f7ac31c155b2c0f4c356d9 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 23 May 2012 15:01:16 +0200
Subject: [PATCH 395/452] [ADD] Added new colorpicker + misc improvements

bzr revid: fme@openerp.com-20120523130116-6yvv8krsryg5x5e5
---
 addons/web_kanban/static/src/css/kanban.css   | 298 ++++++------------
 addons/web_kanban/static/src/css/kanban.sass  | 244 ++++----------
 addons/web_kanban/static/src/js/kanban.js     |  70 ++--
 .../web_kanban/static/src/xml/web_kanban.xml  |  15 +-
 4 files changed, 190 insertions(+), 437 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index ee0517807e6..7030580c1a7 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -107,6 +107,36 @@
 .openerp .oe_kanban_view .oe_kanban_quick_create button {
   float: right;
 }
+.openerp .oe_kanban_view .oe_kanban_vignette {
+  padding: 8px;
+  min-height: 100px;
+}
+.openerp .oe_kanban_view .oe_kanban_image {
+  display: inline-block;
+  vertical-align: top;
+  width: 64px;
+  height: 64px;
+  text-align: center;
+  overflow: hidden;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+  -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+}
+.openerp .oe_kanban_view .oe_kanban_details {
+  display: inline-block;
+  vertical-align: top;
+  width: 240px;
+  font-size: 13px;
+  padding: 0 5px;
+  color: #4c4c4c;
+  min-height: 120px;
+}
+.openerp .oe_kanban_view .oe_kanban_details h4 {
+  margin: 0 0 4px 0;
+}
 .openerp .oe_kanban_view .oe_kanban_record {
   position: relative;
   display: block;
@@ -331,6 +361,11 @@
   background: red;
   color: black;
 }
+.openerp .oe_kanban_view .oe_kanban_ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 .openerp .oe_kanban_view a.oe_kanban_menuaction {
   position: absolute;
   top: 0px;
@@ -349,7 +384,7 @@
   right: -140px;
   padding: 4px;
   border: 1px solid #afafb6;
-  width: 160px;
+  min-width: 160px;
   overflow-x: hidden;
   z-index: 900;
   background: white;
@@ -363,14 +398,14 @@
 .openerp .oe_kanban_view .oe_kanban_menu p {
   margin-left: 12px;
 }
-.openerp .oe_kanban_view .oe_kanban_menu li a {
+.openerp .oe_kanban_view .oe_kanban_menu > li > a {
   display: block;
   padding: 3px 6px;
   line-height: 14px;
   color: #4c4c4c;
   text-decoration: none;
 }
-.openerp .oe_kanban_view .oe_kanban_menu li a:hover {
+.openerp .oe_kanban_view .oe_kanban_menu > li > a:hover {
   background: #f0f0fa;
   background: -moz-linear-gradient(#f0f0fa, #eeeef6);
   background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
@@ -379,229 +414,88 @@
   -webkit-box-shadow: none;
   -box-shadow: none;
 }
-.openerp .oe_kanban_view .oe_kanban_color_picker {
-  position: absolute;
-  top: -10px;
-  border: 1px solid black;
-  -moz-box-shadow: 2px 2px 5px #666666;
-  -webkit-box-shadow: 2px 2px 5px #666666;
-  box-shadow: 2px 2px 5px #666666;
-  z-index: 2;
+.openerp .oe_kanban_view .oe_kanban_colorpicker {
+  padding: 3px 6px;
 }
-.openerp .oe_kanban_view .oe_kanban_color_picker a {
-  display: block;
-  width: 30px;
-  height: 30px;
-  border: 1px solid black;
-  text-align: center;
-  text-decoration: none;
+.openerp .oe_kanban_view .oe_kanban_colorpicker li {
+  float: left;
 }
-.openerp .oe_kanban_view .oe_kanban_color_picker a:hover {
-  border-color: white;
+.openerp .oe_kanban_view .oe_kanban_colorpicker li a {
+  display: inline-block;
+  width: 18px;
+  height: 18px;
+  border: 1px solid white;
 }
-.openerp .oe_kanban_view .oe_kanban_color_picker span {
-  border: none;
-  font-size: 120%;
-  font-weight: bold;
-  color: black;
-  line-height: 30px;
+.openerp .oe_kanban_view .oe_kanban_colorpicker li a:hover {
+  border: 1px solid gray !important;
 }
-.openerp .oe_kanban_view .oe_kanban_color_0 .oe_kanban_color_bglight {
-  background: white;
+.openerp .oe_kanban_view .oe_kanban_colorpicker li:first-child a {
+  margin-top: 1px;
+  height: 16px;
+  border: 1px solid #cccccc;
 }
-.openerp .oe_kanban_view .oe_kanban_color_0 .oe_kanban_color_bgdark {
-  background: #eeeeee;
+.openerp .oe_kanban_view .oe_kanban_colorpicker li:first-child a:hover {
+  margin-top: 0px;
+  height: 18px;
 }
-.openerp .oe_kanban_view .oe_kanban_color_0 .oe_kanban_color_border {
-  border-color: #cccccc;
-}
-.openerp .oe_kanban_view .oe_kanban_color_0 .oe_kanban_button {
-  background-color: #eeeeee;
-  border-color: #cccccc;
-  text-shadow: 0 1px white;
-}
-.openerp .oe_kanban_view .oe_kanban_color_0 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_0 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_0 button.oe_kanban_button:hover {
-  background-color: #999999;
+.openerp .oe_kanban_view .oe_kanban_color_0 {
   color: white;
-  text-shadow: 0 1px black;
+  text-shadow: -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black, 1px 1px 0 black;
 }
-.openerp .oe_kanban_view .oe_kanban_color_1 .oe_kanban_color_bglight {
-  background: #cccccc;
+.openerp .oe_kanban_view .oe_kanban_bgcolor_0 {
+  background-color: white;
 }
-.openerp .oe_kanban_view .oe_kanban_color_1 .oe_kanban_color_bgdark {
-  background: #999999;
+.openerp .oe_kanban_view .oe_kanban_color_1 {
+  color: #cccccc;
 }
-.openerp .oe_kanban_view .oe_kanban_color_1 .oe_kanban_color_border {
-  border-color: #666666;
+.openerp .oe_kanban_view .oe_kanban_bgcolor_1 {
+  background-color: #cccccc;
 }
-.openerp .oe_kanban_view .oe_kanban_color_1 .oe_kanban_button {
-  background-color: #999999;
-  border-color: #666666;
-  text-shadow: 0 1px #cccccc;
+.openerp .oe_kanban_view .oe_kanban_color_2 {
+  color: #ffc7c7;
 }
-.openerp .oe_kanban_view .oe_kanban_color_1 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_1 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_1 button.oe_kanban_button:hover {
-  background-color: #666666;
-  color: white;
-  text-shadow: 0 1px black;
+.openerp .oe_kanban_view .oe_kanban_bgcolor_2 {
+  background-color: #ffc7c7;
 }
-.openerp .oe_kanban_view .oe_kanban_color_2 .oe_kanban_color_bglight {
-  background: #ffc7c7;
+.openerp .oe_kanban_view .oe_kanban_color_3 {
+  color: #fff1c7;
 }
-.openerp .oe_kanban_view .oe_kanban_color_2 .oe_kanban_color_bgdark {
-  background: #ff8f8f;
+.openerp .oe_kanban_view .oe_kanban_bgcolor_3 {
+  background-color: #fff1c7;
 }
-.openerp .oe_kanban_view .oe_kanban_color_2 .oe_kanban_color_border {
-  border-color: #d97979;
+.openerp .oe_kanban_view .oe_kanban_color_4 {
+  color: #e3ffc7;
 }
-.openerp .oe_kanban_view .oe_kanban_color_2 .oe_kanban_button {
-  background-color: #ff8f8f;
-  border-color: #d97979;
-  text-shadow: 0 1px #ffc7c7;
+.openerp .oe_kanban_view .oe_kanban_bgcolor_4 {
+  background-color: #e3ffc7;
 }
-.openerp .oe_kanban_view .oe_kanban_color_2 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_2 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_2 button.oe_kanban_button:hover {
-  background-color: #cc5c5c;
-  color: white;
-  text-shadow: 0 1px black;
+.openerp .oe_kanban_view .oe_kanban_color_5 {
+  color: #c7ffd5;
 }
-.openerp .oe_kanban_view .oe_kanban_color_3 .oe_kanban_color_bglight {
-  background: #fff1c7;
+.openerp .oe_kanban_view .oe_kanban_bgcolor_5 {
+  background-color: #c7ffd5;
 }
-.openerp .oe_kanban_view .oe_kanban_color_3 .oe_kanban_color_bgdark {
-  background: #ffe38f;
+.openerp .oe_kanban_view .oe_kanban_color_6 {
+  color: #c7ffff;
 }
-.openerp .oe_kanban_view .oe_kanban_color_3 .oe_kanban_color_border {
-  border-color: #d9c179;
+.openerp .oe_kanban_view .oe_kanban_bgcolor_6 {
+  background-color: #c7ffff;
 }
-.openerp .oe_kanban_view .oe_kanban_color_3 .oe_kanban_button {
-  background-color: #ffe38f;
-  border-color: #d9c179;
-  text-shadow: 0 1px #fff1c7;
+.openerp .oe_kanban_view .oe_kanban_color_7 {
+  color: #c7d5ff;
 }
-.openerp .oe_kanban_view .oe_kanban_color_3 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_3 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_3 button.oe_kanban_button:hover {
-  background-color: #ccb05c;
-  color: white;
-  text-shadow: 0 1px black;
+.openerp .oe_kanban_view .oe_kanban_bgcolor_7 {
+  background-color: #c7d5ff;
 }
-.openerp .oe_kanban_view .oe_kanban_color_4 .oe_kanban_color_bglight {
-  background: #e3ffc7;
+.openerp .oe_kanban_view .oe_kanban_color_8 {
+  color: #e3c7ff;
 }
-.openerp .oe_kanban_view .oe_kanban_color_4 .oe_kanban_color_bgdark {
-  background: #c7ff8f;
+.openerp .oe_kanban_view .oe_kanban_bgcolor_8 {
+  background-color: #e3c7ff;
 }
-.openerp .oe_kanban_view .oe_kanban_color_4 .oe_kanban_color_border {
-  border-color: #a9d979;
+.openerp .oe_kanban_view .oe_kanban_color_9 {
+  color: #ffc7f1;
 }
-.openerp .oe_kanban_view .oe_kanban_color_4 .oe_kanban_button {
-  background-color: #c7ff8f;
-  border-color: #a9d979;
-  text-shadow: 0 1px #e3ffc7;
-}
-.openerp .oe_kanban_view .oe_kanban_color_4 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_4 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_4 button.oe_kanban_button:hover {
-  background-color: #94cc5c;
-  color: white;
-  text-shadow: 0 1px black;
-}
-.openerp .oe_kanban_view .oe_kanban_color_5 .oe_kanban_color_bglight {
-  background: #c7ffd5;
-}
-.openerp .oe_kanban_view .oe_kanban_color_5 .oe_kanban_color_bgdark {
-  background: #8fffab;
-}
-.openerp .oe_kanban_view .oe_kanban_color_5 .oe_kanban_color_border {
-  border-color: #79d991;
-}
-.openerp .oe_kanban_view .oe_kanban_color_5 .oe_kanban_button {
-  background-color: #8fffab;
-  border-color: #79d991;
-  text-shadow: 0 1px #c7ffd5;
-}
-.openerp .oe_kanban_view .oe_kanban_color_5 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_5 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_5 button.oe_kanban_button:hover {
-  background-color: #5ccc78;
-  color: white;
-  text-shadow: 0 1px black;
-}
-.openerp .oe_kanban_view .oe_kanban_color_6 .oe_kanban_color_bglight {
-  background: #c7ffff;
-}
-.openerp .oe_kanban_view .oe_kanban_color_6 .oe_kanban_color_bgdark {
-  background: #8fffff;
-}
-.openerp .oe_kanban_view .oe_kanban_color_6 .oe_kanban_color_border {
-  border-color: #79d9d9;
-}
-.openerp .oe_kanban_view .oe_kanban_color_6 .oe_kanban_button {
-  background-color: #8fffff;
-  border-color: #79d9d9;
-  text-shadow: 0 1px #c7ffff;
-}
-.openerp .oe_kanban_view .oe_kanban_color_6 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_6 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_6 button.oe_kanban_button:hover {
-  background-color: #5ccccc;
-  color: white;
-  text-shadow: 0 1px black;
-}
-.openerp .oe_kanban_view .oe_kanban_color_7 .oe_kanban_color_bglight {
-  background: #c7d5ff;
-}
-.openerp .oe_kanban_view .oe_kanban_color_7 .oe_kanban_color_bgdark {
-  background: #8fabff;
-}
-.openerp .oe_kanban_view .oe_kanban_color_7 .oe_kanban_color_border {
-  border-color: #8fabff;
-}
-.openerp .oe_kanban_view .oe_kanban_color_7 .oe_kanban_button {
-  background-color: #8fabff;
-  border-color: #7995e9;
-  text-shadow: 0 1px #c7d5ff;
-}
-.openerp .oe_kanban_view .oe_kanban_color_7 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_7 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_7 button.oe_kanban_button:hover {
-  background-color: #5c78cc;
-  color: white;
-  text-shadow: 0 1px black;
-}
-.openerp .oe_kanban_view .oe_kanban_color_8 .oe_kanban_color_bglight {
-  background: #e3c7ff;
-}
-.openerp .oe_kanban_view .oe_kanban_color_8 .oe_kanban_color_bgdark {
-  background: #c78fff;
-}
-.openerp .oe_kanban_view .oe_kanban_color_8 .oe_kanban_color_border {
-  border-color: #a979d9;
-}
-.openerp .oe_kanban_view .oe_kanban_color_8 .oe_kanban_button {
-  background-color: #c78fff;
-  border-color: #a979d9;
-  text-shadow: 0 1px #e3c7ff;
-}
-.openerp .oe_kanban_view .oe_kanban_color_8 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_8 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_8 button.oe_kanban_button:hover {
-  background-color: #945ccc;
-  color: white;
-  text-shadow: 0 1px black;
-}
-.openerp .oe_kanban_view .oe_kanban_color_9 .oe_kanban_color_bglight {
-  background: #ffc7f1;
-}
-.openerp .oe_kanban_view .oe_kanban_color_9 .oe_kanban_color_bgdark {
-  background: #ff8fe3;
-}
-.openerp .oe_kanban_view .oe_kanban_color_9 .oe_kanban_color_border {
-  border-color: #d979c1;
-}
-.openerp .oe_kanban_view .oe_kanban_color_9 .oe_kanban_button {
-  background-color: #ff8fe3;
-  border-color: #d979c1;
-  text-shadow: 0 1px #ffc7f1;
-}
-.openerp .oe_kanban_view .oe_kanban_color_9 .oe_kanban_button_active, .openerp .oe_kanban_view .oe_kanban_color_9 a.oe_kanban_button:hover, .openerp .oe_kanban_view .oe_kanban_color_9 button.oe_kanban_button:hover {
-  background-color: #cc5cb0;
-  color: white;
-  text-shadow: 0 1px black;
-}
-.openerp .oe_kanban_view .oe_kanban_color_alert .oe_kanban_color_border, .openerp .oe_kanban_view .oe_kanban_color_red .oe_kanban_color_border {
-  border-color: #cc0000 !important;
-}
-.openerp .oe_kanban_view .oe_kanban_color_green .oe_kanban_color_border {
-  border-color: #00cc00 !important;
-}
-.openerp .oe_kanban_view .oe_kanban_color_blue .oe_kanban_color_border {
-  border-color: #0000cc !important;
+.openerp .oe_kanban_view .oe_kanban_bgcolor_9 {
+  background-color: #ffc7f1;
 }
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 59db3fc8743..bb012bd328d 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -292,6 +292,10 @@
     .oe_kanban_text_red
         background: red
         color: #000
+    .oe_kanban_ellipsis
+        overflow: hidden
+        text-overflow: ellipsis
+        white-space: nowrap
     // }}}
     // KanbanDropDown {{{
     a.oe_kanban_menuaction
@@ -310,7 +314,7 @@
         right: -140px
         padding: 4px
         border: 1px solid #afafb6
-        width: 160px
+        min-width: 160px
         overflow-x: hidden
         z-index: 900
         background: white
@@ -318,13 +322,13 @@
         @include box-shadow(0 1px 4px rgba(0,0,0,0.3))
         p
             margin-left: 12px
-        li a
+        > li > a
             display: block
             padding: 3px 6px
             line-height: 14px
             color: #4c4c4c
             text-decoration: none
-        li a:hover
+        > li > a:hover
             background: #f0f0fa
             background: -moz-linear-gradient(#f0f0fa, #eeeef6)
             background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6))
@@ -332,214 +336,76 @@
             @include box-shadow(none)
     // }}}
     // KanbanColorPicker {{{
-    .oe_kanban_color_picker
-        position: absolute
-        top: -10px
-        border: 1px solid black
-        -moz-box-shadow: 2px 2px 5px #666
-        -webkit-box-shadow: 2px 2px 5px #666
-        box-shadow: 2px 2px 5px #666
-        z-index: 2
+    .oe_kanban_colorpicker
+        padding: 3px 6px
+    .oe_kanban_colorpicker li
+        float: left
         a
-            display: block
-            width: 30px
-            height: 30px
-            border: 1px solid black
-            text-align: center
-            text-decoration: none
-            &:hover
-                border-color: white
-        span
-            border: none
-            font-size: 120%
-            font-weight: bold
-            color: black
-            line-height: 30px
+            display: inline-block
+            width: 18px
+            height: 18px
+            border: 1px solid white
+        a:hover
+            border: 1px solid gray !important
+    .oe_kanban_colorpicker li:first-child a
+        margin-top: 1px
+        height: 16px
+        border: 1px solid #ccc
+        &:hover
+            margin-top: 0px
+            height: 18px
     // }}}
     // KanbanColors {{{
-    // Custom colors are also present in kanban.js
-    // Custom color#0
     .oe_kanban_color_0
-        .oe_kanban_color_bglight
-            background: #FFFFFF
-        .oe_kanban_color_bgdark
-            background: #EEEEEE
-        .oe_kanban_color_border
-            border-color: #CCCCCC
-        .oe_kanban_button
-            background-color: #EEEEEE
-            border-color: #CCCCCC
-            text-shadow: 0 1px #FFFFFF
-        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
-            background-color: #999999
-            color: #fff
-            text-shadow: 0 1px #000
+        color: #FFFFFF
+        text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000
+    .oe_kanban_bgcolor_0
+        background-color: #FFFFFF
 
-    // Custom color#1
     .oe_kanban_color_1
-        .oe_kanban_color_bglight
-            background: #CCCCCC
-        .oe_kanban_color_bgdark
-            background: #999999
-        .oe_kanban_color_border
-            border-color: #666666
-        .oe_kanban_button
-            background-color: #999999
-            border-color: #666666
-            text-shadow: 0 1px #CCCCCC
-        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
-            background-color: #666666
-            color: #fff
-            text-shadow: 0 1px #000
+        color: #CCCCCC
+    .oe_kanban_bgcolor_1
+        background-color: #CCCCCC
 
-    // Custom color#2
     .oe_kanban_color_2
-        .oe_kanban_color_bglight
-            background: #FFC7C7
-        .oe_kanban_color_bgdark
-            background: #FF8F8F
-        .oe_kanban_color_border
-            border-color: #D97979
-        .oe_kanban_button
-            background-color: #FF8F8F
-            border-color: #D97979
-            text-shadow: 0 1px #FFC7C7
-        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
-            background-color: #CC5C5C
-            color: #fff
-            text-shadow: 0 1px #000
+        color: #FFC7C7
+    .oe_kanban_bgcolor_2
+        background-color: #FFC7C7
 
-    // Custom color#3
     .oe_kanban_color_3
-        .oe_kanban_color_bglight
-            background: #FFF1C7
-        .oe_kanban_color_bgdark
-            background: #FFE38F
-        .oe_kanban_color_border
-            border-color: #D9C179
-        .oe_kanban_button
-            background-color: #FFE38F
-            border-color: #D9C179
-            text-shadow: 0 1px #FFF1C7
-        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
-            background-color: #CCB05C
-            color: #fff
-            text-shadow: 0 1px #000
+        color: #FFF1C7
+    .oe_kanban_bgcolor_3
+        background-color: #FFF1C7
 
-    // Custom color#4
     .oe_kanban_color_4
-        .oe_kanban_color_bglight
-            background: #E3FFC7
-        .oe_kanban_color_bgdark
-            background: #C7FF8F
-        .oe_kanban_color_border
-            border-color: #A9D979
-        .oe_kanban_button
-            background-color: #C7FF8F
-            border-color: #A9D979
-            text-shadow: 0 1px #E3FFC7
-        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
-            background-color: #94CC5C
-            color: #fff
-            text-shadow: 0 1px #000
+        color: #E3FFC7
+    .oe_kanban_bgcolor_4
+        background-color: #E3FFC7
 
-    // Custom color#5
     .oe_kanban_color_5
-        .oe_kanban_color_bglight
-            background: #C7FFD5
-        .oe_kanban_color_bgdark
-            background: #8FFFAB
-        .oe_kanban_color_border
-            border-color: #79D991
-        .oe_kanban_button
-            background-color: #8FFFAB
-            border-color: #79D991
-            text-shadow: 0 1px #C7FFD5
-        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
-            background-color: #5CCC78
-            color: #fff
-            text-shadow: 0 1px #000
+        color: #C7FFD5
+    .oe_kanban_bgcolor_5
+        background-color: #C7FFD5
 
-    // Custom color#6
     .oe_kanban_color_6
-        .oe_kanban_color_bglight
-            background: #C7FFFF
-        .oe_kanban_color_bgdark
-            background: #8FFFFF
-        .oe_kanban_color_border
-            border-color: #79D9D9
-        .oe_kanban_button
-            background-color: #8FFFFF
-            border-color: #79D9D9
-            text-shadow: 0 1px #C7FFFF
-        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
-            background-color: #5CCCCC
-            color: #fff
-            text-shadow: 0 1px #000
+        color: #C7FFFF
+    .oe_kanban_bgcolor_6
+        background-color: #C7FFFF
 
-    // Custom color#7
     .oe_kanban_color_7
-        .oe_kanban_color_bglight
-            background: #C7D5FF
-        .oe_kanban_color_bgdark
-            background: #8FABFF
-        .oe_kanban_color_border
-            border-color: #8FABFF
-        .oe_kanban_button
-            background-color: #8FABFF
-            border-color: #7995E9
-            text-shadow: 0 1px #C7D5FF
-        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
-            background-color: #5C78CC
-            color: #fff
-            text-shadow: 0 1px #000
+        color: #C7D5FF
+    .oe_kanban_bgcolor_7
+        background-color: #C7D5FF
 
-    // Custom color#8
     .oe_kanban_color_8
-        .oe_kanban_color_bglight
-            background: #E3C7FF
-        .oe_kanban_color_bgdark
-            background: #C78FFF
-        .oe_kanban_color_border
-            border-color: #A979D9
-        .oe_kanban_button
-            background-color: #C78FFF
-            border-color: #A979D9
-            text-shadow: 0 1px #E3C7FF
-        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
-            background-color: #945CCC
-            color: #fff
-            text-shadow: 0 1px #000
+        color: #E3C7FF
+    .oe_kanban_bgcolor_8
+        background-color: #E3C7FF
 
-    // Custom color#9
     .oe_kanban_color_9
-        .oe_kanban_color_bglight
-            background: #FFC7F1
-        .oe_kanban_color_bgdark
-            background: #FF8FE3
-        .oe_kanban_color_border
-            border-color: #D979C1
-        .oe_kanban_button
-            background-color: #FF8FE3
-            border-color: #D979C1
-            text-shadow: 0 1px #FFC7F1
-        .oe_kanban_button_active, a.oe_kanban_button:hover, button.oe_kanban_button:hover
-            background-color: #CC5CB0
-            color: #fff
-            text-shadow: 0 1px #000
-
-    // Red border
-    .oe_kanban_color_alert .oe_kanban_color_border, .oe_kanban_color_red .oe_kanban_color_border
-        border-color: #c00 !important
-
-    // Green border
-    .oe_kanban_color_green .oe_kanban_color_border
-        border-color: #0c0 !important
-
-    // Blue border
-    .oe_kanban_color_blue .oe_kanban_color_border
-        border-color: #00c !important
-    // }}}
+        color: #FFC7F1
+    .oe_kanban_bgcolor_9
+        background-color: #FFC7F1
 
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index e6f9b23258f..1dfe39edc94 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -10,6 +10,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     display_name: _lt('Kanban'),
     default_nr_columns: 3,
     view_type: "kanban",
+    number_of_color_schemes: 10,
     init: function (parent, dataset, view_id, options) {
         this._super(parent, dataset, view_id, options);
         _.defaults(this.options, {"quick_creatable": true, "creatable": true});
@@ -114,7 +115,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
             case 'button':
             case 'a':
                 var type = node.attrs.type || '';
-                if (_.indexOf('action,object,edit,delete,color'.split(','), type) !== -1) {
+                if (_.indexOf('action,object,edit,delete'.split(','), type) !== -1) {
                     _.each(node.attrs, function(v, k) {
                         if (_.indexOf('icon,type,name,args,string,context,states,kanban_states'.split(','), k) != -1) {
                             node.attrs['data-' + k] = v;
@@ -434,7 +435,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
         var min_height = 0;
         var els = [];
         _.each(this.records, function(r) {
-            var $e = r.$element.find('.oe_kanban_auto_height').first();
+            var $e = r.$element.find('.oe_kanban_auto_height').first().css('min-height', 0);
             if ($e.length) {
                 els.push($e[0]);
                 min_height = Math.max(min_height, $e.outerHeight());
@@ -559,6 +560,7 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
     },
     bind_events: function() {
         var self = this;
+        this.setup_color_picker();
         var $show_on_click = self.$element.find('.oe_kanban_box_show_onclick');
         $show_on_click.toggle(this.state.folded);
         this.$element.find('.oe_kanban_box_show_onclick_trigger').click(function() {
@@ -602,6 +604,25 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
             }
         });
     },
+    setup_color_picker: function() {
+        var self = this;
+        var $el = this.$element.find('ul.oe_kanban_colorpicker');
+        if ($el.length) {
+            $el.html(QWeb.render('KanbanColorPicker', {
+                widget: this
+            }));
+            $el.on('click', 'a', function(ev) {
+                ev.preventDefault();
+                var color_field = $(this).parents('.oe_kanban_colorpicker').first().data('field') || 'color';
+                var data = {};
+                data[color_field] = $(this).data('color');
+                self.view.dataset.write(self.id, data, {}, function() {
+                    self.record[color_field] = $(this).data('color');
+                    self.do_reload();
+                });
+            });
+        }
+    },
     do_action_delete: function($action) {
         var self = this;
         if (confirm(_t("Are you sure you want to delete this record ?"))) {
@@ -621,28 +642,6 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
             this.view.open_record(this.id);
         }
     },
-    do_action_color: function($action) {
-        var self = this,
-            colors = '#FFFFFF,#CCCCCC,#FFC7C7,#FFF1C7,#E3FFC7,#C7FFD5,#C7FFFF,#C7D5FF,#E3C7FF,#FFC7F1'.split(','),
-            $cpicker = $(QWeb.render('KanbanColorPicker', { colors : colors, columns: 2 }));
-        $action.after($cpicker);
-        $cpicker.mouseenter(function() {
-            clearTimeout($cpicker.data('timeoutId'));
-        }).mouseleave(function(evt) {
-            var timeoutId = setTimeout(function() { $cpicker.remove(); }, 500);
-            $cpicker.data('timeoutId', timeoutId);
-        });
-        $cpicker.find('a').click(function() {
-            var data = {};
-            data[$action.data('name')] = $(this).data('color');
-            self.view.dataset.write(self.id, data, {}, function() {
-                self.record[$action.data('name')] = $(this).data('color');
-                self.do_reload();
-            });
-            $cpicker.remove();
-            return false;
-        });
-    },
     do_action_object: function ($action) {
         var button_attrs = $action.data();
         this.view.do_execute_action(button_attrs, this.view.dataset, this.id, this.do_reload);
@@ -652,19 +651,18 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
         this.view.dataset.read_ids([this.id], this.view.fields_keys.concat(['__last_update'])).then(function(records) {
             if (records.length) {
                 self.set_record(records[0]);
-                self.do_render();
+                var $render = $(self.render());
+                self.$element.replaceWith($render);
+                self.$element = $render;
+                self.bind_events();
+                self.group.compute_cards_auto_height();
             } else {
                 self.destroy();
             }
         });
     },
-    do_render: function() {
-        this.$element.html(this.render());
-        this.bind_events();
-    },
-    kanban_color: function(variable) {
-        var number_of_color_schemes = 10,
-            index = 0;
+    kanban_getcolor: function(variable) {
+        var index = 0;
         switch (typeof(variable)) {
             case 'string':
                 for (var i=0, ii=variable.length; i<ii; i++) {
@@ -677,8 +675,12 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
             default:
                 return '';
         }
-        var color = (index % number_of_color_schemes);
-        return 'oe_kanban_color_' + color;
+        var color = (index % this.view.number_of_color_schemes);
+        return color;
+    },
+    kanban_color: function(variable) {
+        var color = this.kanban_getcolor();
+        return color ? 'oe_kanban_color_' + color : '';
     },
     kanban_gravatar: function(email, size) {
         size = size || 22;
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 953189683eb..b227949c309 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -57,18 +57,9 @@
     </div>
 </t>
 <t t-name="KanbanColorPicker">
-    <table cellspacing="0" cellpadding="0" border="0" class="oe_kanban_color_picker">
-    <tr>
-        <t t-foreach="colors" t-as="color">
-            <td t-att-bgcolor="color">
-                <a href="#" t-att-data-color="color_index">
-                    <span t-if="__debug__"><t t-esc="color_index"/></span>
-                </a>
-            </td>
-            <t t-if="((color_index + 1) % Math.round(colors.length / columns)) == 0">&lt;/tr&gt;&lt;tr&gt;</t>
-        </t>
-    </tr>
-    </table>
+    <li t-foreach="widget.view.number_of_color_schemes" t-as="color">
+        <a href="#" t-att-data-color="color_index" t-attf-class="oe_kanban_bgcolor_#{color}"/>
+    </li>
 </t>
 <div t-name="KanbanView.quick_create" class="oe_kanban_quick_create">
     <input t-att-placeholder="_t('Type name to create')"/>

From 6bb0e4fdc97df1877b5a8e5f80a505303d037758 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 23 May 2012 15:02:18 +0200
Subject: [PATCH 396/452] [IMP] Added new colorpicker to project and
 opportunities

bzr revid: fme@openerp.com-20120523130218-nfrbs7y2p51k3z79
---
 addons/crm/crm_lead_view.xml              |  3 ++-
 addons/project/project_view.xml           | 18 +++---------------
 addons/project/static/src/css/project.css |  6 ------
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c2c4aa7756f..8b84edddc1a 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -251,11 +251,12 @@
                         </ul>
                     </t>
                     <t t-name="kanban-box">
-                        <div class="oe_kanban_card">
+                        <div t-attf-class="oe_kanban_bgcolor_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
                             <a class="oe_kanban_menuaction oe_i">B</a>
                             <ul class="oe_kanban_menu">
                                 <li><a type="edit" >Edit...</a></li>
                                 <li><a type="delete">Delete</a></li>
+                                <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                             </ul>
                             <div class="oe_kanban_content">
                                 <h3>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a68a7217275..15f12ecadfb 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -188,27 +188,15 @@
                     <field name="task_count"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="#{kanban_color(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height">
+                            <div t-attf-class="oe_kanban_bgcolor_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height">
                                 <a class="oe_kanban_menuaction oe_i">B</a>
                                 <ul class="oe_kanban_menu">
                                     <li><a type="edit" >Edit...</a></li>
                                     <li><a type="delete">Delete</a></li>
-                                    <li>
-                                        <ul class="color-chooser">
-                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_0 square"></span></a></li>
-                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_1 square"></span></a></li>
-                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_2 square"></span></a></li>
-                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_3 square"></span></a></li>
-                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_4 square"></span></a></li>
-                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_5 square"></span></a></li>
-                                        </ul>
-                                    </li>
+                                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
                                 <div class="oe_kanban_content">
-                                    <h3>
-                                        <!--<t t-esc="record.name.value.substr(0,33)"/><t t-if="record.name.value.length > 33">...</t>-->
-                                        <field name="name"/>
-                                    </h3>
+                                    <h3 class="oe_kanban_ellipsis"><field name="name"/></h3>
 
                                     <div class="oe_kanban_project_list">
                                         <a t-if="record.use_tasks.raw_value"
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index ad57708687e..df5c788690c 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,11 +1,6 @@
 .oe_kanban_project {
     width: 300px;
 }
-.oe_kanban_project h3 {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
 .oe_kanban_project_list {
     margin: 8px 0 8px 0;
 }
@@ -30,7 +25,6 @@
 
 .oe_kanban_project_avatars {
     padding-top: 1em;
-    text-align: center;
     margin-top: 8px;
 }
 .oe_kanban_project_avatars img {

From 7f93ac0dc3347972904d4321038bb530f5bc95a6 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 23 May 2012 18:49:56 +0530
Subject: [PATCH 397/452] [FIX]: ADD google map in event form view. remove
 preveiw wizard.

bzr revid: atp@tinyerp.com-20120523131956-ttslmltvzscz024o
---
 addons/event/__openerp__.py                |   1 -
 addons/event/event.py                      |   6 +
 addons/event/event_view.xml                | 124 +++++++++++++--------
 addons/event/static/src/css/event.css      |  65 +----------
 addons/event/wizard/__init__.py            |   1 -
 addons/event/wizard/event_preview.py       |  56 ----------
 addons/event/wizard/event_preview_view.xml |  67 -----------
 7 files changed, 86 insertions(+), 234 deletions(-)
 delete mode 100644 addons/event/wizard/event_preview.py
 delete mode 100644 addons/event/wizard/event_preview_view.xml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 577a9ba9f3c..5f02bb8a05e 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -46,7 +46,6 @@ Note that:
         'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_confirm_view.xml',
-         'wizard/event_preview_view.xml',
         'event_view.xml',
         'report/report_event_registration_view.xml',
         'board_association_view.xml',
diff --git a/addons/event/event.py b/addons/event/event.py
index dfa35ad50b2..ef33b6ebc52 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -221,6 +221,12 @@ class event_event(osv.osv):
         'available_qty': fields.integer('Availabel Quantity'),
          'sale_end_date': fields.datetime('SalesEnd'),
       
+     'city': fields.related('address_id', 'city', type='char', string='City'),
+     'street': fields.related('address_id', 'street', type='char', string='Street'),
+     'country_id': fields.related('address_id', 'country_id', relation='res.country', type='many2one', string='Country'),
+     'state_id': fields.related('address_id', 'state_id', relation="res.country.state", type="many2one", string='Fed. State'),
+     'zip': fields.related('address_id','zip', type="char", string="Zip"),      
+      
     }
     _defaults = {
         'state': 'draft',
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 730f6cb6573..0964f52e36b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -52,19 +52,82 @@
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events">
-                    <group col="6" colspan="4">
-                        <field name="name"/>
-                        <field name="date_begin"/>
-                        <field name="date_end"/>
-                        <field name="type" on_change="onchange_event_type(type,context)"/>
-                        <field name="user_id"/>
-                        <field name="address_id" />
-                    </group>
-                    <notebook colspan="4">
-                    <page string="Event">
-                        <separator string="Description" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
+            <form string="Events" layout="manual">
+                <div class="oe_form_topbar">
+                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/> 
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet layout="auto">
+                <group colspan="4">
+                  <group col="2" colspan="2" class="oe_form_group_label_border"  >
+                  <field name="name" required="1" nolabel="1" class="oe_form_title" /><br/><br/><br/>
+                    <field name="type" on_change="onchange_event_type(type,context)"/>
+                    <field name="user_id"/>
+                    <field name="address_id" widget ="many2one_Geo_address"/>
+                  </group>
+                  <group colspan="2" col="2">
+                    <div id = "oe_mapbox" class="oe_mapbox">
+                    </div>
+                  </group>  
+                  <group colspan="4">
+                     <group col="4" colspan="2" class="oe_form_group_label_border" >
+                           <field name="register_min"/>
+                           <field name="register_max"/>
+                     </group>
+                     <group colspan="2" col="2">
+	                   <div>
+	                        <table  width="400px" >
+	                         <tr>
+	                           <td  class="oe_td_border">
+	                               Where :
+	                           </td>
+	                           <td width="auto">
+	                            <field name="street" nolabel="1" readonly="1"/><br/>
+	                             <field name="state_id" nolabel="1" readonly="1"/><br/>
+	                              <field name="city" nolabel="1" readonly="1"/><br/>
+	                               <field name="country_id" nolabel="1" readonly="1"/><br/>
+	                               <field name="zip" nolabel="1" readonly="1"/><br/>
+	                           </td>
+	                           <td width="10px" >
+	                               <table width="150px" >
+	                                <tr >
+	                                  <td class="oe_td_date_border">Start: </td><td width="auto"><field name="date_begin" nolabel="1" /></td>
+	                                </tr>
+	                                <tr >
+	                                  <td class="oe_td_date_border">End</td><td width="auto"><field name="date_end" nolabel="1" /></td>
+	                                </tr><newline/>
+	                              </table>
+	                           </td>
+	                         </tr>
+	                       </table>
+	                    </div>
+                     </group>
+                  </group>
+                  </group>
+                <notebook colspan="4">
+                <page string="Event Details">
+                <separator colspan="4" string="Details" nolabel="1"/>
+                <field name="note" colspan="4" nolabel="1"/>    
+                </page>
+                    <page string="Speakers">
+                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
+                        <field name="speaker_confirmed"/>
+                        <separator string="Other Speakers" colspan="4"/>
+                        <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Event Registration">
+	                     <group col="6" colspan="4" class="oe_form_group_label_border" >
+                            <field name="register_current"/>
+                            <field name="register_prospect"/>
+                            <field name="register_attended"/>
+	                     </group> 
+	                     <br/>
+	                     <br/>                   
                         <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
@@ -98,37 +161,9 @@
                                     </group>
                             </form>
                             </field>
-                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                        <group col="4" colspan="2">
-                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        </group>
                     </page>
-                    <page string="Speakers">
-                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                        <field name="speaker_confirmed"/>
-                        <separator string="Other Speakers" colspan="4"/>
-                        <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
-                    </page>
-                    <page string="Extra Info">
-                        <group col="2" colspan="2">
-                            <separator string="Registrations" colspan="2"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                            <field name="register_prospect"/>
-                            <field name="register_current"/>
-                            <field name="register_attended"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator string="Emails" colspan="2"/>
-                            <field name="reply_to"/>
-                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
-                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
-                        </group>
-                    </page>
-                    </notebook>
+                </notebook>
+                </sheet>
             </form>
             </field>
         </record>
@@ -211,9 +246,6 @@
                                   <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
                                   <span >Subscribe</span>
                                   </button>
-                                 <button name="%(action_event_preview)d" type="action">
-                                 <span>Preview</span>
-                                 </button>
                               </t>
                             </t>
                             <t t-if="record.is_subscribed.raw_value">
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index cdf92810392..160e0d82b1c 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -93,7 +93,9 @@ div.oe_fold_column{
     margin-left:auto; 
     margin-right:auto; 
     text-align: right;
+
 }
+
 .oe_td_border
 {
     width: 7em;
@@ -109,75 +111,12 @@ div.oe_fold_column{
     border-color: #DCDCDC;
 }
 
-td.oe_sale_end_date
-{
-    padding:5px;
-}
-td.oe_qty
-{
-    width: 80px;
-    text-align:right;
-    padding:5px;
-}
-
-.oe_order_button
-{
-    height:25px;
-    position: absolute;
-    left:330px;
-    padding: 5px;
-}
- 
-.oe_a
-{
-    position: absolute;
-    left: 22%;
-}
-
-td.oe_b
-{
-    position:relative;
-    left: 60%;
-}
-
 textarea.field_text
 {
     width: 765px;
     height: 318px;
 }
-
 td.oe_form_group_nested
 {
     padding: 5px;
 }
-.oe_event_title{
-  font-size: 25px;
-}
-.oe_sub1
-{
-    float:left;
-    height:50px;
-    border-right: 1px solid black;
-    border-color: #DCDCDC;
-}
-.oe_mapbox
-{ 
-    width:auto;
-    height:200px;
-    margin-left:auto; 
-    margin-right:auto; 
-    text-align: right;
-}
-.oe_td_border
-{
-    width: 5em;
-    padding: 2px;
-    border-right: 1px solid black;
-    text-align: center;
-    border-color: #DCDCDC;
-}
-.oe_td_date_border
-{
-    border-right:1px solid black;
-    border-color: #DCDCDC;
-}
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
index d1350fb43b8..92e33960484 100644
--- a/addons/event/wizard/__init__.py
+++ b/addons/event/wizard/__init__.py
@@ -21,5 +21,4 @@
 
 
 import event_confirm
-import event_preview
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/event_preview.py b/addons/event/wizard/event_preview.py
deleted file mode 100644
index 4a490ad930e..00000000000
--- a/addons/event/wizard/event_preview.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-
-    
-class event_preview(osv.osv_memory):
-    _name = 'event.preview'
-    _inherit= 'event.event'
-    _columns = {
-     'qty': fields.integer('Quantity'),
-     'sale_end_date': fields.datetime('SalesEnd'),
-    }
-    def default_get(self, cr, uid, fields, context=None):
-        event_pool = self.pool.get('event.event')
-        data_obj = self.pool.get('ir.model.data')
-        res_id = data_obj._get_id(cr, uid, 'event', 'view_event_preview')
-        if res_id:
-            event_preview_id = data_obj.browse(cr, uid, res_id, context=context).res_id
-
-        record_ids = context and context.get('active_ids', []) or []
-        res = {}
-        for event in event_pool.browse(cr, uid, record_ids, context=context):
-            if 'name' in fields:
-                res.update({'name': event.name})
-            if 'date_begin' in fields:
-                res.update({'date_begin': event.date_begin or False})
-            if 'address_id' in fields:
-                res.update({'address_id': event.address_id and event.address_id.id or False})
-            if 'date_end' in fields:
-                res.update({'date_end': event.date_end})
-            if 'note' in fields:
-                res.update({'note': event.note})
-        return res
-    
-event_preview()   
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/wizard/event_preview_view.xml b/addons/event/wizard/event_preview_view.xml
deleted file mode 100644
index 1d2aead8b28..00000000000
--- a/addons/event/wizard/event_preview_view.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>  
-<openerp>
-    <data>
-
-    <record model="ir.ui.view" id="view_event_preview">
-        <field name="name">Events</field>
-        <field name="model">event.preview</field>
-        <field name="type">form</field>
-        <field name="priority">20</field>
-        <field name="arch" type="xml">
-            <form string="Preview" layout="manual">
-                <div class="oe_form_topbar">
-                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                    </div>
-                </div>
-                <sheet layout="auto">
-                    <group colspan="4" col="2">
-                            <field name="name"  nolabel="1" class="oe_form_title" width="60%%" />
-		                     <div id = "oe_mapbox" class="oe_mapbox"> </div>
-		                     <table>
-		                       <tr>
-		                         <td width="70px" class="oe_td_border">
-		                             Where
-		                         </td>
-		                         <td width="auto">
-		                             <field name="address_id" widget ="many2one_Geo_address" nolabel="1"/>
-		                         </td>
-		                         <td width="210px">
-		                             <table align="right">
-		                              <tr>
-		                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
-		                              </tr>
-		                              <tr>
-		                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
-		                              </tr>
-		                            </table>
-		                         </td>
-		                         
-		                       </tr>
-		                     </table>
-
-                        <group colspan="2">
-                        </group>
-                    </group> 
-                      <separator colspan="4" string="Details" nolabel="1"/>
-                    <field name="note" colspan="4" nolabel="1"/>
-                 </sheet>
-            </form>
-        </field>
-    </record>
-    
-    <record model="ir.actions.act_window" id="action_event_preview">
-            <field name="name">Preview</field>
-            <field name="res_model">event.preview</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">current</field>
-        </record>
-
-
-    </data>
-</openerp>
\ No newline at end of file

From 121a4036ad1817445a5795458c55a3324aa98f09 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 23 May 2012 15:31:52 +0200
Subject: [PATCH 398/452] [FIX] Fix kanban colors

bzr revid: fme@openerp.com-20120523133152-4ng1o040u1e7rvda
---
 addons/web_kanban/static/src/css/kanban.css   | 31 -------------------
 addons/web_kanban/static/src/css/kanban.sass  | 21 -------------
 addons/web_kanban/static/src/js/kanban.js     |  4 +--
 .../web_kanban/static/src/xml/web_kanban.xml  |  2 +-
 4 files changed, 3 insertions(+), 55 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 7030580c1a7..f506f2e4795 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -439,63 +439,32 @@
   height: 18px;
 }
 .openerp .oe_kanban_view .oe_kanban_color_0 {
-  color: white;
-  text-shadow: -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black, 1px 1px 0 black;
-}
-.openerp .oe_kanban_view .oe_kanban_bgcolor_0 {
   background-color: white;
 }
 .openerp .oe_kanban_view .oe_kanban_color_1 {
-  color: #cccccc;
-}
-.openerp .oe_kanban_view .oe_kanban_bgcolor_1 {
   background-color: #cccccc;
 }
 .openerp .oe_kanban_view .oe_kanban_color_2 {
-  color: #ffc7c7;
-}
-.openerp .oe_kanban_view .oe_kanban_bgcolor_2 {
   background-color: #ffc7c7;
 }
 .openerp .oe_kanban_view .oe_kanban_color_3 {
-  color: #fff1c7;
-}
-.openerp .oe_kanban_view .oe_kanban_bgcolor_3 {
   background-color: #fff1c7;
 }
 .openerp .oe_kanban_view .oe_kanban_color_4 {
-  color: #e3ffc7;
-}
-.openerp .oe_kanban_view .oe_kanban_bgcolor_4 {
   background-color: #e3ffc7;
 }
 .openerp .oe_kanban_view .oe_kanban_color_5 {
-  color: #c7ffd5;
-}
-.openerp .oe_kanban_view .oe_kanban_bgcolor_5 {
   background-color: #c7ffd5;
 }
 .openerp .oe_kanban_view .oe_kanban_color_6 {
-  color: #c7ffff;
-}
-.openerp .oe_kanban_view .oe_kanban_bgcolor_6 {
   background-color: #c7ffff;
 }
 .openerp .oe_kanban_view .oe_kanban_color_7 {
-  color: #c7d5ff;
-}
-.openerp .oe_kanban_view .oe_kanban_bgcolor_7 {
   background-color: #c7d5ff;
 }
 .openerp .oe_kanban_view .oe_kanban_color_8 {
-  color: #e3c7ff;
-}
-.openerp .oe_kanban_view .oe_kanban_bgcolor_8 {
   background-color: #e3c7ff;
 }
 .openerp .oe_kanban_view .oe_kanban_color_9 {
-  color: #ffc7f1;
-}
-.openerp .oe_kanban_view .oe_kanban_bgcolor_9 {
   background-color: #ffc7f1;
 }
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index bb012bd328d..e38439d0da7 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -357,54 +357,33 @@
     // }}}
     // KanbanColors {{{
     .oe_kanban_color_0
-        color: #FFFFFF
-        text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000
-    .oe_kanban_bgcolor_0
         background-color: #FFFFFF
 
     .oe_kanban_color_1
-        color: #CCCCCC
-    .oe_kanban_bgcolor_1
         background-color: #CCCCCC
 
     .oe_kanban_color_2
-        color: #FFC7C7
-    .oe_kanban_bgcolor_2
         background-color: #FFC7C7
 
     .oe_kanban_color_3
-        color: #FFF1C7
-    .oe_kanban_bgcolor_3
         background-color: #FFF1C7
 
     .oe_kanban_color_4
-        color: #E3FFC7
-    .oe_kanban_bgcolor_4
         background-color: #E3FFC7
 
     .oe_kanban_color_5
-        color: #C7FFD5
-    .oe_kanban_bgcolor_5
         background-color: #C7FFD5
 
     .oe_kanban_color_6
-        color: #C7FFFF
-    .oe_kanban_bgcolor_6
         background-color: #C7FFFF
 
     .oe_kanban_color_7
-        color: #C7D5FF
-    .oe_kanban_bgcolor_7
         background-color: #C7D5FF
 
     .oe_kanban_color_8
-        color: #E3C7FF
-    .oe_kanban_bgcolor_8
         background-color: #E3C7FF
 
     .oe_kanban_color_9
-        color: #FFC7F1
-    .oe_kanban_bgcolor_9
         background-color: #FFC7F1
 
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 1dfe39edc94..801e8edaee1 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -679,8 +679,8 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
         return color;
     },
     kanban_color: function(variable) {
-        var color = this.kanban_getcolor();
-        return color ? 'oe_kanban_color_' + color : '';
+        var color = this.kanban_getcolor(variable);
+        return color === '' ? '' : 'oe_kanban_color_' + color;
     },
     kanban_gravatar: function(email, size) {
         size = size || 22;
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index b227949c309..2fef4737acc 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -58,7 +58,7 @@
 </t>
 <t t-name="KanbanColorPicker">
     <li t-foreach="widget.view.number_of_color_schemes" t-as="color">
-        <a href="#" t-att-data-color="color_index" t-attf-class="oe_kanban_bgcolor_#{color}"/>
+        <a href="#" t-att-data-color="color_index" t-attf-class="oe_kanban_color_#{color}"/>
     </li>
 </t>
 <div t-name="KanbanView.quick_create" class="oe_kanban_quick_create">

From 0e63a19cc68932bf8701e0cf4c7b0ed6c260b603 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 23 May 2012 15:32:26 +0200
Subject: [PATCH 399/452] [IMP] Kanban, renamed oe_kanban_bgcolor to
 oe_kanban_color

bzr revid: fme@openerp.com-20120523133226-5q1spbd1jmcs8toj
---
 addons/crm/crm_lead_view.xml    | 2 +-
 addons/project/project_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 8b84edddc1a..01f954f5d3e 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -251,7 +251,7 @@
                         </ul>
                     </t>
                     <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_bgcolor_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
+                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
                             <a class="oe_kanban_menuaction oe_i">B</a>
                             <ul class="oe_kanban_menu">
                                 <li><a type="edit" >Edit...</a></li>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 15f12ecadfb..84d1339f3de 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -188,7 +188,7 @@
                     <field name="task_count"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_bgcolor_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height">
                                 <a class="oe_kanban_menuaction oe_i">B</a>
                                 <ul class="oe_kanban_menu">
                                     <li><a type="edit" >Edit...</a></li>

From e21492a8bf490e64d7323967541d9e83e1b791ca Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 23 May 2012 19:14:48 +0530
Subject: [PATCH 400/452] [REM]: Remove unused code and refactor code as per
 specification

bzr revid: atp@tinyerp.com-20120523134448-9vqtiufzjgmmaq0b
---
 addons/event/__openerp__.py                   |   1 -
 addons/event/event.py                         |  13 +-
 addons/event/static/src/xml/event_address.xml |   9 --
 addons/event_sale/__openerp__.py              |   4 -
 addons/event_sale/event_sale.py               | 105 ----------------
 addons/event_sale/event_sale_view.xml         | 114 ------------------
 .../event_sale/security/ir.model.access.csv   |   2 -
 .../event_sale/static/src/css/event_page.css  |  31 -----
 addons/event_sale/static/src/js/google_map.js |  64 ----------
 .../static/src/xml/event_address.xml          |   9 --
 addons/portal_event/__init__.py               |  22 ----
 addons/portal_event/__openerp__.py            |  40 ------
 addons/portal_event/portal_event.py           |  47 --------
 .../portal_event/security/ir.model.access.csv |   6 -
 .../security/portal_event_security.xml        |  33 -----
 15 files changed, 5 insertions(+), 495 deletions(-)
 delete mode 100644 addons/event/static/src/xml/event_address.xml
 delete mode 100644 addons/event_sale/security/ir.model.access.csv
 delete mode 100644 addons/event_sale/static/src/css/event_page.css
 delete mode 100644 addons/event_sale/static/src/js/google_map.js
 delete mode 100644 addons/event_sale/static/src/xml/event_address.xml
 delete mode 100644 addons/portal_event/__init__.py
 delete mode 100644 addons/portal_event/__openerp__.py
 delete mode 100644 addons/portal_event/portal_event.py
 delete mode 100644 addons/portal_event/security/ir.model.access.csv
 delete mode 100644 addons/portal_event/security/portal_event_security.xml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index f9f7ef6c416..c491dd06138 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -54,7 +54,6 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
     'js': ['static/src/js/google_map.js'],
-    'qweb': ['static/src/xml/event_address.xml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
     'application': True,
diff --git a/addons/event/event.py b/addons/event/event.py
index 5f72b3d40b6..a15d1d92557 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -218,14 +218,11 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
-        'available_qty': fields.integer('Availabel Quantity'),
-         'sale_end_date': fields.datetime('SalesEnd'),
-      
-     'city': fields.related('address_id', 'city', type='char', string='City'),
-     'street': fields.related('address_id', 'street', type='char', string='Street'),
-     'country_id': fields.related('address_id', 'country_id', relation='res.country', type='many2one', string='Country'),
-     'state_id': fields.related('address_id', 'state_id', relation="res.country.state", type="many2one", string='Fed. State'),
-     'zip': fields.related('address_id','zip', type="char", string="Zip"),      
+         'city': fields.related('address_id', 'city', type='char', string='City'),
+         'street': fields.related('address_id', 'street', type='char', string='Street'),
+         'country_id': fields.related('address_id', 'country_id', relation='res.country', type='many2one', string='Country'),
+         'state_id': fields.related('address_id', 'state_id', relation="res.country.state", type="many2one", string='Fed. State'),
+         'zip': fields.related('address_id','zip', type="char", string="Zip"),      
       
     }
     _defaults = {
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event/static/src/xml/event_address.xml
deleted file mode 100644
index 14c7051cf7d..00000000000
--- a/addons/event/static/src/xml/event_address.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	
-	<template>
-		<td id = "address_text" t-name="address">
-			<t t-esc="record.street"/> <br/>
-			<t t-esc="record.city"/> <br/>
-			<t t-esc="record.country_id[1]"/>
-		</td>
-	</template>
\ No newline at end of file
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index a7e9495af60..d06e964c483 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -35,14 +35,10 @@ It defines a new kind of service products that offers you the possibility to cho
     'author': 'OpenERP SA',
     'depends': ['event','sale','sale_crm'],
     'update_xml': [
-        'security/ir.model.access.csv',
         'event_sale_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
     'test':['test/confirm.yml'],
-    'css': ['static/src/css/event_page.css'],
-    'js': ['static/src/js/google_map.js'],
-    'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 0abbfc2cfb3..44b3aaf5409 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -93,108 +93,3 @@ class sale_order_line(osv.osv):
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.log(cr, uid, registration_id, message)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
-  
-class event_event(osv.osv):
-    _inherit = 'event.event'
-    _columns = {
-                    'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
-                }
-    
-    def order_now(self, cr, uid, ids, context=None):
-        res = {}
-        register_pool = self.pool.get('event.registration')
-        sale_order_line_pool = self.pool.get('sale.order.line')
-        sale_order = self.pool.get('sale.order')
-        partner_pool = self.pool.get("res.partner")
-        data_obj = self.pool.get("ir.model.data")
-        prod_pricelist_obj = self.pool.get('product.pricelist')
-        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
-        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
-        if not partner_ids:
-            # partner not found create new partner.....
-            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
-            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
-        else:
-            new_partner_id = partner_ids[0]
-            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
-        for event_id in self.browse(cr, uid, ids, context=context):
-            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-            new_sale_id = sale_order.create(cr, uid, {
-                'date_order': event_id.date_begin,
-                'pricelist_id': price_list,
-                 'partner_id': new_partner_id, 
-                  'partner_invoice_id': partner_invoice_id,
-                 'partner_shipping_id': partner_shipping_id
-                })  
-            if event_id.event_item_ids:
-                for items in event_id.event_item_ids:
-                    product = items.product_id.id
-                    sale_order_line = sale_order_line_pool.create(cr, uid, {
-                        'order_id': new_sale_id, 
-                        'name': items.product_id.name,
-                        'product_uom_qty': items.qty,
-                        'product_id': items.product_id.id,
-                        'price_unit': items.price,
-                        'date_planned': items.sales_end_date,
-                    }, context=context)
-            view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
-            if view_id:
-                res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
-            res = {
-                    'name': _('Quotation'),
-                    'view_type': 'form',
-                    'view_mode': 'form',
-                    'res_model': 'sale.order',
-                    'res_id': new_sale_id,
-                    'views':[(res_id,'form'), (False, 'tree')],
-                    'type': 'ir.actions.act_window',
-                    'nodestroy': True,
-                    'target': 'current',
-            }
-        return res
-    
-    def subscribe_to_event(self, cr, uid, ids, context=None):
-        res = {}
-        data_obj = self.pool.get("ir.model.data")
-        view_id = data_obj._get_id(cr, uid, 'event_sale', 'view_event_page')
-        if view_id:
-            res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
-        res = {
-                'name': _('Event Page'),
-                'view_type': 'form',
-                'view_mode': 'form',
-                'views':[(res_id,'form'), (False, 'tree')],
-                'res_model': 'event.event',
-                'res_id': ids[0],
-                'type': 'ir.actions.act_window',
-                'nodestroy': True,
-                'target': 'current',
-        }
-        return res
-    
-class event_items(osv.osv):
-    _name = "event.items"
-    _columns = {
-        'product_id': fields.many2one('product.product', 'Product', required=True),
-        'price': fields.integer('Price'),
-        #Need to convert  this integer field in to dynamic selection.. TODO
-      #  'max_qty': fields.integer('Max.Quantity available'),
-        'qty': fields.integer('Quantity'),
-        'uom_id': fields.many2one('product.uom', 'UoM'),
-        'discount': fields.integer('Discount'),
-        'event_id': fields.many2one('event.event', 'Event'),
-        'sales_end_date': fields.date('Sales End')
-        }
-
-    def onchange_product_id(self, cr, uid, ids, product, context=None):
-        product_obj = self.pool.get('product.product')
-        data = {}
-        if not product:
-            return {'value': data}
-        price = product_obj.browse(cr, uid, product).list_price
-        uom = product_obj.browse(cr, uid, product).uom_id.id
-        data['price'] = price
-        data['uom_id'] = uom
-        return {'value': data}
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index d0e00c9a8bf..5746f1de554 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -29,120 +29,6 @@
                 </xpath>
              </field>
         </record>
-        
-        
-    <!-- Events Organisation/CONFIGURATION/EVENTS PAGE VIEW -->
-
-        <record model="ir.ui.view" id="view_event_page">
-            <field name="name">Events</field>
-            <field name="model">event.event</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Events"  layout="manual">
-                <div class="oe_form_topbar" readonly="1">
-                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                   <div class="oe_right">
-                      <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                   </div>
-                </div>
-                <sheet string="Event Form" layout="auto">
-                   <group col="2">
-                     <group col="2">
-                       <div class="oe_event_title">
-                          <field name="name" nolabel="1" readonly="1"/>
-                       </div>
-                      <newline/>
-                      <group colspan="4" name="venue">
-                            <div class="oe_sub1"> Venue   : </div> 
-                              <field name="address_id_id" nolabel="1"/> 
-                      </group>
-                       <field name="event_item_ids" nolabel="1">
-                         <tree editable="top" string="Event Items">
-                          <field name="product_id" readonly="1" />
-                          <field name="sales_end_date" readonly="1"/>
-                          <field name="price" readonly="1"/>
-                          <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
-                          <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
-                         </tree>
-                       </field>
-                       <newline/>
-                      <div class="oe_right">
-                         <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
-                      </div>
-                   </group>	
-                    <group>
-                     <div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
-                     <table>
-                       <tr>
-                         <td width="70px" class="oe_td_border">
-                             Where
-                         </td>
-                         <td width="auto">
-                             <field name="address_id" widget ="geo_address" nolabel="1"/>
-                         </td>
-                         <td width="210px">
-                             <table align="right">
-                              <tr>
-                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
-                              </tr>
-                              <tr>
-                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
-                              </tr>
-                            </table>
-                         </td>
-                         
-                       </tr>
-                     </table>
-                  </group>
-                  </group>
-                    <separator string="" colspan="4"/>
-                      <label string="Event Details:" colspan="4"/>
-                       <field name="note" colspan="4" nolabel="1" readonly="1"/>
-                    </sheet>
-            </form>
-            </field>
-        </record>
-
-        
-
-
-        <record model="ir.ui.view" id="view_event_form_inherit">
-           <field name="name">Events Inherit</field>
-           <field name="model">event.event</field>
-           <field name="type">form</field>
-          <field name="inherit_id" ref="event.view_event_form"/>
-          <field name="arch" type="xml">
-           <xpath expr="//page[@string='Extra Info']" position="after">
-             <page string="Event Item">
-             <field name="event_item_ids" nolabel="1">
-             <tree editable="top" string="Event Items">
-                <field name="product_id" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
-                <field name="sales_end_date" />
-                <field name="price"/>
-                <!-- <field name="max_qty" groups="event.group_event_manager"/> --> 
-                <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
-             </tree>
-            </field>
-            <newline/>
-             </page>
-           </xpath>
-          </field>
-        </record>
-
-		<record id="view_event_kanban_inherit" model="ir.ui.view">
-            <field name="name">event.inherit.kanban</field>
-            <field name="model">event.event</field>
-            <field name="type">kanban</field>
-            <field name="inherit_id" ref="event.view_event_kanban"/>
-            <field name="arch" type="xml">
-            	<xpath expr="//div/t/t/input[@name='subscribe']" position="replace">
-            		<input type="hidden"/>
-                </xpath> 
-            </field>
-        </record>
 
     </data>
 </openerp>
diff --git a/addons/event_sale/security/ir.model.access.csv b/addons/event_sale/security/ir.model.access.csv
deleted file mode 100644
index 8078ec3ff78..00000000000
--- a/addons/event_sale/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_event_items,event.items,event_sale.model_event_items,event.group_event_user,1,1,0,0
diff --git a/addons/event_sale/static/src/css/event_page.css b/addons/event_sale/static/src/css/event_page.css
deleted file mode 100644
index 0f7b2a81e32..00000000000
--- a/addons/event_sale/static/src/css/event_page.css
+++ /dev/null
@@ -1,31 +0,0 @@
-.oe_event_title{
-  font-size: 25px;
-}
-.oe_sub1
-{
-    float:left;
-    height:50px;
-    border-right: 1px solid black;
-    border-color: #DCDCDC;
-}
-.oe_mapbox
-{ 
-    width:auto;
-    height:200px;
-    margin-left:auto; 
-    margin-right:auto; 
-    text-align: right;
-}
-.oe_td_border
-{
-    width: 5em;
-    padding: 2px;
-    border-right: 1px solid black;
-    text-align: center;
-    border-color: #DCDCDC;
-}
-.oe_td_date_border
-{
-    border-right:1px solid black;
-    border-color: #DCDCDC;
-}
diff --git a/addons/event_sale/static/src/js/google_map.js b/addons/event_sale/static/src/js/google_map.js
deleted file mode 100644
index 2cf67df78a4..00000000000
--- a/addons/event_sale/static/src/js/google_map.js
+++ /dev/null
@@ -1,64 +0,0 @@
-openerp.event = function(instance){
-    instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
-    instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, {
-        init : function(){
-            this._super.apply(this,arguments);
-            this.googleMapsLoaded = $.Deferred();
-        },
-        start:function(){
-        },
-
-        set_input_id:function(id){
-        },
-        Map_Load: function() {
-            var self = this;
-            if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
-                googleMapsCallback = function () {
-                self.googleMapsLoaded.resolve();
-            };
-            $.ajax({
-                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
-                dataType: "script"
-            }).fail(self.googleMapsLoaded.reject);
-            return this.googleMapsLoaded.promise();
-        },
-        set_value:function(value){
-            var self = this;
-            this.get_address(value).done(function(value){
-            if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
-            var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
-            var defer = self.Map_Load();
-            defer.done(function(){
-                return self.render_map(address);	
-            });
-            });
-        },
-        get_address:function(value){
-            if (!value || value.length == 0){
-                return $.Deferred().reject();
-            }
-            return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
-        },
-
-        render_map: function(address){
-            var geocoder = new google.maps.Geocoder();
-            geocoder.geocode( { 'address': address}, function(results, status){
-                if (status == google.maps.GeocoderStatus.OK){
-                    var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
-                    var myOptions = {
-                    zoom: 17,
-                    center:  new google.maps.LatLng(lat,lng),
-                    mapTypeId: google.maps.MapTypeId.ROADMAP
-                }
-                return new google.maps.Marker({
-                    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
-                    position: new google.maps.LatLng(lat,lng)
-                });
-                }
-            });
-        },
-        get_value:function(){
-        }
-
-    }));
-};
\ No newline at end of file
diff --git a/addons/event_sale/static/src/xml/event_address.xml b/addons/event_sale/static/src/xml/event_address.xml
deleted file mode 100644
index 14c7051cf7d..00000000000
--- a/addons/event_sale/static/src/xml/event_address.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	
-	<template>
-		<td id = "address_text" t-name="address">
-			<t t-esc="record.street"/> <br/>
-			<t t-esc="record.city"/> <br/>
-			<t t-esc="record.country_id[1]"/>
-		</td>
-	</template>
\ No newline at end of file
diff --git a/addons/portal_event/__init__.py b/addons/portal_event/__init__.py
deleted file mode 100644
index 70c078b769d..00000000000
--- a/addons/portal_event/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 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 portal_event
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/portal_event/__openerp__.py b/addons/portal_event/__openerp__.py
deleted file mode 100644
index 88ca9815323..00000000000
--- a/addons/portal_event/__openerp__.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 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/>.
-#
-##############################################################################
-
-{
-    'name' : "Portal Event",
-    'version' : "1.0",
-    'depends' : ["portal", "event_sale"],
-    'author' : "OpenERP SA",
-    'category': 'Portal',
-    'description': """
-This module defines 'portals' to customize the access to your OpenERP database
-for external users.
-    """,
-    'update_xml': [
-        'security/portal_event_security.xml',
-        'security/ir.model.access.csv',
-    ],    
-    'website': 'http://www.openerp.com',
-    'installable': True,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/portal_event/portal_event.py b/addons/portal_event/portal_event.py
deleted file mode 100644
index 570bd3131b6..00000000000
--- a/addons/portal_event/portal_event.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-from osv import fields, osv
-from tools.translate import _
-
-class event_event(osv.osv):
-    _inherit = 'event.event'
-
-    def make_quotation(self, cr, uid, ids, context=None):
-        event_pool = self.pool.get('event.event')
-        register_pool = self.pool.get('event.registration')
-        sale_order_line_pool = self.pool.get('sale.order.line')
-        sale_order = self.pool.get('sale.order')
-        partner_pool = self.pool.get('res.partner')
-        prod_pricelist_obj = self.pool.get('product.pricelist')
-        res_users_obj = self.pool.get('res.users')
-        user = res_users_obj.browse(cr, uid, uid, context=context)
-        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
-        if partner_ids:
-            res_users_obj.write(cr, uid, user.id, {'partner_id': partner_ids[0]})        
-        if not partner_ids:
-              raise osv.except_osv(_('Error !'),
-                                    _('There is no Partner defined ' \
-                                            'for this event:'))
-        res = super(event_event,self).make_quotation(cr, uid, ids, context)              
-
-        return res
diff --git a/addons/portal_event/security/ir.model.access.csv b/addons/portal_event/security/ir.model.access.csv
deleted file mode 100644
index 0b3dfe5f3b2..00000000000
--- a/addons/portal_event/security/ir.model.access.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_event,event,event.model_event_event,portal_event.group_event_portal,1,0,0,0
-access_registration,registration,event.model_event_registration,portal_event.group_event_portal,1,0,0,0
-access_event_items,event.items,event.model_event_event,portal_event.group_event_portal,1,1,1,0
-access_product_product,product.product,product.model_product_product,portal_event.group_event_portal,1,0,0,0
-access_product_uom,product.uom,product.model_product_uom,portal_event.group_event_portal,1,0,0,0
\ No newline at end of file
diff --git a/addons/portal_event/security/portal_event_security.xml b/addons/portal_event/security/portal_event_security.xml
deleted file mode 100644
index 1202fcce3f5..00000000000
--- a/addons/portal_event/security/portal_event_security.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-        <!-- Creating Portal Group -->
-        
-        <record id="group_event_portal" model="res.groups">
-            <field name="name">Event Portal Groups</field>
-            <field ref="event.module_category_event_management" name="category_id"/>
-        </record>
-        
-        <record id="portal_event" model="res.portal">
-            <field name="name">Portal User</field>
-            <field name="group_id" ref="group_event_portal"/>
-        </record>
-            
-        <!-- Sale Portal Access Rules -->
-        <record id="portal_event_rule" model="ir.rule">
-            <field name="name">Personal Events</field>
-            <field ref="event.model_event_event" name="model_id"/>
-            <field name="domain_force">[]</field>
-            <field name="groups" eval="[(4, ref('group_event_portal'))]"/>
-        </record>
-        
-        <record id="portal_registration_rule" model="ir.rule">
-            <field name="name">Personal Registrations</field>
-            <field ref="event.model_event_registration" name="model_id"/>
-            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
-            <field name="groups" eval="[(4, ref('group_event_portal'))]"/>
-        </record>        
-        
-    </data>
-</openerp>
\ No newline at end of file

From f80dd759f0102df2ba649704f5d97f0ca66d6f2c Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 23 May 2012 19:22:37 +0530
Subject: [PATCH 401/452] [REM]: Remove duplicate page view

bzr revid: atp@tinyerp.com-20120523135237-xylcrrkiod620sve
---
 addons/event/event_view.xml | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index e0d7badd1b4..0866dd876af 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -163,29 +163,6 @@
                             </form>
                             </field>
                     </page>
-
-                    <page string="Speakers">
-                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                        <field name="speaker_confirmed"/>
-                        <separator string="Other Speakers" colspan="4"/>
-                        <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
-                    </page>
-                    <page string="Extra Info">
-                        <group col="2" colspan="2">
-                            <separator string="Registrations" colspan="2"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                            <field name="register_prospect"/>
-                            <field name="register_current"/>
-                            <field name="register_attended"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator string="Emails" colspan="2"/>
-                            <field name="reply_to"/>
-                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
-                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
-                        </group>
-                    </page>
                     </notebook>
             </sheet>
             </form>

From b3ba6e55b73eabbad0e6dadbd760b87089d06555 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 23 May 2012 16:01:11 +0200
Subject: [PATCH 402/452] [IMP] Improved kanban records styling

bzr revid: fme@openerp.com-20120523140111-zplwft92zeq7v7g7
---
 addons/web_kanban/static/src/css/kanban.css  | 6 ++++--
 addons/web_kanban/static/src/css/kanban.sass | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index f506f2e4795..0d8695cf220 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -141,7 +141,7 @@
   position: relative;
   display: block;
   min-height: 50px;
-  margin: 6px 0;
+  margin: 0;
   display: block;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -154,6 +154,9 @@
   font-weight: bold;
   margin: 2px 4px;
 }
+.openerp .oe_kanban_view .oe_kanban_grouped .oe_kanban_record {
+  margin-bottom: 6px;
+}
 .openerp .oe_kanban_view .oe_kanban_gravatar {
   display: block;
   width: 20px;
@@ -296,7 +299,6 @@
   border: 1px solid #d8d8d8;
   border-bottom-color: #b9b9b9;
   padding: 6px;
-  margin: 6px 0;
   display: block;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index e38439d0da7..1d5c7a5da43 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -139,7 +139,7 @@
         position: relative
         display: block
         min-height: 50px
-        margin: 6px 0
+        margin: 0
         display: block
         @include radius(4px)
         &:last-child
@@ -147,6 +147,8 @@
         .oe_kanban_title
             font-weight: bold
             margin: 2px 4px
+    .oe_kanban_grouped .oe_kanban_record
+        margin-bottom: 6px
     .oe_kanban_gravatar
         display: block
         width: 20px
@@ -256,7 +258,6 @@
         border: 1px solid #d8d8d8
         border-bottom-color: #b9b9b9
         padding: 6px
-        margin: 6px 0
         display: block
         @include radius(4px)
         &:last-child

From de97edb9cbf852220c3b9fe82b37b7de358fa19b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 23 May 2012 16:30:30 +0200
Subject: [PATCH 403/452] [IMP] remove create button from module kanban view

bzr revid: fp@tinyerp.com-20120523143030-qgkp1t09sf6fvac9
---
 openerp/addons/base/module/module_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 2df2c60b147..29933e52966 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -69,7 +69,7 @@
             <field name="type">kanban</field>
             <field name="arch" type="xml">
 
-              <kanban>
+              <kanban create="false">
                   <field name="icon"/>
                   <field name="name"/>
                   <field name="state"/>

From 4f4e48c96fe40f543e33dedf1bc16fcdf4f93ab2 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 23 May 2012 16:40:37 +0200
Subject: [PATCH 404/452] [IMP] Improved kanban title styling

bzr revid: fme@openerp.com-20120523144037-59fu1l3phu2orl1c
---
 addons/web_kanban/static/src/css/kanban.css  | 5 +++++
 addons/web_kanban/static/src/css/kanban.sass | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 0d8695cf220..83c3de06f37 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -317,6 +317,11 @@
 }
 .openerp .oe_kanban_view .oe_kanban_card h3 {
   margin: 0 16px 0 0;
+  color: #4c4c4c;
+  text-decoration: none;
+}
+.openerp .oe_kanban_view .oe_kanban_card h3:hover {
+  text-decoration: none;
 }
 .openerp .oe_kanban_view .oe_kanban_star {
   float: left;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 1d5c7a5da43..536581de4cd 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -268,6 +268,10 @@
                 display: block
         h3
             margin: 0 16px 0 0
+            color: #4c4c4c
+            text-decoration: none
+        h3:hover
+            text-decoration: none
     .oe_kanban_star
         float: left
         position: inline-block

From 99584eceed60f0a0a611d48781e49f60727456e1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 23 May 2012 16:41:22 +0200
Subject: [PATCH 405/452] [IMP] Kanban project and opportunities, use link on
 title

bzr revid: fme@openerp.com-20120523144122-dxqqrxh21wv12hgn
---
 addons/crm/crm_lead_view.xml              | 4 ++--
 addons/project/project_view.xml           | 4 ++--
 addons/project/static/src/css/project.css | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 01f954f5d3e..04acf1188b2 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -259,13 +259,13 @@
                                 <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                             </ul>
                             <div class="oe_kanban_content">
-                                <h3>
+                                <a type="edit"><h3>
                                     <field name="partner_id"/>
                                     <t t-if="record.planned_revenue.raw_value">
                                         - <t t-esc="Math.round(record.planned_revenue.value)"/>
                                         <field name="company_currency"/>
                                     </t>
-                                </h3>
+                                </h3></a>
                                 <div>
                                     <b> <field name="partner_address_name"/> </b>
                                 </div>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 84d1339f3de..b5fa9afbb5f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -191,12 +191,12 @@
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height">
                                 <a class="oe_kanban_menuaction oe_i">B</a>
                                 <ul class="oe_kanban_menu">
-                                    <li><a type="edit" >Edit...</a></li>
+                                    <li><a type="edit">Edit...</a></li>
                                     <li><a type="delete">Delete</a></li>
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
                                 <div class="oe_kanban_content">
-                                    <h3 class="oe_kanban_ellipsis"><field name="name"/></h3>
+                                    <a type="edit"><h3 class="oe_kanban_ellipsis"><field name="name"/></h3></a>
 
                                     <div class="oe_kanban_project_list">
                                         <a t-if="record.use_tasks.raw_value"
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index df5c788690c..ebab44e225a 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -31,9 +31,9 @@
     width: 30px;
     height: 30px;
     padding-left: 0px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    border-radius: 4px;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+    border-radius: 2px;
     -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
     -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
     -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);

From 8a627dd9eba1c77a63340f77b159d6edbfdadbd5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 23 May 2012 16:42:45 +0200
Subject: [PATCH 406/452] [IMP] minor useability improvements

bzr revid: fp@tinyerp.com-20120523144245-a3yqo9oi4cwf6lz4
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 addons/sale/sale.py                 | 2 +-
 addons/sale/sale_view.xml           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 657a9c3a89e..874cd406852 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -10,7 +10,7 @@
         </table>
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
-                <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/>
+                <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="What are you working on?"/>
                 <button class="oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
             <div class="oe_clear"></div>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index a93e67585d6..1af91989499 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1015,7 +1015,7 @@ class sale_order_line(osv.osv):
             help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."),
         'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
         'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner'),
-        'product_uom_qty': fields.float('Quantity (Unit of Measure)', digits_compute= dp.get_precision('Product UoS'), required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Product UoS'), required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'product_uos_qty': fields.float('Quantity (UoS)' ,digits_compute= dp.get_precision('Product UoS'), readonly=True, states={'draft': [('readonly', False)]}),
         'product_uos': fields.many2one('product.uom', 'Product UoS'),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 7a573993c45..dbd1cc16a6b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -199,9 +199,9 @@
                                 </form>
                                 <tree string="Sales Order Lines">
                                     <field colspan="4" name="name"/>
-                                    <field name="product_uom_qty" string="Qty(Unit of Measure)"/>
+                                    <field name="product_uom_qty" string="Quantity"/>
                                     <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                    <field groups="product.group_uos" name="product_uos_qty" string="Qty(UoS)"/>
+                                    <field groups="product.group_uos" name="product_uos_qty" string="Quantity (UoS)"/>
                                     <field groups="product.group_uos" name="product_uos" string="UoS"/>
                                     <field name="discount" groups="sale.group_discount_per_so_line"/>
                                     <field name="price_unit"/>

From c618dd3c0fc5281df6eecc9d3da16950274cd7bb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 23 May 2012 17:01:36 +0200
Subject: [PATCH 407/452] [IMP] tooltip project

bzr revid: fp@tinyerp.com-20120523150136-c8qe84ho0wldee5w
---
 addons/project/project_view.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9dc143d2fbb..41dd0c2952b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -268,12 +268,16 @@
             <field name="view_id" ref="view_project_kanban"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
             <field name="context">{}</field>
-            <field name="help" type="xml"><p>You have no projects.</p>
+            <field name="help" type="xml">
+                <p>Press the <i>'create'</i> button to start a new project.</p>
                 <p>Projects are used to organize your activities; plan tasks,
                 track issues, invoice timesheets. You can define internal
                 projects (R&amp;D, Improve Sales Process), private projects (My
                 Todos) or customer ones.</p>
-                <p>Click <i>'create'</i> to start a new project.</p>
+                <p>
+                    You will be able collaborate with internal users on
+                    projects or invite customers to share your activities.
+                </p>
             </field>
         </record>
 

From 6b247d8513e89184edf7bf359ed763f9522285ba Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 23 May 2012 17:05:45 +0200
Subject: [PATCH 408/452] [IMP] Added some kanban menu options for
 opportunities

bzr revid: fme@openerp.com-20120523150545-2z7z4zi0078e3suo
---
 addons/crm/crm_lead_view.xml | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 04acf1188b2..0eb3ad7309b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -256,6 +256,10 @@
                             <ul class="oe_kanban_menu">
                                 <li><a type="edit" >Edit...</a></li>
                                 <li><a type="delete">Delete</a></li>
+                                <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send New Email</a></li>
+                                <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
+                                <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
+                                <li><a name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" type="action">Add Internal Note</a></li>
                                 <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                             </ul>
                             <div class="oe_kanban_content">
@@ -296,33 +300,13 @@
                             </div>
                             <div class="oe_clear"></div>
                         </div>
-
                         <!--
-                        <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}">
-                            <div class="oe_kanban_box oe_kanban_color_border">
-                                <table class="oe_kanban_draghandle">
-                                </table>
-                                <div class="oe_kanban_box_show_onclick_trigger">
-                                </div>
-                                <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
-                                    <div class="oe_kanban_left">
-                                        <a string="Edit" icon="gtk-edit" type="edit"/>
-                                        <a string="Change Color" icon="color-picker" type="color" name="color"/>
-                                        <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
-                                        <a string="Log Call" name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action"/>
-                                        <a string="Schedule Meeting" name="action_makeMeeting" type="object" icon="stock_calendar"/>
-                                        <a string="Add Internal Note" name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action"/>
-                                    </div>
-                                    <div class="oe_kanban_right">
-                                        <a name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="kanban-stop" />
-                                        <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause" />
-                                        <a name="case_open" string="Open" states="pending" type="object" icon="gtk-media-play" />
-                                        <a name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="kanban-apply" />
-                                    </div>
-                                    <br class="oe_kanban_clear"/>
-                                </div>
+                            <div class="oe_kanban_right">
+                                <a name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="kanban-stop" />
+                                <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause" />
+                                <a name="case_open" string="Open" states="pending" type="object" icon="gtk-media-play" />
+                                <a name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="kanban-apply" />
                             </div>
-                        </div>
                         -->
                     </t>
                 </templates>

From 13e782908b6a448a61ad4091d62f4c4e478d82a6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 23 May 2012 17:08:45 +0200
Subject: [PATCH 409/452] [IMP] tooltip project

bzr revid: fp@tinyerp.com-20120523150845-dyx1c0frqfo08esf
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 41dd0c2952b..494fb690fe6 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -269,7 +269,7 @@
             <field name="search_view_id" ref="view_project_project_filter"/>
             <field name="context">{}</field>
             <field name="help" type="xml">
-                <p>Press the <i>'create'</i> button to start a new project.</p>
+                <p>Click <i>'Create'</i> to start a new project.</p>
                 <p>Projects are used to organize your activities; plan tasks,
                 track issues, invoice timesheets. You can define internal
                 projects (R&amp;D, Improve Sales Process), private projects (My

From c6ab501bebe82feaec3935795acc250d7f840769 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 23 May 2012 17:14:45 +0200
Subject: [PATCH 410/452] [imp] re-enabled kitten mode

bzr revid: nicolas.vanhoren@openerp.com-20120523151445-j1613g16d55gp1u1
---
 addons/web/static/src/css/base.css  | 8 ++++++++
 addons/web/static/src/css/base.sass | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 1f4f8c2ddd2..82230667e3a 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2096,6 +2096,14 @@
   color: #333333;
 }
 
+.openerp.kitten-mode-activated {
+  background-image: url(http://placekitten.com/g/1365/769);
+  background-size: cover;
+}
+.openerp.kitten-mode-activated > * {
+  opacity: 0.65;
+}
+
 .openerp .oe_form_field_many2one td:first-child {
   position: relative;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index aa77aca7287..cf025bd03d4 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1727,6 +1727,12 @@ $colour4: #8a89ba
         color: #333
     // }}}
 
+.openerp.kitten-mode-activated
+    background-image: url(http://placekitten.com/g/1365/769)
+    background-size: cover
+    >*
+        opacity: 0.65
+
 // Transitional overrides for old styles {{{
 .openerp
     .oe_form_field_many2one

From 29c0a1ec842608113cb52fada6b5a57e03e20c6e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 23 May 2012 17:16:58 +0200
Subject: [PATCH 411/452] [IMP] tooltip project

bzr revid: fp@tinyerp.com-20120523151658-zomcuvjolf0b5a2z
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 494fb690fe6..9bf97576644 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -269,7 +269,7 @@
             <field name="search_view_id" ref="view_project_project_filter"/>
             <field name="context">{}</field>
             <field name="help" type="xml">
-                <p>Click <i>'Create'</i> to start a new project.</p>
+                <p>Click <i>'Create'</i> to <b>start a new project</b>.</p>
                 <p>Projects are used to organize your activities; plan tasks,
                 track issues, invoice timesheets. You can define internal
                 projects (R&amp;D, Improve Sales Process), private projects (My

From a0ce14ad9b27fd321d76dc2ed1bbf496cc2dfdff Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 23 May 2012 17:28:04 +0200
Subject: [PATCH 412/452] [imp] improvements of kitten mode

bzr revid: nicolas.vanhoren@openerp.com-20120523152804-20qykcbh73vgn008
---
 addons/web/static/src/css/base.css  | 9 +++++----
 addons/web/static/src/css/base.sass | 5 +++--
 addons/web/static/src/js/chrome.js  | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 82230667e3a..01ff07a27ae 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -2096,12 +2096,13 @@
   color: #333333;
 }
 
-.openerp.kitten-mode-activated {
+.kitten-mode-activated {
   background-image: url(http://placekitten.com/g/1365/769);
   background-size: cover;
+  background-attachment: fixed;
 }
-.openerp.kitten-mode-activated > * {
-  opacity: 0.65;
+.kitten-mode-activated > * {
+  opacity: 0.7;
 }
 
 .openerp .oe_form_field_many2one td:first-child {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index cf025bd03d4..1c5ffe27481 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1727,11 +1727,12 @@ $colour4: #8a89ba
         color: #333
     // }}}
 
-.openerp.kitten-mode-activated
+.kitten-mode-activated
     background-image: url(http://placekitten.com/g/1365/769)
     background-size: cover
+    background-attachment: fixed
     >*
-        opacity: 0.65
+        opacity: 0.70
 
 // Transitional overrides for old styles {{{
 .openerp
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index eb2dcad8624..57cab0b6989 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -846,7 +846,7 @@ instance.web.WebClient = instance.web.Widget.extend({
         var self = this;
         this.$element.addClass("openerp openerp-web-client-container");
         if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) {
-            self.$element.addClass("kitten-mode-activated");
+            $("body").addClass("kitten-mode-activated");
             self.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) {
                 self.$element.toggleClass('clark-gable');
             });

From 6c2240c4c1871c76972e77e9a7f29cb9b910f08c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 23 May 2012 17:43:39 +0200
Subject: [PATCH 413/452] [IMP] avatar for edmo users

bzr revid: fp@tinyerp.com-20120523154339-ow7355e5k0p1wzk1
---
 addons/hr/hr_demo.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 6533748bc5e..b2bebb47944 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -8,36 +8,42 @@
           <field name="name">Fabien</field>
           <field name="login">fp</field>
           <field name="password">fp</field>
+          <field name="avatar_big">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</field>
       </record>
 
       <record id="base.user_al" model="res.users">
           <field name="name">Antony</field>
           <field name="login">al</field>
           <field name="password">al</field>
+          <field name="avatar_big">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</field>
       </record>
 
       <record id="base.user_mit" model="res.users">
           <field name="name">Minh</field>
           <field name="login">mit</field>
           <field name="password">mit</field>
+          <field name="avatar_big">/9j/4AAQSkZJRgABAQAAAQABAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2ODApLCBxdWFsaXR5ID0gNzUK/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAoACgAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A77avUmnBY+c8+5oZVVsbweeueKNsanLSrj65/lWhAp2YxtHtRvGRxj6UI8B3jDsT93CnikfbjKBsHpuGKYhDNjI5pPNBwTmk+XAGVyfU4wKaQo5DK2OwB/nQA7zlBJAxUbzEDcT8o7mnKJDglFAJ7jFcP478ZRaPaz6ZBCXu5oirMThY1YHn3OM0hWOw+3QyRxSRMsiSnajJggnnv+FY3iG+WS0NnDLG1y7j5G6EDkj615H4dvZQ1jbXF1MtnFcboI88K5HUenPPpXcReXNFJ+9y8Fw43IeRzkH8Qf0p3A0rJizBZIHib03BgfxFcr4ouI5dZRVUZhQrnvnPNb9xqiW1m8odGl+7kevqa4HU7mV9QQwsHJUluepz60iytrCmS2RiBlXFR2bDkN6VLNILq0aMhkdTkhh6VAPlm46E8fWmDJLvzsRSI5xEflU9uc0698Vard6haXdw6ma0bfF5a7QO5HHb/GrKQPdBYowTI52qPU1j3cMlpeTQTY3xuU+XnkEioktR20PoPTb+LVLCG7t5UdZEViFbO0kZIPvVtVYtgDJPGK4DwDdtbyW8LDEd9ab1x0MkR2k/UrtNd8ZOOrD8atbGfkBjbuKAppyTYA2kZXsBSGck8g0wJDDI4yCoz2dqlSGSMF/OCj/ZHWgMgfdjJ9cf40bWc/NMqr6Z/pUhoO+bKsbhY1IxknJ/Hk0ixRu2d8sh/wBletKirFki5UfRc0b1bg3MuPYUegxfsqLHuEMjP6MKRonC5KrGo65f9MCms0CfdVn93Y1EZYieYxj2oAcrF258pQOhY5x+deQ/FXVtLnvoYIUWS/iUCWZMbdvZeOtd9431U6Z4VupLeApM42LKpJZc/wAVfO80jSOWdixPc0myooRrqZlUF2wowoz0pY7u4iOUldfdWIpkYDv8wJrWttBudQfbbrg4zg+lQ5WLUHLYhttUukBBkZlP3gT1rV0uWKZpmZsMzZAzVWXwxqdvIE8gsT6dKgNncWN4kc8TRN1B9aIzTYSpzjq0aOqQTLbtIkzkZGQcdPrVTeYU/eBzkZ5FbM8ZmsnQg8pS6eVlsYyQDgYOa0ZJh/2nJt2xl0bs6kgitbQ9C1DxNO95/ro4Zo4p/mAkfd/dz1PB/OnTWhbUY5VQbeAeOnrXaeCbiK016fTTiOK+h81MDpKhyCPfBP5UmhSZq6haRaTa6TeWpRYLG9TbtXaRDIPLIPfOTz7iusCbjyQD71W1vRpdQ0O8s0KmadSVkYYAbII/DIq9DbzrbxCdVEu0BsHILY7U0QyHbjjApmDkjnFXTCYz84Gcd6hdMnn9KoQKjnopb/gNIxZSQQFx2xT/AN5nBkYj03YqVGiVkZow20fMC33j60hlUuegJz6VIrRjGVMhIz97FSEK0u9FCD0HOKsieJSVy5TGBljQNFQJySYicdjnipPtnljCwQr9VzTljBctMpWPGASMc/4UgaIfLuXaf7opBY4z4pXM8/guUliFWZAQowME4/wrwEozMa+mfGdnDqfg7U7URgOIC6HHJZeR/Kvnz+xbsQGdVQqq5cZwVH+cVMmjSEXJaEOlWguLyKNuAW5NetaPp1vB+8Tkng/SuE8MxWsNyZZnjLqPl5yBXSXPiKPTn2BkYlQ4/iGD6kHg1zVE5StE66NoR5pHUXUUYYbR1rk/FVmr2cdxt+eGVeg7E4P+NXtP8QjUVfeUVlXdj2rMv9XM87W7MhToyqv9amNOSlY6alWHs73KA5XFUtLfyzNAT9xiRXWR6PafZBOXl2lN3zcdvSseXSftGpQxm3kgSJCZXwcsxHH9K6nUR5dr7DoY3lOEVmJ9Bmtm30vUVj+028RjvbUefbEnBLD+HHowyK1dLTbbopChgMNgYyR3rQaY2bC4ETP5ZDFE6ms/bNu1g5dDp/D+qw+I9Htr+CLBlX5kJyQw6r+B4q5NFGjlCD/tZHf0rjPDDX9n4x1fTmR7bTLpDf26H72SVDHHbJJ4rsmZEchZG3f7bdK2M0iVBbLGVZVHIIY9T/8AWpryQswSOEEngMvf86q7jICAQf8AdFRfaJEk5cooH5U7BewcMTtxj3pFA34z+NIOhO4A+mKBn1FMTJQqK33SwHcnFTRTx8sUAbsV4qrj3pB/vUDRLLK8x/euSB0zVW81ew0mF5rqYRrGu4tjcQPoKq3l+6B4bNRJMv32zwn59TXN3elzXkE0VyS3mjDMeefX8KmUkikmU/FWu+ILkRjTiBYzod5WMFyD2yfaufjeLU9HSNBIbmFsNGHC4HOePyrc0+XyLp9Hvh5bKA0LseDj0NM8R+HfOgkvbTdFqEIydnHmj0+uOlYzfMdeHqeyb0vc5bT7eGIP8qsCckMM1efw9aakjMly0BPUAZB/wrGtJ3Pyk4OcEHrXSadE8kLsjAsuMAmsHJpnZBQktUTafbWGknyBIqSsNjySDBcfyxUEegWTXwlEpYFvujGCCfWtePynti93ctEV/gNsWz9CDzVnSNNaa6ErnKLyOMden40KTvdCqKCha2hoWOnfbb6NX2raod8oI6gdB+J/Sk8X6czPHqts7B1wkxA6jscfpVw6taaSGFwUWEnmUsAB7e9bO2G4g5Cywyrj1DAj/wCvXVCK5TypNpnB6ZdlpWVyOcMCvTHT8OR+tdFgSxZHUVz91ZvperLESI2UHZNt3LInYMPbpmt+1k82NSyYJ67DkE1zzTTKRa0a0dtQfWLuXzLt7dbYxk/KqqTyPrwa2sgk4VeetUNL8sGVN4Vs5UH0q5ja3XI/KuqnK6uZNO5IJXTIREBPemMkbt+8J24PpyaBtHr19aC2ScZwParuIQDHVRnNOkbcBhQmB270zkgkMpAOOvNLk5O4HpQMAc8k/pWTrWqLYp5Ubfv3HbkqPWtKeVbW3eebKxKpYt7VxLeZqV9NclSvmHPvjsPypSdkNK7JbVJp45ZIyVVOTjktzWlBHMsYYMJF74NVrKT7PIFRGIJ7VryQNCheEbj1KAY3CsJSNUjE1nS01a3KcJcRndFJjHPofY1zZ1PU7YG1uM/JgFX+8pByMGvQB5c8auvQ9D3+lZut2Pn2wmSNHkhHzRuMiVO445BHY1N7Fo4i+0hNVYXOnbIrxvvxE7Vf3HvUFjfSabcm3vonhkAwyuMZHr9K1SbUndaF43HIyCSD7irQ1Xz40hv9NklB4DeXvU/4VMopmsKjiRrPaTlBHcM2eig5rS1DWYND0ld3JPO0cFj6fT3rG1K50/w/bC5tbCOOaXKqDn8fpXEXl7d6pc+bcM0jfwqo6D0A9KqnS6k1sRzKx0Njp2oeLr5rq4dktN2Ax+6PZR0rufD0U1nepZaVJJPp0eRciRtyo3YIeu7PUDiua8I+HtWe3bz7mS1sZuGRfvMPb+79a7VPM0+NYLFdgQBcDsKu7UvIwtzK7L2raYmqWw58u4jH7pyOh9D7Vz1k7QyFCWilBw6EcZrehvb1Yz9oWMj/AGeGNU9WsfNP9pWh3Mq4ljH8aj+opzSmtCVeOjLMfI3jCv6gVetLoFsSBS44K46j2zWPY3IliVlbIIyPpVh8giRchhyDWEJODLaTNvzdrghAoHbNNfBJPAzjp2qCCUXEQfkHv9akBAHfNdid1dGJ5PLHLbSmNwyOvBGMGmi6uVPyzOR2+Y13N94YmvwBNqbybT8vmIP5isxvBE+75LxAO2VP+NdEakdpGDg+hjQXs8iLHPdTNHxiJpCRxyK6G3MUMalz8zDIUHmsbUvD8ulNBI86yrKxTKqRg9RSo+7gHPzbR/Wuao+Z6HTT91HRK6uRtUH2x0q7HOyKEK/L096o6ZZkwEyEjIwMelXPsm0grdzhR/CxBH61hKxsncUlIy8qcAnLL6e9R+fuMm0/cAYfiaSUNuGz5kHfp/kVWsUV31ACQsDMoGRgqoCnH4c0mhmj9nhdt7xqJMZDDgn8RTJLVJQUcuSeATyR+NTO2E3cDAz9KhdmC70kB75U84pINjzCPR9S8Q3t1G5LrYfugzttDncRnOD6E10Nn4HSKFi8uGIx+5JGD9Tyf0+lanhGNotLmjlw0y3MiufXB4/TFbyja208r2PpVOT2JSV7lezaa30+NbllaVflZh0bHQ/yqRZUiiUucyPyT6morzOYSoBXJZsnFZdnd/2gXkRsxtIQhHZeg/kT+IqRm2twqLvlYKD0zRHOI2EkZDK3UetQPJFEVTAkmI+UHmp0lWMfvDuYjt/nimtHdA0mZuoWw09hd2inyGb94mfuH1+lWre6WaIcmpJGgmglhJ2pKpVgawbR5rG48iYEY6Hs3uDRNX1RK0OitpliuMZ+Rzj6GtMMAK5wyAg4PX1NbOn3SXEIK4Lp8r89DVUZdGTUj1NAxyHB2Dn0pgQg42nNPWc7dnykDnkc0skjPtJRsjjIroM7XOU8b3kdtp1tETiV5gyqR6A8/mRXL6FJ9t1WKEsAhBbk9hya1viXA7WtldiXEkbFPLbuDzkfl+tcVpN2TcRTLwwOCCe9S9ho9XaWNFCxLuxwOwFEStISXcknjA4x9BWRpt08smwnI25z6VqW9wot3mxlWfYgHfFc+xve5I1sFO5rhwPTAqq8qQSErITk8qQCTj3qaNZGJeQ5Zu3YCgRxM5Ujn2oABcechJTaOwJqIQ7CXgIVCfmjPTPt3FPmjCsqqxLkZVAO2cZpjR3GWCkqre3NFuwrsjsdkOp30IGN+ybHuQQf/Qats5yozxmoIrbZceaSd23YWPUjrj86SeaOKIPJIiAN1dgo/Wkxoqa3eG10y7k43CLao/2jwP1NccNYk0TzooJBlbZcBuQGLcHHsBW14mDX628Fq8chkfAKyDDHqBnpzj8689vVvbrUWtVhnlvGwohSMluB6f561UUDasejeHNTGoWokkl33GcMe9bivG9w8O/dMqh2jU8qD0z6Zry3Q31XQdaeKWGNbhY932SaUIW449s85xwauN4niu1ntZpbrSLySQGa6UE7yBjDL1X8OlNrsSpHpXmQI2wqGI6gdqrahbC4hHkEiRDuCnv7A1wdrq2v+HWS4vYmvdLdx/pC/vEYequOn0Neh2mqWd4QkFwhcqGMR+VwD04PNLbcFqecav4m1KCX7KsT2wwd24Yf/wCt+FdN4M1T+zYreC7uIZItRk3Q7W3MrdDu9OgFQ+ObKBUs7xogZDJsdx1KDnB/z0qDQDHd6g9xbW6wsybI1SPLM3ryMKPcVpFK10ZTvex6ftXgqSCDmh3J58zJz0rZXSY0jU/eI7Z4NZ+rQ2unafcahMpiihUsxLDH0A96vmCzPI/iJqrS6w1ouXW3jC+25huP8xXEWUzW05LYAYjp2Na3iTUjrepy3RjWENg7F9uMn3xWHtPXdQwR6Bo2qkFwSSzrtzXR6TKz2xJOQrEL7V5TZan9lfDnHoa6Sw8STQjAb5GOQKyavsaRfc9CEpRT69qRG2sOfnbkn0rnrXxAJtokXB9a1I7nzG3dazaaLUrmgjFrmSY8AgIo9h/9cmrK/MKopM204jP1pRc+WCWBA9e1Ayy5JB3oVAwPY15v8TEXdp7oMr86n68dq9Akuw2wYYqe4GAa86+Jl4HNhbjadu5iRz6Afypx3E2cW8d1BChIkiicAr1ANMtr29gmeSC6mjmkG1mVzuYehP5Vq3+r2t7olva/ZvKmgJw4/izgAewGM/jWArEjOK2Zl0uddZ2uk6rCbLVZJtP1lW4uJSWWYHoGz0/D/wCtVfUtMvNImFrrlrIUZtqXUXJ+oPRh7GtLwnFpurWh0rXbhkMpzZTSPhcdCit/Cc8+nPStnUdO8SeELF4ZY01fQuN0U652Lz+I+oyPpUXs7AjmkttU0WwW/wBNv1n02ZxGXjOVzn7rxnoeKdr/AIkvp/EaXEjRCazbyo3jQKcA8g+vORWZE1k+ry3VtHKljF++2SsCwx0XI6/NgA+lR6ZYza9rMdokgWSZizSNzjgmqS7jses2gj8a+HLR9/lBpNzZwSpGQetdJonh/TdMU+W2JMY3udze/wBPwrL8PaJdaZpX2W4ugxVj5TwJtO3HQg575rQOlrMxWW4uHUjBXfgEfhTSsiG0yqvxH1FSQ1nbH0GTXG+O/GV/riw27oqQL83ko3Bb1Pr7ZqSdLCWN3tfOiVB8rSMfn+nWuVvtAlklnuBcypOSG8uQdQeRyOh+tdUqWnurX/M5o4iPNaT0MiWaZE3Mqj2HNUTPO/PAB9qfOJoJjHODvU4IJpnmqRzjPYVztWdmdKd1dFSd33bWYmpIJ7hEBjlPsCelQTK4O4g81JG37k+opK1xtmlbeINQtmwdrY7NXQWfjqaKMLLZ89ij/wBDXHsQX3dcsBT93IH40+RPcXMzv08biS2P+k3FrL2xErj8QTVSL4iXkE5WeJZ4zwWi+Un361x0bg5JHXoKcRnsAKapRBzZ1GoePbgXavpVu0MG3DpKd28+/pWDrmr3GtrFqEyIgjxDtQn0znn/ADxVJl+X5cZ9+9RLA0qyKSFIBfGeOP8A61JwS2BSbK7zF+OgpvnP0zxTAOv5UnQ9Kgsvx6gUgMOWMZbcYzyufUDsa2LTxnrGmQG2s9UuTblceVLiRfphs8VzSJufHSr0cSKAAAT700rkt2Bbme4Vo8hVZ974GMn/ACauwXdzaxPFBO8SOQWCHGSPcc1AoWMcAZoB5LHr2FaqK6kuTPWfBXjhdRWPTNSfF2PljlJ/1nsf9r+dd3uI4r5sRmWQOpIZSCpB5B9a9s8AeKotf057TUELahbDJcNgyp/ex6+tNx6onyOeurOxhVzAzyQKOFMn3mz2x68/lVGQalaRzwpuitwFdw+OATx/n0riF1e98oRm7l2DohbIFLcane3mWluXkJxnnHTgVr9ZXLyNXXnr/kc7wvvc19fLQ2NX8Pzs81w93awjB5llA3sMcD0JBBrjmjk3cg1bydxPf1NPB4ya5pylKV2dUI8q5dytHKR8sgOD3NSGNfvIRyKlyPTIpMoD93H0qUyiFuFUcdaX70h9BUjRgn1FRO4Ube9Vcmw9DuYL0FTnB4xVaIgAmrCgEbia0RLF46cGnW8Ya5EeOJfkw3qabgsf7opJJGiKyIfnRgQabEtynPavDJhvwxTHj2qCM8danlkkmcu2Dli3HvyaRuh9KysmattFYHnI5qzG5GOetaXhnwvf+KdU+w2AUMFLvI/3VHufeqNzZz2F89rcxGOaN9rK3UULQT1JCcYA6nrSswAIHU1C77WYj1xUZYsRzVOViVG5bGQox1q3pmpXej6lDfWj7J4jlT2Psfas/cUwAcmpI3BJ8xscZHGapTT0YONj/9k=</field>
       </record>
 
       <record id="base.user_niv" model="res.users">
           <field name="name">Nicolas</field>
           <field name="login">niv</field>
           <field name="password">niv</field>
+          <field name="avatar_big">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</field>
       </record>
 
       <record id="base.user_stw" model="res.users">
           <field name="name">Stéphane</field>
           <field name="login">stw</field>
           <field name="password">stw</field>
+          <field name="avatar_big">/9j/4AAQSkZJRgABAgAAAQABAAD//gAEKgD/4gv4SUNDX1BST0ZJTEUAAQEAAAvoAAAAAAIAAABtbnRyUkdCIFhZWiAH2QADABsAFQAkAB9hY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAA9tYAAQAAAADTLQAAAAAp+D3er/JVrnhC+uTKgzkNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBkZXNjAAABRAAAAHliWFlaAAABwAAAABRiVFJDAAAB1AAACAxkbWRkAAAJ4AAAAIhnWFlaAAAKaAAAABRnVFJDAAAB1AAACAxsdW1pAAAKfAAAABRtZWFzAAAKkAAAACRia3B0AAAKtAAAABRyWFlaAAAKyAAAABRyVFJDAAAB1AAACAx0ZWNoAAAK3AAAAAx2dWVkAAAK6AAAAId3dHB0AAALcAAAABRjcHJ0AAALhAAAADdjaGFkAAALvAAAACxkZXNjAAAAAAAAAB9zUkdCIElFQzYxOTY2LTItMSBibGFjayBzY2FsZWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAACSgAAAPhAAAts9jdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//2Rlc2MAAAAAAAAALklFQyA2MTk2Ni0yLTEgRGVmYXVsdCBSR0IgQ29sb3VyIFNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAAAABQAAAAAAAAbWVhcwAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACWFlaIAAAAAAAAAMWAAADMwAAAqRYWVogAAAAAAAAb6IAADj1AAADkHNpZyAAAAAAQ1JUIGRlc2MAAAAAAAAALVJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUMgNjE5NjYtMi0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLXRleHQAAAAAQ29weXJpZ2h0IEludGVybmF0aW9uYWwgQ29sb3IgQ29uc29ydGl1bSwgMjAwOQAAc2YzMgAAAAAAAQxEAAAF3///8yYAAAeUAAD9j///+6H///2iAAAD2wAAwHX/2wBDAAUEBAUEAwUFBAUGBgUGCA4JCAcHCBEMDQoOFBEVFBMRExMWGB8bFhceFxMTGyUcHiAhIyMjFRomKSYiKR8iIyL/2wBDAQYGBggHCBAJCRAiFhMWIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiL/wgARCACvALQDACIAAREBAhEB/8QAHAAAAQUBAQEAAAAAAAAAAAAABgIDBAUHAQAI/8QAGQEAAwEBAQAAAAAAAAAAAAAAAQIDAAQF/8QAGQEAAwEBAQAAAAAAAAAAAAAAAQIDAAQF/9oADAMAAAERAhEAAAHJi4NLM9joubaLWJH5KivIcgZQuiC7fnsLxL2EGq4E+uEpUupdwu/Vy2MpTK6G6MM2Uywau8QrBhOOXxpaWtSy8iJIt5GJJwhaTBtdwoa9g7U2lG2lUNrWnngRlRxGcuC6Mdx1DdMZQrTOMTb0CwIzq6o7UXIX45DSFT4v8uBJZhUo5BT1wCnQWVqqU6zTXWLTqlcSkIjrElsbSqgcY6HHmZ1seqj3G2PTIb46CklGiKvMR9R0BUCdADSxCIOx7dPA4MQpbLqLUrWQCYX3MiVFeOKq6KaK03PCWzpu29YoDLiFnVN0ELk+BXmqoUuGAr3FDZhBIwqdySBDi4ySUQuil+Ca3kmnx53oeTdURYUmQi2JVVuC7WwVrWQ6RHs1amtau/JRhJlkqterH9DwEo80WnWXx5IL0OH0qVjJ9n9Jrdj+V9Et8kcBPKahLs42iW03NVXcaRzex9BV+Z0FYH+XIU/PzQs8P3hVB5mGKZLL8FWa8rpXSc007MqLzvvI3lJ4GlWlT6fXIRH9XhKKe6Ho9klhaZei2tlVuBR4BbZfhCg36SBwcxhmntgZJU6QXY3v2QEDvFpRuc97ZcuFPWilEL7wH4EbyVdm1smXf5bfGm79K/P2/wB+Ga2w6whsWtGdXrjuuq87PgFcCI7yNE+50ZRYJWjA4bsuPPL2rBMOuukqa2savjeN7pGN24r9Evhhjfk7Tz0vOu7fihCAc3Edsx773PRHU92UpCti5dTKdKVpSZuhDjO3kqTj2VE6GNNWxc+pY4lDt/XjWOT64jo/fQdsU57nPT3OpBV5Pjl9T3D/xAAtEAABBAIBBAAFAwUBAAAAAAABAAIDBAUREgYQEyEUICIjMRUlMyQyNDVBRf/aAAgBAAABBQJh1JGfpCxR/oOxOkLDXLIz8VNYc5GYlhl+kva5OPKXn6hd6XrvXvSwKvehnV+3K+6ojtiw/uh2fotmi4t3JalGPZGyUaTWMcbdbxmJnJzzxlZJxlEpLmShy5hB7V5GryNThC8qA/a/7Dkpqcf65aRzdpHLW3ts2nDH0YRXhsTMEVg8iXoHk1v0Sl6L0yQ8g9zZI2hsPxtVCMSI26rXeWKROGjV9wKX89gVU1NdUrXEWQGNKCuDRHvsCg7k9v8AqCVW/wAb/wBCoNxE7VP+MIVZLC/TJ1+lzqfHWGqm0xZQysiFjKQKW0HiSw0IWmFWvdaP0bHaL3JVgZJX+AgQrMAOPgKFONvakfqCota5eJi8Ma8MadCGZbIw2JHOY/dSo+WOWN3NrHKQf0uuInP0KEbe0luKbZn5M/xjasB+Oc59RVTqwPzjvz3s/ShKArb4nzNDK+LemuCIMql1G5xJ7M9IyMONZQeW/ir4WF2O9UlEdTLHf3d7g3TltFwMp5zTc38ncmOPOk/+vzEXjuL/AKoP5MhJFFiqEXmi+AroVY2gKlibN6CvjYBjzSrxxWIfE7sfavxOq2IH7lmglEbSQnS7dhmfdyTfPiP+FEaAOqkcj7EYbLE2KHJyJld4ZbpfDu6XjDcY6bipJtqWUkdyHZOsdxP+KeWOk2o2GR3xPwsnKP8ATAoY+T5g1pGzWpY15aC2JS3mtD8k7kXue7pJw8EganjRtTsrxTZzZGVtcMbA/JZiO0/HWp5obTjChEuQjD5A919s2Pdy0BK4JkrQ7HWqETZMnXBnyYIbBbup0WnBYCWSvbeNh6yMZkpaDe3SY/ds3H+98SEyUCOScaJ32zbfJjfkb2xtmRleT+QKDflbLuCxO0K7kI42H8rpL/adQt1nzoKN3ht2HeabWu1r7nSfyN/KgnbHA6Zpdeg8F3fjrHOWBWkuTTlzi+Tt0p6y3Uzf3/x+w2SaUk79lcUBz6O+YtJXicsuzcsqaPtnij36V9ZfqYfvbf761yaonvMkmwtqnC2XowjXygoO0A7ayB4RlRJ2gt7W+2ArEYeWlWsx2uma3OTptzXO6YlCPT9kKLA2HPqV2w47KUhj7x+VkEjlFj4XxXpfJO53EQkmVwG/WtIDk+GIV64PvW06vyM+o2s+okpjtO6naBlz8uKsfS7HQPIOkGl5cfe+TQPZesPH5szz97+246kJ9WXaQTvTF1J/P2PejL4rvkK4enPTWFx8Lk8fbLOKx04q3YuoYy6Jwfj5PcO/UkfJ0EBlfaI866jH2+x7j0WzyOa5zFzDV5XIyOXkcVvaB0WO2MLfjOPHuqw/TI3kowI4i7k9dQDeO+aCwGxH8u9/NA/Tqj+Ela6A2M9rD9V+2YbyxHbX099po2SnI/LWfyDXbjrz67WX7W+1tvko9t/T8n//xAAjEQABBAICAgIDAAAAAAAAAAABAAIQEQMSBDEgIRMiI0FR/9oACAECEQE/AXoyzESLRxIiouKh/SC1C190qRTxJMWn9RssZtyddp10vdeNp3UsNFbBFyc71LQD2iILvrfgbai9GyIDfraulsrK0LmGoBj5LFFekXILYpuNj3LNgGNuwjhamy7oIcIn2Ss2MM6gJ0Nhhorke2Q3LphI/qxHbACuVRFw3tEwJ+T6alWnLiZwGlhXJeC2vFsnqNG/ty/EFkyB56WEMeKIWRmjqlvfhXgx2rrXK9kGCh4//8QAIREAAgICAgMAAwAAAAAAAAAAAAECEBExEiEDIEETMlH/2gAIAQERAT8Bju5Nom8s4o48SPTOXdKWKjsb6Ms5PIq2hGCKyJHFC3WCUfpG/tIVK3oSvGKbawkfq6j2YHWzB9HUdnE4xE8Omu641gkuzBlxQptup/MH5kiM+V4VTp6IbqMctEupHjENHH6YHeO81HpHki85IIjSqerVcv4diWBykiLys19Ja9M+j7PDqkPXr//EADkQAAEDAgMFBQUGBwEAAAAAAAEAAhEDIRASMSAyQVFhBBMicZFScoGhsSMwQoKSwRRDYnPR4fCi/9oACAEAAAY/AghgPM7FvReExZWMNKAdwRAHFMBwg7VjLfZKAnK/kU85yOmAw/NjB4rPTMcV3bDPtPUtZJ5laKKgQLD4UDKE6K+FirrVarVS4AnBqCyUsmU3uF/L/St5v6UWmpwjQKi0Eklg8SaOPFQ0Xxyu0Kex3AWV9g1X3bC0PomPZurKTdTTNvJdEEEMT5Kkzg2+0yoNdEcQvIfuneSZ5JyPvYEdcPs4tqtQtR6JuQF3ujRNaRfKpquhFragVl4jhI54A4N81eSOUrdUAv8A1FbvzUNzAdDg4YPzAFbjfRbjfRbjfRUXNEBzSFmp08zY5q4Ce46MGHD0UFdUydcBKeW/BDxn1TZ9lEB5jzUvMmcB1QVT4bFN/suUuROnknXbcSbqcBTZvOMIsI8Q5oTh8EWNQqNY8t4GF+RXdrqm4N88KmxUjUXVjwV1LBFrxhdUneyZU8KgnYbI8JdCbQY05iU7vZLRpdbnzUDMB72D6vZg0hh0J1TabqcZh4p1WSlTDf6uK8M5eeMcEaZ3TdpV1na0QvFGD6r9MpDf3XZ6zJJZrjqFPHMI9FSFSHOLiBPwTpcwANs1o4q8NHVAVHtLl9m7M3mi/u4LnHx810RUcNjtOffZU8PRRxCgnDoqRa1rmt/A4SE40mhtPupAjCfwjVQ1ZeOb9lTdUzMDDI5qW0785koz81ZS8knqu0tvMjyxz1TDVHZqfxciHOZJ4huio0qz3OYTLr8FVpVGzByO+CkCCrFXx7plV3dVGacOqthLmz5r2avN6jvQfJfZX+CzU2HLzUHXBtGpXIpv/lC914cKjWiSRYK2FQ8qJ+oXa517w4faLwY9krf9cbN8K8ulrW+GeaPTBtTMQ6ZkcE19iCOChFs+Iq2Fb+yfqF2rzB/8jBrnMztbwRc1mUY03ey1v+NtzXficEVUaN3UIEawmta1jDFyG6qX1HH4rXGp/ZP1Cq+636YOFCm5518IlXx/L9HbdsKbxxsgwaK87LutI/UJ3uBN80/uXQHiHSnPfEnF/Pu6n7/cWBVOTJldSiMbYUXE7xJWXtFJtT3kHdmqPp303grdqn8n+14e0MP5Vv0j8T/hfaOYxnOZX8CHS1zXNzHqjQD89pnLG0zLTJzaJrqvamtceHJBsyGfVX3l5q6jCG6nRUqI0pMDU3DUqJvyhXVkCg8fjpA/XadQeMzNVPd+hUqSrLW+Fl2Vp9vN6XT/ACTHdV54dTgOuHZz/RH/AHrtU3dYW781LlDdFZfh/UFlHJaj1TK28W8F46LhLYs6UxzdDdNdgXO0VtFlbusth2V3vD6bYdm16r/Ss354WKucZQ7PUMPabI7BPPCkeVT9tvK7h9xHNBZKu7zxd6Y1f6SD88Z2ev3AOADtMAMe0M5sOI2f/8QAJxABAAICAQMDBAMBAAAAAAAAAQARITFBUWFxEIGRobHB8CDR8eH/2gAIAQAAAT8hufeWQUv7Er9AFsqF315EwBFtnMx28VfvLTq6IHBbZgWQpUwRQGNxd+5AcHgnLBQcM3Besqz45/5CEvfuMrTroDgzol030l57QcnvFZ5/Y9SnThGI1suDP9zIMBm4vifMAFzWSVvEYgp5iWLffTzFpdt4YyHaOu4COGNRBWQlxsnVU9J/jyv/AIZi/rO4LE9GbuhB+p+JTaxvLfz2ijinu/uZeDwJhdKVFx1qCXfyzaF35jmM897AHcGWiSgogrkxQm7p5SwyvPxHdcTcLxAVYvMaErNBdegCcB7E3GoKbKgLtEjgb6o/BxCPo5zC/rAq2rfEv8xXv6TCMwtqYC2wO2Kdba0CcWqxEw8YlaRlXvDGDDkIPScJlt+79pb+6Js612jvovRyrrzTrxuP1fWB5CsFZY1RlEJ4uUk6dZ0kZSUB0idZrrGBopCZNSpQFvJDQwUHAi2ZuY8tT9bKgh0JLWu2C/DFPT2cMeTz+GC4pVWX1n+Yn+AleviQluFOpHJh24e0M8s3hmBm43EOtS+beYXt0+8sl7cDFec3iLQVABpT9orNOLXFFiWHl6K/ErFziAL32XsTiUjoSL9PMV/o5/hntxQ+GGqe0UKK97MPL2spdsqXh8xBZNrKQgyQ9moQVddPRjthGNULBhWkLXPnPwjZ7N5agwOsNS5+EOHoxfAfmDLlxuJae2YlIKNCxhLcA5d4LbEttCU8L7CC5NHRzz+95nFytGaqdXGVvzMAyt4ARmxqB2PJ+9Yt/wBpeEnAvRRtFgq6EwTw858+YD8RWvfcIS6m3WXLgoqrHMyKe2IKHOC7GWWkGcdcQvbzMFV5hr8iKYoBB2p+pL2m1w9s9pfHtXlcA+/iwBoU1W0yNly4fG7bYXnNJiVa93T09q8QFUCgalzu3oTjmKK+iqwfSByw0qHIaj6T6oMXdPX+oe8OwaeMLqUulxEKlobVKBeW7uAAMtjsD+5c66/Ccf1LOzz/ADERkjD3nXmMmvariKRtry39dzgMsLbI8pT0uXGf+uI3ogC4y4aa1ynvr3h6k3dtUSr788JMu0xjiEuc8wfjapyarF+feFihbywuuHtGN+lUrgET4v2j+y8n7RZ8hDTkG+JbKo3mZMux9VVvfr2ljZYHmOlrAgCjCCsg86qtRyT5JfbXdFG4ikorYE8yBfufj+CdJkdUMaZcdhCustTEDsiRE4hXLRM5StqNnR7wIwpLxK4qMVn3lLcO/ot0M7jh9EICKyW5w/nMyinARexCC+39Gn8Sl3Ob4PgjEq28Qt7OusMHxCrmUxVqsutRZ1Jp9IoVPmMqGI7+6n0QsS9szxexUHXEtgImElcTFBklrXC/X2/jqXNGnYhO73PsJ+ZdNRtg8zu6lerGDSu4yosvgwycV8X7xGsEAG47afNFSiZ6JUGB79KiL+NbnUHLEFrOxGxcP0P8i+5KObXEBXWY9CdIzG+sZWV4eX+oIOGkWnh2Tvu7g8c/WUoO+XTkvKIxj25Ag5J9of5HLkjcZ3j3mALL6n3YM+j6eYHQbaYa/WGSK3E8MsMsAymur7B7TMbPpAG+Et7cT3HWBMxCJWoHWVO0D2K/E90siC3sxDvRzOvPQi63xUK+k3Ov43NAn1ofiPPo+hFtGgVddfafSqgfAzde0Y6eYAeiBse4RWwY6wrqA0gC/TtG3YT8TKT4Mz3Ey6g0zA2ufos/lD2bi8+nD1c682h0Y9X8IUGA7y80Ri/8QtzAiNtRbx8xzn2Qwk7PTsr8xTzt+RqJtZUZ3kQveWToSpijtjDqKR1L+nf0e3rt6ESCQMLC42UXof8AVxZh9/6VF6cHgv7y8Kj8RRdj3zFbRTTZK8SxSBfSb/v0a6KNcS9GCrjL8r9PGL9Xozn1Mw+DamZt0S2N8x3iXK9cn1D+VL2UzHTMO5tCYY7whr0z/YfwPyxjqae6vWpjuBl7CLZOHzFmceo02TqldMqfEq8B8Qee0odP0XDc6LzWI7nEcDv6VMks5J//2gAMAwAAARECEQAAEBdEOjLEJ/si44FIY7sRfZh+We9X51X0GL/Me04gpkGvqiG2MaP/AK53RzpXcZRfettJIrv0dBr4MUxqzvmNNzBW+fC9FStO0Gg8a5N8Dj9HtAVqRV22QzmNXu5/d5fhG5AHJyv/xAAjEQADAAICAgICAwAAAAAAAAAAAREQITFBUWGBkSAwccHh/9oACAECEQE/EF1kiiaRDSKILJqyLEibjPWJGqDTSXQ1LqkxBaG3Lgps2ihiEMtIbgGqXNLNkCUPEdjUivR1c1PA6SEoFGLZoHahKmIbTrSHs3BNwsd4ulyMWlxs9iYBpFTwDXZqj2iOd+/8K1+ysRG6is16V3BOk2x8C1oZ1+McMR2In/yhJIkfMr4IWl8+hIA+Bkkfs6Coa5uikfaSFc91GiN/0NOHAxs5ZWisnxfCbL5H9IXnpNcnPgWfHDUX6S9S9EJeGh4cvx//xAAfEQEBAQADAAMBAQEAAAAAAAABABEQITFBUWEgccH/2gAIAQERAT8Qk48Ty9KG7mj2TvpDsk1++BDRftPUfqUSdUJgiBc5LNLNkQGR7ab1Cup8gpDbP26M8HUcQZBrkF5PcoH1y0QlGw41DODEkfaMOke+peyChDcf+N2VeuAAImfxfEndI2JliTeVlinh/wCjeANkXnD1Gm/Nl6ODuLpO7afBDUbY5DWR8jL07tfUXreTOFjCFATDvAOAHsd1ysbC1mC7s/yu5GxJ5Ds9uT+Qxl2Z9Sce6P42/8QAJxABAAICAQMEAwEBAQEAAAAAAQARITFBUWFxgZGhscHR8BDhIPH/2gAIAQAAAT8QyW4EtVIVpYQ+YVt0vm/zKJj/ADIir4gAgFCb/wCmsd4iAQtQyaCnZv56RDmzea5dXG4WV5AsVdH4MQJZ0EZOfuVNWmisr3413xGAbGjtnv3rEzb3RvKbHthIFFtSlzrj3meWk8wgLUyDeZamveULLLzA1T21+h36PZmFji4Bemh8Ye0y7wCpEFnBLCN5ToJQ+Zjep+EoPAfy/mVDH7hALmVvO/HmIML2WBh1KFa1004RGviyDoHlynAXiYoEtOy7zMJY9QvC48/ESqqo4T/kEpQrnlg/aehGVhbVNa+IE1tUVZA466jZ18hd1R/cRJKpa2o9DtAdgoFZOmvSYDwgXEFT7Lynya4/RF/2Jd1TLrY6qMAq2+CewwWvpSQQF2DGH8xMq66DA8n85ib4Geiz1vJ+JgT4Ot8BYxycxuJgUxgqugOFy2Zg1KLnKtXcopZ2YKTglujOMYsgNcOrl24LDGeKS4YPN/3aMF1LFO1n/wA9YoFg6uczAWNHpWT6lB2gqcX/AN+IvcVVRbbuuTXSGRo5bP7lFxFHHLH1DEXRDY+JTjXLfP8AVAWYwBH6xFDdrfk/8m3Vn5qYeg+YJpd7z0/5zEGqzw78nruEcNQUfcemJY4muDYGH1MKctlRQUa2kpGZyhUDYYvdRSpqLZTyJAoZpYXnfETQ0DmMm837wxZYT4qIcu1MmlTZF7R7/wDIKr0s2A9LL/LnyaniKlyCgt06ENTn9kP1KKefwxJAx+XVe0G0fSzvz0nVIoGzAChcwmgK5iESTK0XrjZHvVcy+kAAisE9NS/K0u+ubjFFak5fJmuDzEWEoJyQgrBtL73GxxbdWW08Z+WWAZpuAlogcC5fuWVI4YC3q84R9YqGN+f7gOi6AD2uJdgLa2L7UrRL67iYGUOvIPRT8zB3lECThd09Xifz34my/wCrtOI/H6oqanSjI3XcT2gkxmO1z1e0IAtQLrleBLKjOju79pxCO0upRLo4ofe4hIW89kxaWu45eSAD2IUJnEby2YRF2qfKvmKcPBoiUdcdfWJKuigyXmOJK3C3msJGWDiXjmNnuqlgaxnHDv3+JQnf8ftLFkQwuD/CWDoMOwi/UBkAWwkAIovsREbHBrQq7ukJjAjlICJfcmsJb1q9okEoKAu7zT04IBDQdH9/XFcDEFqWwObz/wAlqxdNXVz3rHpFJqvC7lwZBH2loWUa7NJnLyC6oZXg13ZU8hX0H+V14AL1x+YVKUo/X5igdVjBCCGoKAgvY+gxDJYDMokB268sW0IihgHqihgebbuATJu+Lmf27g1VLfa0hkqe+dLN5yXrgcSsAaND0mkMTJo+sJZnChZYjDurhDdPbXm76ta29oli6CwI6HIUPa0UdFcoH5g/XwcPn/BgPsO9yYukcod7xMFECjirZONK4iRfFnFdXk+WYPkGn3U4+PthYJSpTVMEFv61OAAMo7fIlekowwC+8bLJUGvFxJVbTMxQpKd3WBfEYXg6vHvQKB24ohPEBNzedw9SioDvZVfHmw/MAq1ZWaV/oTtnjCABM8vxKKnFrymay0nv6yoGiRV11w18kJ1Gaxb7D9sG2VlAVXAOTvWM3woVtwaoIZJdLhdnrYWKdQkMC9BTiBWYEzi/EErn0iKHM2kMM6mUB0duYeMvW3mX2uD5uaHTF6lmNLmX4tkjXEoSXWQdYYFMTbKaG/LQjTshVwKr5lCy+1z2GnMXCMK93wM4eCXVWLkqg9vtCmEB2Sr5Snl7QCwKttVXNK1ooqAE62Gs9K5+IjMnAqL74iFRtRfMKVqWkKAHTku8VVU2NsAepdRqRbvrK9qFtlugI9iZBUnmn7gFWkouzr3GWaRLgwrpQpWkQKKgYUg7KU12XcQoC8KV/v7iJfsHMByI6SkQJwEosoYaHrKzRLHSGAtvDQekQtgMF1EWDu0+TMu4VZAXF8NnGWu8WSYFhZ6sweWnpzGYFi6L6hH3hKDDmX4Ny5FUtLPQWvi5Y11JtmXAC10S4IgVhWXlou7uKcQmUrnb63KoD/szkXAtuFK5BXvraRMU6u19YFzcI4tIvFhcDKBV5EWz4jtjRARc5I4Z2VWPeEBc7UySzKsfHEAQtsDpnfH/ADBWPeYeJyKkyMS1lHf+7S2CHmZLJURimWhawdojXqe0D8RmaVZEEQRUQ2M9uoQL4JgQTArHtOEvcceZXBWDKcKLDH2cy+wtsIBfQ1G+OIlC3IwBCjW1flYsg6zUtjCmIqLrW3sgAVDXPoz7QYWPMHOPEJAqt9/pl/8AIAOsF4PrBZvPqq269WvaKEkbG8wA0yRcmg7NnpEIK5oZLZ+MRFfIVgzdi3xXSoFUu6o+xD0mUUYVbUy4ilw1Nxu4iIFBxrmr8Q0swMyhDLHRlAULd95dAVgpE4ijZ6QI+pOfF3XaxzOZ0jLsJszNrDs94QLJL/3T9yxBTUTFDnyvWK0ShfdlQwK62Jp4mRboOIijNjnROzXaXlG0M82/iNxr9+mIDdmQ9EJzkqEbHJvee8JA5RDVcRIyiqwfmI4t1GkNZ7TOPeM6RY59olCtN3GndZRO52gl92a1WXEOxYtr4iUeVjV6PQmXMBYE3NiO5hLy4l8EnACrmRGYBqr9/UhCPcA9fpElFOXRphZlQ9VKAZOQrtVpkLVlKr0WU+n4HfP5QjOcafgDL5YI2wZcLAYo0Fe6y4aeMFLCvycwTDXSczRhMeEYrL0dAtRaHXLhgCVtWsbAtnipQCRvlWHYP08INDddL/EI7oGhm+h7ywBRp3mbAF8U47wmQso2CtBMlgA00W+XvAAvB+thOMyokWOij9kVUkKAWu+IrIBbgqDZYyrrLs013zcoIbD1T6Jln+HidK/wZGrTWXkU7OfMxnBMDXOABvpBCVug9esQF5J5gS6sVAJMqacye1cEzV7SgquHSFr9fWVYfqQBBDOnk6IEZUaInmUGqgqqaNSxHO5lINY9jLBAxGWlJxGyuLFB0mqhIouSrw780+kW/Z+yJnmWPR/2KAU/MLFrtVAeVoIWzHn90MoHkJIi5djrEirPKew3EmScd7ds92uJRKXRZLmlJQ3s3JhioXSMAeCZlqdjUCWFl4P3CaoIHXb8s4I9Jhh8iPtL/wAVj/WAlER7xPELBEyEt2h+1T2lsQ1ZnAhmANgGHujwuu6fwjFGld3vFcCzoRg8kNNh+GGdrKy8C+G32EdbktPeKR2lBbeISyPQZmRdW3mOT9xwDUq4FfwRscxYGXY/1Uq8xvBAJ0uz7go5SrtnUoJ0pbxKWFq9ZKpjmYHeJ1VLj3lgvSvhmVMUYgvibMjn15gOITNI2JB8pNOE/tgq0dJArPRFsPtBC9O3+L3ay74JZBJd0wWOTEmWlmb6Z9JyVmXyf35iW9ucj+e0swp0xVWM3HXadInIGZ0CwOgcogLFxYzlzKa9D1lL3StI4URvfWCz17gJXuR5FZGmLnLOlT71DJ/gswwbkZ//2Q==</field>
       </record>
 
       <record id="base.user_chs" model="res.users">
           <field name="name">Christophe</field>
           <field name="login">chs</field>
           <field name="password">chs</field>
+          <field name="avatar_big">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</field>
       </record>
 
       <record id="base.user_qdp" model="res.users">
@@ -56,24 +62,28 @@
           <field name="name">Francois</field>
           <field name="login">fpi</field>
           <field name="password">fpi</field>
+          <field name="photo_big">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</field>
       </record>
 
       <record id="base.user_jth" model="res.users">
           <field name="name">Julien</field>
           <field name="login">jth</field>
           <field name="password">jth</field>
+          <field name="photo_big">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</field>
       </record>
 
       <record id="base.user_ngh" model="res.users">
           <field name="name">Nicoleta</field>
           <field name="login">ngh</field>
           <field name="password">ngh</field>
+          <field name="avatar_big">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</field>
       </record>
 
       <record id="base.user_vad" model="res.users">
           <field name="name">Valérie</field>
           <field name="login">vad</field>
           <field name="password">vad</field>
+          <field name="avatar_big">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</field>
       </record>
 
     <!--Department-->

From 0310c410fa9445ceaafb8558f42cac225b0bf72f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 23 May 2012 17:58:10 +0200
Subject: [PATCH 414/452] [FIX] Kanban view action menu reaches edge of window
 on rightmost column

bzr revid: fme@openerp.com-20120523155810-0r825p2fi9irlo6h
---
 addons/web_kanban/static/src/js/kanban.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 801e8edaee1..ab296674e76 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -41,9 +41,18 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         // Bind kanban cards dropdown menus
         this.$element.on('click', '.oe_kanban_menuaction', function() {
             var $menu = $(this).next('.oe_kanban_menu');
-            var toggle = $menu.is(':visible');
+            var show = !$menu.is(':visible');
             self.$element.find('.oe_kanban_menu').hide();
-            $menu.toggle(!toggle);
+            var doc_width = $(document).width();
+            $menu.toggle(show);
+            if (show) {
+                var offset = $menu.offset();
+                var menu_width = $menu.width();
+                var x = doc_width - offset.left - menu_width - 15;
+                if (x < 0) {
+                    $menu.offset({ left: offset.left + x }).width(menu_width);
+                }
+            }
             return false;
         });
         $('html').on('click', function() {

From 4044c597a5c8773b59220042914c14eb4c1049df Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 23 May 2012 17:55:23 +0200
Subject: [PATCH 415/452] [FIX] web: failed login are marked as failed

bzr revid: chs@openerp.com-20120523155523-c3ifog3iq3y27i6c
---
 addons/web/static/src/js/coresetup.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 37e80e44d35..4defde54a3c 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -121,6 +121,10 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
         var base_location = document.location.protocol + '//' + document.location.host;
         var params = { db: db, login: login, password: password, base_location: base_location };
         return this.rpc("/web/session/authenticate", params).pipe(function(result) {
+            if (!result.uid) {
+                return $.Deferred().reject();
+            }
+
             _.extend(self, {
                 session_id: result.session_id,
                 db: result.db,

From 59fba5b8bd12e8d4e582d9e75ac5ca25f4daf34b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 23 May 2012 18:25:48 +0200
Subject: [PATCH 416/452] [IMP] web: allow pipe()ing login.do_login() call

bzr revid: chs@openerp.com-20120523162548-kajbox13hww4slr3
---
 addons/web/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 57cab0b6989..8b4bb5ff3f8 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -521,7 +521,7 @@ instance.web.Login =  instance.web.Widget.extend({
     do_login: function (db, login, password) {
         var self = this;
         this.$element.removeClass('oe_login_invalid');
-        this.session.session_authenticate(db, login, password).then(function() {
+        return this.session.session_authenticate(db, login, password).pipe(function() {
             if (self.has_local_storage) {
                 if(self.remember_credentials) {
                     localStorage.setItem('last_db_login_success', db);

From 42e2dae924f606c99def25a1026550b336d76821 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 23 May 2012 18:29:03 +0200
Subject: [PATCH 417/452] [IMP] web: login widget: allow dblist loading without
 changing $element

bzr revid: chs@openerp.com-20120523162903-0fnu8k15idomvme6
---
 addons/web/static/src/js/chrome.js | 36 ++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 8b4bb5ff3f8..a36421f2b2b 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -450,6 +450,8 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
 instance.web.Login =  instance.web.Widget.extend({
     template: "Login",
     remember_credentials: true,
+    _db_list: null,
+
     init: function(parent) {
         this._super(parent);
         this.has_local_storage = typeof(localStorage) != 'undefined';
@@ -478,23 +480,33 @@ instance.web.Login =  instance.web.Widget.extend({
                 self.databasemanager.destroy();
                 self.$element.find('.oe_login_bottom').show();
                 self.$element.find('.oe_login_pane').show();
-                self.load_db_list();
+                self.load_db_list(true).then(self.proxy('_db_list_loaded'));
             });
         });
-        self.load_db_list();
+        return self.load_db_list().then(self.proxy('_db_list_loaded'));
     },
-    load_db_list: function () {
-        var self = this;
-        self.rpc("/web/database/get_list", {}, function(result) {
-            self.set_db_list(result.db_list);
-        }, function(error, event) {
-            if (error.data.fault_code === 'AccessDenied') {
-                event.preventDefault();
-            }
-        });
+    load_db_list: function (force) {
+        var d = $.when(), self = this;
+        if (_.isNull(this._db_list) || force) {
+            d = self.rpc("/web/database/get_list", {}, function(result) {
+                self._db_list = _.clone(result.db_list);
+            }, function(error, event) {
+                if (error.data.fault_code === 'AccessDenied') {
+                    event.preventDefault();
+                }
+            });
+        }
+        return d;
     },
-    set_db_list: function (list) {
+    _db_list_loaded: function () {
+        var list = this._db_list,
+            dbdiv = this.$element.find('div.oe_login_dbpane');
         this.$element.find("[name=db]").replaceWith(instance.web.qweb.render('Login.dblist', { db_list: list, selected_db: this.selected_db}));
+        if(list && list.length === 1) {
+            dbdiv.hide();
+        } else {
+            dbdiv.show();
+        }
     },
     on_submit: function(ev) {
         if(ev) {

From 4c8dc6b80622bf3c3d884be1c4bb914b93768acf Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 23 May 2012 19:15:27 +0200
Subject: [PATCH 418/452] [IMP] sale: some code
 refactoring/cleaning/fixing/improving

bzr revid: qdp-launchpad@openerp.com-20120523171527-p82rno4ba4q5le42
---
 .../sale/wizard/sale_make_invoice_advance.py  | 57 +++++++++----------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 0d826fe1efa..f3d9bd65a91 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -20,23 +20,23 @@
 
 from osv import fields, osv
 from tools.translate import _
+import decimal_precision as dp
 
 class sale_advance_payment_inv(osv.osv_memory):
     _name = "sale.advance.payment.inv"
     _description = "Sales Advance Payment Invoice"
 
     def _default_product_id(self, cr, uid, context=None):
-        if context is None:
-            context = {}
         try:
-            product_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'sale', 'advance_product_0')[1]
+            product_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'sale', 'advance_product_0')
         except ValueError:
+            #a ValueError is returned if the xml id given is not found in the table ir_model_data
             return False
-        return product_id
+        return product_id[1]
 
     _columns = {
         'product_id': fields.many2one('product.product', 'Advance Product', help="Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."),
-        'amount': fields.float('Advance Amount', digits=(16, 2), required=True, help="The amount to be invoiced in advance."),
+        'amount': fields.float('Advance Amount', digits_compute= dp.get_precision('Sale Price'), required=True, help="The amount to be invoiced in advance."),
         'qtty': fields.float('Quantity', digits=(16, 2), required=True),
         'advance_payment_method':fields.selection([('percentage','Percentage'), ('fixed','Fixed Price')], 'Type', required=True, help="Use Fixed Price if you want to give specific amound in Advance, Use Percentage if you want to give percentage of Total Invoice Amount."),
     }
@@ -49,12 +49,11 @@ class sale_advance_payment_inv(osv.osv_memory):
 
     def onchange_advance_payment_method(self, cr, uid, ids, advance_payment_method, product_id, context=None):
         if advance_payment_method == 'percentage':
-            return {'value': {'amount':0,'product_id':False }}
-        else:
-            if not product_id:
-                return {'value': {'amount': 0}}
-            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            return {'value': {'amount': product.list_price}}
+            return {'value': {'amount':0, 'product_id':False }}
+        if not product_id:
+            return {'value': {'amount': 0}}
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        return {'value': {'amount': product.list_price}}
 
 
     def create_invoices(self, cr, uid, ids, context=None):
@@ -99,8 +98,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                     if not account_id:
                         raise osv.except_osv(_('Configuration Error !'),
                                 _('There is no income account defined as global property.'))
-                    else:
-                        res['account_id'] = account_id
+                    res['account_id'] = account_id
 
                 if not res.get('account_id'):
                     raise osv.except_osv(_('Configuration Error !'),
@@ -112,15 +110,18 @@ class sale_advance_payment_inv(osv.osv_memory):
                 if sale_adv_obj.amount <= 0.00:
                     raise osv.except_osv(_('Data Insufficient !'),
                         _('Please check the Advance Amount, it should not be 0 or less!'))
+                if sale_adv_obj.advance_payment_method == 'percentage':
+                    final_amount = sale.amount_total * sale_adv_obj.amount / 100
+                    if not res.get('name'):
+                        res['name'] = _("Advance of %s %%") % (sale_adv_obj.amount)
                 else:
-                    if sale_adv_obj.advance_payment_method == 'percentage':
-                        final_amount = sale.amount_total * sale_adv_obj.amount / 100
-                        if not res.get('name'):
-                            res['name'] = "Advance of %s"%(final_amount)
-                    else:
-                        final_amount = sale_adv_obj.amount
-                        if not res.get('name'):
-                            res['name'] = "Advance of %s %s"%(final_amount,sale.pricelist_id.currency_id.symbol)
+                    final_amount = sale_adv_obj.amount
+                    if not res.get('name'):
+                        #TODO: should find a way to call formatLang() from rml_parse
+                        if sale.pricelist_id.currency_id.position == 'after':
+                            res['name'] = _("Advance of %s %s") % (final_amount, sale.pricelist_id.currency_id.symbol)
+                        else:
+                            res['name'] = _("Advance of %s %s") % (sale.pricelist_id.currency_id.symbol, final_amount)
 
                 if res.get('invoice_line_tax_id'):
                     res['invoice_line_tax_id'] = [(6, 0, res.get('invoice_line_tax_id'))]
@@ -133,7 +134,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                     'price_unit': final_amount,
                     'quantity': sale_adv_obj.qtty or 1.0,
                     'discount': False,
-                    'uos_id': res.get('uos_id') or False,
+                    'uos_id': res.get('uos_id', False),
                     'product_id': sale_adv_obj.product_id.id,
                     'invoice_line_tax_id': res.get('invoice_line_tax_id'),
                     'account_analytic_id': sale.project_id.id or False,
@@ -169,25 +170,23 @@ class sale_advance_payment_inv(osv.osv_memory):
                 if sale.order_policy == 'picking':
                     vals = {
                         'order_id': sale.id,
-                        'name': res.get('name')  or ("%s %s %s "%(sale_adv_obj.amount,sale_adv_obj.advance_payment_method,"Advance.")),
+                        'name': res.get('name'),
                         'price_unit': -final_amount,
                         'product_uom_qty': sale_adv_obj.qtty or 1.0,
                         'product_uos_qty': sale_adv_obj.qtty or 1.0,
-                        'product_uos': res.get('uos_id') or False,
+                        'product_uos': res.get('uos_id', False),
+                        'product_uom': res.get('uom_id', False),
                         'product_id': sale_adv_obj.product_id.id or False,
                         'discount': False,
                         'tax_id': res.get('invoice_line_tax_id'),
                     }
-                    if res.get('uos_id'):
-                        vals.update({'product_uom': res.get('uos_id')})
-                    self.pool.get('sale.order.line').create(cr, uid, vals, context)
+                    self.pool.get('sale.order.line').create(cr, uid, vals, context=context)
 
         context.update({'invoice_id':list_inv})
 
         if context.get('open_invoices'):
             return self.open_invoices( cr, uid, ids, context=context)
-        else:
-            return {'type': 'ir.actions.act_window_close'}
+        return {'type': 'ir.actions.act_window_close'}
 
     def open_invoices(self, cr, uid, ids, context=None):
         if context is None:

From 1514122cac9a0959f89ce9e9bae9b9128d28b115 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 23 May 2012 19:16:35 +0200
Subject: [PATCH 419/452] [IMP] avatars

bzr revid: fp@tinyerp.com-20120523171635-opejgr38l0b95nge
---
 addons/hr/hr_demo.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index b2bebb47944..c30c9fd33fb 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -4,6 +4,11 @@
 
     <!--Users-->
 
+      <record id="base.user_root" model="res.users">
+          <field name="avatar_big">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</field>
+      </record>
+
+
       <record id="base.user_fp" model="res.users">
           <field name="name">Fabien</field>
           <field name="login">fp</field>

From 2a09a66192ea8a45f42dcd36dc48743cd596e4a7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 24 May 2012 11:02:14 +0200
Subject: [PATCH 420/452] [IMP] Improved module and partners kanban view a bit

bzr revid: fme@openerp.com-20120524090214-nrd1yz3afrjwmny2
---
 openerp/addons/base/module/module_view.xml    |  6 ++--
 openerp/addons/base/res/res_partner_view.xml  |  2 +-
 .../addons/base/static/src/css/modules.css    | 32 +++++++++----------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 29933e52966..5a4590ef0cb 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -76,9 +76,9 @@
                   <field name="complexity"/>
                   <templates>
                     <t t-name="kanban-box">
-                      <div class="oe_module_vignette">
+                      <div class="oe_module_vignette oe_kanban_auto_height">
                         <t t-set="installed" t-value="record.state.raw_value == 'installed'"/>
-                        <a type="edit"> 
+                        <a type="edit">
                           <img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
                         </a>
                         <div class="oe_module_desc">
@@ -86,7 +86,7 @@
                           <p class="oe_module_name">
                              <field name="name"/><br/>
                              <span t-if="record.complexity.raw_value == 'Expert'" class="oe_label oe_warning">Complex</span>
-                           </p>
+                          </p>
                           <button type="object" name="button_immediate_install" states="uninstalled" class="oe_button">Install</button>
                           <button t-if="installed" class="oe_button" disabled="disabled">Installed</button>
                         </div>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 43b7c4e4d1c..e3924cb4e5d 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -112,7 +112,7 @@
                         <t t-set="color" t-value="kanban_color(record.color.raw_value || record.name.raw_value)"/>
                         <div t-att-class="color + (record.color.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
                             <div class="oe_kanban_box oe_kanban_color_border">
-                                <div class="oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
+                                <div class="oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_auto_height">
                                     <table class="oe_kanban_table">
                                         <tr>
                                             <td class="oe_kanban_title1" align="left" valign="middle">
diff --git a/openerp/addons/base/static/src/css/modules.css b/openerp/addons/base/static/src/css/modules.css
index 158a4c94976..054d86644a5 100644
--- a/openerp/addons/base/static/src/css/modules.css
+++ b/openerp/addons/base/static/src/css/modules.css
@@ -1,41 +1,39 @@
 .oe_module_vignette {
-  padding: 12px 6px 6px 0px;
+    padding: 14px;
 }
-
 .oe_module_icon, .oe_module_desc {
-  display: inline-block;
-  vertical-align: top;
+    display: inline-block;
+    vertical-align: top;
 }
-
 .oe_module_icon {
-  width: 80px;
-  height: 80px;
-  padding: 0 4px;
+    width: 80px;
+    height: 80px;
+    padding: 0 4px;
 }
 
 .oe_module_desc {
-  width: 210px;
-  font-size: 13px;
-  padding: 0px 5px;
+    width: 210px;
+    font-size: 13px;
+    padding: 0px 5px;
 }
 
 .oe_module_desc h4 {
-  margin: 0;
-  font-size: 13px;
+    margin: 0;
+    font-size: 13px;
 }
 
 .oe_module_desc h4 a {
-  color: #4c4c4c;
+    color: #4c4c4c;
 }
 
 .oe_module_name {
-  color: #999999;
+    color: #999999;
 }
 
 .oe_module_desc p {
-  margin: 3px 0 5px;
+    margin: 3px 0 5px;
 }
 
 .oe_module_desc .oe_button {
-  min-width: 70px;
+    min-width: 70px;
 }

From 25d0c8057e72d8e0149fb54d11cfe95c82b85dd0 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 24 May 2012 11:38:53 +0200
Subject: [PATCH 421/452] [FIX] crm_partner_assign: make geolocation tests more
 lenient

Google map geolocation results may slightly vary
depending on the actual match performed between the
street name and a place, so we should not try to
have an exact match.
For instance the previous test stopped passing on 24-may-2012.

bzr revid: odo@openerp.com-20120524093853-gb0r1zda7ph5s9a3
---
 addons/crm_partner_assign/test/process/partner_assign.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm_partner_assign/test/process/partner_assign.yml b/addons/crm_partner_assign/test/process/partner_assign.yml
index 18f03c9d41c..14a8df10e4f 100644
--- a/addons/crm_partner_assign/test/process/partner_assign.yml
+++ b/addons/crm_partner_assign/test/process/partner_assign.yml
@@ -10,8 +10,8 @@
 -
   !python {model: res.partner}: |
     partner = self.browse(cr, uid, ref('base.res_partner_ericdubois0'))
-    assert partner.partner_latitude == 50.4530495 , "Latitude is wrong"
-    assert partner.partner_longitude == 3.9693885 , "Longitude is wrong"
+    assert 50 < partner.partner_latitude < 51 , "Latitude is wrong"
+    assert 3 < partner.partner_longitude < 5 , "Longitude is wrong"
 -
   I assign nearest partner to opportunity.
 -
@@ -23,8 +23,8 @@
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm.crm_case_abcfuelcounits0'))
     assert lead.partner_assigned_id.id == ref('base.res_partner_ericdubois0') , "Opportuniy is not assigned nearest partner"
-    assert lead.partner_latitude == 50.8495239 , "Latitude is wrong"
-    assert lead.partner_longitude == 4.3667002 , "Longitude is wrong"
+    assert 50 < lead.partner_latitude < 51 , "Latitude is wrong"
+    assert 3 < lead.partner_longitude < 5, "Longitude is wrong"
 -
   I forward this opportunity to its nearest partner.
 -

From b8820a4db99428218085ef7e5d673ce6172453b0 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 24 May 2012 11:08:34 +0000
Subject: [PATCH 422/452] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120524110834-jkc46sjhrs6vbf2b
---
 openerp/addons/base/i18n/ja.po | 72 ++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 33 deletions(-)

diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 9998a83e91c..fa088083387 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-05-15 06:28+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
+"PO-Revision-Date: 2012-05-23 21:17+0000\n"
+"Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n"
-"X-Generator: Launchpad (build 15247)\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:08+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -223,7 +223,7 @@ msgstr "制約エラー"
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_custom
 msgid "ir.ui.view.custom"
-msgstr ""
+msgstr "ir.ui.view.custom"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:313
@@ -443,7 +443,7 @@ msgstr "ソースオブジェクト"
 #. module: base
 #: model:res.partner.bank.type,format_layout:base.bank_normal
 msgid "%(bank_name)s: %(acc_number)s"
-msgstr ""
+msgstr "%(bank_name)s: %(acc_number)s"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -453,7 +453,7 @@ msgstr "設定ウィザードステップ"
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_sc
 msgid "ir.ui.view_sc"
-msgstr ""
+msgstr "ir.ui.view_sc"
 
 #. module: base
 #: field:res.widget.user,widget_id:0
@@ -890,7 +890,7 @@ msgstr "オポチュニティ"
 #. module: base
 #: model:ir.model,name:base.model_base_language_export
 msgid "base.language.export"
-msgstr ""
+msgstr "base.language.export"
 
 #. module: base
 #: help:ir.actions.server,write_id:0
@@ -949,7 +949,7 @@ msgstr "基本的なパートナ"
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid ","
-msgstr ""
+msgstr ","
 
 #. module: base
 #: view:res.partner:0
@@ -1002,12 +1002,12 @@ msgstr "オマーン"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp
 msgid "MRP"
-msgstr ""
+msgstr "MRP（資材所要量計画）"
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "1cm 28cm 20cm 28cm"
-msgstr ""
+msgstr "1cm 28cm 20cm 28cm"
 
 #. module: base
 #: model:res.country,name:base.nu
@@ -1072,7 +1072,7 @@ msgstr "子分類"
 #. module: base
 #: model:ir.model,name:base.model_ir_config_parameter
 msgid "ir.config_parameter"
-msgstr ""
+msgstr "ir.config_parameter"
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1438,7 +1438,7 @@ msgstr "入力順序番号"
 #. module: base
 #: model:ir.model,name:base.model_ir_exports
 msgid "ir.exports"
-msgstr ""
+msgstr "ir.exports"
 
 #. module: base
 #: code:addons/base/module/wizard/base_update_translations.py:38
@@ -1507,7 +1507,7 @@ msgstr ""
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
@@ -1539,7 +1539,7 @@ msgstr "銀行"
 #. module: base
 #: model:ir.model,name:base.model_ir_exports_line
 msgid "ir.exports.line"
-msgstr ""
+msgstr "ir.exports.line"
 
 #. module: base
 #: model:ir.module.module,description:base.module_html_view
@@ -1680,7 +1680,7 @@ msgstr "倉庫管理"
 #. module: base
 #: model:ir.model,name:base.model_res_request_link
 msgid "res.request.link"
-msgstr ""
+msgstr "res.request.link"
 
 #. module: base
 #: field:ir.actions.wizard,name:0
@@ -1805,7 +1805,7 @@ msgstr "キルギス共和国"
 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create_line
 msgid "wizard.ir.model.menu.create.line"
-msgstr ""
+msgstr "wizard.ir.model.menu.create.line"
 
 #. module: base
 #: field:ir.attachment,res_id:0
@@ -1924,7 +1924,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_rule
 msgid "ir.rule"
-msgstr ""
+msgstr "ir.rule"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -1934,7 +1934,7 @@ msgstr "日"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_rpc
 msgid "OpenERP Web web"
-msgstr ""
+msgstr "OpenERPウェブ web"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_html_view
@@ -1981,7 +1981,7 @@ msgstr "一般的な情報フッター"
 #. module: base
 #: view:res.lang:0
 msgid "7.  %H:%M:%S      ==> 18:25:20"
-msgstr ""
+msgstr "7. %H:%M:%S ==> 18:25:20"
 
 #. module: base
 #: view:res.partner:0
@@ -2019,11 +2019,17 @@ msgid ""
 "        ============================================================\n"
 "    "
 msgstr ""
+"\n"
+"        添加中文省份数据\n"
+"        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计\n"
+"        凭证簿\n"
+"        ============================================================\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_access
 msgid "ir.model.access"
-msgstr ""
+msgstr "ir.model.access"
 
 #. module: base
 #: field:ir.cron,priority:0
@@ -2230,7 +2236,7 @@ msgstr "多通貨（分析）"
 #. module: base
 #: view:base.language.export:0
 msgid "https://help.launchpad.net/Translations"
-msgstr ""
+msgstr "https://help.launchpad.net/Translations"
 
 #. module: base
 #: field:ir.actions.act_window,view_mode:0
@@ -2547,7 +2553,7 @@ msgstr "対象削除"
 #. module: base
 #: model:ir.model,name:base.model_ir_sequence
 msgid "ir.sequence"
-msgstr ""
+msgstr "ir.sequence"
 
 #. module: base
 #: help:ir.actions.server,expression:0
@@ -2899,7 +2905,7 @@ msgstr "パラグアイ"
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_close
 msgid "ir.actions.act_window_close"
-msgstr ""
+msgstr "ir.actions.act_window_close"
 
 #. module: base
 #: field:ir.server.object.lines,col1:0
@@ -3039,7 +3045,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
 msgid "Openstuff.net"
-msgstr ""
+msgstr "Openstuff.net"
 
 #. module: base
 #: model:res.country,name:base.nf
@@ -3196,7 +3202,7 @@ msgstr "項目選択のために選択オプションを指定して下さい。
 #. module: base
 #: model:res.widget,title:base.facebook_widget
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #. module: base
 #: model:res.country,name:base.am
@@ -3524,7 +3530,7 @@ msgstr "ナミビア"
 #. module: base
 #: model:ir.model,name:base.model_workflow_activity
 msgid "workflow.activity"
-msgstr ""
+msgstr "workflow.activity"
 
 #. module: base
 #: help:ir.ui.view_sc,res_id:0
@@ -3790,7 +3796,7 @@ msgstr "ホスト名またはSMTPサーバのIPアドレス"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Japanese / 日本語"
-msgstr ""
+msgstr "Japanese / 日本語"
 
 #. module: base
 #: field:ir.actions.report.xml,auto:0
@@ -3805,7 +3811,7 @@ msgstr "インポート"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "XSL"
-msgstr ""
+msgstr "XSL"
 
 #. module: base
 #: field:res.lang,grouping:0
@@ -3936,7 +3942,7 @@ msgstr "右から左"
 #. module: base
 #: model:ir.model,name:base.model_res_partner_event
 msgid "res.partner.event"
-msgstr ""
+msgstr "res.partner.event"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -4039,7 +4045,7 @@ msgstr "標準"
 #. module: base
 #: model:ir.model,name:base.model_maintenance_contract
 msgid "maintenance.contract"
-msgstr ""
+msgstr "maintenance.contract"
 
 #. module: base
 #: model:res.country,name:base.ru
@@ -4127,7 +4133,7 @@ msgstr "EANチェック"
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
-msgstr ""
+msgstr "VAT（Value Added Tax）"
 
 #. module: base
 #: field:res.users,new_password:0
@@ -4178,7 +4184,7 @@ msgstr "GPL-2 またはそれ以降のバージョン"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
 msgid "M."
-msgstr ""
+msgstr "M."
 
 #. module: base
 #: code:addons/base/module/module.py:519

From d954a740ca8d8bbe3bbd03a5432ab7b7afd82d52 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 24 May 2012 11:42:10 +0000
Subject: [PATCH 423/452] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120524110922-t8uefmyvno7kcdfk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120524114210-pxdagcmwygwrxgrw
---
 addons/account/i18n/fr.po                     |  12 +-
 addons/account/i18n/zh_TW.po                  |  10 +-
 addons/account_asset/i18n/fr.po               |  10 +-
 addons/account_asset/i18n/id.po               | 793 ++++++++++++++++++
 .../i18n/ja.po                                |  22 +-
 .../i18n/ro.po                                | 385 +++++++++
 addons/account_check_writing/i18n/ro.po       | 213 +++++
 addons/auth_openid/i18n/ro.po                 | 113 +++
 addons/base_calendar/i18n/ja.po               | 427 +++++-----
 addons/base_iban/i18n/ja.po                   |  26 +-
 addons/base_module_quality/i18n/ja.po         | 692 +++++++++++++++
 addons/base_module_record/i18n/ja.po          | 268 ++++++
 addons/base_report_designer/i18n/ja.po        | 198 +++++
 addons/base_setup/i18n/ja.po                  |  20 +-
 addons/base_synchro/i18n/ja.po                | 279 ++++++
 addons/board/i18n/ja.po                       |  42 +-
 addons/caldav/i18n/ja.po                      | 107 ++-
 addons/import_google/i18n/pt.po               | 227 +++++
 addons/import_sugarcrm/i18n/pt.po             | 404 +++++++++
 addons/pad_project/i18n/pt.po                 |  38 +
 addons/plugin/i18n/pt.po                      |  23 +
 addons/stock/i18n/zh_TW.po                    |  20 +-
 addons/web_process/i18n/sl.po                 | 118 +++
 addons/web_uservoice/i18n/pt.po               |  23 +
 24 files changed, 4172 insertions(+), 298 deletions(-)
 create mode 100644 addons/account_asset/i18n/id.po
 create mode 100644 addons/account_bank_statement_extensions/i18n/ro.po
 create mode 100644 addons/account_check_writing/i18n/ro.po
 create mode 100644 addons/auth_openid/i18n/ro.po
 create mode 100644 addons/base_module_quality/i18n/ja.po
 create mode 100644 addons/base_module_record/i18n/ja.po
 create mode 100644 addons/base_report_designer/i18n/ja.po
 create mode 100644 addons/base_synchro/i18n/ja.po
 create mode 100644 addons/import_google/i18n/pt.po
 create mode 100644 addons/import_sugarcrm/i18n/pt.po
 create mode 100644 addons/pad_project/i18n/pt.po
 create mode 100644 addons/plugin/i18n/pt.po
 create mode 100644 addons/web_process/i18n/sl.po
 create mode 100644 addons/web_uservoice/i18n/pt.po

diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index ba03a8d062a..c328c761933 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 17:54+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-05-22 12:17+0000\n"
+"Last-Translator: Francois Degrave <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:48+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:08+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1200
@@ -3767,7 +3767,7 @@ msgstr "Date"
 #. module: account
 #: view:account.move:0
 msgid "Post"
-msgstr "Message"
+msgstr "Comptabiliser"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -10886,7 +10886,7 @@ msgstr "Rechercher une facture"
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "Créer un avoir"
+msgstr "Avoir"
 
 #. module: account
 #: model:email.template,body_text:account.email_template_edi_invoice
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index f44c0af16ed..f5aa3781e50 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-09-27 10:01+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
+"PO-Revision-Date: 2012-05-23 07:32+0000\n"
+"Last-Translator: VTTW <victso@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:55+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr "上月"
+msgstr "上個月"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
diff --git a/addons/account_asset/i18n/fr.po b/addons/account_asset/i18n/fr.po
index 614a952f916..3cc6369d50a 100755
--- a/addons/account_asset/i18n/fr.po
+++ b/addons/account_asset/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:23+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-05-22 12:19+0000\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -621,7 +621,7 @@ msgstr "Prorata temporis"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Informations comptables"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice
diff --git a/addons/account_asset/i18n/id.po b/addons/account_asset/i18n/id.po
new file mode 100644
index 00000000000..76572006197
--- /dev/null
+++ b/addons/account_asset/i18n/id.po
@@ -0,0 +1,793 @@
+# Indonesian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-05-21 16:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian <id@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,name:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
+#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0 view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "Perusahaan"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid ""
+"This wizard will post the depreciation lines of running assets that belong "
+"to the selected period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence of the depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr "Tanggal pembelian aset"
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method:0 field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "Metode Perhitungan"
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross value "
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You can not create recursive assets."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other Information"
+msgstr "Informasi lainnya"
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
+msgid "Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+msgid "Compute assets"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current year"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month"
+msgstr "Bulan"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0 field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method:0 help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Tanggal"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current month"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr "Filter Tambahan..."
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktif"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr "Periode"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr "Faktur"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
+msgid "Review Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
+msgid "Close"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Metode Depresiasi"
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr "Tanggal Pembelian"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0
+msgid "Depreciation Dates"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr "Mata Uang"
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr "Jurnal"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the state is 'Draft'.\n"
+"If the asset is confirmed, the state goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that state."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "Nama"
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0 view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in last month"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"From this report, you can have an overview on all depreciation. The tool "
+"search can also be used to personalise your Assets reports and so, match "
+"this analysis to your needs;"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Post Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr "Hirarki Aset"
diff --git a/addons/account_bank_statement_extensions/i18n/ja.po b/addons/account_bank_statement_extensions/i18n/ja.po
index f040102bb83..170139fac06 100644
--- a/addons/account_bank_statement_extensions/i18n/ja.po
+++ b/addons/account_bank_statement_extensions/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-16 23:00+0000\n"
+"PO-Revision-Date: 2012-05-23 06:08+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
-"X-Generator: Launchpad (build 15108)\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -80,14 +80,14 @@ msgstr "ドラフト"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement"
-msgstr "明細書"
+msgstr "取引明細書"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
 #: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
 msgid "Confirm selected statement lines"
-msgstr "選択した明細行の確認"
+msgstr "選択した取引明細書行の確認"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
@@ -165,7 +165,7 @@ msgstr "警告"
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Closing Balance"
-msgstr "締切残高"
+msgstr "期末残高"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
@@ -176,7 +176,7 @@ msgstr "日付"
 #: view:account.bank.statement.line:0
 #: field:account.bank.statement.line,globalisation_amount:0
 msgid "Glob. Amount"
-msgstr "国際化金額"
+msgstr "全体の金額"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -201,7 +201,7 @@ msgid ""
 "valid payments"
 msgstr ""
 "\n"
-"正当な支払いを行うために銀行タイプIBAN口座のための銀行にBIC/Swiftコードを定義して下さい。"
+"正当な支払いを行うために銀行タイプIBAN口座のための銀行にBIC / SWIFTコードを定義して下さい。"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
@@ -221,7 +221,7 @@ msgstr "選択した銀行明細行のキャンセルを本当に行いますか
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Name"
-msgstr "名称"
+msgstr "氏名"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
@@ -295,7 +295,7 @@ msgstr "ドラフト明細行"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Glob. Am."
-msgstr "国際化総額"
+msgstr "全体の金額"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
@@ -340,7 +340,7 @@ msgstr "明細行"
 #. module: account_bank_statement_extensions
 #: sql_constraint:account.bank.statement.line.global:0
 msgid "The code must be unique !"
-msgstr "コードは固有でなければなりません。"
+msgstr "コードは固有であるべきです。"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,bank_statement_line_ids:0
diff --git a/addons/account_bank_statement_extensions/i18n/ro.po b/addons/account_bank_statement_extensions/i18n/ro.po
new file mode 100644
index 00000000000..32d75c3dac4
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/ro.po
@@ -0,0 +1,385 @@
+# Romanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-05-21 11:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Cauta Tranzactii Bancare"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Confirmat(a)"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "Id Glob."
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "Cod parinte"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Debit"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "Anuleaza liniile selectate ale extrasului de cont"
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "Codul RIB si/sau IBAN nu este valabil"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Grupeaza dupa..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr "Stare"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Ciorna"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Extras de cont"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "Confirma liniile extrasului de cont selectat"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Raport Sold Extras de cont"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Anuleaza Liniile"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Informatii Plata Lot"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Confirma Liniile"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr ""
+"Operatiune de stergere nepermisa! Va rugam sa mergeti la extrasul de cont "
+"asociat pentru a sterge si/sau modifica aceasta linie a extrasului de cont"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Tip:"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Jurnal"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Liniile confirmate ale Extrasului de cont."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Operatiuni de credit"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "anuleaza liniile extrasului de cont selectat."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Numar Echivalent"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Tranzactii"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr "Atentionare"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Sold la inchidere"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Data"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "Suma Glob."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Tranzactii de debit."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Filtre Extinse..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Liniile confirmate nu mai pot fi modificate."
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Va rugam sa definiti un cod BIC/Swift la banca pentru ca Contul bancar de "
+"tip IBAN sa faca plati valabile"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr "Data Valuta"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr "Confirmati liniile extrasului de cont selectat."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+"Sunteti sigur(a) ca doriti sa anulati liniile Extrasului de cont selectat ?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Nume"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Note"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Credit"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Suma"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Cont Fin."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Moneda echivalenta"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "BIC echivalent"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Coduri subordonate"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+"Sunteti sigur(a) ca doriti sa confirmati liniile Extrasului de cont selectat "
+"?"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+"Suma de pe chitanta trebuie sa fie aceeasi ca si cea din linia extrasului"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+"Cod pentru identificarea tranzactiilor care apartin aceluiasi nivel de "
+"globalizare din cadrul unei plati a unui lot"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Linii ale Extrasului de cont ciorna."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr "Suma Glob."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Linie extras de cont"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Cod"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Nume echivalent"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr "Comunicare"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Conturi Bancare"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "Jurnalul si perioada aleasa trebuie sa apartina aceleiasi companii."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extras de cont"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "Linie a Extrasului de cont"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "Codul trebuie sa fie unic !"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Linii Extras de cont"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Plati secundare lot"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Anuleaza"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Linii Extras de cont"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Suma totala"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "ID globalizare"
diff --git a/addons/account_check_writing/i18n/ro.po b/addons/account_check_writing/i18n/ro.po
new file mode 100644
index 00000000000..9ffa733ff3b
--- /dev/null
+++ b/addons/account_check_writing/i18n/ro.po
@@ -0,0 +1,213 @@
+# Romanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-05-21 12:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "Cecul in partea de sus"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+"Forma de plata prin cec va permite sa tineti evidenta platilor pe care le "
+"faceti furnizorilor d-voastra mai ales prin cecuri. Atunci cand selectati un "
+"furnizor, metoda de plata si o suma pentru plata, OpenERP va propune "
+"reconcilierea platii d-voastra cu facturile deschise ale furnizorului. "
+"Puteti printa cecul"
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr "Printeaza Cecul"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Cecul la mijloc"
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+"Cecul in partea de sus este compatibil cu Quicken, QuickBooks si Microsoft "
+"Money. Cecul la mijloc este compatibil cu Peachtree, ACCPAC si DacEasy. "
+"Cecul in partea de jos este compatibil numai cu Peachtree, ACCPAC si DacEasy"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Cecul in partea de jos"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Eroare! Nu puteti crea companii recursive."
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr ""
+"Bifati aceasta casuta daca jurnalul va fi folosit pentru scrierea de cecuri."
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Permite scrierea de cecuri"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Descriere"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Jurnal"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr "Scrieti Cecuri"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr "Reducere"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr "Suma Initiala"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configurare"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Permiteti Scrierea de Cecuri"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Plata"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Folositi Cecuri pre-tiparite"
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Numele companiei trebuie sa fie unic !"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr "Data scadentei"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Companii"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Eroare de configurare! Moneda aleasa ar trebui sa fie comuna si conturilor "
+"predefinite."
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "Sold datorat"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr "Suma Cec"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Chitanta contabila"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Numele jurnalului trebuie sa fie unic per companie !"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Codul jurnalului trebuie sa fie unic per companie !"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "Suma in litere"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Sold la deschidere"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr "Alegeti formatul Cecului"
+
+#~ msgid "Default Check layout"
+#~ msgstr "Formatul implicit al cecului"
diff --git a/addons/auth_openid/i18n/ro.po b/addons/auth_openid/i18n/ro.po
new file mode 100644
index 00000000000..b239f88da35
--- /dev/null
+++ b/addons/auth_openid/i18n/ro.po
@@ -0,0 +1,113 @@
+# Romanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-05-21 17:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-#  auth_openid.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: view:res.users:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:12
+msgid "OpenID"
+msgstr "OpenID"
+
+#. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-#  auth_openid.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: field:res.users,openid_url:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47
+msgid "OpenID URL"
+msgstr "URL OpenID"
+
+#. module: auth_openid
+#: help:res.users,openid_email:0
+msgid "Used for disambiguation in case of a shared OpenID URL"
+msgstr "Folosit pentru evitarea ambiguitatii in cazul unui URL OpenID"
+
+#. module: auth_openid
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Nu pot exista doi utilizatori cu acelasi nume de autentificare !"
+
+#. module: auth_openid
+#: field:res.users,openid_email:0
+msgid "OpenID Email"
+msgstr "E-mail OpenID"
+
+#. module: auth_openid
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Compania aleasa nu se afla printre companiile permise acestui utilizator"
+
+#. module: auth_openid
+#: field:res.users,openid_key:0
+msgid "OpenID Key"
+msgstr "Cheie OpenID"
+
+#. module: auth_openid
+#: model:ir.model,name:auth_openid.model_res_users
+msgid "res.users"
+msgstr "res.utilizatori"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:8
+msgid "Password"
+msgstr "Parola"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:9
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google"
+msgstr "Google"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google Apps"
+msgstr "Google Apps"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:11
+msgid "Launchpad"
+msgstr "Launchpad"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20
+msgid "Google Apps Domain:"
+msgstr "Domeniu Google Apps:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24
+msgid "Username:"
+msgstr "Nume de utilizator:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:28
+msgid "OpenID URL:"
+msgstr "URL OpenID:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35
+msgid "Google Apps Domain"
+msgstr "Domeniu Google Apps"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41
+msgid "Username"
+msgstr "Nume de utilizator"
diff --git a/addons/base_calendar/i18n/ja.po b/addons/base_calendar/i18n/ja.po
index 79432f88c3f..86889b89ef7 100644
--- a/addons/base_calendar/i18n/ja.po
+++ b/addons/base_calendar/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-19 05:06+0000\n"
+"PO-Revision-Date: 2012-05-23 06:06+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-20 04:38+0000\n"
-"X-Generator: Launchpad (build 15259)\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -77,7 +77,7 @@ msgstr "招待"
 #: help:calendar.event,recurrency:0
 #: help:calendar.todo,recurrency:0
 msgid "Recurrent Meeting"
-msgstr "定例ミーティング"
+msgstr "定期ミーティング"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
@@ -255,95 +255,95 @@ msgstr "エラー"
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Chair Person"
-msgstr ""
+msgstr "議長"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Procedure"
-msgstr ""
+msgstr "手続き"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:1004
 #, python-format
 msgid "Interval cannot be negative"
-msgstr ""
+msgstr "間隔は負の値を持てません。"
 
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "キャンセル済"
 
 #. module: base_calendar
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #, python-format
 msgid "%s must have an email  address to send mail"
-msgstr ""
+msgstr "%sはメール送信用のEメールアドレスを持つべきです。"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Minutes"
-msgstr ""
+msgstr "分"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Display"
-msgstr ""
+msgstr "表示"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation type"
-msgstr ""
+msgstr "招待タイプ"
 
 #. module: base_calendar
 #: help:calendar.attendee,state:0
 msgid "Status of the attendee's participation"
-msgstr ""
+msgstr "出席者の参加の状況"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event ends"
-msgstr ""
+msgstr "イベントの終了"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Group By..."
-msgstr ""
+msgstr "グループ化…"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,email:0
 msgid "Provide external email address who will receive this invitation."
-msgstr ""
+msgstr "この招待状を受け取る外部のEメールアドレスを提供して下さい。"
 
 #. module: base_calendar
 #: help:calendar.attendee,partner_id:0
 msgid "Partner related to contact"
-msgstr ""
+msgstr "コンタクトと関係あるパートナ"
 
 #. module: base_calendar
 #: help:calendar.attendee,cutype:0
 msgid "Specify the type of Invitation"
-msgstr ""
+msgstr "招待タイプを定義して下さい。"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_end_date:0
 #: field:calendar.attendee,event_end_date:0
 msgid "Event End Date"
-msgstr ""
+msgstr "イベント終了日"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Optional Participation"
-msgstr ""
+msgstr "任意の参加"
 
 #. module: base_calendar
 #: field:calendar.event,date_deadline:0
 #: field:calendar.todo,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "期限"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:389
@@ -351,7 +351,7 @@ msgstr ""
 #: code:addons/base_calendar/base_calendar.py:1006
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告"
 
 #. module: base_calendar
 #: help:calendar.event,active:0
@@ -359,14 +359,14 @@ msgstr ""
 msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
-msgstr ""
+msgstr "アクティブ項目をTrueに設定した場合，イベントアラーム情報を削除することなく，非表示にできます。"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,partner_id:0
 #: view:calendar.attendee:0
 #: field:calendar.attendee,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "パートナ"
 
 #. module: base_calendar
 #: field:calendar.event,organizer:0
@@ -374,7 +374,7 @@ msgstr ""
 #: field:calendar.todo,organizer:0
 #: field:calendar.todo,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "主催者"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -382,443 +382,443 @@ msgstr ""
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "責任者"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: model:res.request.link,name:base_calendar.request_link_meeting
 msgid "Event"
-msgstr ""
+msgstr "イベント"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "Before"
-msgstr ""
+msgstr "変更前"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "確認済"
 
 #. module: base_calendar
 #: field:calendar.alarm,attendee_ids:0
 #: field:calendar.event,attendee_ids:0
 #: field:calendar.todo,attendee_ids:0
 msgid "Attendees"
-msgstr ""
+msgstr "出席者"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:1411
 #, python-format
 msgid "Group by date not supported, use the calendar view instead"
-msgstr ""
+msgstr "日付のグループ化はサポートされませんが、代りにカレンダービューを使って下さい。"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
-msgstr ""
+msgstr "確認"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_todo
 msgid "Calendar Task"
-msgstr ""
+msgstr "カレンダータスク"
 
 #. module: base_calendar
 #: field:calendar.event,su:0
 #: field:calendar.todo,su:0
 msgid "Sun"
-msgstr ""
+msgstr "日"
 
 #. module: base_calendar
 #: field:calendar.attendee,cutype:0
 msgid "Invite Type"
-msgstr ""
+msgstr "招待タイプ"
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder details"
-msgstr ""
+msgstr "通知詳細"
 
 #. module: base_calendar
 #: field:calendar.attendee,parent_ids:0
 msgid "Delegrated From"
-msgstr ""
+msgstr "委任元"
 
 #. module: base_calendar
 #: selection:calendar.event,select1:0
 #: selection:calendar.todo,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "月の日"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,location:0
 #: field:calendar.todo,location:0
 msgid "Location"
-msgstr ""
+msgstr "場所"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "従業員の一般"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,send_mail:0
 msgid "Send mail?"
-msgstr ""
+msgstr "メール送信しますか？"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,email:0
 #: selection:calendar.alarm,action:0
 #: field:calendar.attendee,email:0
 msgid "Email"
-msgstr ""
+msgstr "Eメール"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Event Detail"
-msgstr ""
+msgstr "イベント詳細"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Run"
-msgstr ""
+msgstr "実行"
 
 #. module: base_calendar
 #: field:calendar.event,exdate:0
 #: field:calendar.todo,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "例外の日付 / 時間"
 
 #. module: base_calendar
 #: field:calendar.event,end_date:0
 #: field:calendar.todo,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "繰り返し（まで）"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
 msgid ""
 "Create specific calendar alarms that may be assigned to calendar events or "
 "meetings."
-msgstr ""
+msgstr "カレンダーイベントまたはミーティングを割り当てられる特定のカレンダーアラームを作成して下さい。"
 
 #. module: base_calendar
 #: field:calendar.event,show_as:0
 #: field:calendar.todo,show_as:0
 msgid "Show as"
-msgstr ""
+msgstr "見せる（として）"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Visibility"
-msgstr ""
+msgstr "視界"
 
 #. module: base_calendar
 #: field:calendar.attendee,rsvp:0
 msgid "Required Reply?"
-msgstr ""
+msgstr "返信が必要ですか？"
 
 #. module: base_calendar
 #: field:calendar.event,base_calendar_url:0
 #: field:calendar.todo,base_calendar_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "CalDAVのURL"
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_uid:0
 #: field:calendar.todo,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "定期ID"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Accepted"
-msgstr ""
+msgstr "受諾済"
 
 #. module: base_calendar
 #: field:calendar.event,th:0
 #: field:calendar.todo,th:0
 msgid "Thu"
-msgstr ""
+msgstr "木"
 
 #. module: base_calendar
 #: field:calendar.attendee,child_ids:0
 msgid "Delegrated To"
-msgstr ""
+msgstr "委任先"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "To"
-msgstr ""
+msgstr "終了"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
-msgstr ""
+msgstr "返信要求"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
-msgstr ""
+msgstr "参加必須"
 
 #. module: base_calendar
 #: field:calendar.event,create_date:0
 #: field:calendar.todo,create_date:0
 msgid "Created"
-msgstr ""
+msgstr "作成済"
 
 #. module: base_calendar
 #: sql_constraint:ir.model:0
 msgid "Each model must be unique!"
-msgstr ""
+msgstr "各モジュールは固有でなければなりません。"
 
 #. module: base_calendar
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "日次"
 
 #. module: base_calendar
 #: field:calendar.event,class:0
 #: field:calendar.todo,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "マーク"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,partner_address_id:0
 msgid "Contact"
-msgstr ""
+msgstr "連絡先"
 
 #. module: base_calendar
 #: help:calendar.event,rrule_type:0
 #: help:calendar.todo,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "イベントをその間隔で自動的に繰り返します。"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Delegate"
-msgstr ""
+msgstr "委任"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Partner Contacts"
-msgstr ""
+msgstr "パートナ連絡先"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "First"
-msgstr ""
+msgstr "先頭"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Privacy"
-msgstr ""
+msgstr "プライバシー"
 
 #. module: base_calendar
 #: field:calendar.event,vtimezone:0
 #: field:calendar.todo,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "タイムゾーン"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
-msgstr ""
+msgstr "件名"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Needs Action"
-msgstr ""
+msgstr "要アクション"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,send_mail:0
 msgid "Check this if you want to send an Email to Invited Person"
-msgstr ""
+msgstr "招待者にEメールを送信したい場合は、ここをチェックして下さい。"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Availability"
-msgstr ""
+msgstr "利用可能"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Individual"
-msgstr ""
+msgstr "個人"
 
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
 msgid "Repeat x times"
-msgstr ""
+msgstr "ｎ回繰り返し"
 
 #. module: base_calendar
 #: field:calendar.alarm,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "所有者"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Delegation Info"
-msgstr ""
+msgstr "委任情報"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Start Date"
-msgstr ""
+msgstr "開始日"
 
 #. module: base_calendar
 #: field:calendar.attendee,cn:0
 msgid "Common name"
-msgstr ""
+msgstr "一般名"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Declined"
-msgstr ""
+msgstr "拒否済"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "My Role"
-msgstr ""
+msgstr "私の役割"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "My Events"
-msgstr ""
+msgstr "私のイベント"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Decline"
-msgstr ""
+msgstr "拒否"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Group"
-msgstr ""
+msgstr "グループ"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Private"
-msgstr ""
+msgstr "非公開"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,contact_ids:0
 msgid "Contacts"
-msgstr ""
+msgstr "コンタクト"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
 msgid "Basic Alarm Information"
-msgstr ""
+msgstr "基本アラーム情報"
 
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "金"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Hours"
-msgstr ""
+msgstr "時間"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "招待の詳細"
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
 msgid "Member"
-msgstr ""
+msgstr "メンバー"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "From"
-msgstr ""
+msgstr "開始"
 
 #. module: base_calendar
 #: field:calendar.event,rrule:0
 #: field:calendar.todo,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "定期ルール"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Draft"
-msgstr ""
+msgstr "ドラフト"
 
 #. module: base_calendar
 #: field:calendar.alarm,attach:0
 msgid "Attachment"
-msgstr ""
+msgstr "添付"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
-msgstr ""
+msgstr "招待フォーム"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "End of Recurrency"
-msgstr ""
+msgstr "定期の終了"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Reminder"
-msgstr ""
+msgstr "通知"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: model:ir.actions.act_window,name:base_calendar.action_view_event
 #: model:ir.ui.menu,name:base_calendar.menu_events
 msgid "Events"
-msgstr ""
+msgstr "イベント"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
 #: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
 msgid "Invite Attendees"
-msgstr ""
+msgstr "出席者の招待"
 
 #. module: base_calendar
 #: help:calendar.attendee,email:0
 msgid "Email of Invited Person"
-msgstr ""
+msgstr "招待者のEメール"
 
 #. module: base_calendar
 #: field:calendar.alarm,repeat:0
@@ -826,100 +826,100 @@ msgstr ""
 #: field:calendar.todo,count:0
 #: field:res.alarm,repeat:0
 msgid "Repeat"
-msgstr ""
+msgstr "繰り返し"
 
 #. module: base_calendar
 #: help:calendar.attendee,dir:0
 msgid ""
 "Reference to the URIthat points to the directory information corresponding "
 "to the attendee."
-msgstr ""
+msgstr "出席者に対応しているディレクトリ情報を指し示すURIへの参照"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "月曜"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Models"
-msgstr ""
+msgstr "モデル"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_date:0
 #: field:calendar.attendee,event_date:0
 #: view:calendar.event:0
 msgid "Event Date"
-msgstr ""
+msgstr "イベント日"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "Number of repetitions"
-msgstr ""
+msgstr "繰り返し数"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "The"
-msgstr ""
+msgstr "・"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_from:0
 msgid "Delegated From"
-msgstr ""
+msgstr "委任元"
 
 #. module: base_calendar
 #: field:calendar.attendee,user_id:0
 msgid "User"
-msgstr ""
+msgstr "ユーザ"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,date:0
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: base_calendar
 #: help:calendar.attendee,member:0
 msgid "Indicate the groups that the attendee belongs to"
-msgstr ""
+msgstr "出席者が属すグループを示して下さい。"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Data"
-msgstr ""
+msgstr "データ"
 
 #. module: base_calendar
 #: field:calendar.event,end_type:0
 #: field:calendar.todo,end_type:0
 msgid "Recurrence termination"
-msgstr ""
+msgstr "定期の終了"
 
 #. module: base_calendar
 #: field:calendar.event,mo:0
 #: field:calendar.todo,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "月"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -930,30 +930,30 @@ msgstr "レビューのための招待"
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Uncertain"
-msgstr ""
+msgstr "不確実"
 
 #. module: base_calendar
 #: field:calendar.attendee,language:0
 msgid "Language"
-msgstr ""
+msgstr "言語"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_occurs:0
 #: field:res.alarm,trigger_occurs:0
 msgid "Triggers"
-msgstr ""
+msgstr "トリガー"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -964,19 +964,19 @@ msgstr "委任された招待"
 #: field:calendar.alarm,trigger_interval:0
 #: field:res.alarm,trigger_interval:0
 msgid "Interval"
-msgstr ""
+msgstr "間隔"
 
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "水曜"
 
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
 msgid "Summary"
-msgstr ""
+msgstr "要約"
 
 #. module: base_calendar
 #: field:calendar.alarm,active:0
@@ -984,28 +984,28 @@ msgstr ""
 #: field:calendar.todo,active:0
 #: field:res.alarm,active:0
 msgid "Active"
-msgstr ""
+msgstr "アクティブ"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:389
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
-msgstr ""
+msgstr "カレンダーの出席者は重複できません。"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr ""
+msgstr "ミーティングを定期的に行う場合は月の日を選択して下さい。"
 
 #. module: base_calendar
 #: field:calendar.alarm,action:0
 msgid "Action"
-msgstr ""
+msgstr "アクション"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,type:0
 msgid "Select whom you want to Invite"
-msgstr ""
+msgstr "招待したい人を選択して下さい。"
 
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
@@ -1013,50 +1013,50 @@ msgstr ""
 msgid ""
 "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
 "other"
-msgstr ""
+msgstr "継続期間と繰り返しは両方オプションです。しかし、片方が生じるなら他も必要です。"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required to Join"
-msgstr ""
+msgstr "参加要請"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
 msgid "Participation role for the calendar user"
-msgstr ""
+msgstr "カレンダーユーザのための関連する役割"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_to:0
 msgid "Delegated To"
-msgstr ""
+msgstr "委任先"
 
 #. module: base_calendar
 #: help:calendar.alarm,action:0
 msgid "Defines the action to be invoked when an alarm is triggered"
-msgstr ""
+msgstr "アラームが起動する時に発動するアクションを定義して下さい。"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "End date"
-msgstr ""
+msgstr "終了日"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr ""
+msgstr "イベントの検索"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "定期のオプション"
 
 #. module: base_calendar
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "週次"
 
 #. module: base_calendar
 #: help:calendar.alarm,active:0
@@ -1064,18 +1064,18 @@ msgstr ""
 msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
-msgstr ""
+msgstr "アクティブ項目をTrueに設定した場合、イベントアラーム情報を削除することなく非表示にできます。"
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_id:0
 #: field:calendar.todo,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "定期ID日付"
 
 #. module: base_calendar
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "同じログインでは２つのユーザを持てません。"
 
 #. module: base_calendar
 #: field:calendar.alarm,state:0
@@ -1085,40 +1085,40 @@ msgstr ""
 #: field:calendar.event,state:0
 #: field:calendar.todo,state:0
 msgid "State"
-msgstr ""
+msgstr "状態"
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder Details"
-msgstr ""
+msgstr "通知の詳細"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "To Review"
-msgstr ""
+msgstr "レビュー"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Done"
-msgstr ""
+msgstr "完了"
 
 #. module: base_calendar
 #: help:calendar.event,interval:0
 #: help:calendar.todo,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "反復間隔（日 / 週 / 月 / 年）"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: field:base_calendar.invite.attendee,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "ユーザ"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_users
@@ -1129,7 +1129,7 @@ msgstr ""
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "火曜"
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1137,12 +1137,12 @@ msgid ""
 "Provides a more complete                             description of the "
 "calendar component, than that                             provided by the "
 "\"SUMMARY\" property"
-msgstr ""
+msgstr "要約プロパティによって提供されるよりも、より完全なカレンダー構成の説明を提供します。"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr ""
+msgstr "ユーザ責任者"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:1466
@@ -1152,37 +1152,37 @@ msgstr ""
 #: selection:res.users,availability:0
 #, python-format
 msgid "Busy"
-msgstr ""
+msgstr "ビジー"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event
 msgid "Calendar Event"
-msgstr ""
+msgstr "カレンダーイベント"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Tentative"
-msgstr ""
+msgstr "暫定"
 
 #. module: base_calendar
 #: field:calendar.event,interval:0
 #: field:calendar.todo,interval:0
 msgid "Repeat every"
-msgstr ""
+msgstr "反復（間隔）"
 
 #. module: base_calendar
 #: field:calendar.event,recurrency:0
 #: field:calendar.todo,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "定期"
 
 #. module: base_calendar
 #: help:calendar.event,location:0
 #: help:calendar.todo,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "イベント場所"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
@@ -1194,24 +1194,24 @@ msgstr "イベントの招待"
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "木曜"
 
 #. module: base_calendar
 #: field:calendar.event,exrule:0
 #: field:calendar.todo,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "例外ルール"
 
 #. module: base_calendar
 #: help:calendar.attendee,language:0
 msgid ""
 "To specify the language for text values in aproperty or property parameter."
-msgstr ""
+msgstr "プロパティまたはプロパティパラメータのテキスト値の言語を指定します。"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Details"
-msgstr ""
+msgstr "詳細"
 
 #. module: base_calendar
 #: help:calendar.event,exrule:0
@@ -1219,29 +1219,29 @@ msgstr ""
 msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
-msgstr ""
+msgstr "ルールまたは反復ルールから除外あうする時間の繰り返しパターンを定義して下さい。"
 
 #. module: base_calendar
 #: field:calendar.event,month_list:0
 #: field:calendar.todo,month_list:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 msgid "Invite People"
-msgstr ""
+msgstr "招待"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirmed Events"
-msgstr ""
+msgstr "確認済イベント"
 
 #. module: base_calendar
 #: field:calendar.attendee,dir:0
 msgid "URI Reference"
-msgstr ""
+msgstr "URI参照"
 
 #. module: base_calendar
 #: field:calendar.alarm,description:0
@@ -1251,19 +1251,19 @@ msgstr ""
 #: field:calendar.todo,description:0
 #: field:calendar.todo,name:0
 msgid "Description"
-msgstr ""
+msgstr "詳細"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,type:0
 #: view:calendar.attendee:0
 msgid "Type"
-msgstr ""
+msgstr "タイプ"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -1274,12 +1274,12 @@ msgstr "招待の検索"
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "After"
-msgstr ""
+msgstr "変更後"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Stop"
-msgstr ""
+msgstr "停止"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_values
@@ -1295,62 +1295,62 @@ msgstr ""
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Delegated"
-msgstr ""
+msgstr "委任済"
 
 #. module: base_calendar
 #: field:calendar.event,sa:0
 #: field:calendar.todo,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "土"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "定例ミーティングの日を選択して下さい。"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_related:0
 #: field:res.alarm,trigger_related:0
 msgid "Related to"
-msgstr ""
+msgstr "関連先"
 
 #. module: base_calendar
 #: help:calendar.attendee,sent_by:0
 msgid "Specify the user that is acting on behalf of the calendar user"
-msgstr ""
+msgstr "カレンダーユーザのために行動しているユーザを指定してして下さい。"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "End Date"
-msgstr ""
+msgstr "終了日"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Resource"
-msgstr ""
+msgstr "リソース"
 
 #. module: base_calendar
 #: field:res.alarm,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_alarm
 msgid "Event alarm information"
-msgstr ""
+msgstr "イベントアラーム情報"
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
 msgid ""
 "Contains the text to be                      used as the message subject for "
 "email                      or contains the text to be used for display"
-msgstr ""
+msgstr "Eメールのメッセージの件名として使用されるテキスト、あるいは表示に使用するためのテキストが含まれています。"
 
 #. module: base_calendar
 #: field:calendar.event,alarm_id:0
@@ -1358,45 +1358,45 @@ msgstr ""
 #: field:calendar.todo,alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "アラーム"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by_uid:0
 msgid "Sent By User"
-msgstr ""
+msgstr "ユーザによる送信"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "定期の期間"
 
 #. module: base_calendar
 #: field:calendar.event,week_list:0
 #: field:calendar.todo,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "平日"
 
 #. module: base_calendar
 #: field:calendar.event,byday:0
 #: field:calendar.todo,byday:0
 msgid "By day"
-msgstr ""
+msgstr "日毎"
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "モデル"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Audio"
-msgstr ""
+msgstr "音声"
 
 #. module: base_calendar
 #: field:calendar.event,id:0
@@ -1407,62 +1407,62 @@ msgstr ""
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "For information Purpose"
-msgstr ""
+msgstr "情報目的のため"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Invite"
-msgstr ""
+msgstr "招待"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "出席者情報"
 
 #. module: base_calendar
 #: field:calendar.alarm,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "リソースID"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:418
 #, python-format
 msgid "Couldn't Invite because date is not specified!"
-msgstr ""
+msgstr "日付が定義されていないため招待できません。"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by:0
 msgid "Sent By"
-msgstr ""
+msgstr "送信者"
 
 #. module: base_calendar
 #: field:calendar.event,sequence:0
 #: field:calendar.todo,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "順序"
 
 #. module: base_calendar
 #: help:calendar.event,alarm_id:0
 #: help:calendar.todo,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "イベントが発生する前に今回アラームを設定して下さい。"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Internal User"
-msgstr ""
+msgstr "内部ユーザ"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Accept"
-msgstr ""
+msgstr "受諾"
 
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "土曜"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -1473,13 +1473,13 @@ msgstr "招待先"
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Second"
-msgstr ""
+msgstr "秒"
 
 #. module: base_calendar
 #: field:calendar.attendee,availability:0
 #: field:res.users,availability:0
 msgid "Free/Busy"
-msgstr ""
+msgstr "空き / 済"
 
 #. module: base_calendar
 #: field:calendar.alarm,duration:0
@@ -1490,17 +1490,17 @@ msgstr ""
 #: field:res.alarm,duration:0
 #: field:res.alarm,trigger_duration:0
 msgid "Duration"
-msgstr ""
+msgstr "期間"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "External Email"
-msgstr ""
+msgstr "外部Eメール"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "トリガー日"
 
 #. module: base_calendar
 #: help:calendar.alarm,attach:0
@@ -1512,9 +1512,12 @@ msgid ""
 "                    * Points to a procedure resource, which is invoked when  "
 "                    the alarm is triggered for procedure."
 msgstr ""
+"・ アラームが起動する時に発せられる音のリソースを指定して下さい。\n"
+"                    ・ ファイルはEメールにメッセージの添付として送信されます。\n"
+"                    ・ アラームが起動された時に処理される手続きのリソースを指定して下さい。"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "第５"
diff --git a/addons/base_iban/i18n/ja.po b/addons/base_iban/i18n/ja.po
index 6a23a021336..592190abca4 100644
--- a/addons/base_iban/i18n/ja.po
+++ b/addons/base_iban/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-08 06:11+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-05-23 06:14+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:08+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
@@ -24,27 +24,29 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"正当な支払いを行うために銀行タイプIBAN口座のための銀行にBIC/Swiftコードを定義して下さい。"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:139
 #, python-format
 msgid "This IBAN does not pass the validation check, please verify it"
-msgstr ""
+msgstr "このIBANは検証チェックを通過できません。それを確認して下さい。"
 
 #. module: base_iban
 #: model:res.partner.bank.type,format_layout:base_iban.bank_iban
 msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s"
-msgstr ""
+msgstr "%(bank_name)s：IBAN %(acc_number)s - BIC %(bank_bic)s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
 msgid "bank_bic"
-msgstr ""
+msgstr "BIC（銀行特定コード）"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
 msgid "zip"
-msgstr ""
+msgstr "郵便番号"
 
 #. module: base_iban
 #: help:res.partner.bank,iban:0
@@ -59,7 +61,7 @@ msgstr "銀行口座"
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
-msgstr ""
+msgstr "国コード"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:136
@@ -67,7 +69,7 @@ msgstr ""
 msgid ""
 "The IBAN does not seem to be correct. You should have entered something like "
 "this %s"
-msgstr ""
+msgstr "このIBANは正しくないようです。次のように何かを入れるべきです：%s"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
@@ -78,12 +80,12 @@ msgstr "国際銀行口座番号"
 #: code:addons/base_iban/base_iban.py:140
 #, python-format
 msgid "The IBAN is invalid, it should begin with the country code"
-msgstr ""
+msgstr "このIBANは無効です。それは国コードから始まる必要があります。"
 
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr ""
+msgstr "IBAN口座"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_module_quality/i18n/ja.po b/addons/base_module_quality/i18n/ja.po
new file mode 100644
index 00000000000..3f2a0360c7c
--- /dev/null
+++ b/addons/base_module_quality/i18n/ja.po
@@ -0,0 +1,692 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-24 01:37+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#: code:addons/base_module_quality/object_test/object_test.py:204
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
+#, python-format
+msgid "Suggestion"
+msgstr "提案"
+
+#. module: base_module_quality
+#: model:ir.actions.act_window,name:base_module_quality.action_view_quality_save_report
+#: view:save.report:0
+msgid "Standard Entries"
+msgstr "標準エントリー"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/base_module_quality.py:100
+#, python-format
+msgid "Programming Error"
+msgstr "プログラムエラー"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:31
+#, python-format
+msgid "Method Test"
+msgstr "メソッドのテスト"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:34
+#, python-format
+msgid ""
+"\n"
+"Test checks for fields, views, security rules, dependancy level\n"
+msgstr ""
+"\n"
+"項目、ビュー、セキュリティルール、依存関係レベルのテストをチェック\n"
+
+#. module: base_module_quality
+#: view:save.report:0
+msgid " "
+msgstr " "
+
+#. module: base_module_quality
+#: selection:module.quality.detail,state:0
+msgid "Skipped"
+msgstr "スキップ済"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:46
+#, python-format
+msgid "Module has no objects"
+msgstr "モジュールはオブジェクトを持っていません。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:49
+#, python-format
+msgid "Speed Test"
+msgstr "速度テスト"
+
+#. module: base_module_quality
+#: model:ir.model,name:base_module_quality.model_quality_check
+msgid "Module Quality Check"
+msgstr "モジュール品質チェック"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:82
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#: code:addons/base_module_quality/object_test/object_test.py:204
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
+#: code:addons/base_module_quality/speed_test/speed_test.py:144
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#: code:addons/base_module_quality/terp_test/terp_test.py:132
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:143
+#, python-format
+msgid "Object Name"
+msgstr "オブジェクト名"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:54
+#: code:addons/base_module_quality/method_test/method_test.py:61
+#: code:addons/base_module_quality/method_test/method_test.py:68
+#, python-format
+msgid "Ok"
+msgstr "OK"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:34
+#, python-format
+msgid ""
+"This test checks if the module satisfies the current coding standard used by "
+"OpenERP."
+msgstr "このテストでは、このモジュールがOpenERPにより使用されている現在のコーディング基準を満たしているかをチェックします。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/wizard/quality_save_report.py:39
+#, python-format
+msgid "No report to save!"
+msgstr "保存するレポートはありません。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#, python-format
+msgid "Result of dependancy in %"
+msgstr "依存関係の結果（%）"
+
+#. module: base_module_quality
+#: help:module.quality.detail,state:0
+msgid ""
+"The test will be completed only if the module is installed or if the test "
+"may be processed on uninstalled module."
+msgstr ""
+"テストはモジュールがインストールがされている場合にのみ完了します。またはモジュールがアンインストールされた場合にもテストは実行されるかも知れません。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:99
+#, python-format
+msgid "Result (/10)"
+msgstr "結果（ / 10）"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:33
+#, python-format
+msgid "Terp Test"
+msgstr "Terpテスト"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:33
+#, python-format
+msgid "Object Test"
+msgstr "オブジェクトテスト"
+
+#. module: base_module_quality
+#: view:module.quality.detail:0
+msgid "Save Report"
+msgstr "レポートを保存"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/wizard/module_quality_check.py:43
+#: model:ir.actions.act_window,name:base_module_quality.act_base_module_quality
+#: view:quality.check:0
+#, python-format
+msgid "Quality Check"
+msgstr "品質チェック"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:128
+#, python-format
+msgid "Not Efficient"
+msgstr "非効率"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/wizard/quality_save_report.py:39
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:172
+#, python-format
+msgid "Feedback about structure of module"
+msgstr "モジュール構造についてのフィードバック"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:35
+#, python-format
+msgid "Unit Test"
+msgstr "単体テスト"
+
+#. module: base_module_quality
+#: view:quality.check:0
+msgid "Check"
+msgstr "チェック"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "Reading Complexity"
+msgstr "読み易さ"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:267
+#, python-format
+msgid "Result of pep8_test in %"
+msgstr "pep8テストの結果（%）"
+
+#. module: base_module_quality
+#: field:module.quality.detail,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:50
+#, python-format
+msgid "Module does not have 'unit_test/test.py' file"
+msgstr "モジュールには\"unit_test/test.py\"ファイルがありません。"
+
+#. module: base_module_quality
+#: field:module.quality.detail,ponderation:0
+msgid "Ponderation"
+msgstr "熟考"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#, python-format
+msgid "Result of Security in %"
+msgstr "セキュリティの結果（%）"
+
+#. module: base_module_quality
+#: help:module.quality.detail,ponderation:0
+msgid ""
+"Some tests are more critical than others, so they have a bigger weight in "
+"the computation of final rating"
+msgstr "幾つかのテストは他よりもっと重要です。それらは最終格付けの計算においてより大きな比重を持っています。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:120
+#, python-format
+msgid "No enough data"
+msgstr "十分なデータがありません。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:132
+#, python-format
+msgid "Result (/1)"
+msgstr "結果（ / 1）"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "N (Number of Records)"
+msgstr "N（レコード数）"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:133
+#, python-format
+msgid "No data"
+msgstr "データがありません。"
+
+#. module: base_module_quality
+#: model:ir.model,name:base_module_quality.model_module_quality_detail
+msgid "module.quality.detail"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:127
+#, python-format
+msgid "O(n) or worst"
+msgstr "O（n）または最悪"
+
+#. module: base_module_quality
+#: field:save.report,module_file:0
+msgid "Save report"
+msgstr "レポートの保存"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:34
+#, python-format
+msgid ""
+"This test checks where object has workflow or not on it if there is a state "
+"field and several buttons on it and also checks validity of workflow xml file"
+msgstr ""
+"このテストは状態項目とその上に幾つかのボタンを持つ場合、オブジェクトがワークフローをどこに持つのか持たないかをチェックします。そしてワークフローxmlファ"
+"イルの有効性もチェックします。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:151
+#, python-format
+msgid "Result in %"
+msgstr "結果（%）"
+
+#. module: base_module_quality
+#: view:quality.check:0
+msgid "This wizard will check module(s) quality"
+msgstr "このウィザードはモジュールの品質チェックをします。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:58
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:88
+#, python-format
+msgid "No python file found"
+msgstr "Phthonファイルが見つかりません。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:144
+#: view:module.quality.check:0
+#: view:module.quality.detail:0
+#, python-format
+msgid "Result"
+msgstr "結果"
+
+#. module: base_module_quality
+#: field:module.quality.detail,message:0
+msgid "Message"
+msgstr "メッセージ"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:54
+#, python-format
+msgid "The module does not contain the __openerp__.py file"
+msgstr "モジュールは__openerp__.pyファイルが含んでいません。"
+
+#. module: base_module_quality
+#: view:module.quality.detail:0
+msgid "Detail"
+msgstr "詳細"
+
+#. module: base_module_quality
+#: field:module.quality.detail,note:0
+msgid "Note"
+msgstr "注記"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:85
+#, python-format
+msgid ""
+"<html>O(1) means that the number of SQL requests to read the object does not "
+"depand on the number of objects we are reading. This feature is mostly "
+"wished.\n"
+"</html>"
+msgstr ""
+"<html>O(1) "
+"はオブジェクトの読み込みのためのSQLリクエストの数が読み込むオブジェクト数に依存しないこと意味します。これは多くの人が望む機能です。</html>"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:120
+#, python-format
+msgid "__openerp__.py file"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:70
+#, python-format
+msgid "Status"
+msgstr "状態"
+
+#. module: base_module_quality
+#: view:module.quality.check:0
+#: field:module.quality.check,check_detail_ids:0
+msgid "Tests"
+msgstr "テスト"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:50
+#, python-format
+msgid ""
+"\n"
+"This test checks the speed of the module. Note that at least 5 demo data is "
+"needed in order to run it.\n"
+"\n"
+msgstr ""
+"\n"
+"このテストはモジュールの速度をチェックします。その実行には少なくとも５つのデモデータが必要であることに注意して下さい。\n"
+"\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:71
+#, python-format
+msgid "Unable to parse the result. Check the details."
+msgstr "結果の解析ができません。詳細をチェックして下さい。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:33
+#, python-format
+msgid ""
+"\n"
+"This test checks if the module satisfy tiny structure\n"
+msgstr ""
+"\n"
+"このテストはモジュールが小さな構造を満たすかをチェックします。\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:151
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:136
+#, python-format
+msgid "Module Name"
+msgstr "モジュール名"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:56
+#, python-format
+msgid "Error! Module is not properly loaded/installed"
+msgstr "エラー。モジュールは正しくロードまたはインストールされていません。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:115
+#, python-format
+msgid "Error in Read method"
+msgstr "読み込みでエラーです。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:138
+#, python-format
+msgid "Score is below than minimal score(%s%%)"
+msgstr "そのスコアは最小スコアより下です（%s%%）"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "N/2"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:57
+#: code:addons/base_module_quality/method_test/method_test.py:64
+#: code:addons/base_module_quality/method_test/method_test.py:71
+#, python-format
+msgid "Exception"
+msgstr "例外"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/base_module_quality.py:100
+#, python-format
+msgid "Test Is Not Implemented"
+msgstr "テストが実装されていません。"
+
+#. module: base_module_quality
+#: model:ir.model,name:base_module_quality.model_save_report
+msgid "Save Report of Quality"
+msgstr "品質レポートの保存"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "N"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:143
+#, python-format
+msgid "Feed back About Workflow of Module"
+msgstr "モジュールのワークフローについてのフィードバック"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:73
+#, python-format
+msgid ""
+"Given module has no objects.Speed test can work only when new objects are "
+"created in the module along with demo data"
+msgstr ""
+"そのモジュールにはオブジェクトがありません。速度テストは新しいオブジェクトがデモデータとともにモジュールの中に作成された時にのみ動作します。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:32
+#, python-format
+msgid ""
+"This test uses Pylint and checks if the module satisfies the coding standard "
+"of Python. See http://www.logilab.org/project/name/pylint for further info.\n"
+" "
+msgstr ""
+"このテストはPylint を使います。そしてPythonのコーディング規約を満たしているかをチェックします。\n"
+"詳細は http://www.logilab.org/project/name/pylint を見て下さい。\n"
+" "
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:116
+#, python-format
+msgid "Error in Read method: %s"
+msgstr "読み込みでエラー：%s"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:129
+#, python-format
+msgid "No Workflow define"
+msgstr "ワークフローの定義がありません。"
+
+#. module: base_module_quality
+#: selection:module.quality.detail,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: base_module_quality
+#: view:quality.check:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: base_module_quality
+#: view:save.report:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:32
+#, python-format
+msgid ""
+"\n"
+"PEP-8 Test , copyright of py files check, method can not call from loops\n"
+msgstr ""
+"\n"
+"PEP-8テスト、pyファイルの著作権チェック、メソッドはループから呼び出しはできません\n"
+
+#. module: base_module_quality
+#: field:module.quality.check,final_score:0
+msgid "Final Score (%)"
+msgstr "最終スコア（%）"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:61
+#, python-format
+msgid ""
+"Error. Is pylint correctly installed? (http://pypi.python.org/pypi/pylint)"
+msgstr "エラー。Pylintは正しくインストールされていますか？（http://pypi.python.org/pypi/pylint）"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:125
+#, python-format
+msgid "Efficient"
+msgstr "効率性"
+
+#. module: base_module_quality
+#: field:module.quality.check,name:0
+msgid "Rated Module"
+msgstr "評価モジュール"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:33
+#, python-format
+msgid "Workflow Test"
+msgstr "ワークフローテスト"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:36
+#, python-format
+msgid ""
+"\n"
+"This test checks the Unit Test(PyUnit) Cases of the module. Note that "
+"'unit_test/test.py' is needed in module.\n"
+"\n"
+msgstr ""
+"\n"
+"このテストはモジュールの単体テスト（PyUnit）の実情をチェックします。\"unit_test/test.py\"がモジュールに必要とされることに注意し"
+"て下さい。\n"
+"\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:32
+#, python-format
+msgid ""
+"\n"
+"This test checks if the module classes are raising exception when calling "
+"basic methods or not.\n"
+msgstr ""
+"\n"
+"このテストは基本メソッド呼び出しの時にモジュールクラスが例外を起こすかどうかをテストします。\n"
+
+#. module: base_module_quality
+#: field:module.quality.detail,detail:0
+msgid "Details"
+msgstr "詳細"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:119
+#, python-format
+msgid "Warning! Not enough demo data"
+msgstr "警告。十分なデモデータがありません。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:31
+#, python-format
+msgid "Pylint Test"
+msgstr "Pylintテスト"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:31
+#, python-format
+msgid "PEP-8 Test"
+msgstr "PEP-8テスト"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#, python-format
+msgid "Field name"
+msgstr "項目名"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "1"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:132
+#, python-format
+msgid "Warning! Object has no demo data"
+msgstr "警告。オブジェクトはデモデータを持っていません。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:140
+#, python-format
+msgid "Tag Name"
+msgstr "タグ名"
+
+#. module: base_module_quality
+#: model:ir.model,name:base_module_quality.model_module_quality_check
+msgid "module.quality.check"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:136
+#, python-format
+msgid "Result of views in %"
+msgstr "ビューの結果（%）"
+
+#. module: base_module_quality
+#: field:module.quality.detail,score:0
+msgid "Score (%)"
+msgstr "スコア（%）"
+
+#. module: base_module_quality
+#: help:save.report,name:0
+msgid "Save report as .html format"
+msgstr ".html フォーマットとしてレポートを保存"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/base_module_quality.py:269
+#, python-format
+msgid "The module has to be installed before running this test."
+msgstr "このモジュールはこのテストの実行前にインストールされている必要があります。"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:123
+#, python-format
+msgid "O(1)"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#, python-format
+msgid "Result of fields in %"
+msgstr "項目の結果（%）"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:70
+#: view:module.quality.detail:0
+#: field:module.quality.detail,summary:0
+#, python-format
+msgid "Summary"
+msgstr "要約"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:99
+#: code:addons/base_module_quality/structure_test/structure_test.py:172
+#: field:save.report,name:0
+#, python-format
+msgid "File Name"
+msgstr "ファイル名"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
+#, python-format
+msgid "Line number"
+msgstr "行番号"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:32
+#, python-format
+msgid "Structure Test"
+msgstr "構造テスト"
+
+#. module: base_module_quality
+#: field:module.quality.detail,quality_check_id:0
+msgid "Quality"
+msgstr "品質"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:140
+#, python-format
+msgid "Feed back About terp file of Module"
+msgstr "モジュールのterpファイルについてのフィードバック"
diff --git a/addons/base_module_record/i18n/ja.po b/addons/base_module_record/i18n/ja.po
new file mode 100644
index 00000000000..46eec086f36
--- /dev/null
+++ b/addons/base_module_record/i18n/ja.po
@@ -0,0 +1,268 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-24 03:50+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:08+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,category:0
+msgid "Category"
+msgstr "分類"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid "Information"
+msgstr "情報"
+
+#. module: base_module_record
+#: model:ir.model,name:base_module_record.model_ir_module_record
+msgid "ir.module.record"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,info,end:0
+#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
+msgid "End"
+msgstr "終了"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,init:0
+#: wizard_view:base_module_record.module_record_objects,init:0
+msgid "Choose objects to record"
+msgstr "オブジェクトを記録するための選択"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,author:0
+msgid "Author"
+msgstr "著者"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
+msgid "Directory Name"
+msgstr "ディレクトリ名"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
+#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Records only"
+msgstr "レコードのみ"
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_objects,info,data_kind:0
+msgid "Demo Data"
+msgstr "デモデータ"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
+msgid "Filename"
+msgstr "ファイル名"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,version:0
+msgid "Version"
+msgstr "バージョン"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,info:0
+#: wizard_view:base_module_record.module_record_data,init:0
+#: wizard_view:base_module_record.module_record_data,save_yaml:0
+#: wizard_view:base_module_record.module_record_objects,init:0
+msgid "Objects Recording"
+msgstr "オブジェクトの記録"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid ""
+"If you think your module could interest other people, we'd like you to "
+"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
+"it through the website or using features of the 'base_module_publish' module."
+msgstr ""
+"あなたのモジュールに他の人々が興味を持つであろうと思う場合は、http://www.openerp.com "
+"上の\"Modules\"セクションに公開して下さい。これは、Webサイトを通じて、または\"base_module_publish\"モジュールの機能を"
+"使うことで行うことができます。"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,check_date:0
+#: wizard_field:base_module_record.module_record_objects,init,check_date:0
+msgid "Record from Date"
+msgstr "記録開始日"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,end:0
+#: wizard_view:base_module_record.module_record_objects,end:0
+#: wizard_view:base_module_record.module_record_objects,info:0
+#: wizard_view:base_module_record.module_record_objects,save:0
+#: wizard_view:base_module_record.module_record_objects,save_yaml:0
+msgid "Module Recording"
+msgstr "モジュールの記録"
+
+#. module: base_module_record
+#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
+#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
+msgid "Export Customizations As a Module"
+msgstr "カスタマイズをモジュールとしてエクスポート"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid "Thanks in advance for your contribution."
+msgstr "あなたの貢献に感謝します。"
+
+#. module: base_module_record
+#: help:base_module_record.module_record_data,init,objects:0
+#: help:base_module_record.module_record_objects,init,objects:0
+msgid "List of objects to be recorded"
+msgstr "記録されるレコードのリスト"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,description:0
+msgid "Full Description"
+msgstr "全詳細"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,name:0
+msgid "Module Name"
+msgstr "モジュール名"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,objects:0
+#: wizard_field:base_module_record.module_record_objects,init,objects:0
+msgid "Objects"
+msgstr "オブジェクト"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,save,module_file:0
+#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
+msgid "Module .zip File"
+msgstr "モジュールの .zipファイル"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid "Module successfully created!"
+msgstr "モジュールの作成が成功しました。"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save_yaml:0
+msgid "YAML file successfully created !"
+msgstr "YAMLファイルの作成が成功しました。"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,info:0
+#: wizard_view:base_module_record.module_record_data,save_yaml:0
+msgid "Result, paste this to your module's xml"
+msgstr "結果として、モジュールのxmlにこれを貼り付けます。"
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_data,init,filter_cond:0
+#: selection:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Created"
+msgstr "作成済"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,end:0
+#: wizard_view:base_module_record.module_record_objects,end:0
+msgid "Thanks For using Module Recorder"
+msgstr "モジュールレコーダーの利用に感謝します。"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,website:0
+msgid "Documentation URL"
+msgstr "ドキュメントURL"
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_data,init,filter_cond:0
+#: selection:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Modified"
+msgstr "変更済"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,init,record:0
+#: wizard_button:base_module_record.module_record_objects,init,record:0
+msgid "Record"
+msgstr "記録"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_objects,info,save:0
+msgid "Continue"
+msgstr "続き"
+
+#. module: base_module_record
+#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
+#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
+msgid "Export Customizations As Data File"
+msgstr "カスタマイズをデータファイルとしてエクスポート"
+
+#. module: base_module_record
+#: code:addons/base_module_record/wizard/base_module_save.py:129
+#, python-format
+msgid "Error"
+msgstr "エラー"
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_objects,info,data_kind:0
+msgid "Normal Data"
+msgstr "通常データ"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,end,end:0
+#: wizard_button:base_module_record.module_record_objects,end,end:0
+msgid "OK"
+msgstr ""
+
+#. module: base_module_record
+#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
+msgid "Module Creation"
+msgstr "モジュールの作成"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
+msgid "Type of Data"
+msgstr "データのタイプ"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,info:0
+msgid "Module Information"
+msgstr "モジュール情報"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
+#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
+msgid "YAML"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,info,res_text:0
+#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
+msgid "Result"
+msgstr "結果"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,init,end:0
+#: wizard_button:base_module_record.module_record_objects,info,end:0
+#: wizard_button:base_module_record.module_record_objects,init,end:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_objects,save,end:0
+#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_data,init,filter_cond:0
+#: selection:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Created & Modified"
+msgstr "作成＆修正済"
diff --git a/addons/base_report_designer/i18n/ja.po b/addons/base_report_designer/i18n/ja.po
new file mode 100644
index 00000000000..8ef88c33f69
--- /dev/null
+++ b/addons/base_report_designer/i18n/ja.po
@@ -0,0 +1,198 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-24 04:08+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_sxw
+msgid "base.report.sxw"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "OpenERP Report Designer Configuration"
+msgstr "OpenERPレポートデザイナ設定"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid ""
+"This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
+"Writer."
+msgstr "このプラグインによって、OpenOfficeライターの中にOpenERPレポートを作成 / 修正することができます。"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "修正後レポートのアップロード"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "The .SXW report"
+msgstr "SXWレポート"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_designer_installer
+msgid "base_report_designer.installer"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "_Close"
+msgstr "閉じる"
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "The RML Report"
+msgstr "RMLレポート"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Configure"
+msgstr "設定"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "title"
+msgstr "タイトル"
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,report_id:0
+#: field:base.report.sxw,report_id:0
+msgid "Report"
+msgstr "レポート"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_rml_save
+msgid "base.report.rml.save"
+msgstr ""
+
+#. module: base_report_designer
+#: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
+msgid "Report Designer"
+msgstr "レポートデザイナ"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,name:0
+msgid "File name"
+msgstr "ファイル名"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.sxw:0
+msgid "Get a report"
+msgstr "レポート取得"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
+msgid "OpenERP Report Designer"
+msgstr "OpenERPレポートデザイナ"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Continue"
+msgstr "続き"
+
+#. module: base_report_designer
+#: field:base.report.rml.save,file_rml:0
+msgid "Save As"
+msgstr "名前を付けて保存"
+
+#. module: base_report_designer
+#: help:base_report_designer.installer,plugin_file:0
+msgid ""
+"OpenObject Report Designer plug-in file. Save as this file and install this "
+"plug-in in OpenOffice."
+msgstr ""
+"OpenObjectレポートデザイナのプラグインファイルです。このファイルを保存し、OpenOfficeの中にこのプラグインをインストールして下さい。"
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "Save RML FIle"
+msgstr "RMLファイルの保存"
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,file_sxw:0
+#: field:base.report.file.sxw,file_sxw_upload:0
+msgid "Your .SXW file"
+msgstr "あなたのSXWファイル"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "インストールと設定の手順"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,description:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+"これは要求されたレポートのテンプレートです。\n"
+"これをSXWファイルとして保存し、OpenOfficeで開いて下さい。\n"
+"更新のためOpenERPのOpenOfficeパッケージのインストールを忘れないで下さい。\n"
+"更新された後、このウィザードを使用してOpenERPの中に再アップロードして下さい。"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "画像"
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
+msgid "Base Report sxw"
+msgstr "基本レポートSXW"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_file_sxw
+msgid "base.report.file.sxw"
+msgstr ""
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,plugin_file:0
+msgid "OpenObject Report Designer Plug-in"
+msgstr "OpenObjectレポートデザイナプラグイン"
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
+msgid "OpenERP Report Designer Installation"
+msgstr "OpenERPレポートデザイナインストール"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.rml.save:0
+#: view:base.report.sxw:0
+#: view:base_report_designer.installer:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Select your report"
+msgstr "レポートの選択"
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index 1c8714f4031..5cc2296cbcf 100644
--- a/addons/base_setup/i18n/ja.po
+++ b/addons/base_setup/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-07 05:42+0000\n"
+"PO-Revision-Date: 2012-05-23 09:07+0000\n"
 "Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-08 04:49+0000\n"
-"X-Generator: Launchpad (build 15204)\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:08+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -52,7 +52,7 @@ msgstr "Googleの連絡先を同期する。"
 msgid ""
 "Set default for new user's timezone, used to perform timezone conversions "
 "between the server and the client."
-msgstr ""
+msgstr "新規ユーザのタイムゾーンのデフォルト設定のために、サーバとクライアント間のタイムゾーンの変換をします。"
 
 #. module: base_setup
 #: selection:product.installer,customers:0
@@ -76,6 +76,8 @@ msgid ""
 "printed on your reports. You can click on the button 'Preview Header' in "
 "order to check the header/footer of PDF documents."
 msgstr ""
+"レポートに印刷されますので、会社のデータ（アドレス、ロゴ、銀行口座）を記入してください。　PDF "
+"ドキュメントのヘッダー/フッターを確認するには、\"ヘッダープレビュー\"をクリックします。"
 
 #. module: base_setup
 #: field:product.installer,customers:0
@@ -99,6 +101,8 @@ msgid ""
 "you can import your existing partners by CSV spreadsheet from \"Import "
 "Data\" wizard"
 msgstr ""
+"このフォームから手動で顧客とその連絡先を作成またはインポート或いは "
+"\"データのインポート\"ウィザードからCSVスプレッドシートで、既存のパートナーをインポートすることができます。"
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -113,7 +117,7 @@ msgstr "ユーザのプリファレンスを初期値に定義します。"
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_saleforce:0
 msgid "For Import Saleforce"
-msgstr ""
+msgstr "Salesforceのインポート"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,quickbooks_ippids:0
@@ -149,7 +153,7 @@ msgstr "migrade.application.installer.modules"
 msgid ""
 "You can use this wizard to change the terminologies for customers in the "
 "whole application."
-msgstr ""
+msgstr "アプリケーション全体の顧客の用語を変更するには、このウィザードを使用することができます。"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -173,6 +177,8 @@ msgid ""
 "available. If you want to Add new Language, you can add it from 'Load an "
 "Official Translation' wizard  from 'Administration' menu."
 msgstr ""
+"UI翻訳が利用可能な時は、既定の言語を全てのユーザインターフェースに設定します。新しい言語を追加する場合は、\"管理\" "
+"メニューのウィザード\"オフィシャル翻訳をロードする' から追加することができます。"
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -210,7 +216,7 @@ msgstr "タイムゾーン"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr ""
+msgstr "\"顧客\"を言い表す他の言葉を使用してください。"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
diff --git a/addons/base_synchro/i18n/ja.po b/addons/base_synchro/i18n/ja.po
new file mode 100644
index 00000000000..afb60e50941
--- /dev/null
+++ b/addons/base_synchro/i18n/ja.po
@@ -0,0 +1,279 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-24 04:40+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
+msgid "Base Synchronization"
+msgstr "ベースの同期"
+
+#. module: base_synchro
+#: field:base.synchro.server,server_db:0
+msgid "Server Database"
+msgstr "サーバデータベース"
+
+#. module: base_synchro
+#: view:base.synchro.server:0
+#: model:ir.model,name:base_synchro.model_base_synchro_server
+msgid "Synchronized server"
+msgstr "同期サーバ"
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,name:0
+msgid "Field Name"
+msgstr "項目名"
+
+#. module: base_synchro
+#: field:base.synchro.obj,synchronize_date:0
+msgid "Latest Synchronization"
+msgstr "最終同期"
+
+#. module: base_synchro
+#: field:base.synchro,user_id:0
+msgid "Send Result To"
+msgstr "結果送信先"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
+msgid "Fields to not synchronize"
+msgstr "非同期項目"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Close"
+msgstr "閉じる"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Transfer Data To Server"
+msgstr "サーバにデータ転送"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj
+msgid "Register Class"
+msgstr "クラス登録"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: model:ir.actions.act_window,name:base_synchro.action_transfer_tree
+#: model:ir.ui.menu,name:base_synchro.transfer_menu_id
+msgid "Synchronized objects"
+msgstr "同期済オブジェクト"
+
+#. module: base_synchro
+#: field:base.synchro.server,obj_ids:0
+msgid "Models"
+msgstr "モデル"
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,obj_id:0
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,obj_id:0
+msgid "Object"
+msgstr "オブジェクト"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Synchronization Completed!"
+msgstr "同期が完了しました。"
+
+#. module: base_synchro
+#: field:base.synchro.server,login:0
+msgid "User Name"
+msgstr "ユーザ名"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: view:base.synchro.obj.line:0
+msgid "Group By"
+msgstr "グループ化"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Upload"
+msgstr "アップロード"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Latest synchronization"
+msgstr "最終同期"
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,name:0
+msgid "Date"
+msgstr "日付"
+
+#. module: base_synchro
+#: field:base.synchro.server,password:0
+msgid "Password"
+msgstr "パスワード"
+
+#. module: base_synchro
+#: field:base.synchro.obj,avoid_ids:0
+msgid "Fields Not Sync."
+msgstr "非同期項目"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Both"
+msgstr "両方"
+
+#. module: base_synchro
+#: field:base.synchro.obj,name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Fields"
+msgstr "項目"
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+msgid "Transfered Ids Details"
+msgstr "転送IDの詳細"
+
+#. module: base_synchro
+#: field:base.synchro.obj,action:0
+msgid "Synchronisation direction"
+msgstr "同期指示"
+
+#. module: base_synchro
+#: field:base.synchro.obj,server_id:0
+msgid "Server"
+msgstr "サーバ"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_obj_line_tree
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_line
+#: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
+msgid "Synchronized instances"
+msgstr "同期インスタンス"
+
+#. module: base_synchro
+#: field:base.synchro.obj,active:0
+msgid "Active"
+msgstr "アクティブ"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: field:base.synchro.obj,model_id:0
+msgid "Object to synchronize"
+msgstr "同期させるオブジェクト"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
+#: model:ir.ui.menu,name:base_synchro.synchro_server_tree_menu_id
+msgid "Servers to be synchronized"
+msgstr "同期されるサーバ"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Transfer Details"
+msgstr "転送の詳細"
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,remote_id:0
+msgid "Remote Id"
+msgstr "リモート ID"
+
+#. module: base_synchro
+#: field:base.synchro.obj,line_id:0
+msgid "Ids Affected"
+msgstr "影響を受けたID"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_63
+msgid "History"
+msgstr "履歴"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_62
+#: model:ir.ui.menu,name:base_synchro.synch_config
+msgid "Synchronization"
+msgstr "同期"
+
+#. module: base_synchro
+#: field:base.synchro.obj,domain:0
+msgid "Domain"
+msgstr "ドメイン"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Synchronize"
+msgstr "同期"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "OK"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,name:0
+msgid "Server name"
+msgstr "サーバ名"
+
+#. module: base_synchro
+#: field:base.synchro.obj,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid ""
+"The synchronisation has been started.You will receive a request when it's "
+"done."
+msgstr "同期が開始されました。完了したら、あなたは要求を受け取るでしょう。"
+
+#. module: base_synchro
+#: field:base.synchro.server,server_port:0
+msgid "Server Port"
+msgstr "サーバのポート"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
+msgid "Synchronize objects"
+msgstr "オブジェクトの同期"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro
+msgid "base.synchro"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,local_id:0
+msgid "Local Id"
+msgstr "ローカルID"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
+#: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
+msgid "Filters"
+msgstr "フィルタ"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Download"
+msgstr "ダウンロード"
+
+#. module: base_synchro
+#: field:base.synchro,server_url:0
+#: field:base.synchro.server,server_url:0
+msgid "Server URL"
+msgstr "サーバURL"
diff --git a/addons/board/i18n/ja.po b/addons/board/i18n/ja.po
index d6c6e71f1cf..d3d95a02373 100644
--- a/addons/board/i18n/ja.po
+++ b/addons/board/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-29 04:47+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 04:45+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-30 04:41+0000\n"
-"X-Generator: Launchpad (build 15171)\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -115,12 +115,12 @@ msgstr "ダッシュボードの定義"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "March"
-msgstr "３月"
+msgstr "3月"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "August"
-msgstr "８月"
+msgstr "8月"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_user_connection_tree
@@ -192,7 +192,7 @@ msgstr "10月"
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "Board Line"
-msgstr ""
+msgstr "ボード行"
 
 #. module: board
 #: field:board.menu.create,menu_parent_id:0
@@ -224,7 +224,7 @@ msgstr "11月"
 msgid ""
 "Gives the sequence order                         when displaying a list of "
 "board lines."
-msgstr ""
+msgstr "ボード行のリストを表示する場合、並び順を指定して下さい。"
 
 #. module: board
 #: selection:res.log.report,month:0
@@ -248,7 +248,7 @@ msgstr "ユーザエラー"
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "アクション"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -268,7 +268,7 @@ msgstr "ホームページ"
 #. module: board
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
 msgid "Latest Activities"
-msgstr ""
+msgstr "最新の行動"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -278,58 +278,58 @@ msgstr "左"
 #. module: board
 #: field:board.board,view_id:0
 msgid "Board View"
-msgstr ""
+msgstr "ボードビュー"
 
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Right"
-msgstr ""
+msgstr "右"
 
 #. module: board
 #: field:board.board.line,width:0
 msgid "Width"
-msgstr ""
+msgstr "幅"
 
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   月   "
 
 #. module: board
 #: field:board.board.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "順序"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: board
 #: view:board.board:0
 #: view:board.menu.create:0
 msgid "Create Menu"
-msgstr ""
+msgstr "メニューの作成"
 
 #. module: board
 #: field:board.board.line,height:0
 msgid "Height"
-msgstr ""
+msgstr "高さ"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_menu_create
 msgid "Create Board Menu"
-msgstr ""
+msgstr "ボードメニューの作成"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/caldav/i18n/ja.po b/addons/caldav/i18n/ja.po
index 0fb4deac052..3562cb9af41 100644
--- a/addons/caldav/i18n/ja.po
+++ b/addons/caldav/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:21+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 06:38+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -57,6 +57,29 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"事前要求事項\n"
+"----------\n"
+"CalDAVとのカレンダー同期を行う組み込みの方法はありません。\n"
+"サードパーティのソフトウェアのインストールが必要です：Calendar（CalDAV）が現在唯一です。\n"
+"\n"
+"設定\n"
+"-------------\n"
+"\n"
+"1. Calendar Syncを開きます。\n"
+"    ２つのタブのインタフェースが現れます。\n"
+"    最初のタブに留まります。\n"
+"\n"
+"2. CaDAV Calendar URL：そのURL にアクセスします（即ち "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings）。\n"
+"\n"
+"3. OpenERPのユーザ名とパスワードを入力します。\n"
+"\n"
+"4. サーバがSSLを使わない場合は警告を受けます。\"Yes\"を応答します。\n"
+"\n"
+"5. すると、手動で同期、または x分毎に同期を設定するカスタマイズが可能です。\n"
+"\n"
+"    "
 
 #. module: caldav
 #: field:basic.calendar.alias,name:0
@@ -104,6 +127,9 @@ msgid ""
 "to synchronize Meeting with Calendars client.You can access Calendars using "
 "CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
 msgstr ""
+"カレンダーはOpenERPモデルの全てとともにカレンダーイベントとToDo属性のカスタマイズが可能です。カレンダーはiCalのインポート / "
+"エクスポートを提供します。WebDAVサーバはカレンダーへのリモートアクセスを提供します。カレンダークライアントとともにミーティングの同期を手伝います。S"
+"unbird、Calendar Evaluation、MobileのようにCalDAVクライアントを使ってカレンダーにアクセスできます。"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:789
@@ -176,6 +202,26 @@ msgid ""
 "side.\n"
 "     "
 msgstr ""
+"\n"
+"    1. カレンダービューへ行く\n"
+"\n"
+"    2. ファイル -> 新規 -> カレンダー\n"
+"\n"
+"    3. フォームを埋める\n"
+"        ・ タイプ：CalDav\n"
+"        ・ 名前：好みの名前（例：会議）\n"
+"        ・ "
+"URL：http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings （例： "
+"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings）このウィンドウに与えら"
+"れたもの\n"
+"        ・ \"SSL使用\"のチェックを外す\n"
+"        ・ ユーザ名：あなたのユーザ名（例：demo）\n"
+"        ・ リフレッシュ：サーバとデータの同期を行う好みの時間間隔\n"
+"\n"
+"    4. OKをクリックし、OpenERPのパスワードを入力\n"
+"\n"
+"    5. 名付けをした新しいカレンダーが左側に表示\n"
+"     "
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:879
@@ -218,7 +264,7 @@ msgstr "ICS をエクスポートする"
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
 msgid "Use the field"
-msgstr ""
+msgstr "この項目を使用"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:789
@@ -475,6 +521,25 @@ msgid ""
 "created\n"
 "     "
 msgstr ""
+"\n"
+"  ・ WebDAVサーバはカレンダーにリモートアクセスを提供\n"
+"  ・ WebDAVを使ってカレンダーの同期\n"
+"  ・ 全てのOpenERPモデルとともにカレンダーイベントとToDo属性をカスタマイズ\n"
+"  ・ iCalのインポート / エクスポート機能を提供\n"
+"\n"
+"    CalDAVクライアントを使ってカレンダーにアクセスする先：\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    WebCalを使ってOpenERPカレンダーにアクセスするためのリモートサイトのURL：\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      場所\n"
+"        HOSTNAME：稼動中のOpenERPサーバ（WebDAVとともに）ホスト名\n"
+"        PORT：稼動中のOpenERPサーバのポート（デフォルト：8069）\n"
+"        DATABASE_NAME：作成されたOpenERPカレンダーのデータベース名\n"
+"     "
 
 #. module: caldav
 #: sql_constraint:document.directory:0
@@ -560,6 +625,30 @@ msgid ""
 "\n"
 "7. Then Finish, your meetings should appear now in your calendar view\n"
 msgstr ""
+"\n"
+"事前要求事項\n"
+"----------\n"
+"Thunderbirdを使っている場合、最初にlightningモジュールをインストールする必要があります。\n"
+"http://www.mozilla.org/projects/calendar/lightning/\n"
+"\n"
+"設定\n"
+"-------------\n"
+"1. カレンダービューへ行く\n"
+"\n"
+"2. ファイル -> 新規カレンダー\n"
+"\n"
+"3. \"ネットワークで\"を選択\n"
+"\n"
+"4. フォーマットとしてCalDAVを選択\n"
+"   "
+"場所としてURLを指定（例：http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings）"
+"\n"
+"\n"
+"5. カレンダーの名前と色を選択。警報のチェックを外すのが望ましい\n"
+"\n"
+"6. OpenERPのログイン名とパスワードを入力（パスワード入力を１回だけとする場合はパスワードを記憶するをチェック）\n"
+"\n"
+"7. 完了すると、その時にはカレンダービューにミーティングが現れる\n"
 
 #. module: caldav
 #: view:caldav.browse:0
@@ -596,7 +685,7 @@ msgstr "私のカレンダー"
 msgid ""
 "Also export a <name>.ics entry next to the calendar folder, with WebCal "
 "content."
-msgstr ""
+msgstr "また、<name>.ics エントリーを隣のカレンダーフォルダにWebCalコンテンツとともにインポートします。"
 
 #. module: caldav
 #: field:basic.calendar.fields,fn:0
@@ -619,7 +708,7 @@ msgstr "詳細"
 #. module: caldav
 #: help:basic.calendar.alias,cal_line_id:0
 msgid "The calendar/line this mapping applies to"
-msgstr ""
+msgstr "このマッピングのカレンダー / 行の適用先"
 
 #. module: caldav
 #: field:basic.calendar.fields,mapping:0
@@ -660,7 +749,7 @@ msgstr "遠隔カレンダを継読する。"
 #. module: caldav
 #: help:basic.calendar,calendar_color:0
 msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
+msgstr "サポートするクライアントのカレンダーエントリーの色"
 
 #. module: caldav
 #: field:basic.calendar,name:0
@@ -817,7 +906,7 @@ msgstr "basic.calendar.todo"
 #. module: caldav
 #: help:basic.calendar,calendar_order:0
 msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
+msgstr "サポートするクライアントのカレンダー中のフォルダ並び順"
 
 #~ msgid "Provide path for Remote Calendar"
 #~ msgstr "遠隔カレンダーへの経路を指定して下さい。"
diff --git a/addons/import_google/i18n/pt.po b/addons/import_google/i18n/pt.po
new file mode 100644
index 00000000000..a17769a57c9
--- /dev/null
+++ b/addons/import_google/i18n/pt.po
@@ -0,0 +1,227 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-21 12:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: import_google
+#: help:synchronize.google.import,group_name:0
+msgid "Choose which group to import, By default it takes all."
+msgstr "Escolha qual o grupo a importar, por padrão, ele leva tudo."
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Google Calendar Events"
+msgstr "Importar Os Eventos do Calendário Google"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Events"
+msgstr "_Importar Eventos"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid ""
+"No Google Username or password Defined for user.\n"
+"Please define in user view"
+msgstr ""
+"Nenhum nome de utilizador do Google ou password definida para o utilizador.\n"
+"Por favor, defina na vista do utilizador"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#, python-format
+msgid ""
+"Invalid login detail !\n"
+" Specify Username/Password."
+msgstr ""
+"Detalhe do Login Inválido !\n"
+" Especifique Nome de Utilizador / Password."
+
+#. module: import_google
+#: field:synchronize.google.import,supplier:0
+msgid "Supplier"
+msgstr "Fornecedor"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Options"
+msgstr "Opções da Importação"
+
+#. module: import_google
+#: field:synchronize.google.import,group_name:0
+msgid "Group Name"
+msgstr "Nome do Grupo"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_crm_case_categ
+msgid "Category of Case"
+msgstr "Categoria do Caso"
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
+#: model:ir.ui.menu,name:import_google.menu_sync_contact
+msgid "Import Google Contacts"
+msgstr "Importar Contatos do Google"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "Import Google Data"
+msgstr "Importar Dados do Google"
+
+#. module: import_google
+#: view:crm.meeting:0
+msgid "Meeting Type"
+msgstr "Tipo de reunião"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Por Favor instale gdata-python-client de http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_login
+msgid "Google Contact"
+msgstr "Contato Google"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import contacts from a google account"
+msgstr "Importar Contatos de uma Conta Google"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Please specify correct user and password !"
+msgstr "Por Favor Especifique um Utilizador e uma Password Correta !"
+
+#. module: import_google
+#: field:synchronize.google.import,customer:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_synchronize_google_import
+msgid "synchronize.google.import"
+msgstr "synchronize.google.import"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Contacts"
+msgstr "_Importar Contatos"
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_form
+#: model:ir.ui.menu,name:import_google.menu_sync_calendar
+msgid "Import Google Calendar"
+msgstr "Importar Calendário Google"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:50
+#, python-format
+msgid "Import google"
+msgstr "Importar Google"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Error"
+msgstr "Erro"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid "Warning !"
+msgstr "Aviso !"
+
+#. module: import_google
+#: field:synchronize.google.import,create_partner:0
+msgid "Options"
+msgstr "Opções"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "_Ok"
+msgstr "_Ok"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Erro na importação dos contatos Google!"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_import_message
+msgid "Import Message"
+msgstr "Importar mensagem"
+
+#. module: import_google
+#: field:synchronize.google.import,calendar_name:0
+msgid "Calendar Name"
+msgstr "Nome do Calendário"
+
+#. module: import_google
+#: help:synchronize.google.import,supplier:0
+msgid "Check this box to set newly created partner as Supplier."
+msgstr ""
+"Marque esta caixa para definir parceiro recém-criado como Fornecedor."
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Import only address"
+msgstr "Importar apenas o endereço"
+
+#. module: import_google
+#: field:crm.case.categ,user_id:0
+msgid "User"
+msgstr "Utilizador"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Partner Status for this Group:"
+msgstr ""
+
+#. module: import_google
+#: field:google.import.message,name:0
+msgid "Message"
+msgstr "Mensagem"
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Create partner for each contact"
+msgstr "Criar parceiro para cada contato"
+
+#. module: import_google
+#: help:synchronize.google.import,customer:0
+msgid "Check this box to set newly created partner as Customer."
+msgstr "Marque esta caixa para definir parceiro recém-criado como cliente."
+
+#~ msgid "Partner status for this group:"
+#~ msgstr "Estatuto de parceiro para este grupo:"
diff --git a/addons/import_sugarcrm/i18n/pt.po b/addons/import_sugarcrm/i18n/pt.po
new file mode 100644
index 00000000000..d8de70ebb3c
--- /dev/null
+++ b/addons/import_sugarcrm/i18n/pt.po
@@ -0,0 +1,404 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-21 12:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "Error !!"
+msgstr "Erro !!"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "(Coming Soon)"
+msgstr "(Em breve)"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,document:0
+msgid "Documents"
+msgstr "Documentos"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import your data from SugarCRM :"
+msgstr "Importar os seus dados do SugarCRM:"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Choose data you want to import. Click 'Import' to get data manually or "
+"'Schedule Reccurent Imports' to get recurrently and automatically data."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,contact:0
+msgid "Contacts"
+msgstr "Contatos"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "HR"
+msgstr "RH"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,bug:0
+msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,instance_name:0
+msgid "Instance's Name"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project_task:0
+msgid "Project Tasks"
+msgstr "Tarefas do Projeto"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_from:0
+msgid "Notify End Of Import To:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,user:0
+msgid ""
+"Check this box to import sugarCRM Users into OpenERP users, warning if a "
+"user with the same login exist in OpenERP, user information will be erase by "
+"sugarCRM user information"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#, python-format
+msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Schedule Recurrent Imports"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Do not forget the email address to be notified of the success of the import."
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,call:0
+msgid "Check this box to import sugarCRM Calls into OpenERP calls"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"If you make recurrent or ponctual import, data already  in OpenERP will be "
+"updated by SugarCRM data."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,employee:0
+msgid "Employee"
+msgstr "Funcionário"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Document"
+msgstr "Documento"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,document:0
+msgid "Check this box to import sugarCRM Documents into OpenERP documents"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import Data From SugarCRM"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "CRM"
+msgstr "CRM"
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid ""
+"Data are importing, the process is running in the background, an email will "
+"be sent to the given email address if it was defined."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,call:0
+msgid "Calls"
+msgstr "Chamadas"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Multi Instance Management"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid "_Ok"
+msgstr "_Ok"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,opportunity:0
+msgid ""
+"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
+"and Opportunities"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_history:0
+msgid "Email and Note"
+msgstr "Email e Notas"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,url:0
+msgid ""
+"Webservice's url where to get the data.                      example : "
+"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
+"application "
+"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
+msgstr ""
+
+#. module: import_sugarcrm
+#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
+#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
+msgid "Import SugarCRM"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Import"
+msgstr "_Importar"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,user:0
+msgid "User"
+msgstr "Utilizador"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "%s data required %s Module to be installed, Please install %s module"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,claim:0
+msgid "Cases"
+msgstr "Casos"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,meeting:0
+msgid ""
+"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,email_history:0
+msgid ""
+"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
+"Messages and Attachments"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project:0
+msgid "Projects"
+msgstr "Projetos"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid ""
+"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
+"http://pypi.python.org/pypi/ZSI/"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project:0
+msgid "Check this box to import sugarCRM Projects into OpenERP projects"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Select Module to Import."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,meeting:0
+msgid "Meetings"
+msgstr "Reuniões"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,employee:0
+msgid "Check this box to import sugarCRM Employees into OpenERP employees"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,url:0
+msgid "SugarSoap Api url:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Address Book"
+msgstr "Lista de Contatos"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,bug:0
+msgid "Bugs"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Project"
+msgstr "Projeto"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project_task:0
+msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,opportunity:0
+msgid "Leads & Opp"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password or bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid "Error !"
+msgstr "Erro !"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Warning !"
+msgstr "Aviso !"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,instance_name:0
+msgid ""
+"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
+"from different server."
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,contact:0
+msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,password:0
+msgid "Password"
+msgstr "Password"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Login Information"
+msgstr "Informação de Login"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,claim:0
+msgid "Check this box to import sugarCRM Cases into OpenERP claims"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Notification When Import is Finished"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,username:0
+msgid "User Name"
+msgstr "Nome do Utilizador"
+
+#. module: import_sugarcrm
+#: view:import.message:0
+#: model:ir.model,name:import_sugarcrm.model_import_message
+msgid "Import Message"
+msgstr "Importar mensagem"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,account:0
+msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Online documentation:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,account:0
+msgid "Accounts"
+msgstr "Contas"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid "ZSI Import Error!"
+msgstr ""
+
+#. module: import_sugarcrm
+#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
+msgid "Import SugarCRM DATA"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Address to Notify"
+msgstr ""
diff --git a/addons/pad_project/i18n/pt.po b/addons/pad_project/i18n/pt.po
new file mode 100644
index 00000000000..a86cca3d2e6
--- /dev/null
+++ b/addons/pad_project/i18n/pt.po
@@ -0,0 +1,38 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-22 09:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Erro ! Data final da tarefa tem que ser posterior a data inicial"
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Tarefa"
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr ""
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Erro ! Não se pode criar tarefas recursivas"
diff --git a/addons/plugin/i18n/pt.po b/addons/plugin/i18n/pt.po
new file mode 100644
index 00000000000..efc1467c3b2
--- /dev/null
+++ b/addons/plugin/i18n/pt.po
@@ -0,0 +1,23 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-22 09:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "plugin.handler"
diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po
index 7e6da0e0eed..e734c2fbdaa 100644
--- a/addons/stock/i18n/zh_TW.po
+++ b/addons/stock/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-11-07 13:04+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
+"PO-Revision-Date: 2012-05-23 08:16+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:39+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:08+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -56,7 +56,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.todo.category,name:stock.category_stock_management_config
 msgid "Stock Management"
-msgstr ""
+msgstr "倉儲管理"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
@@ -72,7 +72,7 @@ msgstr "今日"
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision Number"
-msgstr ""
+msgstr "修定版次"
 
 #. module: stock
 #: view:stock.move:0
@@ -172,7 +172,7 @@ msgstr "量度單位"
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
 msgid "Physical Inventories"
-msgstr ""
+msgstr "實地盤存"
 
 #. module: stock
 #: field:product.category,property_stock_journal:0 view:report.stock.move:0
@@ -183,7 +183,7 @@ msgstr "庫存日誌"
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Current month"
-msgstr ""
+msgstr "本月"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_move.py:222
@@ -349,7 +349,7 @@ msgstr "生產批次"
 #. module: stock
 #: help:stock.incoterms,code:0
 msgid "Code for Incoterms"
-msgstr ""
+msgstr "貿易條件"
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
@@ -3711,7 +3711,7 @@ msgstr "生產批次"
 #: model:ir.ui.menu,name:stock.menu_traceability view:stock.move:0
 #: view:stock.picking:0 view:stock.production.lot:0 view:stock.tracking:0
 msgid "Traceability"
-msgstr ""
+msgstr "異動記錄"
 
 #. module: stock
 #: view:stock.picking:0
diff --git a/addons/web_process/i18n/sl.po b/addons/web_process/i18n/sl.po
new file mode 100644
index 00000000000..aa0b0ffd9dd
--- /dev/null
+++ b/addons/web_process/i18n/sl.po
@@ -0,0 +1,118 @@
+# Slovenian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-07 19:19+0100\n"
+"PO-Revision-Date: 2012-05-23 20:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:42+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:261
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:262
+msgid "Save"
+msgstr "Shrani"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:6
+msgid "Process View"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Read Documentation Online"
+msgstr "Preberi spletno dokumentacijo"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Forum"
+msgstr "Forum"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Community Discussion"
+msgstr "Razprava skupnosti"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Books"
+msgstr "Knjige"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Get the books"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "OpenERP Enterprise"
+msgstr "OpenERP Enterprise"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "Purchase OpenERP Enterprise"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:52
+msgid "Process"
+msgstr "Proces"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:56
+msgid "Notes:"
+msgstr "Zapiski:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "Last modified by:"
+msgstr "Zadnja sprememba:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "N/A"
+msgstr "N/A"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:62
+msgid "Subflows:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:75
+msgid "Related:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:88
+msgid "Select Process"
+msgstr "Izberi postopek"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:98
+msgid "Select"
+msgstr "Izberi"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:109
+msgid "Edit Process"
+msgstr ""
diff --git a/addons/web_uservoice/i18n/pt.po b/addons/web_uservoice/i18n/pt.po
new file mode 100644
index 00000000000..e7f2dc362a0
--- /dev/null
+++ b/addons/web_uservoice/i18n/pt.po
@@ -0,0 +1,23 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-05-22 11:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/web_uservoice/static/src/xml/web_uservoice.xml:6
+msgid "feedback"
+msgstr "Feedback"

From 72d3fa43fd2149b0089765817010bd92f2673168 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 24 May 2012 14:27:43 +0200
Subject: [PATCH 424/452] [CHG] Add more position absolute problems

... in order to fix kanban problem when only one record is shown

bzr revid: fme@openerp.com-20120524122743-sdyp33a6qwigw9mr
---
 addons/web_kanban/static/src/css/kanban.css  | 5 ++++-
 addons/web_kanban/static/src/css/kanban.sass | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 83c3de06f37..3512398bffa 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,8 +1,10 @@
 @charset "utf-8";
 .openerp .oe_kanban_view {
   position: absolute;
-  top: 111px;
+  top: 118px;
   bottom: 0;
+  left: 221px;
+  right: 0;
 }
 .openerp .oe_kanban_view .ui-sortable-placeholder {
   border: 1px dotted black;
@@ -20,6 +22,7 @@
 }
 .openerp .oe_kanban_view .oe_kanban_groups {
   height: 100%;
+  width: 100%;
 }
 .openerp .oe_kanban_view .oe_kanban_group_title {
   margin: 1px 1px 4px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 536581de4cd..cad7b2e228d 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -22,8 +22,10 @@
 .openerp .oe_kanban_view
     // KanbanView {{{
     position: absolute
-    top: 111px
+    top: 118px
     bottom: 0
+    left: 221px
+    right: 0
     .ui-sortable-placeholder
         border: 1px dotted black
         visibility: visible !important
@@ -38,6 +40,7 @@
     // KanbanGroups {{{
     .oe_kanban_groups
         height: 100%
+        width: 100%
     .oe_kanban_group_title
         margin: 1px 1px 4px
         padding-left: 2px

From dd359a3903890e33ac4ae145043637188fa8da4f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 24 May 2012 14:28:59 +0200
Subject: [PATCH 425/452] [FIX] Do not wrap user menu options

bzr revid: fme@openerp.com-20120524122859-djzjb7nrcy60lj4v
---
 addons/web/static/src/css/base.css  | 1 +
 addons/web/static/src/css/base.sass | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 01ff07a27ae..d1873cedb8c 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -595,6 +595,7 @@
   background-color: none;
 }
 .openerp .oe_user_menu .oe_dropdown_options li a {
+  white-space: nowrap;
   display: block;
   padding: 4px 15px;
   clear: both;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 1c5ffe27481..2c6add8a20b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -499,6 +499,7 @@ $colour4: #8a89ba
                 display: block
                 background-color: none
                 a
+                    white-space: nowrap
                     display: block
                     padding: 4px 15px
                     clear: both

From 0194d0255ef8eedf8fee99ff9e1965e204ea939f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 24 May 2012 14:59:35 +0200
Subject: [PATCH 426/452] first version of many2manykanban

bzr revid: nicolas.vanhoren@openerp.com-20120524125935-6w2z7aavaq18aih1
---
 addons/web/static/src/js/view_form.js         | 111 ++++++++++++++++++
 addons/web_kanban/static/src/js/kanban.js     |   2 +-
 .../web_kanban/static/src/xml/web_kanban.xml  |   4 +-
 3 files changed, 115 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3430f1dd703..a049a5f215f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3338,6 +3338,116 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in
     }
 });
 
+instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend({
+    disable_utility_classes: true,
+    init: function(field_manager, node) {
+        this._super(field_manager, node);
+        m2m_kanban_lazy_init();
+        this.is_loaded = $.Deferred();
+        this.initial_is_loaded = this.is_loaded;
+        this.is_setted = $.Deferred();
+    },
+    start: function() {
+        this._super.apply(this, arguments);
+
+        var self = this;
+
+        this.dataset = new instance.web.form.Many2ManyDataSet(this, this.field.relation);
+        this.dataset.m2m = this;
+        this.dataset.on_unlink.add_last(function(ids) {
+            self.dataset_changed();
+        });
+        
+        this.is_setted.then(function() {
+            self.load_view();
+        });
+        this.is_loaded.then(function() {
+            self.on("change:effective_readonly", self, function() {
+                self.is_loaded = self.is_loaded.pipe(function() {
+                    self.kanban_view.destroy();
+                    return $.when(self.load_view()).then(function() {
+                        self.reload_content();
+                    });
+                });
+            });
+        })
+    },
+    set_value: function(value_) {
+        value_ = value_ || [];
+        if (value_.length >= 1 && value_[0] instanceof Array) {
+            value_ = value_[0][2];
+        }
+        this._super(value_);
+        this.dataset.set_ids(value_);
+        var self = this;
+        self.reload_content();
+        this.is_setted.resolve();
+    },
+    load_view: function() {
+        var self = this;
+        this.kanban_view = new instance.web.form.Many2ManyKanbanView(this, this.dataset, false, {
+                    'create_text': _t("Add"),
+                    'creatable': self.get("effective_readonly") ? false : true,
+                    'quick_creatable': self.get("effective_readonly") ? false : true,
+            });
+        var embedded = (this.field.views || {}).kanban;
+        if (embedded) {
+            this.kanban_view.set_embedded_view(embedded);
+        }
+        this.kanban_view.m2m_field = this;
+        var loaded = $.Deferred();
+        this.kanban_view.on_loaded.add_last(function() {
+            self.initial_is_loaded.resolve();
+            loaded.resolve();
+        });
+        this.kanban_view.do_switch_view.add_last(_.bind(this.add_new_record, this));
+        $.async_when().then(function () {
+            self.kanban_view.appendTo(self.$element);
+        });
+        return loaded;
+    },
+    reload_content: function() {
+        var self = this;
+        this.is_loaded = this.is_loaded.pipe(function() {
+            return self.kanban_view.do_search(self.build_domain(), self.dataset.get_context(), []);
+        });
+    },
+    dataset_changed: function() {
+        this.set({'value': [commands.replace_with(this.dataset.ids)]});
+    },
+    add_new_record: function(type) {
+        if (type !== "form")
+            return;
+        var pop = new instance.web.form.SelectCreatePopup(this);
+        pop.select_element(
+            this.field.relation,
+            {
+                title: _t("Add: ") + this.name
+            },
+            new instance.web.CompoundDomain(this.build_domain(), ["!", ["id", "in", this.dataset.ids]]),
+            this.build_context()
+        );
+        var self = this;
+        pop.on_select_elements.add(function(element_ids) {
+            _.each(element_ids, function(one_id) {
+                if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) {
+                    self.dataset.set_ids([].concat(self.dataset.ids, [one_id]));
+                    self.dataset_changed();
+                    self.reload_content();
+                }
+            });
+        });
+    },
+});
+
+function m2m_kanban_lazy_init() {
+if (instance.web.form.Many2ManyKanbanView)
+    return;
+instance.web.form.Many2ManyKanbanView = instance.web_kanban.KanbanView.extend({
+    
+});
+}
+
 /**
  * Class with everything which is common between FormOpenPopup and SelectCreatePopup.
  */
@@ -3951,6 +4061,7 @@ instance.web.form.widgets = new instance.web.Registry({
     'many2one' : 'instance.web.form.FieldMany2One',
     'many2many' : 'instance.web.form.FieldMany2Many',
     'many2manytags' : 'instance.web.form.FieldMany2ManyTags',
+    'many2manykanban' : 'instance.web.form.FieldMany2ManyKanban',
     'one2many' : 'instance.web.form.FieldOne2Many',
     'one2many_list' : 'instance.web.form.FieldOne2Many',
     'reference' : 'instance.web.form.FieldReference',
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index ab296674e76..20d10ca410b 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -13,7 +13,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     number_of_color_schemes: 10,
     init: function (parent, dataset, view_id, options) {
         this._super(parent, dataset, view_id, options);
-        _.defaults(this.options, {"quick_creatable": true, "creatable": true});
+        _.defaults(this.options, {"quick_creatable": true, "creatable": true, "create_text": undefined});
         this.fields_view = {};
         this.fields_keys = [];
         this.group_by = null;
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 2fef4737acc..cabe9cb52fb 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -13,7 +13,9 @@
 <div t-name="KanbanView.buttons" class="oe_kanban_buttons">
     <t t-if="widget.options.action_buttons !== false">
         <t t-if="widget._is_create_enabled()">
-            <button type="button" class="oe_button oe_kanban_button_new oe_form_button_hi">Create</button>
+            <button type="button" class="oe_button oe_kanban_button_new oe_form_button_hi">
+                <t t-esc="widget.options.create_text || _t('Create')"/>
+            </button>
         </t>
     </t>
 </div>

From 0d773b18ba6e04acb08a94cf3f26b5b2e789301f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 24 May 2012 15:29:09 +0200
Subject: [PATCH 427/452] [HACK] Kanban absolute positioning messing with o2m

bzr revid: fme@openerp.com-20120524132909-hivsvhp6p7rmr31h
---
 addons/web/static/src/css/base.css  | 3 +++
 addons/web/static/src/css/base.sass | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index d1873cedb8c..01f5d21511f 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1745,6 +1745,9 @@
   right: 5px;
   top: 3px;
 }
+.openerp .oe_form .oe_form_group_cell .oe_kanban_view {
+  position: static;
+}
 .openerp .oe_form .oe_form_button.oe_button {
   height: 22px;
   color: #4c4c4c;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 2c6add8a20b..95571ee7caf 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1421,6 +1421,9 @@ $colour4: #8a89ba
             filter: alpha(opacity=50)
             right: 5px
             top: 3px
+        .oe_form_group_cell .oe_kanban_view
+            // Hack due to absolute positioning of kanban view messing with o2m
+            position: static
     // }}}
     // FormView.buttons {{{
     .oe_form

From 4b319c2883352e4cb1b1ff1c6b95d583bd0fcbde Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 24 May 2012 15:56:17 +0200
Subject: [PATCH 428/452] [FIX] Fix kanban drag and droping bug

bzr revid: fme@openerp.com-20120524135617-tt5y3va4evj9apxj
---
 addons/web_kanban/static/src/js/kanban.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index ab296674e76..d5fd73bf23d 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -612,6 +612,13 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
                 self.do_warn("Kanban: no action for type : " + type);
             }
         });
+
+        this.$element.on('click', function(ev) {
+            var tag = ev.target.tagName.toLowerCase();
+            if (!$(ev.target).data('events')) {
+                console.log(tag);
+            }
+        });
     },
     setup_color_picker: function() {
         var self = this;
@@ -663,6 +670,7 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
                 var $render = $(self.render());
                 self.$element.replaceWith($render);
                 self.$element = $render;
+                self.$element.data('widget', self);
                 self.bind_events();
                 self.group.compute_cards_auto_height();
             } else {

From 2889564e8d1fa8cb3dd1f4976dd07649424f8b1a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 24 May 2012 16:42:51 +0200
Subject: [PATCH 429/452] [imp] added open field

bzr revid: nicolas.vanhoren@openerp.com-20120524144251-af1b19hnyrj5p98y
---
 addons/web/static/src/js/view_form.js | 55 ++++++++++++++++++---------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index a049a5f215f..69a418cb225 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3400,7 +3400,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
             self.initial_is_loaded.resolve();
             loaded.resolve();
         });
-        this.kanban_view.do_switch_view.add_last(_.bind(this.add_new_record, this));
+        this.kanban_view.do_switch_view.add_last(_.bind(this.open_popup, this));
         $.async_when().then(function () {
             self.kanban_view.appendTo(self.$element);
         });
@@ -3415,28 +3415,45 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
     dataset_changed: function() {
         this.set({'value': [commands.replace_with(this.dataset.ids)]});
     },
-    add_new_record: function(type) {
+    open_popup: function(type, unused) {
         if (type !== "form")
             return;
-        var pop = new instance.web.form.SelectCreatePopup(this);
-        pop.select_element(
-            this.field.relation,
-            {
-                title: _t("Add: ") + this.name
-            },
-            new instance.web.CompoundDomain(this.build_domain(), ["!", ["id", "in", this.dataset.ids]]),
-            this.build_context()
-        );
         var self = this;
-        pop.on_select_elements.add(function(element_ids) {
-            _.each(element_ids, function(one_id) {
-                if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) {
-                    self.dataset.set_ids([].concat(self.dataset.ids, [one_id]));
-                    self.dataset_changed();
-                    self.reload_content();
-                }
+        if (this.dataset.index === null) {
+            var pop = new instance.web.form.SelectCreatePopup(this);
+            pop.select_element(
+                this.field.relation,
+                {
+                    title: _t("Add: ") + this.name
+                },
+                new instance.web.CompoundDomain(this.build_domain(), ["!", ["id", "in", this.dataset.ids]]),
+                this.build_context()
+            );
+            pop.on_select_elements.add(function(element_ids) {
+                _.each(element_ids, function(one_id) {
+                    if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) {
+                        self.dataset.set_ids([].concat(self.dataset.ids, [one_id]));
+                        self.dataset_changed();
+                        self.reload_content();
+                    }
+                });
             });
-        });
+        } else {
+            var id = self.dataset.ids[self.dataset.index];
+            var pop = new instance.web.form.FormOpenPopup(self.view);
+            pop.show_element(self.field.relation, id, self.build_context(), {
+                title: _t("Open: ") + self.name,
+                write_function: function(id, data, options) {
+                    return self.dataset.write(id, data, {}).then(function() {
+                        self.reload_content();
+                    });
+                },
+                alternative_form_view: self.field.views ? self.field.views["form"] : undefined,
+                parent_view: self.view,
+                child_name: self.name,
+                readonly: self.get("effective_readonly")
+            });
+        }
     },
 });
 

From 3dc215b1579a2dc71df8171fe382459a35a72286 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 24 May 2012 17:50:15 +0200
Subject: [PATCH 430/452] [IMP] corelib events: on() should throw error when
 func is not a Function

bzr revid: fme@openerp.com-20120524155015-avjc79bqcet8xnb6
---
 addons/web/static/src/js/corelib.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index a7ef3eb9b23..94c748f839c 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -331,6 +331,9 @@ instance.web.EventDispatcherMixin = _.extend({}, instance.web.ParentedMixin, {
     },
     on: function(events, dest, func) {
         var self = this;
+        if (!(func instanceof Function)) {
+            throw new Error("Event handler must be a function.");
+        }
         events = events.split(/\s+/);
         _.each(events, function(eventName) {
             self.__edispatcherEvents.on(eventName, func, dest);

From b70dd5534f16ce590c2b52f0edc616b7c280d17d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 24 May 2012 17:58:37 +0200
Subject: [PATCH 431/452] [ADD] Kanban card are clickable

bzr revid: fme@openerp.com-20120524155837-5j6zflr5rldun98e
---
 addons/web_kanban/static/src/js/kanban.js | 55 ++++++++++++-----------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index d5fd73bf23d..60ff0891525 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -39,29 +39,16 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         var self = this;
         this._super.apply(this, arguments);
         // Bind kanban cards dropdown menus
-        this.$element.on('click', '.oe_kanban_menuaction', function() {
-            var $menu = $(this).next('.oe_kanban_menu');
-            var show = !$menu.is(':visible');
-            self.$element.find('.oe_kanban_menu').hide();
-            var doc_width = $(document).width();
-            $menu.toggle(show);
-            if (show) {
-                var offset = $menu.offset();
-                var menu_width = $menu.width();
-                var x = doc_width - offset.left - menu_width - 15;
-                if (x < 0) {
-                    $menu.offset({ left: offset.left + x }).width(menu_width);
-                }
-            }
-            return false;
+        $('html').on('click.kanban', function() {
+            self.trigger('hide_menus');
         });
-        $('html').on('click', function() {
+        this.on('hide_menus', this, function() {
             self.$element.find('.oe_kanban_menu').hide();
         });
     },
     destroy: function() {
         this._super.apply(this, arguments);
-        $('html').off('click');
+        $('html').off('click.kanban');
     },
     on_loaded: function(data) {
         this.fields_view = data;
@@ -599,8 +586,8 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
             this.$element.children(':first').addClass('oe_kanban_draghandle');
         }
 
-        this.$element.find('.oe_kanban_action').click(function(ev) {
-            ev.preventDefault();
+        this.$element.find('.oe_kanban_action').click(function() {
+            self.view.trigger('hide_menus');
             var $action = $(this),
                 type = $action.data('type') || 'button',
                 method = 'do_action_' + (type === 'action' ? 'object' : type);
@@ -611,14 +598,31 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
             } else {
                 self.do_warn("Kanban: no action for type : " + type);
             }
+            return false;
         });
 
-        this.$element.on('click', function(ev) {
-            var tag = ev.target.tagName.toLowerCase();
-            if (!$(ev.target).data('events')) {
-                console.log(tag);
+        this.$element.on('click', '.oe_kanban_menuaction', function() {
+            var $menu = $(this).next('.oe_kanban_menu');
+            var show = !$menu.is(':visible');
+            self.view.trigger('hide_menus');
+            var doc_width = $(document).width();
+            $menu.toggle(show);
+            if (show) {
+                var offset = $menu.offset();
+                var menu_width = $menu.width();
+                var x = doc_width - offset.left - menu_width - 15;
+                if (x < 0) {
+                    $menu.offset({ left: offset.left + x }).width(menu_width);
+                }
             }
+            return false;
         });
+
+        this.$element.on('click', this.on_card_clicked);
+    },
+    on_card_clicked: function() {
+        this.view.trigger('hide_menus');
+        this.view.open_record(this.id);
     },
     setup_color_picker: function() {
         var self = this;
@@ -627,8 +631,8 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
             $el.html(QWeb.render('KanbanColorPicker', {
                 widget: this
             }));
-            $el.on('click', 'a', function(ev) {
-                ev.preventDefault();
+            $el.on('click', 'a', function() {
+                self.view.trigger('hide_menus');
                 var color_field = $(this).parents('.oe_kanban_colorpicker').first().data('field') || 'color';
                 var data = {};
                 data[color_field] = $(this).data('color');
@@ -636,6 +640,7 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
                     self.record[color_field] = $(this).data('color');
                     self.do_reload();
                 });
+                return false;
             });
         }
     },

From c78ca8dd35271227b6c82fe79dc3be15baae8a7a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 24 May 2012 18:07:52 +0200
Subject: [PATCH 432/452] [IMP] Improved project and opportunities kanban view.
 Use KanbanRecord#on_card_clicked

bzr revid: fme@openerp.com-20120524160752-rl0by5v4g1n22syl
---
 addons/crm/crm_lead_view.xml            |  4 ++--
 addons/project/project_view.xml         |  2 +-
 addons/project/static/src/js/project.js | 10 ++++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3c773ed3ec9..3c2b8f48eb6 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -264,13 +264,13 @@
                                 <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                             </ul>
                             <div class="oe_kanban_content">
-                                <a type="edit"><h3>
+                                <h3>
                                     <field name="partner_id"/>
                                     <t t-if="record.planned_revenue.raw_value">
                                         - <t t-esc="Math.round(record.planned_revenue.value)"/>
                                         <field name="company_currency"/>
                                     </t>
-                                </h3></a>
+                                </h3>
                                 <div>
                                     <b> <field name="partner_address_name"/> </b>
                                 </div>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8e10fe6df7e..70cdac1efa0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -196,7 +196,7 @@
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
                                 <div class="oe_kanban_content">
-                                    <a type="edit"><h3 class="oe_kanban_ellipsis"><field name="name"/></h3></a>
+                                    <h3 class="oe_kanban_ellipsis"><field name="name"/></h3>
 
                                     <div class="oe_kanban_project_list">
                                         <a t-if="record.use_tasks.raw_value"
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index 297aa7184b9..510fcbb99e7 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -23,4 +23,14 @@ openerp.project = function(openerp) {
             }
         }
     });
+
+    openerp.web_kanban.KanbanRecord.include({
+        on_card_clicked: function() {
+            if (this.view.dataset.model === 'project.project') {
+                this.$('.oe_kanban_project_list a').first().click();
+            } else {
+                this._super.apply(this, arguments);
+            }
+        }
+    });
 };

From 86638a545c74c5576cf53b0e37e778d343b2f0f3 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 25 May 2012 04:40:07 +0000
Subject: [PATCH 433/452] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120525044007-8yn0z71lbi14nuu6
---
 addons/account_check_writing/i18n/fr.po |  10 +-
 addons/account_coda/i18n/fr.po          |  10 +-
 addons/account_followup/i18n/fr.po      |  70 ++-
 addons/caldav/i18n/ja.po                |  45 +-
 addons/crm_partner_assign/i18n/ja.po    |  10 +-
 addons/import_base/i18n/ja.po           | 104 +++++
 addons/import_google/i18n/ja.po         | 223 ++++++++++
 addons/import_sugarcrm/i18n/fr.po       |  10 +-
 addons/l10n_be/i18n/ja.po               | 503 +++++++++++++++++++++
 addons/lunch/i18n/ja.po                 | 554 ++++++++++++++++++++++++
 addons/mail/i18n/ja.po                  | 508 ++++++++++++++++++++++
 addons/mrp/i18n/fr.po                   |  91 ++--
 addons/plugin/i18n/fr.po                |  11 +-
 addons/plugin_thunderbird/i18n/fr.po    |  11 +-
 addons/purchase/i18n/fr.po              |  75 ++--
 addons/stock/i18n/de.po                 |  10 +-
 16 files changed, 2126 insertions(+), 119 deletions(-)
 create mode 100644 addons/import_base/i18n/ja.po
 create mode 100644 addons/import_google/i18n/ja.po
 create mode 100644 addons/l10n_be/i18n/ja.po
 create mode 100644 addons/lunch/i18n/ja.po
 create mode 100644 addons/mail/i18n/ja.po

diff --git a/addons/account_check_writing/i18n/fr.po b/addons/account_check_writing/i18n/fr.po
index 1a5c3d54fa0..c179c281856 100644
--- a/addons/account_check_writing/i18n/fr.po
+++ b/addons/account_check_writing/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-13 21:29+0000\n"
-"Last-Translator: t.o <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 17:30+0000\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:15+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -155,7 +155,7 @@ msgstr "Sociétés"
 #. module: account_check_writing
 #: view:res.company:0
 msgid "Default Check Layout"
-msgstr ""
+msgstr "Disposition par défaut des chèques"
 
 #. module: account_check_writing
 #: constraint:account.journal:0
diff --git a/addons/account_coda/i18n/fr.po b/addons/account_coda/i18n/fr.po
index 90cabdeb999..6c1d8caa2c7 100644
--- a/addons/account_coda/i18n/fr.po
+++ b/addons/account_coda/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-31 10:33+0000\n"
-"Last-Translator: lholivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2012-05-24 17:31+0000\n"
+"Last-Translator: gde (OpenERP) <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:08+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
@@ -70,7 +70,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_002
 msgid "Interest paid"
-msgstr ""
+msgstr "Intérêts payés"
 
 #. module: account_coda
 #: field:account.coda.trans.type,parent_id:0
diff --git a/addons/account_followup/i18n/fr.po b/addons/account_followup/i18n/fr.po
index 74243144583..4e1604dcf9b 100644
--- a/addons/account_followup/i18n/fr.po
+++ b/addons/account_followup/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-13 21:37+0000\n"
-"Last-Translator: t.o <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 17:31+0000\n"
+"Last-Translator: YannUbuntu <yannubuntu@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-14 05:43+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -69,6 +69,26 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Cher % (partner_name)s,\n"
+"\n"
+"Nous constatons que, malgré l'envoi d'un rappel, votre compte client "
+"présente toujours à ce jour un solde débiteur.\n"
+"\n"
+"Il est essentiel que le règlement soit réalisé immédiatement faute de quoi "
+"nous devrons envisager de stopper\n"
+"nos relations commerciales jusqu'à apurement de la situation.\n"
+"\n"
+"Merci de prendre les mesures appropriées pour que le règlement intervienne "
+"dans les 8 prochains jours.\n"
+"\n"
+"S'il subsiste un problème avec le paiement de la facture dont nous n'avons "
+"pas été informé, n'hésitez pas à contacter notre service comptabilité  au "
+"(+32) .12.34.56.78 afin que nous puissions le solutionner rapidement.\n"
+"\n"
+"Le détails de paiements dus est imprimé ci-dessous.\n"
+"\n"
+"Nous vous prions d’agréer, Madame, Monsieur, nos respectueuses salutations.\n"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -123,7 +143,7 @@ msgstr "Valeur erronée au crédit ou au débit de l'écriture comptable !"
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
-msgstr "Jour ouvrable"
+msgstr "Jours ouvrables"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
@@ -340,6 +360,8 @@ msgid ""
 "Your description is invalid, use the right legend or %% if you want to use "
 "the percent character."
 msgstr ""
+"Votre description n'est pas correcte, utilisez une légende exacte  ou %% si "
+"vous souhaitez utiliser le caractère pour cent."
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -449,7 +471,7 @@ msgstr "Envoyer un Message de confirmation"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Total:"
-msgstr "Total:"
+msgstr "Total :"
 
 #. module: account_followup
 #: constraint:res.company:0
@@ -529,7 +551,7 @@ msgstr "Rapport des Relances"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Steps"
-msgstr ""
+msgstr "Niveaux de relance"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
@@ -561,7 +583,7 @@ msgstr "Niveau de relance maximal"
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_view_account_followup_followup_form
 msgid "Review Invoicing Follow-Ups"
-msgstr ""
+msgstr "Définir les relances"
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -576,6 +598,11 @@ msgid ""
 "code to adapt the email content to the good context (good name, good date) "
 "and you can manage the multi language of messages."
 msgstr ""
+"Définissez les niveaux de relance, leur message et leur déclenchement. Pour "
+"chaque étape, spécifiez le message et le nombre de jours avant la relance. "
+"Utilisez la légende pour connaître le code à utiliser pour adapter "
+"dynamiquement le contenu du courriel  (nom, date). Vous pouvez aussi gérer "
+"la langue des messages en fonction des destinataires."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -590,6 +617,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Aucun courriel n'a été envoyé aux partenaires suivants. Leur adresse de "
+"courriel n'est pas renseignée !\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -605,7 +636,7 @@ msgstr "%(date)s: Date Courante"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Including journal entries marked as a litigation"
-msgstr ""
+msgstr "Inclure les écritures marquées comme litigieuses"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -621,7 +652,7 @@ msgstr "Description"
 #. module: account_followup
 #: constraint:account_followup.followup:0
 msgid "Only One Followup by Company."
-msgstr ""
+msgstr "Une seule relance par société"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -715,11 +746,26 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Cher% (partner_name)s,\n"
+"\n"
+"Malgré plusieurs rappels, votre compte est toujours débiteur.\n"
+"\n"
+"A moins d'un paiement intégral effectué dans les 8 prochains jours, une "
+"action  pour le recouvrement de la dette sera entreprise sans autre avis.\n"
+"\n"
+"Je suis convaincu que cette action se révélera inutile. Le  détails des "
+"sommes dues est imprimé ci-dessous.\n"
+"\n"
+"En cas de question concernant cette situation, n'hésitez pas à contacter "
+"notre service comptabilité au (+32) .12.34.56.78.\n"
+"\n"
+"Cordialement,\n"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Vous ne pouvez pas passer d'écritures sur un compte clôturé."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -744,7 +790,7 @@ msgstr "Réf. Client"
 #. module: account_followup
 #: field:account.followup.print.all,test_print:0
 msgid "Test Print"
-msgstr ""
+msgstr "Tester l'impression"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
diff --git a/addons/caldav/i18n/ja.po b/addons/caldav/i18n/ja.po
index 3562cb9af41..cb0c2dc92e5 100644
--- a/addons/caldav/i18n/ja.po
+++ b/addons/caldav/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-24 06:38+0000\n"
+"PO-Revision-Date: 2012-05-24 17:42+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
 "X-Generator: Launchpad (build 15288)\n"
 
 #. module: caldav
@@ -850,6 +850,47 @@ msgid ""
 "      now trusts it.\n"
 "    "
 msgstr ""
+"\n"
+"    SSL固有の設定は以下のドキュメントを参照して下さい。\n"
+"\n"
+"カレンダーの設定のために次のことをする必要があります：\n"
+"\n"
+"1. 設定をクリックし、メール、コンタクト、カレンダーページに行きます。\n"
+"2. アカウントを追加に進みます。\n"
+"3. その他をクリックします。\n"
+"4. カレンダーグループからCalDAVアカウントの追加を選択します。\n"
+"\n"
+"5. ホスト名を入力します。\n"
+"   （例：URLが http://openerp.com:8069/webdav/db_1/calendars/ "
+"であれば、openerp.comのホスト）\n"
+"\n"
+"6. OpenERPのユーザ名とパスワードを埋めます。\n"
+"\n"
+"7. 詳細として、サーバ名かOpenERPカレンダーの類の何れかを残すことができます。\n"
+"\n"
+"9. SSLサーバを使わない場合、エラーが発生します。気に留めず継続を押下します。\n"
+"\n"
+"10. 詳細設定をクリックし正しいポートとパスを設定します。\n"
+"\n"
+"11. OpenERPサーバのポートを指定：SSLは8071、他は8069\n"
+"\n"
+"12. アカウントURLにOpenERP WebDAVの正しいパスを設定します。\n"
+"    URLはウィザードにより与えられます（例：http://my.server.ip:8069/webdav/dbname/calendars/）\n"
+"\n"
+"13. 完了をクリック。上手くいけば電話はOpenERPサーバに接続詞アカウントの使用を検証します。\n"
+"\n"
+"14. iPhoneのメインメニューに行き、カレンダーアプリケーションに入ります。\n"
+"　　あなたのOpenERPカレンダーはカレンダーボタンの選択の内側に表示される。\n"
+"　　新しいカレンダーエントリーを作成する時、保存されるカレンダーの指定が必要であることに注意して下さい。\n"
+"\n"
+"SSLを必要とする場合は（証明書はいつものように検証済ではない）、最初に次の手順でiPhoneに信頼させることが必要です。\n"
+"IF you need SSL (and your certificate is not a verified one, as usual),\n"
+"\n"
+"    s1. Safari（ブラウザ）を開いてOpenERPサーバのhttpsの場所を入力します：\n"
+"　      https://my.server.ip:8071/\n"
+"      （サーバが\"my.server.ip\"にありHTTPSポートがデフォルトの8071と想定)\n"
+"    s2. Safariは接続してその証明書が使われたことを警告します。証明書を検証し、同意するとiPhoneは信頼します。\n"
+"    "
 
 #. module: caldav
 #: selection:user.preference,device:0
diff --git a/addons/crm_partner_assign/i18n/ja.po b/addons/crm_partner_assign/i18n/ja.po
index c2ab27be520..430536f66cd 100644
--- a/addons/crm_partner_assign/i18n/ja.po
+++ b/addons/crm_partner_assign/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-22 04:23+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-05-25 02:34+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-23 04:46+0000\n"
-"X-Generator: Launchpad (build 15135)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -30,7 +30,7 @@ msgstr "メッセージタイプ"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr "送信後、Eメールを削除する"
+msgstr "送信後、Eメールを削除"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
diff --git a/addons/import_base/i18n/ja.po b/addons/import_base/i18n/ja.po
new file mode 100644
index 00000000000..373a4668d1b
--- /dev/null
+++ b/addons/import_base/i18n/ja.po
@@ -0,0 +1,104 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-24 18:29+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:434
+#, python-format
+msgid "Import failed due to an unexpected error"
+msgstr "予期しないエラーでインポートが失敗しました。"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:461
+#, python-format
+msgid "started at %s and finished at %s \n"
+msgstr "%s で起動し %s で終了 \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:448
+#, python-format
+msgid "Import of your data finished at %s"
+msgstr "データのインポートは %s で終了しました。"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:463
+#, python-format
+msgid ""
+"but failed, in consequence no data were imported to keep database "
+"consistency \n"
+" error : \n"
+msgstr ""
+"失敗しました。結果としてデータベースの整合性維持のためデータはインポートされませんでした。 \n"
+"　エラー： \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:477
+#, python-format
+msgid ""
+"The import of data \n"
+" instance name : %s \n"
+msgstr ""
+"データのインポート\n"
+"　インスタンス名：%s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:470
+#, python-format
+msgid "%s has been successfully imported from %s %s, %s \n"
+msgstr "%s は正常にインポートされました。元：%s %s、%s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:447
+#, python-format
+msgid "Data Import failed at %s due to an unexpected error"
+msgstr "データインポートは %s で予期しないエラーのため失敗しました。"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:436
+#, python-format
+msgid "Import finished, notification email sended"
+msgstr "インポートが完了しました。通知メールが送信されました。"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:190
+#, python-format
+msgid "%s is not a valid model name"
+msgstr "%s は有効なモデル名ではありません。"
+
+#. module: import_base
+#: model:ir.ui.menu,name:import_base.menu_import_crm
+msgid "Import"
+msgstr "インポート"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:467
+#, python-format
+msgid "with no warning"
+msgstr "警告なしで"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:469
+#, python-format
+msgid "with warning : %s"
+msgstr "警告付きで：%s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:191
+#, python-format
+msgid " fields imported : "
+msgstr " 項目がインポートされました： "
diff --git a/addons/import_google/i18n/ja.po b/addons/import_google/i18n/ja.po
new file mode 100644
index 00000000000..ad1ab085495
--- /dev/null
+++ b/addons/import_google/i18n/ja.po
@@ -0,0 +1,223 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-24 18:56+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: import_google
+#: help:synchronize.google.import,group_name:0
+msgid "Choose which group to import, By default it takes all."
+msgstr "インポートするグループを選択して下さい。デフォルトでは全てを取得します。"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Google Calendar Events"
+msgstr "Googleカレンダーイベントのインポート"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Events"
+msgstr "イベントのインポート"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid ""
+"No Google Username or password Defined for user.\n"
+"Please define in user view"
+msgstr ""
+"ユーザのGoogleユーザ名またはパスワードが定義されていません。\n"
+"ユーザビューで定義して下さい。"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#, python-format
+msgid ""
+"Invalid login detail !\n"
+" Specify Username/Password."
+msgstr ""
+"ログインの詳細が無効です。\n"
+"　ユーザ名 / パスワードを指定して下さい。"
+
+#. module: import_google
+#: field:synchronize.google.import,supplier:0
+msgid "Supplier"
+msgstr "仕入先"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Options"
+msgstr "インポートオプション"
+
+#. module: import_google
+#: field:synchronize.google.import,group_name:0
+msgid "Group Name"
+msgstr "グループ名"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_crm_case_categ
+msgid "Category of Case"
+msgstr "ケースの分類"
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
+#: model:ir.ui.menu,name:import_google.menu_sync_contact
+msgid "Import Google Contacts"
+msgstr "Googleコンタクトのインポート"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "Import Google Data"
+msgstr "Googleデータのインポート"
+
+#. module: import_google
+#: view:crm.meeting:0
+msgid "Meeting Type"
+msgstr "ミーティングタイプ"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"gdata-python-client をインストールして下さい。URL：http://code.google.com/p/gdata-python-"
+"client/downloads/list"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_login
+msgid "Google Contact"
+msgstr "Googleコンタクト"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import contacts from a google account"
+msgstr "Googleアカウントからコンタクトのインポート"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Please specify correct user and password !"
+msgstr "正しいユーザとパスワードを指定して下さい。"
+
+#. module: import_google
+#: field:synchronize.google.import,customer:0
+msgid "Customer"
+msgstr "顧客"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Cancel"
+msgstr "キャンセル"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_synchronize_google_import
+msgid "synchronize.google.import"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Contacts"
+msgstr "コンタクトのインポート"
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_form
+#: model:ir.ui.menu,name:import_google.menu_sync_calendar
+msgid "Import Google Calendar"
+msgstr "Googleカレンダーのインポート"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:50
+#, python-format
+msgid "Import google"
+msgstr "Googleのインポート"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Error"
+msgstr "エラー"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: import_google
+#: field:synchronize.google.import,create_partner:0
+msgid "Options"
+msgstr "オプション"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "_Ok"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Googleコンタクトのインポートエラーです。"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_import_message
+msgid "Import Message"
+msgstr "メッセージのインポート"
+
+#. module: import_google
+#: field:synchronize.google.import,calendar_name:0
+msgid "Calendar Name"
+msgstr "カレンダー名"
+
+#. module: import_google
+#: help:synchronize.google.import,supplier:0
+msgid "Check this box to set newly created partner as Supplier."
+msgstr "仕入先として新しく作成したパートナを設定するにはこのボックスをチェックして下さい。"
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Import only address"
+msgstr "住所のみをインポート"
+
+#. module: import_google
+#: field:crm.case.categ,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Partner Status for this Group:"
+msgstr "このグループのパートナステータス："
+
+#. module: import_google
+#: field:google.import.message,name:0
+msgid "Message"
+msgstr "メッセージ"
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Create partner for each contact"
+msgstr "各コンタクトのパートナの作成"
+
+#. module: import_google
+#: help:synchronize.google.import,customer:0
+msgid "Check this box to set newly created partner as Customer."
+msgstr "顧客として新しく作成したパートナを設定するにはこのボックスをチェックして下さい。"
diff --git a/addons/import_sugarcrm/i18n/fr.po b/addons/import_sugarcrm/i18n/fr.po
index bc86547f52b..29b68b9f73a 100644
--- a/addons/import_sugarcrm/i18n/fr.po
+++ b/addons/import_sugarcrm/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-17 13:55+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-05-24 17:37+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:15+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
@@ -108,7 +108,7 @@ msgstr ""
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Schedule Recurrent Imports"
-msgstr ""
+msgstr "_Planifier les imports récurrents"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
diff --git a/addons/l10n_be/i18n/ja.po b/addons/l10n_be/i18n/ja.po
new file mode 100644
index 00000000000..d70ff834981
--- /dev/null
+++ b/addons/l10n_be/i18n/ja.po
@@ -0,0 +1,503 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-12-23 09:56+0000\n"
+"PO-Revision-Date: 2012-05-25 01:29+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: l10n_be
+#: field:partner.vat.intra,test_xml:0
+msgid "Test XML file"
+msgstr "テスト用XMLファイル"
+
+#. module: l10n_be
+#: view:partner.vat.list_13:0
+msgid "You can remove customers which you do not want in exported xml file"
+msgstr "XMLファイルにエクスポートしたくない顧客を削除できます。"
+
+#. module: l10n_be
+#: view:partner.vat_13:0
+msgid ""
+"This wizard will create an XML file for VAT details and total invoiced "
+"amounts per partner."
+msgstr "このウィザードはVATの詳細とパートナ毎の合計請求済金額のXMLファイルを作成します。"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_tiers_receiv
+msgid "Tiers - Recevable"
+msgstr "層 - 受取勘定"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:102
+#, python-format
+msgid "Wrong Period Code"
+msgstr "誤った期間コード"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:52
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:109
+#, python-format
+msgid "No partner has a VAT Number asociated with him."
+msgstr "パートナは彼に結びつけるVAT番号を持っていません。"
+
+#. module: l10n_be
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_tiers
+msgid "Tiers"
+msgstr "層"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,period_id:0
+msgid "Period"
+msgstr "期間"
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_ids:0
+msgid "Period (s)"
+msgstr "期間"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+msgid "Save the File with '.xml' extension."
+msgstr "\".xml\"拡張子のファイルを保存"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_charge
+msgid "Charge"
+msgstr "料金"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:47
+#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:52
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:105
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:109
+#, python-format
+msgid "Data Insufficient!"
+msgstr "データ不足です。"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.list_13:0
+msgid "Create XML"
+msgstr "XMLの作成"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_capitaux
+msgid "Capital"
+msgstr "大文字"
+
+#. module: l10n_be
+#: view:partner.vat.list_13:0
+msgid "Print"
+msgstr "印刷"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Save XML"
+msgstr "XMLの保存"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:219
+#, python-format
+msgid "Save"
+msgstr "保存"
+
+#. module: l10n_be
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "会社名は固有でなければいけません。"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,msg:0
+#: field:partner.vat.intra,msg:0
+#: field:partner.vat.list_13,msg:0
+msgid "File created"
+msgstr "ファイルを作成しました。"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "_Close"
+msgstr "閉じる"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:131
+#, python-format
+msgid "Save XML For Vat declaration"
+msgstr "VAT申告用XMLの保存"
+
+#. module: l10n_be
+#: view:partner.vat.list_13:0
+msgid "Customers"
+msgstr "顧客"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_tax_in
+msgid "Taxes à l'entrée"
+msgstr "入口税"
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,ask_restitution:0
+msgid "It indicates whether a resitution is to made or not?"
+msgstr "それは還付されたかどうかを示します。"
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_declaration
+msgid "Vat Declaraion"
+msgstr "VAT申告"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+#: field:partner.vat.intra,no_vat:0
+msgid "Partner With No VAT"
+msgstr "VAT対象外パートナ"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_immo
+msgid "Immobilisation"
+msgstr "固定化"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+msgid "Company"
+msgstr "会社"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat_13
+msgid "partner.vat_13"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.partner_vat_listing
+msgid "Annual Listing Of VAT-Subjected Customers"
+msgstr "VAT対象顧客の年間リスト"
+
+#. module: l10n_be
+#: view:partner.vat.list_13:0
+msgid "XML File has been Created."
+msgstr "XMLファイルは作成されました。"
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,client_nihil:0
+msgid ""
+"Tick this case only if it concerns only the last statement on the civil or "
+"cessation of activity"
+msgstr "これは民間の最新の取引明細書または活動の中止に関連する場合のみに、このケースをチェックして下さい。"
+
+#. module: l10n_be
+#: view:partner.vat.list_13:0
+msgid "Select Fiscal Year"
+msgstr "会計年度選択"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_restitution:0
+msgid "Ask Restitution"
+msgstr "還付請求"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat_intra
+#: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
+msgid "Partner VAT Intra"
+msgstr "パートナのVAT内部"
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.l10_be_vat_declaration
+#: view:l1on_be.vat.declaration:0
+msgid "Periodical VAT Declaration"
+msgstr "周期的なVAT申請"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Note: "
+msgstr "注記： "
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "_Preview"
+msgstr "プレビュー"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_tiers_payable
+msgid "Tiers - Payable"
+msgstr "層 - 支払債務"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,tax_code_id:0
+#: field:partner.vat.intra,tax_code_id:0
+msgid "Tax Code"
+msgstr "税金コード"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Periods"
+msgstr "期間"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_produit
+msgid "Produit"
+msgstr "製品"
+
+#. module: l10n_be
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
+msgstr "テストファイルとしてXML出力を設定"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
+msgstr "ビュー"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Ok"
+msgstr "OK"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_payment:0
+msgid "Ask Payment"
+msgstr "支払要請"
+
+#. module: l10n_be
+#: help:partner.vat.intra,no_vat:0
+msgid ""
+"The Partner whose VAT number is not defined they doesn't include in XML File."
+msgstr "パートナのVAT番号はXMLファイルに含まれておらず、定義されていません。"
+
+#. module: l10n_be
+#: field:partner.vat_13,limit_amount:0
+msgid "Limit Amount"
+msgstr "限度額"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_res_company
+msgid "Companies"
+msgstr "会社"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Create _XML"
+msgstr "XMLの作成"
+
+#. module: l10n_be
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
+msgstr "内部定義に含めたい期間をここで定義して下さい。"
+
+#. module: l10n_be
+#: view:partner.vat_13:0
+msgid "View Customers"
+msgstr "顧客ビュー"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:102
+#, python-format
+msgid "The period code you entered is not valid."
+msgstr "入力の期間コードは有効ではありません。"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Is Last Declaration"
+msgstr "最終申請"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_stock
+msgid "Stock et Encours"
+msgstr "株式と未払"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,client_nihil:0
+msgid "Last Declaration of Enterprise"
+msgstr ""
+
+#. module: l10n_be
+#: help:partner.vat.intra,mand_id:0
+msgid ""
+"This identifies the representative of the sending company. This is a string "
+"of 14 characters"
+msgstr "これは送信会社の代表者を識別します。これは14文字の文字列です。"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:75
+#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:150
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:98
+#, python-format
+msgid "Data Insufficient"
+msgstr "データ不足です。"
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
+msgid "Belgium Statements"
+msgstr "ベルギー取引明細書"
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_intra
+msgid "Partner Vat Intra"
+msgstr "パートナのVAT内部"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Declare Periodical VAT"
+msgstr "定期的VATの定義"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat_list_13
+msgid "partner.vat.list_13"
+msgstr ""
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Save xml"
+msgstr "XMLを保存"
+
+#. module: l10n_be
+#: field:partner.vat.intra,mand_id:0
+msgid "MandataireId"
+msgstr "代理人"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,file_save:0
+#: field:partner.vat.intra,file_save:0
+#: field:partner.vat.list_13,file_save:0
+msgid "Save File"
+msgstr "ファイルを保存"
+
+#. module: l10n_be
+#: help:partner.vat.intra,period_code:0
+msgid ""
+"This is where you have to set the period code for the intracom declaration "
+"using the format: ppyyyy\n"
+"      PP can stand for a month: from '01' to '12'.\n"
+"      PP can stand for a trimester: '31','32','33','34'\n"
+"          The first figure means that it is a trimester,\n"
+"          The second figure identify the trimester.\n"
+"      PP can stand for a complete fiscal year: '00'.\n"
+"      YYYY stands for the year (4 positions).\n"
+"    "
+msgstr ""
+"ここで内部定義のための期間コードを設定しなければなりません。フォーマット：ppyyyy\n"
+"      PPで月を示す場合：01から12\n"
+"      PPで3ヶ月間を示す場合：31、32、33、34\n"
+"          最初の数字は3ヶ月間を示します。\n"
+"          ２番目の数字は3ヶ月間の識別です。\n"
+"      PPで会計年度を示す場合：00\n"
+"      YYYYは年（4桁）\n"
+"    "
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,name:0
+#: field:partner.vat.intra,name:0
+#: field:partner.vat.list_13,name:0
+msgid "File Name"
+msgstr "ファイル名"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_tax_out
+msgid "Taxes à la sortie"
+msgstr "出口税"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_tax
+msgid "Tax"
+msgstr "税金"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:75
+#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:150
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:98
+#, python-format
+msgid "No VAT Number Associated with Main Company!"
+msgstr "主会社と関係したVAT番号がありません。"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_l1on_be_vat_declaration
+msgid "Vat Declaration"
+msgstr "VAT申請"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+#: field:partner.vat.intra,country_ids:0
+msgid "European Countries"
+msgstr "ヨーロッパ諸国"
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_partner_vat_listing_13
+#: view:partner.vat_13:0
+msgid "Partner VAT Listing"
+msgstr "パートナVATリスト"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "General Information"
+msgstr "一般情報"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Create an XML file for Vat Intra"
+msgstr "VAT内部のXMLファイルの作成"
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr "期間コード"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_financiers
+msgid "Financier"
+msgstr "出資者"
+
+#. module: l10n_be
+#: field:partner.vat_13,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: l10n_be
+#: view:partner.vat_13:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+#: view:partner.vat.list_13:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:105
+#, python-format
+msgid "Please select at least one Period."
+msgstr "少なくとも１つの期間を選択して下さい。"
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,ask_payment:0
+msgid "It indicates whether a payment is to made or not?"
+msgstr "支払をしたかどうかを示します。"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Partner VAT intra"
+msgstr "パートナVAT内部"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:47
+#, python-format
+msgid "No data for the selected Year."
+msgstr "選択した年にデータがありません。"
diff --git a/addons/lunch/i18n/ja.po b/addons/lunch/i18n/ja.po
new file mode 100644
index 00000000000..445a960e7cc
--- /dev/null
+++ b/addons/lunch/i18n/ja.po
@@ -0,0 +1,554 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-05-25 02:30+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Reset cashbox"
+msgstr "金庫のリセット"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box amount in current year"
+msgstr "現在年のボックス数"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_reporting_order
+msgid "Lunch Orders"
+msgstr "昼食オーダー"
+
+#. module: lunch
+#: view:lunch.order.cancel:0
+msgid "Are you sure you want to cancel this order ?"
+msgstr "本当にこのオーダーをキャンセルしますか？"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Cash Moves"
+msgstr "現金移動"
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:lunch.order:0 view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_confirm
+msgid "confirm Order"
+msgstr "オーダーの確認"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "    7 Days    "
+msgstr "    7日    "
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:lunch.order:0
+msgid "Today"
+msgstr "今日"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Total :"
+msgstr "合計："
+
+#. module: lunch
+#: field:report.lunch.amount,day:0 view:report.lunch.order:0
+#: field:report.lunch.order,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_cancel
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_cancel_values
+#: model:ir.model,name:lunch.model_lunch_order_cancel view:lunch.order:0
+#: view:lunch.order.cancel:0
+msgid "Cancel Order"
+msgstr "オーダーのキャンセル"
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_create_cashbox
+msgid ""
+"You can create on cashbox by employee if you want to keep track of the "
+"amount due by employee according to what have been ordered."
+msgstr "従業員毎に何がオーダーされたかによる金額を追跡したい場合は、従業員毎の金庫を作成することができます。"
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0 field:report.lunch.amount,amount:0
+msgid "Amount"
+msgstr "量"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_form view:lunch.product:0
+msgid "Products"
+msgstr "製品"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_amount
+msgid "Amount available by user and box"
+msgstr "ユーザとボックスで使用可能な量"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "   Month   "
+msgstr "   月   "
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order
+msgid "Lunch Orders Statistics"
+msgstr "昼食オーダー統計"
+
+#. module: lunch
+#: view:lunch.cashmove:0 field:lunch.order,cashmove:0
+msgid "CashMove"
+msgstr "現金移動"
+
+#. module: lunch
+#: view:lunch.order:0 selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr "確認済"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Confirm"
+msgstr "確認"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Search Lunch Order"
+msgstr "昼食オーダーの検索"
+
+#. module: lunch
+#: field:lunch.order,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "New"
+msgstr "新規"
+
+#. module: lunch
+#: field:report.lunch.order,price_total:0
+msgid "Total Price"
+msgstr "合計価格"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box Amount by User"
+msgstr "ユーザ毎のボックス量"
+
+#. module: lunch
+#: field:lunch.cashmove,create_date:0
+msgid "Creation Date"
+msgstr "作成日"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Name/Date"
+msgstr "名前 / 日付"
+
+#. module: lunch
+#: field:lunch.order,descript:0
+msgid "Description Order"
+msgstr "オーダーの詳細"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box amount in last month"
+msgstr "先月のボックス量"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm_values
+#: view:lunch.order:0 view:lunch.order.confirm:0
+msgid "Confirm Order"
+msgstr "オーダーの確認"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:report.lunch.amount:0 view:report.lunch.order:0
+msgid "Box"
+msgstr "ボックス"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "  365 Days  "
+msgstr "  365日  "
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "    Month-1    "
+msgstr "    月-1    "
+
+#. module: lunch
+#: field:report.lunch.amount,date:0
+msgid "Created Date"
+msgstr "作成日"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
+msgid " Product Categories "
+msgstr " 製品分類 "
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Set to Zero"
+msgstr "0に設定"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+msgid "Cash Move"
+msgstr "現金移動"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Tasks performed in last 365 days"
+msgstr "直近365日で実行されたタスク"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: lunch
+#: field:report.lunch.amount,month:0 view:report.lunch.order:0
+#: field:report.lunch.order,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: lunch
+#: field:lunch.order.confirm,confirm_cashbox:0
+msgid "Name of box"
+msgstr "ボックスの名前"
+
+#. module: lunch
+#: view:lunch.order.cancel:0
+msgid "Yes"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_category view:lunch.category:0
+#: view:lunch.order:0 field:lunch.order,category:0
+#: field:lunch.product,category_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "  Year  "
+msgstr "  年  "
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
+msgid "Product Categories"
+msgstr "製品分類"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0 view:lunch.order.cancel:0
+msgid "No"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Orders Confirmation"
+msgstr "オーダー確認"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Are you sure you want to reset this cashbox ?"
+msgstr "本当にこの金庫をリセットしますか？"
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.view_lunch_product_form_installer
+msgid ""
+"Define all products that the employees can order for the lunch time. If you "
+"order lunch at several places, you can use the product categories to split "
+"by supplier. It will be easier for the lunch manager to filter lunch orders "
+"by categories."
+msgstr ""
+"従業員が昼食時間にオーダーできる全ての製品を定義して下さい。複数の場所で昼食をオーダーするなら、仕入先毎に分離した製品分類を使うことができます。これは昼食"
+"マネジャにとって分類別に昼食オーダーをフィルタすることを容易にします。"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
+#: view:report.lunch.order:0
+msgid "Lunch Order Analysis"
+msgstr "昼食オーダー分析"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: lunch
+#: field:lunch.cashmove,user_cashmove:0 field:lunch.order,user_id:0
+#: field:report.lunch.amount,user_id:0 field:report.lunch.order,user_id:0
+msgid "User Name"
+msgstr "ユーザ名"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Sales Analysis"
+msgstr "販売分析"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_root_configuration
+msgid "Lunch"
+msgstr "昼食"
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:report.lunch.order:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: lunch
+#: view:lunch.cashmove:0 field:lunch.order,date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: lunch
+#: field:lunch.cashmove,box:0 field:report.lunch.amount,box:0
+msgid "Box Name"
+msgstr "ボックス名"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox_clean
+msgid "clean cashbox"
+msgstr "金庫のクリア"
+
+#. module: lunch
+#: field:lunch.cashmove,active:0 field:lunch.product,active:0
+msgid "Active"
+msgstr "アクティブ"
+
+#. module: lunch
+#: field:report.lunch.order,date:0
+msgid "Date Order"
+msgstr "日付順"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox
+msgid "Cashbox for Lunch "
+msgstr "昼食用金庫 "
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean_values
+msgid "Set CashBox to Zero"
+msgstr "金庫に0を設定"
+
+#. module: lunch
+#: view:lunch.product:0
+msgid "General Information"
+msgstr "一般情報"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
+msgid " Cashboxes "
+msgstr " 金庫 "
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Unit Price"
+msgstr "単価"
+
+#. module: lunch
+#: field:lunch.order,product:0
+msgid "Product"
+msgstr "製品"
+
+#. module: lunch
+#: field:lunch.cashmove,name:0 report:lunch.order:0 view:lunch.product:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: lunch
+#: field:lunch.order,price:0 field:lunch.product,price:0
+msgid "Price"
+msgstr "価格"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Search CashMove"
+msgstr "現金移動の検索"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Total box"
+msgstr "ボックス合計"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "Lunch Product"
+msgstr "昼食製品"
+
+#. module: lunch
+#: field:lunch.cashbox,sum_remain:0
+msgid "Total Remaining"
+msgstr "残り合計"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Total price"
+msgstr "合計価格"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: lunch
+#: field:lunch.cashbox,name:0 field:lunch.category,name:0
+#: field:lunch.product,name:0 field:report.lunch.order,box_name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Total amount"
+msgstr "合計金額"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Tasks performed in last 30 days"
+msgstr "直近30日で実行したタスク"
+
+#. module: lunch
+#: view:lunch.category:0
+msgid "Category Related to Products"
+msgstr "製品に関連する分類"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form view:lunch.cashbox:0
+msgid "Cashboxes"
+msgstr "金庫"
+
+#. module: lunch
+#: view:lunch.category:0 report:lunch.order:0 view:lunch.order:0
+msgid "Order"
+msgstr "オーダー"
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: model:ir.ui.menu,name:lunch.menu_lunch report:lunch.order:0
+msgid "Lunch Order"
+msgstr "昼食オーダー"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box amount in current month"
+msgstr "現在月のボックス量"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.view_lunch_product_form_installer
+msgid "Define Your Lunch Products"
+msgstr "昼食製品を定義して下さい。"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Tasks during last 7 days"
+msgstr "直近7日間のタスク"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+msgid "Cash Position by User"
+msgstr "ユーザ毎の現金持高"
+
+#. module: lunch
+#: field:lunch.cashbox,manager:0
+msgid "Manager"
+msgstr "マネジャ"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "   30 Days   "
+msgstr "   30日   "
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "To Confirm"
+msgstr "確認"
+
+#. module: lunch
+#: field:report.lunch.amount,year:0 view:report.lunch.order:0
+#: field:report.lunch.order,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_create_cashbox
+msgid "Create Lunch Cash Boxes"
+msgstr "昼食用金庫の作成"
diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po
new file mode 100644
index 00000000000..200fbab9ab8
--- /dev/null
+++ b/addons/mail/i18n/ja.po
@@ -0,0 +1,508 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2012-05-25 04:29+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message Type"
+msgstr "メッセージタイプ"
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "送信後、Eメールを削除"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr "関連ドキュメントを開く"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Attachments"
+msgstr "添付ファイルを開く"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Message Details"
+msgstr "メッセージ詳細"
+
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr "会話履歴"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr "Eメール作成"
+
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr "メッセージのテキスト版"
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr "本文"
+
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr "メッセージの受取人"
+
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text Contents"
+msgstr "テキストの内容"
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr "受信済"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "スレッド"
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr "送信メールサーバ"
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr "返信先"
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr "メッセージのリッチテキスト / HTML版"
+
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr "自動削除"
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr "BCCの受取人"
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "件名"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
+#, python-format
+msgid "On %(date)s, "
+msgstr "%(date)s、 "
+
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "送信者"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr "Eメールメッセージ"
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr "失敗"
+
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr "返信"
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr "送信済"
+
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
+#, python-format
+msgid "Re:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "%(sender_name)s wrote:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
+#, python-format
+msgid "History"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:159
+#, python-format
+msgid " on "
+msgstr ""
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
+#, python-format
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related User"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "You"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:155
+#, python-format
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message Headers"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
+#, python-format
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 7b1afd163bd..7c51b038205 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:49+0000\n"
-"PO-Revision-Date: 2012-02-16 15:09+0000\n"
-"Last-Translator: Nicolas Réau <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 17:38+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-17 04:58+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -66,7 +66,7 @@ msgstr "Occupation du poste de charge"
 #. module: mrp
 #: model:product.template,name:mrp.product_sugar_product_template
 msgid "Sugar"
-msgstr ""
+msgstr "Sucre"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -81,7 +81,7 @@ msgstr "Nombre de cycles"
 #. module: mrp
 #: model:product.uom.categ,name:mrp.product_uom_categ_fluid
 msgid "Fluid"
-msgstr ""
+msgstr "Fluide"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
@@ -165,7 +165,7 @@ msgstr "Produits finis"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are currently in production."
-msgstr ""
+msgstr "Les ordres de fabrications actuellement en production."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
@@ -204,7 +204,7 @@ msgstr "Coût horaire"
 #. module: mrp
 #: model:product.template,name:mrp.product_orange_product_template
 msgid "Orange"
-msgstr ""
+msgstr "Orange"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -253,6 +253,8 @@ msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"Créer un formulaire de produit pour tout ce que vous achetez ou vendez. "
+"Spécifiez un fournisseur si le produit peut être acheté."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.next_id_77
@@ -288,7 +290,7 @@ msgstr "Information sur la Capacité"
 #. module: mrp
 #: field:mrp.production,move_created_ids2:0
 msgid "Produced Products"
-msgstr ""
+msgstr "Produits produis"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -344,7 +346,7 @@ msgstr "Vous essayez d'affecter un lot qui n'est pas pour ce produit."
 #. module: mrp
 #: model:product.template,name:mrp.product_cloth_product_template
 msgid "Cloth"
-msgstr ""
+msgstr "Tissu"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
@@ -354,7 +356,7 @@ msgstr "Production de produits"
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de nomenclature récursive."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@@ -375,7 +377,7 @@ msgstr "UdM par défaut"
 #: sql_constraint:mrp.production:0
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "La référence doit être unique par société !"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -423,6 +425,12 @@ msgid ""
 "sales person creates a sales order, he can relate it to several properties "
 "and OpenERP will automatically select the BoM to use according the needs."
 msgstr ""
+"Les propriétés dans OpenERP sont utilisées pour sélectionner la bonne "
+"nomenclature pour fabriquer un produit quand vous avez différentes façons de "
+"créer le même produit. Vous pouvez assigner plusieurs propriétés à chaque "
+"nomenclature. Quand un vendeur crée un bon de commande, il peut le lier à "
+"différentes propriétés qui sélectionneront la nomenclature en fonction des "
+"besoins."
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -489,7 +497,7 @@ msgstr "le produit est de type Service"
 #. module: mrp
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Le nom de la société doit être unique !"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
@@ -574,7 +582,7 @@ msgstr "Changer la quantité"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_configure_workcenter
 msgid "Configure your work centers"
-msgstr ""
+msgstr "Configurer les centres de travails"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -612,11 +620,15 @@ msgstr "Prix du fournisseur par UdM"
 msgid ""
 "Gives the sequence order when displaying a list of routing Work Centers."
 msgstr ""
+"Donner la numéro de la séquence pour afficher la liste de routage du centre "
+"de travail."
 
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
 msgstr ""
+"Vous ne pouvez pas déplacer des produits depuis ou vers un emplacement de "
+"type \"vue\"."
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
@@ -720,6 +732,8 @@ msgstr "Temps nécessaire à la réalisation d'un cycle"
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
 msgstr ""
+"la ligne de nomemclature de produit ne doit pas être la même que la "
+"nomemclature du produit."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -791,7 +805,7 @@ msgstr ""
 #: code:addons/mrp/mrp.py:762
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Avertissement!"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -938,7 +952,7 @@ msgstr "Stock minimum"
 #: code:addons/mrp/mrp.py:503
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'"
-msgstr ""
+msgstr "Impossible de supprimer un ordre de fabrication dans l'état \"%s\""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
@@ -1055,7 +1069,7 @@ msgstr "Tableau de bord de production"
 #. module: mrp
 #: model:res.groups,name:mrp.group_mrp_manager
 msgid "Manager"
-msgstr ""
+msgstr "Responsable"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1116,12 +1130,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.todo.category,name:mrp.category_mrp_config
 msgid "MRP Management"
-msgstr ""
+msgstr "Gestion de production"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Work Center per hour."
-msgstr ""
+msgstr "Coût spécifique pour le centre de travail par heure."
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
@@ -1174,6 +1188,7 @@ msgid ""
 "Time in hours for this Work Center to achieve the operation of the specified "
 "routing."
 msgstr ""
+"Temps en heure pour ce centre de travail pour achever l'opération de routage."
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1228,7 +1243,7 @@ msgstr "Notes"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are ready to start production."
-msgstr ""
+msgstr "Ordres de fabrication prêts à produire."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom
@@ -1295,7 +1310,7 @@ msgstr "Révisions"
 #. module: mrp
 #: model:product.template,name:mrp.product_shirt_product_template
 msgid "Shirt"
-msgstr ""
+msgstr "Chemise"
 
 #. module: mrp
 #: field:mrp.production,priority:0
@@ -1333,7 +1348,7 @@ msgstr "Produit géré en Plan Directeur"
 #: code:addons/mrp/report/price.py:204
 #, python-format
 msgid "Work Cost of %s %s"
-msgstr ""
+msgstr "Centre de cout de %s %s"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
@@ -1343,7 +1358,7 @@ msgstr "Jours de sécurité pour chaque opération de production."
 #. module: mrp
 #: model:product.template,name:mrp.product_water_product_template
 msgid "Water"
-msgstr ""
+msgstr "Eau"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1360,7 +1375,7 @@ msgstr "Production sur stock"
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "La quantité commandée ne peut pas être nulle ou négative !"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
@@ -1453,7 +1468,7 @@ msgstr "En attente"
 #: code:addons/mrp/mrp.py:603
 #, python-format
 msgid "Couldn't find a bill of material for this product."
-msgstr ""
+msgstr "Impossible de trouver une nomenclature pour ce produit."
 
 #. module: mrp
 #: field:mrp.bom,active:0
@@ -1537,7 +1552,7 @@ msgstr "Non urgent"
 #. module: mrp
 #: field:mrp.production,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
@@ -1892,7 +1907,7 @@ msgstr "Arrondi de produit"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "New"
-msgstr ""
+msgstr "Nouveau"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
@@ -1955,7 +1970,7 @@ msgstr "Configuration"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Date de début"
 
 #. module: mrp
 #: field:mrp.workcenter,time_stop:0
@@ -2011,7 +2026,7 @@ msgstr "Temps en Heures pour la mise en place"
 #. module: mrp
 #: model:product.template,name:mrp.product_orangejuice_product_template
 msgid "Orange Juice"
-msgstr ""
+msgstr "Jus d'orange"
 
 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
@@ -2078,7 +2093,7 @@ msgstr "Structure de coût"
 #. module: mrp
 #: model:res.groups,name:mrp.group_mrp_user
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
@@ -2109,7 +2124,7 @@ msgstr ""
 #. module: mrp
 #: model:product.uom,name:mrp.product_uom_litre
 msgid "Litre"
-msgstr ""
+msgstr "Litre"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:762
@@ -2294,7 +2309,7 @@ msgstr ""
 #: code:addons/mrp/mrp.py:954
 #, python-format
 msgid "PROD: %s"
-msgstr ""
+msgstr "PROD: %s"
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
@@ -2820,9 +2835,6 @@ msgstr "Produits à consommer"
 #~ msgid "An entry is being made from billing material to routing."
 #~ msgstr "Une entrée sera faite depuis la liste du matériel a assembler."
 
-#~ msgid "Product to stock rules"
-#~ msgstr "Règles de stock produit"
-
 #~ msgid "Procurement convert into the draft purchase order."
 #~ msgstr "Approvisionnement converti en commande d'achat au brouillon."
 
@@ -2857,9 +2869,8 @@ msgstr "Produits à consommer"
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Stock de produit stockable"
 
-#~ msgid "From minimum stock rules, it goes for procure product."
-#~ msgstr ""
-#~ "Des règles de stock minimal, il mène à l'approvisionnement du produit."
+#~ msgid "Product to stock rules"
+#~ msgstr "Règles de stock produit"
 
 #~ msgid "Minimum Stock Procure"
 #~ msgstr "Approvisionnement de stock minimum"
@@ -3001,6 +3012,10 @@ msgstr "Produits à consommer"
 #~ "Si le produit est de type \"service\" et que la méthode d'approvisionnement "
 #~ "est \"Sur stock\""
 
+#~ msgid "From minimum stock rules, it goes for procure product."
+#~ msgstr ""
+#~ "Des règles de stock minimal, il mène à l'approvisionnement du produit."
+
 #~ msgid "Service Make to Stock"
 #~ msgstr "Service sur stock"
 
diff --git a/addons/plugin/i18n/fr.po b/addons/plugin/i18n/fr.po
index f7ce62549d4..10c5f30904f 100644
--- a/addons/plugin/i18n/fr.po
+++ b/addons/plugin/i18n/fr.po
@@ -8,16 +8,17 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-15 19:26+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-05-24 17:39+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-16 05:07+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
 msgid "plugin.handler"
-msgstr ""
+msgstr "Gestionnaire d'extensions"
diff --git a/addons/plugin_thunderbird/i18n/fr.po b/addons/plugin_thunderbird/i18n/fr.po
index 74bef6f2bdf..d79a72481f0 100644
--- a/addons/plugin_thunderbird/i18n/fr.po
+++ b/addons/plugin_thunderbird/i18n/fr.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-12-26 19:12+0000\n"
-"Last-Translator: tfr (Openerp) <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 17:39+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -103,4 +104,4 @@ msgstr ""
 #: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
-msgstr ""
+msgstr "Installer l'extension Thunderbird"
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index 2566fb68726..32eff6448a6 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-16 15:11+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 17:54+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:40+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -47,6 +48,7 @@ msgstr "Destination"
 #, python-format
 msgid "In order to delete a purchase order, it must be cancelled first!"
 msgstr ""
+"Afin de supprimer un bon de commande, celui-ci doit d'abord être annulé!"
 
 #. module: purchase
 #: help:purchase.report,date:0
@@ -90,7 +92,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase order"
-msgstr ""
+msgstr "Bon de commande approuvé"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,partner_id:0
@@ -162,7 +164,7 @@ msgstr "Demandes de prix"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Receptions"
-msgstr ""
+msgstr "Basé sur les réceptions"
 
 #. module: purchase
 #: field:purchase.order,company_id:0 field:purchase.order.line,company_id:0
@@ -254,7 +256,7 @@ msgstr "Jour"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on generated draft invoice"
-msgstr ""
+msgstr "Basé sur une facture brouillon générée"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -264,7 +266,7 @@ msgstr ""
 #. module: purchase
 #: view:board.board:0
 msgid "Monthly Purchases by Category"
-msgstr ""
+msgstr "Achats mensuels par catégorie"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
@@ -274,7 +276,7 @@ msgstr "Achats"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in draft state"
-msgstr ""
+msgstr "Bon de commande qui sont en état ​​de brouillon"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -399,6 +401,7 @@ msgstr "Mouvement de stock"
 #, python-format
 msgid "You must first cancel all invoices related to this purchase order."
 msgstr ""
+"Vous devez d'abord annuler toutes les factures liées à ce bon de commande."
 
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
@@ -442,13 +445,14 @@ msgstr "Validé par"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in last month"
-msgstr ""
+msgstr "Commandes du mois dernier"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:412
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
+"Vous devez d'abord annuler toutes les réceptions liées à ce bon de commande."
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
@@ -473,7 +477,7 @@ msgstr "Indique qu'une réception de marchandise a été effectuée."
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in exception state"
-msgstr ""
+msgstr "Les bons de commande qui sont en état ​​d'exception"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.report,validator:0
@@ -494,7 +498,7 @@ msgstr "Prix moyen"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "Réceptions déjà traitées"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -512,7 +516,7 @@ msgstr "Confirmer"
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
 #: selection:purchase.order,invoice_method:0
 msgid "Based on receptions"
-msgstr ""
+msgstr "Basé sur les réceptions"
 
 #. module: purchase
 #: constraint:res.company:0
@@ -548,7 +552,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
-msgstr ""
+msgstr "Les bons de commande qui sont en état ​​d'exception"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -605,7 +609,7 @@ msgstr "Prix total"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_import_create_supplier_installer
 msgid "Create or Import Suppliers"
-msgstr ""
+msgstr "Créer ou importer des fournisseurs"
 
 #. module: purchase
 #: view:stock.picking:0
@@ -689,7 +693,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Divers"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:769
@@ -760,7 +764,7 @@ msgstr "Réceptions"
 #: code:addons/purchase/purchase.py:285
 #, python-format
 msgid "You cannot confirm a purchase order without any lines."
-msgstr ""
+msgstr "Vous ne pouvez pas confirmer un bon de commande sans ligne."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -786,7 +790,7 @@ msgstr "Demande de prix"
 #: code:addons/purchase/edi/purchase_order.py:139
 #, python-format
 msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "Liste de prix EDI (%s)"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -859,7 +863,7 @@ msgstr "Fusion de bons de commandes"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in  current month"
-msgstr ""
+msgstr "Commande du mois en cours"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay_pass:0
@@ -900,7 +904,7 @@ msgstr "Total des lignes de commandes par utilisateur par mois"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase orders"
-msgstr ""
+msgstr "Bons de commande approuvés"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,month:0
@@ -1031,7 +1035,7 @@ msgstr "Vue calendrier"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Purchase Order Lines"
-msgstr ""
+msgstr "Basé sur les lignes du bon de commande"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
@@ -1043,6 +1047,7 @@ msgstr "Montant hors-taxe"
 #, python-format
 msgid "Selected UOM does not belong to the same category as the product UOM"
 msgstr ""
+"UdM sélectionnée n'appartient pas à la même catégorie que l'UdM du produit."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:907
@@ -1154,7 +1159,7 @@ msgstr "Filtres étendus..."
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "Invoicing Control on Purchases"
-msgstr ""
+msgstr "Contrôle de factures sur les achats"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:48
@@ -1171,6 +1176,9 @@ msgid ""
 "can import your existing partners by CSV spreadsheet from \"Import Data\" "
 "wizard"
 msgstr ""
+"Créer ou importer des fournisseurs et leurs contacts à partir de ce "
+"formulaire ou vous pouvez importer vos partenaires existants grâce à un "
+"fichier CSV à partir de l'assistant \"Importer\""
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
@@ -1200,7 +1208,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat
 msgid "Address Book"
-msgstr ""
+msgstr "Carnet d'adresses"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
@@ -1216,7 +1224,7 @@ msgstr "Annuler cde fourn."
 #: code:addons/purchase/purchase.py:411 code:addons/purchase/purchase.py:418
 #, python-format
 msgid "Unable to cancel this purchase order!"
-msgstr ""
+msgstr "Impossible d'annuler ce bon de commande!"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -1301,7 +1309,7 @@ msgstr "Référence du document qui a généré cette demande d'achat"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "Bons de commande qui ne sont pas encore approuvés."
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1468,7 +1476,7 @@ msgstr "Tél. :"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Month"
-msgstr ""
+msgstr "Commande du mois"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1483,7 +1491,7 @@ msgstr "Chercher un bon de commande"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_config
 msgid "Set the Default Invoicing Control Method"
-msgstr ""
+msgstr "Sélectionner la méthode de contrôle de facturation par défaut"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
@@ -1509,7 +1517,7 @@ msgstr "En attente de confirmation du fournisseur"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "Based on draft invoices"
-msgstr ""
+msgstr "Basé sur des factures brouillon"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1551,7 +1559,7 @@ msgstr "Description"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
-msgstr ""
+msgstr "Commande de l'année"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1638,7 +1646,7 @@ msgstr "Montant hors-taxe"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Picking to Invoice"
-msgstr ""
+msgstr "Livraisons à facturer"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
@@ -1692,6 +1700,9 @@ msgid ""
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
 msgstr ""
+"Si vous définissez le contrôle de facturation sur une commande d'achat comme "
+"«Basé sur les réceptions\", vous pouvez suivre ici toutes les réceptions de "
+"produits et créer des factures pour les réceptions."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1907,7 +1918,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
-msgstr ""
+msgstr "Bons de commande en état brouillon"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1927,7 +1938,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in current year"
-msgstr ""
+msgstr "Commande de l'année en cours"
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index 6badf447865..b483c6df987 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:56+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 22:20+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -3011,7 +3011,7 @@ msgstr "Produkt"
 #. module: stock
 #: view:stock.return.picking:0
 msgid "Return"
-msgstr "Rendite"
+msgstr "Retoure Ausführen"
 
 #. module: stock
 #: field:stock.return.picking,invoice_state:0

From 7a70637b1000d5975067cc3eaa8685a407c03136 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 25 May 2012 09:28:29 +0200
Subject: [PATCH 434/452] [IMP] layout

bzr revid: fp@tinyerp.com-20120525072829-34lyox1jl60ffye8
---
 addons/event/event_view.xml           |  6 +-
 addons/event/static/src/css/event.css | 80 +--------------------------
 2 files changed, 5 insertions(+), 81 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index b4932254d86..4cebf3dd309 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -206,14 +206,14 @@
                             </p>
                             <t t-if="record.register_avail.raw_value != 0">
                               <t t-if="!record.is_subscribed.raw_value">
-                                  <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1"   onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
-                                  <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
+                                  <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
+                                  <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_mail_button_follow">
                                   <span >Subscribe</span>
                                   </button>
                               </t>
                             </t>
                             <t t-if="record.is_subscribed.raw_value">
-                              <button type="object" name="unsubscribe_to_event" class="unsubscribe_button oe_event_button_unsubscribe">
+                              <button type="object" name="unsubscribe_to_event" class="oe_mail_button_unfollow">
                                 <span>Subscribed</span>
                                 <span class="unsubscribe">Unsubscribe</span>
                               </button>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index e637bc56c65..8602ea24d53 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -29,63 +29,11 @@
   color: #FFFFFF;
   background-color: #8A89BA;
 }
-div.oe_fold_column{
-  padding:0px !important;
-}
-.oe_event_button_subscribe {
-  color: white;
-  background-color: #8a89ba;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
-  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);
-}
 
-.oe_event_button_unsubscribe {
-  color: white;
-  background-color: #8a89ba;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
-  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);;
-}
-.oe_event_button_subscribe:hover {
-  cursor: pointer;
-  background-size: 100% 100%;
-  /*background: #DC5F59 none;*/
-
-}
-.oe_event_button_unsubscribe:hover {
-   cursor: pointer;
-   background-size: 100% 100%;
-   background: #DC5F59 none;
- }
- .unsubscribe, .unsubscribe_button:hover span {
-   display: none;
-   background-color: #DC5F59
- }
- .unsubscribe_button:hover .unsubscribe {
-   display: inline;
-   background-color: #DC5F59;
- }
- .no_of_seats{
+.no_of_seats{
     width:35px;
-    
- }
- .oe_event_title{
-  font-size: 25px;
-}
-.oe_sub1
-{
-    float:left;
-    height:50px;
-    border-right: 1px solid black;
-    border-color: #DCDCDC;
 }
+
 .oe_mapbox
 { 
     position: relative;
@@ -95,27 +43,3 @@ div.oe_fold_column{
     border: 1px solid #eeeeee;
 }
 
-.oe_td_border
-{
-    width: 7em;
-    padding: 5px;
-    border-right: 1px solid black;
-    text-align: right;
-    border-color: #DCDCDC;
-    border-spacing:5em
-}
-.oe_td_date_border
-{
-    border-right:1px solid black;
-    border-color: #DCDCDC;
-}
-
-textarea.field_text
-{
-    width: 765px;
-    height: 318px;
-}
-td.oe_form_group_nested
-{
-    padding: 5px;
-}

From d79b4a17207cfb0237a86976ff5b53c5f9dfdb7c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 14:08:59 +0200
Subject: [PATCH 435/452] fix problem with quick create

bzr revid: nicolas.vanhoren@openerp.com-20120525120859-ucs6ltabc9mpt78k
---
 addons/web_kanban/static/src/js/kanban.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 20d10ca410b..87eeafb6550 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -424,7 +424,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
                     this.quick.destroy();
                     delete this.quick;
                 });
-            self.quick.appendTo(self.$element.find('.oe_kanban_group_header'));
+            self.quick.appendTo(self.$element.find('.oe_kanban_header'));
             self.quick.focus();
         });
         this.$records.find('.oe_kanban_show_more').click(this.do_show_more);

From 120dfb5fff5dae39764f00877ba9edbd3c7b98e7 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 14:09:47 +0200
Subject: [PATCH 436/452] wip

bzr revid: nicolas.vanhoren@openerp.com-20120525120947-fr9trn68o23hzkpd
---
 addons/web/static/src/js/view_form.js         | 29 +++++++++++++++++--
 addons/web/static/src/xml/base.xml            |  7 +++++
 addons/web_kanban/static/src/js/kanban.js     |  9 ++++--
 .../web_kanban/static/src/xml/web_kanban.xml  |  4 ---
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 69a418cb225..b032b12d43a 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3338,7 +3338,7 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in
     }
 });
 
-instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend({
+instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.CompletionFieldMixin, {
     disable_utility_classes: true,
     init: function(field_manager, node) {
         this._super(field_manager, node);
@@ -3455,13 +3455,38 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
             });
         }
     },
-});
+}));
 
 function m2m_kanban_lazy_init() {
 if (instance.web.form.Many2ManyKanbanView)
     return;
 instance.web.form.Many2ManyKanbanView = instance.web_kanban.KanbanView.extend({
+    _is_quick_create_enabled: function() {
+        return this._super() && ! this.group_by;
+    },
+});
+instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
+    template: 'Many2ManyKanban.quick_create',
     
+    /**
+     * close_btn: If true, the widget will display a "Close" button able to trigger
+     * a "close" event.
+     */
+    init: function(parent, dataset, context, buttons) {
+        this._super(parent);
+        instance.web.form.CompletionFieldMixin.init.call(this);
+        this.m2m = this.getParent().view.m2m;
+        this._dataset = dataset;
+        this._buttons = buttons || false;
+        this._context = context || {};
+    },
+    start: function () {
+        var self = this;
+        self.$input = this.$element.find('input');
+    },
+    focus: function() {
+        this.$element.find('input').focus();
+    },
 });
 }
 
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a558b8e9d1a..38d007d5341 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1816,5 +1816,12 @@
         <pre><t t-esc="error.preview"/></pre>
     </t>
 </t>
+<div t-name="Many2ManyKanban.quick_create" class="oe_kanban_quick_create">
+    <input t-att-placeholder="_t('Type name to create')"/>
+    <t t-if="widget._buttons">
+        <button class="oe-kanban-quick_create_add">Add</button>
+        <button class="oe-kanban-quick_create_close">Close</button>
+    </t>
+</div>
 
 </templates>
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 87eeafb6550..d642b7b2f1e 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -10,6 +10,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     display_name: _lt('Kanban'),
     default_nr_columns: 3,
     view_type: "kanban",
+    quick_create_class: "instance.web_kanban.QuickCreate",
     number_of_color_schemes: 10,
     init: function (parent, dataset, view_id, options) {
         this._super(parent, dataset, view_id, options);
@@ -350,6 +351,10 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     }
 });
 
+function get_class(name) {
+    return new instance.web.Registry({'tmp' : name}).get_object("tmp");
+}
+
 instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
     template: 'KanbanView.group_header',
     init: function (parent, records, group, dataset) {
@@ -403,7 +408,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
             def = this._super();
         if (! self.view.group_by) {
             self.$element.addClass("oe_kanban_no_group");
-            self.quick = new instance.web_kanban.QuickCreate(this, self.dataset, {}, false)
+            self.quick = new (get_class(self.view.quick_create_class))(this, self.dataset, {}, false)
                 .on('added', self, self.proxy('quick_created'));
             self.quick.replace($(".oe_kanban_no_group_qc_placeholder"));
         }
@@ -418,7 +423,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
             if (self.quick) { return; }
             var ctx = {};
             ctx['default_' + self.view.group_by] = self.value;
-            self.quick = new instance.web_kanban.QuickCreate(this, self.dataset, ctx, true)
+            self.quick = new (get_class(self.view.quick_create_class))(this, self.dataset, ctx, true)
                 .on('added', self, self.proxy('quick_created'))
                 .on('close', self, function() {
                     this.quick.destroy();
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index cabe9cb52fb..2b62dec15a9 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -65,9 +65,5 @@
 </t>
 <div t-name="KanbanView.quick_create" class="oe_kanban_quick_create">
     <input t-att-placeholder="_t('Type name to create')"/>
-    <t t-if="widget._buttons">
-        <button class="oe-kanban-quick_create_add">Add</button>
-        <button class="oe-kanban-quick_create_close">Close</button>
-    </t>
 </div>
 </template>

From ba1512e8503d7ef18603c0bdb57083f5d23516ce Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 14:52:39 +0200
Subject: [PATCH 437/452] many2manykanban quick create work in progress

bzr revid: nicolas.vanhoren@openerp.com-20120525125239-5s4il9xtb7p8i7kj
---
 addons/web/static/src/js/view_form.js         | 54 +++++++++++++++++--
 addons/web/static/src/xml/base.xml            |  6 +--
 addons/web_kanban/static/src/css/kanban.css   |  2 +-
 .../web_kanban/static/src/xml/web_kanban.xml  |  4 ++
 4 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index b032b12d43a..7860b2b504b 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3149,7 +3149,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(_.
             });
         }).bind('hideDropdown', function() {
             self._drop_shown = false;
-        }).bind('hideDropdown', function() {
+        }).bind('showDropdown', function() {
             self._drop_shown = true;
         });
         self.tags = self.$text.textext()[0].tags();
@@ -3342,6 +3342,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
     disable_utility_classes: true,
     init: function(field_manager, node) {
         this._super(field_manager, node);
+        instance.web.form.CompletionFieldMixin.init.call(this);
         m2m_kanban_lazy_init();
         this.is_loaded = $.Deferred();
         this.initial_is_loaded = this.is_loaded;
@@ -3394,7 +3395,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
         if (embedded) {
             this.kanban_view.set_embedded_view(embedded);
         }
-        this.kanban_view.m2m_field = this;
+        this.kanban_view.m2m = this;
         var loaded = $.Deferred();
         this.kanban_view.on_loaded.add_last(function() {
             self.initial_is_loaded.resolve();
@@ -3461,6 +3462,7 @@ function m2m_kanban_lazy_init() {
 if (instance.web.form.Many2ManyKanbanView)
     return;
 instance.web.form.Many2ManyKanbanView = instance.web_kanban.KanbanView.extend({
+    quick_create_class: 'instance.web.form.Many2ManyQuickCreate',
     _is_quick_create_enabled: function() {
         return this._super() && ! this.group_by;
     },
@@ -3474,7 +3476,6 @@ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
      */
     init: function(parent, dataset, context, buttons) {
         this._super(parent);
-        instance.web.form.CompletionFieldMixin.init.call(this);
         this.m2m = this.getParent().view.m2m;
         this._dataset = dataset;
         this._buttons = buttons || false;
@@ -3482,11 +3483,56 @@ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
     },
     start: function () {
         var self = this;
-        self.$input = this.$element.find('input');
+        self.$text = this.$element.find('input').css("width", "200px");
+        self.$text.textext({
+            plugins : 'arrow autocomplete',
+            autocomplete: {
+                render: function(suggestion) {
+                    return $('<span class="text-label"/>').
+                             data('index', suggestion['index']).html(suggestion['label']);
+                }
+            },
+            ext: {
+                autocomplete: {
+                    selectFromDropdown: function() {
+                        $(this).trigger('hideDropdown');
+                        var index = Number(this.selectedSuggestionElement().children().children().data('index'));
+                        var data = self.search_result[index];
+                        if (data.id) {
+                            self.add_id(data.id);
+                        } else {
+                            data.action();
+                        }
+                    },
+                },
+                itemManager: {
+                    itemToString: function(item) {
+                        return item.name;
+                    },
+                },
+            },
+        }).bind('getSuggestions', function(e, data) {
+            var _this = this;
+            var str = !!data ? data.query || '' : '';
+            self.m2m.get_search_result(str).then(function(result) {
+                self.search_result = result;
+                $(_this).trigger('setSuggestions', {result : _.map(result, function(el, i) {
+                    return _.extend(el, {index:i});
+                })});
+            });
+        });
+        self.$text.focusout(function() {
+            self.$text.val("");
+        });
     },
     focus: function() {
         this.$element.find('input').focus();
     },
+    add_id: function(id) {
+        self.$input.val("");
+        debugger;
+        self.trigger('added', id);
+    },
 });
 }
 
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 38d007d5341..b1101fb09d2 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1817,11 +1817,7 @@
     </t>
 </t>
 <div t-name="Many2ManyKanban.quick_create" class="oe_kanban_quick_create">
-    <input t-att-placeholder="_t('Type name to create')"/>
-    <t t-if="widget._buttons">
-        <button class="oe-kanban-quick_create_add">Add</button>
-        <button class="oe-kanban-quick_create_close">Close</button>
-    </t>
+    <input t-att-placeholder="_t('Type name to search')"/>
 </div>
 
 </templates>
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 83c3de06f37..d8ce30fc24f 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -93,7 +93,7 @@
   background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat;
 }
 .openerp .oe_kanban_view .oe_kanban_quick_create {
-  overflow: hidden;
+  overflow: visible;
 }
 .openerp .oe_kanban_view .oe_kanban_no_group .oe_kanban_quick_create {
   width: 200px;
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 2b62dec15a9..cabe9cb52fb 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -65,5 +65,9 @@
 </t>
 <div t-name="KanbanView.quick_create" class="oe_kanban_quick_create">
     <input t-att-placeholder="_t('Type name to create')"/>
+    <t t-if="widget._buttons">
+        <button class="oe-kanban-quick_create_add">Add</button>
+        <button class="oe-kanban-quick_create_close">Close</button>
+    </t>
 </div>
 </template>

From c8a27ff458ce60353f31c9e4c6f476d7379857d4 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 15:09:14 +0200
Subject: [PATCH 438/452] perfected quick create

bzr revid: nicolas.vanhoren@openerp.com-20120525130914-h097d6rk90p85wse
---
 addons/web/static/src/js/view_form.js     | 10 +++++++---
 addons/web_kanban/static/src/js/kanban.js |  6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 7860b2b504b..847905a7b37 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3456,6 +3456,9 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
             });
         }
     },
+    add_id: function(id) {
+        this.quick_create.add_id(id);
+    },
 }));
 
 function m2m_kanban_lazy_init() {
@@ -3477,6 +3480,7 @@ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
     init: function(parent, dataset, context, buttons) {
         this._super(parent);
         this.m2m = this.getParent().view.m2m;
+        this.m2m.quick_create = this;
         this._dataset = dataset;
         this._buttons = buttons || false;
         this._context = context || {};
@@ -3526,11 +3530,11 @@ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
         });
     },
     focus: function() {
-        this.$element.find('input').focus();
+        this.$text.focus();
     },
     add_id: function(id) {
-        self.$input.val("");
-        debugger;
+        var self = this;
+        self.$text.val("");
         self.trigger('added', id);
     },
 });
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index d642b7b2f1e..17ee57db768 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -510,7 +510,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
      * @param {(Id, String)} record name_get format for the newly created record
      */
     quick_created: function (record) {
-        var id = record[0], self = this;
+        var id = record, self = this;
         this.dataset.read_ids([id], this.view.fields_keys)
             .then(function (records) {
                 self.view.dataset.ids.push(id);
@@ -774,7 +774,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({
                     this._dataset.get_context(), this._context)])
             .pipe(function(record) {
                 self.$input.val("");
-                self.trigger('added', record);
+                self.trigger('added', record[0]);
             }, function(error, event) {
                 event.preventDefault();
                 return self.slow_create();
@@ -795,7 +795,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({
         );
         pop.on_select_elements.add(function(element_ids) {
             self.$input.val("");
-            self.trigger('added', element_ids);
+            self.trigger('added', element_ids[0]);
         });
     }
 });

From 776b961ebc73fdaf7b6880d6ed86a3ac9eef050b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 15:26:52 +0200
Subject: [PATCH 439/452] [fix] problem in customers

bzr revid: nicolas.vanhoren@openerp.com-20120525132652-tin667omlwdnnuar
---
 addons/web_kanban/static/src/js/kanban.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 60ff0891525..afa98f6a99f 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -37,7 +37,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     },
     start: function() {
         var self = this;
-        this._super.apply(this, arguments);
+        var def = this._super.apply(this, arguments);
         // Bind kanban cards dropdown menus
         $('html').on('click.kanban', function() {
             self.trigger('hide_menus');
@@ -45,6 +45,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         this.on('hide_menus', this, function() {
             self.$element.find('.oe_kanban_menu').hide();
         });
+        return def;
     },
     destroy: function() {
         this._super.apply(this, arguments);

From b0b677955566c9aa54d373ca1014223ba1b913b9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 15:40:31 +0200
Subject: [PATCH 440/452] [fix] small problem with o2m kanban

bzr revid: nicolas.vanhoren@openerp.com-20120525134031-txtpoy8nlh2167qj
---
 addons/web/static/src/js/view_form.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3430f1dd703..4c4dfaac741 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2952,6 +2952,12 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({
         var pop = new instance.web.form.FormOpenPopup(self.o2m.view);
         pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(), {
             title: _t("Open: ") + self.name,
+            create_function: function(data) {
+                return self.o2m.dataset.create(data).then(function(r) {
+                    self.o2m.dataset.set_ids(self.o2m.dataset.ids.concat([r.result]));
+                    self.o2m.dataset.on_change();
+                });
+            },
             write_function: function(id, data, options) {
                 return self.o2m.dataset.write(id, data, {}).then(function() {
                     self.o2m.reload_current_view();
@@ -2966,6 +2972,9 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({
             form_view_options: {'not_interactible_on_create':true},
             readonly: self.o2m.get("effective_readonly")
         });
+        pop.on_select_elements.add_last(function() {
+            self.o2m.reload_current_view();
+        });
     },
 });
 

From cdd8b9d47ad3fcd9aeb2279c05a0725ba68dad62 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 25 May 2012 15:43:06 +0200
Subject: [PATCH 441/452] [IMP] merge events

bzr revid: fp@tinyerp.com-20120525134306-3lz3127527hyly77
---
 addons/event/event.py                    |  6 ------
 addons/event/event_view.xml              | 13 +++++++------
 addons/event/static/src/js/google_map.js | 14 ++++++++++----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index bebddb34d17..f01caac175f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -210,12 +210,6 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
-        'city': fields.related('address_id', 'city', type='char', string='City'),
-        'street': fields.related('address_id', 'street', type='char', string='Street'),
-        'country_id': fields.related('address_id', 'country_id', relation='res.country', type='many2one', string='Country'),
-        'state_id': fields.related('address_id', 'state_id', relation="res.country.state", type="many2one", string='Fed. State'),
-        'zip': fields.related('address_id','zip', type="char", string="Zip"),      
-      
     }
     _defaults = {
         'state': 'draft',
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 4cebf3dd309..190445d6c20 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -64,16 +64,17 @@
                 <sheet layout="auto">
 
                 <field name="name" required="1" nolabel="1" class="oe_form_title" colspan="4"/>
-                <group colspan="4" col="3">
-                    <group colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
+                <group colspan="4" col="5">
+                    <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
                         <field name="type" on_change="onchange_event_type(type,context)"/>
-                        <field name="date_begin"/>
                         <field name="user_id"/>
-                        <field name="date_end"/>
                         <field name="address_id" widget ="many2one_Geo_address"/>
+                        <field name="address"/>
+                    </group>
+                    <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
+                        <field name="date_begin"/>
+                        <field name="date_end"/>
                         <field name="register_min"/>
-                        <label string=""/>
-                        <field name="street" nolabel="1"/>
                         <field name="register_max"/>
                     </group>
                     <div id="oe_mapbox" class="oe_mapbox"></div>
diff --git a/addons/event/static/src/js/google_map.js b/addons/event/static/src/js/google_map.js
index 7d2681a7369..4a02086b85a 100644
--- a/addons/event/static/src/js/google_map.js
+++ b/addons/event/static/src/js/google_map.js
@@ -1,4 +1,4 @@
-openerp.event = function(instance){
+openerp.event = function(instance) {
     instance.web.form.widgets.add('many2one_Geo_address', 'instance.event.Many2OneAddress');
     
     instance.web.GoogleMapConnector = instance.web.Class.extend({
@@ -48,8 +48,14 @@ openerp.event = function(instance){
             }
             (value instanceof Array)?value = parseInt(value[0]):false;
             var data = new instance.web.DataSet(this,this.field.relation, this.build_context());
-            data.read_ids(value,["street","city","country_id"]).done(function(value){
-                var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
+            data.read_ids(value,["street","city","zip","country_id"]).done(function(value){
+                var address;
+                if value['country_id'] {
+                    address = _.str.sprintf('%(street)s, %(zip)s %(city)s, %(country_id[1])s', value);
+                } else {
+                    address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
+                }
+
                 self.map.googleMapsLoaded.done(function(){
                     self.map.render_map(address,document.getElementById("oe_mapbox"));
                 })
@@ -65,4 +71,4 @@ openerp.event = function(instance){
             this._super(no_recurse);
         }
     });
-};
\ No newline at end of file
+};

From bdea8fde06f6966f8c97fb4a1813d57838a6b9af Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 17:05:44 +0200
Subject: [PATCH 442/452] changed something

bzr revid: nicolas.vanhoren@openerp.com-20120525150544-1b4dm827zpg3ehay
---
 addons/web/static/src/js/view_form.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 8707d34beef..5a04b636622 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4161,8 +4161,8 @@ instance.web.form.widgets = new instance.web.Registry({
     'selection' : 'instance.web.form.FieldSelection',
     'many2one' : 'instance.web.form.FieldMany2One',
     'many2many' : 'instance.web.form.FieldMany2Many',
-    'many2manytags' : 'instance.web.form.FieldMany2ManyTags',
-    'many2manykanban' : 'instance.web.form.FieldMany2ManyKanban',
+    'many2many_tags' : 'instance.web.form.FieldMany2ManyTags',
+    'many2many_kanban' : 'instance.web.form.FieldMany2ManyKanban',
     'one2many' : 'instance.web.form.FieldOne2Many',
     'one2many_list' : 'instance.web.form.FieldOne2Many',
     'reference' : 'instance.web.form.FieldReference',

From 5c5abe4f395859225ef440e5479b8e0e05765a05 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 17:48:10 +0200
Subject: [PATCH 443/452] Used m2mtags in partners

bzr revid: nicolas.vanhoren@openerp.com-20120525154810-bv111a5z4ne0yjzh
---
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index e3924cb4e5d..35589aa8037 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -426,7 +426,7 @@
                         <page string="History" invisible="True">
                         </page>
                         <page string="Categories">
-                            <field name="category_id" colspan="4" nolabel="1"/>
+                            <field name="category_id" colspan="4" nolabel="1" widget="many2many_tags"/>
                         </page>
                         <page string="Notes">
                             <field name="comment" colspan="4" nolabel="1"/>

From df59b0b7d2146d5d8b2a88e19e79f1a24f07bfce Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 25 May 2012 21:11:27 +0200
Subject: [PATCH 444/452] [FIX] google map on event part1

bzr revid: al@openerp.com-20120525191127-v5o88etlbdq0jbzn
---
 addons/event/__openerp__.py                      |  3 +--
 addons/event/event_view.xml                      |  4 ++--
 addons/google_map/__openerp__.py                 |  1 +
 addons/google_map/google_map_view.xml            |  3 +--
 .../static/src/js/google_map.js                  | 16 +++++++---------
 5 files changed, 12 insertions(+), 15 deletions(-)
 rename addons/{event => google_map}/static/src/js/google_map.js (85%)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index c491dd06138..f1a9769f803 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -39,7 +39,7 @@ Note that:
         Association / Configuration / Types of Events
 """,
     'author': 'OpenERP SA',
-    'depends': ['email_template'],
+    'depends': ['email_template','google_map'],
     'init_xml': [],
     'update_xml': [
         'security/event_security.xml',
@@ -53,7 +53,6 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
-    'js': ['static/src/js/google_map.js'],
     'css': ['static/src/css/event.css'],
     'installable': True,
     'application': True,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 190445d6c20..69d0135d091 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -68,7 +68,7 @@
                     <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
                         <field name="type" on_change="onchange_event_type(type,context)"/>
                         <field name="user_id"/>
-                        <field name="address_id" widget ="many2one_Geo_address"/>
+                        <field name="address_id" widget ="many2one_address_google_map" widget_option="{'placeholder':'.oe_form_google_map'}"/>
                         <field name="address"/>
                     </group>
                     <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
@@ -77,7 +77,7 @@
                         <field name="register_min"/>
                         <field name="register_max"/>
                     </group>
-                    <div id="oe_mapbox" class="oe_mapbox"></div>
+                    <div class="oe_form_google_map"></div>
                 </group>
 
                 <notebook colspan="4">
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index 8aa1b60ca88..a6e85c3cd66 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -38,6 +38,7 @@ Using this you can directly open Google Map from the URL widget.""",
                    'google_map_view.xml',
                   ],
     'demo_xml': [],
+    'js': ['static/src/js/google_map.js'],
     'installable': True,
     'auto_install': False,
     'certificate': '0029498930765',
diff --git a/addons/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
index 4cd7e4ad7c4..eda86a0662f 100644
--- a/addons/google_map/google_map_view.xml
+++ b/addons/google_map/google_map_view.xml
@@ -12,8 +12,7 @@
                         <label string="Street2 : " align="1.0"/>
                         <group colspan="1" col="2">
                         <field name="street2" nolabel="1"/>
-                        <button name="open_map"
-                           string="Map" type="object" icon="gtk-zoom-in"/>
+                        <button name="open_map" string="Map" type="object" icon="gtk-zoom-in"/>
                         </group>
                     </field>
                 </field>
diff --git a/addons/event/static/src/js/google_map.js b/addons/google_map/static/src/js/google_map.js
similarity index 85%
rename from addons/event/static/src/js/google_map.js
rename to addons/google_map/static/src/js/google_map.js
index 4a02086b85a..cec51510fe2 100644
--- a/addons/event/static/src/js/google_map.js
+++ b/addons/google_map/static/src/js/google_map.js
@@ -1,7 +1,7 @@
-openerp.event = function(instance) {
-    instance.web.form.widgets.add('many2one_Geo_address', 'instance.event.Many2OneAddress');
-    
-    instance.web.GoogleMapConnector = instance.web.Class.extend({
+openerp.event = function(instance, mod) {
+    instance.web.form.widgets.add('many2one_address_google_map', 'instance.event.Many2OneAddress');
+
+    instance.google_map.GoogleMapConnector = instance.web.Class.extend({
         init: function(){
             this.googleMapsLoaded = $.Deferred();
             this.map_load();
@@ -36,10 +36,10 @@ openerp.event = function(instance) {
             });
         },
     });
-    instance.event.Many2OneAddress = instance.web.form.FieldMany2One.extend({
+    instance.google_map.Many2OneAddress = instance.web.form.FieldMany2One.extend({
         init: function(field_manager, node){
           this._super(field_manager, node);
-          this.map = new instance.web.GoogleMapConnector(); 
+          this.map = new instance.google_map.GoogleMapConnector(); 
         },
         get_address:function(value){
             var self = this;
@@ -55,9 +55,8 @@ openerp.event = function(instance) {
                 } else {
                     address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
                 }
-
                 self.map.googleMapsLoaded.done(function(){
-                    self.map.render_map(address,document.getElementById("oe_mapbox"));
+                    self.map.render_map(address,self.$(self.options.selector)[0]);
                 })
             });
         },
@@ -65,7 +64,6 @@ openerp.event = function(instance) {
             this._super(value);
             this.get_address(value);
         },
-
         render_value:function(no_recurse){
             this.get_address(this.get("value"));
             this._super(no_recurse);

From 0b3329874eac2b7d59e25ef68821226a456aa43b Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 25 May 2012 21:22:08 +0200
Subject: [PATCH 445/452] [FIX] view_form widget registry exception

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

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 5a04b636622..22f2a1c23a4 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -937,7 +937,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             }
             var obj = self.fields_registry.get_any([$elem.attr('widget'), self.fvg.fields[name].type]);
             if (!obj) {
-                throw new Error("Widget type '"+ key + "' is not implemented");
+                throw new Error("Widget type '"+ $elem.attr('widget') + "' is not implemented");
             }
             var w = new (obj)(self.view, instance.web.xml_to_json($elem[0]));
             var $label = self.labels[$elem.attr("name")];

From 879b4a37c65975c5c615a1d52f2f39dc8923c66a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 25 May 2012 22:03:26 +0200
Subject: [PATCH 446/452] [FIX] event and google map ok

bzr revid: al@openerp.com-20120525200326-0cfysbpcnlk2agyn
---
 addons/event/event_view.xml                   |  9 +--
 addons/google_map/static/src/js/google_map.js | 69 ++++++++++---------
 2 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 69d0135d091..6c4fada6621 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -61,15 +61,15 @@
                     </div>
                     <div class="oe_clear"/>
                 </div>
-                <sheet layout="auto">
+                <sheet layout="manual">
+
 
                 <field name="name" required="1" nolabel="1" class="oe_form_title" colspan="4"/>
                 <group colspan="4" col="5">
                     <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
                         <field name="type" on_change="onchange_event_type(type,context)"/>
                         <field name="user_id"/>
-                        <field name="address_id" widget ="many2one_address_google_map" widget_option="{'placeholder':'.oe_form_google_map'}"/>
-                        <field name="address"/>
+                        <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_form_google_map'}"/>
                     </group>
                     <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
                         <field name="date_begin"/>
@@ -77,9 +77,10 @@
                         <field name="register_min"/>
                         <field name="register_max"/>
                     </group>
-                    <div class="oe_form_google_map"></div>
                 </group>
 
+                <div class="oe_form_google_map" style="height: 200px"></div>
+
                 <notebook colspan="4">
                     <page string="Event Description">
                         <field name="note" colspan="4" nolabel="1"/>
diff --git a/addons/google_map/static/src/js/google_map.js b/addons/google_map/static/src/js/google_map.js
index cec51510fe2..9aa693e53c6 100644
--- a/addons/google_map/static/src/js/google_map.js
+++ b/addons/google_map/static/src/js/google_map.js
@@ -1,45 +1,48 @@
 openerp.event = function(instance, mod) {
-    instance.web.form.widgets.add('many2one_address_google_map', 'instance.event.Many2OneAddress');
+    instance.web.form.widgets.add('many2one_address_google_map', 'instance.google_map.Many2OneAddress');
+
+    var googleMapsLoaded = null;
 
     instance.google_map.GoogleMapConnector = instance.web.Class.extend({
-        init: function(){
-            this.googleMapsLoaded = $.Deferred();
-            this.map_load();
-        },
         map_load: function() {
             var self = this;
-            if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
-                googleMapsCallback = function () {
-                self.googleMapsLoaded.resolve();
-            };
-            $.ajax({
-                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
-                dataType: "script"
-            }).fail(self.googleMapsLoaded.reject);
-            return this.googleMapsLoaded.promise();
+            if(googleMapsLoaded === null) {
+                googleMapsLoaded = $.Deferred();
+                // global
+                openerp_googleMapsCallback = googleMapsLoaded.resolve;
+                $.ajax({
+                    url: "https://maps.googleapis.com/maps/api/js?v=3&callback=openerp_googleMapsCallback&sensor=false",
+                    dataType: "script"
+                }).fail(googleMapsLoaded.reject);
+            }
+            return googleMapsLoaded;
         },
-        render_map: function(address,$element){
-            var geocoder = new google.maps.Geocoder();
-            geocoder.geocode( { 'address': address}, function(results, status){
-                if (status == google.maps.GeocoderStatus.OK){
-                    var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
-                    var myOptions = {
-                    zoom: 17,
-                    center:  new google.maps.LatLng(lat,lng),
-                    mapTypeId: google.maps.MapTypeId.ROADMAP
-                }
-                return new google.maps.Marker({
-                    map : new google.maps.Map($element,myOptions),
-                    position: new google.maps.LatLng(lat,lng)
+        render_map: function(address,element) {
+            this.map_load().then(function() {
+                var geocoder = new google.maps.Geocoder();
+                geocoder.geocode({'address': address}, function(results, status) {
+                    if (status == google.maps.GeocoderStatus.OK) {
+                        var lat = results[0].geometry.location.lat();
+                        var lng = results[0].geometry.location.lng();
+                        var myOptions = {
+                            zoom: 17,
+                            center: new google.maps.LatLng(lat,lng),
+                            mapTypeId: google.maps.MapTypeId.ROADMAP
+                        };
+                        var map = new google.maps.Map(element,myOptions);
+                        var position = new google.maps.LatLng(lat,lng);
+                        var marker = new google.maps.Marker({ map: map, position: position });
+                        return marker;
+                    }
                 });
-                }
             });
         },
     });
+
     instance.google_map.Many2OneAddress = instance.web.form.FieldMany2One.extend({
         init: function(field_manager, node){
           this._super(field_manager, node);
-          this.map = new instance.google_map.GoogleMapConnector(); 
+          this.map = new instance.google_map.GoogleMapConnector();
         },
         get_address:function(value){
             var self = this;
@@ -50,14 +53,14 @@ openerp.event = function(instance, mod) {
             var data = new instance.web.DataSet(this,this.field.relation, this.build_context());
             data.read_ids(value,["street","city","zip","country_id"]).done(function(value){
                 var address;
-                if value['country_id'] {
+                if (value['country_id']) {
                     address = _.str.sprintf('%(street)s, %(zip)s %(city)s, %(country_id[1])s', value);
                 } else {
                     address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
                 }
-                self.map.googleMapsLoaded.done(function(){
-                    self.map.render_map(address,self.$(self.options.selector)[0]);
-                })
+                // TODO repalce by widget_option selector self.options.selector
+                var el = self.view.$element.find(".oe_form_google_map")[0];
+                self.map.render_map(address,el);
             });
         },
         set_value:function(value){

From 1227741b5a782d6dc6a1d0b3eb9f31e557a83f63 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 27 May 2012 04:40:06 +0000
Subject: [PATCH 447/452] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120526050749-nakl3x59zsy0e3ln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120527044006-4kmo9posveuumgsz
---
 addons/crm_partner_assign/i18n/ja.po          |    6 +-
 addons/email_template/i18n/ja.po              |   10 +-
 addons/hr_holidays/i18n/gu.po                 |  842 +++++++++++++
 addons/import_base/i18n/ro.po                 |  104 ++
 addons/import_google/i18n/ro.po               |  229 ++++
 addons/import_sugarcrm/i18n/ro.po             |  421 +++++++
 addons/l10n_be/i18n/ja.po                     |    2 +-
 addons/lunch/i18n/ja.po                       |    4 +-
 addons/mail/i18n/ja.po                        |  117 +-
 addons/marketing_campaign/i18n/ja.po          | 1106 +++++++++++++++++
 addons/marketing_campaign_crm_demo/i18n/ja.po |  187 +++
 addons/membership/i18n/ja.po                  |  874 +++++++++++++
 12 files changed, 3834 insertions(+), 68 deletions(-)
 create mode 100644 addons/hr_holidays/i18n/gu.po
 create mode 100644 addons/import_base/i18n/ro.po
 create mode 100644 addons/import_google/i18n/ro.po
 create mode 100644 addons/import_sugarcrm/i18n/ro.po
 create mode 100644 addons/marketing_campaign/i18n/ja.po
 create mode 100644 addons/marketing_campaign_crm_demo/i18n/ja.po
 create mode 100644 addons/membership/i18n/ja.po

diff --git a/addons/crm_partner_assign/i18n/ja.po b/addons/crm_partner_assign/i18n/ja.po
index 430536f66cd..e400396e074 100644
--- a/addons/crm_partner_assign/i18n/ja.po
+++ b/addons/crm_partner_assign/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-25 02:34+0000\n"
+"PO-Revision-Date: 2012-05-25 04:47+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
 "X-Generator: Launchpad (build 15288)\n"
 
 #. module: crm_partner_assign
@@ -847,7 +847,7 @@ msgstr "CRMパートナ報告書"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "E-mail composition wizard"
-msgstr "Eメール作成ツール"
+msgstr "Eメール作成ウィザード"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
diff --git a/addons/email_template/i18n/ja.po b/addons/email_template/i18n/ja.po
index ca2abdc61d3..60b491ad0c2 100644
--- a/addons/email_template/i18n/ja.po
+++ b/addons/email_template/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:28+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-05-25 04:53+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -408,7 +408,7 @@ msgstr "Eメールを送信する (%s)"
 #: field:email.template,body_html:0
 #: field:email_template.preview,body_html:0
 msgid "Rich-text Contents"
-msgstr "リッチテキストの内容"
+msgstr "リッチテキストのコンテンツ"
 
 #. module: email_template
 #: field:email.template,copyvalue:0
diff --git a/addons/hr_holidays/i18n/gu.po b/addons/hr_holidays/i18n/gu.po
new file mode 100644
index 00000000000..bf9e1b5626f
--- /dev/null
+++ b/addons/hr_holidays/i18n/gu.po
@@ -0,0 +1,842 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-05-25 06:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Blue"
+msgstr "વાદળી"
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_type:0
+msgid "Allocation Type"
+msgstr "ફાળવણી પ્રકાર"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Waiting Second Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,remaining_leaves:0
+msgid "Maximum Leaves Allowed - Leaves Already Taken"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Leaves Management"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Group By..."
+msgstr "ગ્રુપ દ્વારા..."
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Allocation Mode"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,department_id:0
+msgid "Department"
+msgstr "વિભાગ"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
+msgid "Requests Approve"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Refused"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,category_id:0
+msgid "Category of Employee"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid " Month-1"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Brown"
+msgstr "તપખીરિયા રંગનું"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Remaining Days"
+msgstr "બાકીના દિવસો"
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee"
+msgstr "કર્મચારી દ્વારા"
+
+#. module: hr_holidays
+#: help:hr.holidays,employee_id:0
+msgid ""
+"Leave Manager can let this field empty if this leave request/allocation is "
+"for every employee"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Cyan"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Green"
+msgstr "આછો લીલો"
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_id:0
+msgid "Current Leave Type"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leave 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."
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
+msgid "Summary Of Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.holidays,state:0
+msgid "Approved"
+msgstr "મંજૂર થઇ ચૂકી છે"
+
+#. module: hr_holidays
+#: field:hr.employee,last_login:0
+msgid "Latest Connection"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Refuse"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s: too few remaining days (%s)."
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,state:0
+msgid ""
+"The state is set to 'Draft', when a holiday request is created.            \n"
+"The state is 'Waiting Approval', when holiday request is confirmed by user.  "
+"          \n"
+"The state is 'Refused', when holiday request is refused by manager.          "
+"  \n"
+"The state is 'Approved', when holiday request is approved by manager."
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
+msgid "Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays
+msgid "Leave"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
+msgid "Leave Requests to Approve"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
+msgid "Leaves by Department"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Cancelled"
+msgstr "રદ થયેલ"
+
+#. module: hr_holidays
+#: help:hr.holidays,type:0
+msgid ""
+"Choose 'Leave Request' if someone wants to take an off-day. \n"
+"Choose 'Allocation Request' if you want to increase the number of leaves "
+"available for someone"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.employee,remaining_leaves:0
+msgid ""
+"Total number of legal leaves allocated to this employee, change this value "
+"to create allocation/leave requests."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr "માન્યતા"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid "Warning !"
+msgstr "ચેતવણી !"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,color_name:0
+msgid "Color in Report"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
+msgid "HR Holidays Summary Report By Employee"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id:0
+msgid "This area is automatically filled by the user who validate the leave"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_status_id:0
+#: field:hr.holidays.remaining.leaves.user,leave_type:0
+#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: field:hr.holidays.summary.dept,holiday_type:0
+#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
+#: model:ir.model,name:hr_holidays.model_hr_holidays_status
+#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:199
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid "Warning!"
+msgstr "ચેતવણી!"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Magenta"
+msgstr "જાંબલી"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least 1 Department. And try again"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Confirmed"
+msgstr "સમર્થિત"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,date_from:0
+#: field:hr.holidays.summary.employee,date_from:0
+msgid "From"
+msgstr "તરફથી"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Confirm"
+msgstr "ખાતરી"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:384
+#, python-format
+msgid "Leave Request for %s"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,remaining_leaves:0
+msgid "Remaining Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,state:0
+msgid "State"
+msgstr "સ્થિતિ"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
+msgid "Total holidays by type"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: field:hr.holidays.remaining.leaves.user,name:0
+#: model:ir.model,name:hr_holidays.model_hr_employee
+msgid "Employee"
+msgstr "કર્મચારી"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "New"
+msgstr "નવું"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Type"
+msgstr "પ્રકાર"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Red"
+msgstr "લાલ"
+
+#. module: hr_holidays
+#: view:hr.holidays.remaining.leaves.user:0
+msgid "Leaves by Type"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Wheat"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:382
+#, python-format
+msgid "Allocation for %s"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: field:hr.holidays,number_of_days_temp:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid ""
+"The feature behind the field 'Remaining Legal Leaves' can only be used when "
+"there is only one leave type with the option 'Allow to Override Limit' "
+"unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot "
+"decide on which leave type the update has to be done. \n"
+"You may prefer to use the classic menus 'Leave Requests' and 'Allocation "
+"Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
+"the employees if the configuration does not allow to use this field."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "You have to select an employee or a category"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,double_validation:0
+msgid ""
+"If its True then its Allocation/Request have to be validated by second "
+"validator"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Waiting Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,emp:0
+msgid "Employee(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,categ_id:0
+msgid ""
+"If you set a meeting type, OpenERP will create a meeting in the calendar "
+"once a leave is validated."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,linked_request_ids:0
+msgid "Linked Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,parent_id:0
+msgid "Parent"
+msgstr "પિતૃ"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Lavender"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Month"
+msgstr "મહિનો"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
+msgid "Leave Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,limit:0
+msgid "Allow to Override Limit"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.employee:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
+msgid "Employee's Holidays"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,category_id:0
+msgid "Category"
+msgstr "શ્રેણી"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,max_leaves:0
+msgid ""
+"This value is given by the sum of all holidays requests with a positive "
+"value."
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
+msgid "All Employee Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Coral"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
+msgid "Holidays by Department"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Black"
+msgstr "કાળો"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
+msgid "Allocate Leaves for Employees"
+msgstr ""
+
+#. module: hr_holidays
+#: field:resource.calendar.leaves,holiday_id:0
+msgid "Holiday"
+msgstr "રજાનો દિવસ"
+
+#. module: hr_holidays
+#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+msgid "Meeting"
+msgstr "સભા"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Ivory"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Both Validated and Confirmed"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,leaves_taken:0
+msgid "Leaves Already Taken"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,user_id:0
+#: field:hr.holidays.remaining.leaves.user,user_id:0
+msgid "User"
+msgstr "વપરાશકર્તા"
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The start date must be before the end date !"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,active:0
+msgid "Active"
+msgstr "સક્રિય"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
+msgid "Leaves To Validate"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+msgid "Remaining Legal Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id:0
+msgid "First Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
+msgid "Unpaid"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Holidays during last month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "Error"
+msgstr "ભૂલ"
+
+#. module: hr_holidays
+#: view:hr.employee:0
+msgid "Assign Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Blue"
+msgstr "આછો વાદળી"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "My Department Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_state:0
+msgid "Current Leave Status"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,type:0
+msgid "Request Type"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the leave "
+"type without removing it."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Misc"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "General"
+msgstr "સામાન્ય"
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
+msgid "Compensatory Days"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,notes:0
+msgid "Reasons"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
+msgid "Leaves Analysis"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+msgid "Cancel"
+msgstr "રદ કરો"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,color_name:0
+msgid ""
+"This color will be used in the leaves summary located in Reporting\\Leaves "
+"by Departement"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 selection:hr.holidays,type:0
+msgid "Allocation Request"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
+msgid "Leave Detail"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,double_validation:0
+#: field:hr.holidays.status,double_validation:0
+msgid "Apply Double Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+msgid "Print"
+msgstr "છાપો"
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Details"
+msgstr "વિગતો"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
+msgid "My Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 selection:hr.holidays,type:0
+msgid "Leave Request"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,name:0
+msgid "Description"
+msgstr "વર્ણન"
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
+msgid "Legal Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The number of days must be greater than 0 !"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,holiday_type:0
+msgid ""
+"By Employee: Allocation/Request for individual Employee, By Employee "
+"Category: Allocation/Request for group of employees in category"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:199
+#, python-format
+msgid "You cannot delete a leave which is not in draft state !"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Search Leave"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,holiday_type:0
+msgid "Select Holiday Type"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
+msgid "Remaining leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,depts:0
+msgid "Department(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id2:0
+msgid "Second Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
+msgid "Sick Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,limit:0
+msgid ""
+"If you tick this checkbox, the system will allow, for this section, the "
+"employees to take more leaves than the available ones."
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,leaves_taken:0
+msgid ""
+"This value is given by the sum of all holidays requests with a negative "
+"value."
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Violet"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.hr_holidays_leaves_assign_legal
+msgid ""
+"You can assign remaining Legal Leaves for each employee, OpenERP will "
+"automatically create and validate allocation requests."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id2:0
+msgid ""
+"This area is automaticly filled by the user who validate the leave with "
+"second level (If Leave type need second validation)"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Mode"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
+msgid "HR Holidays Summary Report By Department"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Approve"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
+msgid "Allocation Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Yellow"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Pink"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Confirm"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Approve"
+msgstr ""
diff --git a/addons/import_base/i18n/ro.po b/addons/import_base/i18n/ro.po
new file mode 100644
index 00000000000..aa7dba14d3d
--- /dev/null
+++ b/addons/import_base/i18n/ro.po
@@ -0,0 +1,104 @@
+# Romanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-26 19:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-27 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:434
+#, python-format
+msgid "Import failed due to an unexpected error"
+msgstr "Importul a esuat datorita unei greseli neasteptate"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:461
+#, python-format
+msgid "started at %s and finished at %s \n"
+msgstr "inceput la %s si finalizat la %s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:448
+#, python-format
+msgid "Import of your data finished at %s"
+msgstr "Importul datelor d-voastra s-a finalizat la %s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:463
+#, python-format
+msgid ""
+"but failed, in consequence no data were imported to keep database "
+"consistency \n"
+" error : \n"
+msgstr ""
+"dar a esuat, in consecinta nu au fost importate datele pentru a mentine "
+"consistenta bazei de date \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:477
+#, python-format
+msgid ""
+"The import of data \n"
+" instance name : %s \n"
+msgstr ""
+"Importul datelor \n"
+" nume instanta : %s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:470
+#, python-format
+msgid "%s has been successfully imported from %s %s, %s \n"
+msgstr "%s a fost importat cu succes de la %s %s, %s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:447
+#, python-format
+msgid "Data Import failed at %s due to an unexpected error"
+msgstr "Importul de date a esuat la %s datorita unei erori neasteptate"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:436
+#, python-format
+msgid "Import finished, notification email sended"
+msgstr "Importul s-a finalizat, a fost trimis e-mail-ul de instiintare"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:190
+#, python-format
+msgid "%s is not a valid model name"
+msgstr "%s nu este nu nume valid de model"
+
+#. module: import_base
+#: model:ir.ui.menu,name:import_base.menu_import_crm
+msgid "Import"
+msgstr "Importati"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:467
+#, python-format
+msgid "with no warning"
+msgstr "fara avertizare"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:469
+#, python-format
+msgid "with warning : %s"
+msgstr "cu avertizare : %s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:191
+#, python-format
+msgid " fields imported : "
+msgstr " campuri importate : "
diff --git a/addons/import_google/i18n/ro.po b/addons/import_google/i18n/ro.po
new file mode 100644
index 00000000000..c0aea581d77
--- /dev/null
+++ b/addons/import_google/i18n/ro.po
@@ -0,0 +1,229 @@
+# Romanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-26 19:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-27 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: import_google
+#: help:synchronize.google.import,group_name:0
+msgid "Choose which group to import, By default it takes all."
+msgstr "Alegeti grupul pe care sa il importati, implicit sunt alese toate."
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Google Calendar Events"
+msgstr "Importati Evenimente Google Calendar"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Events"
+msgstr "_Importati Evenimente"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid ""
+"No Google Username or password Defined for user.\n"
+"Please define in user view"
+msgstr ""
+"Nu a fost definit(a) nici un nume de utilizator sau o parola pentru "
+"utilizator.\n"
+"Va rugam sa definiti in vizualizarea utilizatorului"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#, python-format
+msgid ""
+"Invalid login detail !\n"
+" Specify Username/Password."
+msgstr ""
+"Detalii de autentificare nevalide !\n"
+" Specificati Numele de utilizator/Parola."
+
+#. module: import_google
+#: field:synchronize.google.import,supplier:0
+msgid "Supplier"
+msgstr "Furnizor"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Options"
+msgstr "Importati Optiuni"
+
+#. module: import_google
+#: field:synchronize.google.import,group_name:0
+msgid "Group Name"
+msgstr "Numele grupului"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_crm_case_categ
+msgid "Category of Case"
+msgstr "Categoria Cazului"
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
+#: model:ir.ui.menu,name:import_google.menu_sync_contact
+msgid "Import Google Contacts"
+msgstr "Importati Contacte Google"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "Import Google Data"
+msgstr "Importati Date Google"
+
+#. module: import_google
+#: view:crm.meeting:0
+msgid "Meeting Type"
+msgstr "Tipul intalnirii"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Va rugam sa instalati gdata-python-client de la adresa "
+"http://code.google.com/p/gdata-python-client/downloads/list"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_login
+msgid "Google Contact"
+msgstr "Contact Google"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import contacts from a google account"
+msgstr "Importati contacte dintr-un cont google"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Please specify correct user and password !"
+msgstr "Va rugam sa specificati utilizatorul si parola corecte !"
+
+#. module: import_google
+#: field:synchronize.google.import,customer:0
+msgid "Customer"
+msgstr "Client"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Cancel"
+msgstr "_Anulati"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_synchronize_google_import
+msgid "synchronize.google.import"
+msgstr "sincronizati.import.google"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Contacts"
+msgstr "_Importati Contacte"
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_form
+#: model:ir.ui.menu,name:import_google.menu_sync_calendar
+msgid "Import Google Calendar"
+msgstr "Importati Google Calendar"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:50
+#, python-format
+msgid "Import google"
+msgstr "Import google"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Error"
+msgstr "Eroare"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid "Warning !"
+msgstr "Avertizare !"
+
+#. module: import_google
+#: field:synchronize.google.import,create_partner:0
+msgid "Options"
+msgstr "Optiuni"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "_Ok"
+msgstr "_Ok"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Eroare Import Contacte Google!"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_import_message
+msgid "Import Message"
+msgstr "Importati Mesajul"
+
+#. module: import_google
+#: field:synchronize.google.import,calendar_name:0
+msgid "Calendar Name"
+msgstr "Nume Calendar"
+
+#. module: import_google
+#: help:synchronize.google.import,supplier:0
+msgid "Check this box to set newly created partner as Supplier."
+msgstr ""
+"Bifati aceasta casuta pentru a seta partenerul nou creat drept Furnizor."
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Import only address"
+msgstr "Importati doar adresa"
+
+#. module: import_google
+#: field:crm.case.categ,user_id:0
+msgid "User"
+msgstr "Utilizator"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Partner Status for this Group:"
+msgstr ""
+
+#. module: import_google
+#: field:google.import.message,name:0
+msgid "Message"
+msgstr "Mesaj"
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Create partner for each contact"
+msgstr "Creati partenerul pentru fiecare contact"
+
+#. module: import_google
+#: help:synchronize.google.import,customer:0
+msgid "Check this box to set newly created partner as Customer."
+msgstr ""
+"Bifati aceasta casuta pentru a seta partenerul nou creat drept Client."
+
+#~ msgid "Partner status for this group:"
+#~ msgstr "Statusul partenerului acestui grup:"
diff --git a/addons/import_sugarcrm/i18n/ro.po b/addons/import_sugarcrm/i18n/ro.po
new file mode 100644
index 00000000000..9f956a27142
--- /dev/null
+++ b/addons/import_sugarcrm/i18n/ro.po
@@ -0,0 +1,421 @@
+# Romanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-26 19:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-27 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "Error !!"
+msgstr "Eroare !!"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
+msgstr ""
+"Utilizati URL API SugarSoap (unealta de citire) si acces complet la "
+"autentificarea SugarCRM."
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "(Coming Soon)"
+msgstr "(In curand)"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,document:0
+msgid "Documents"
+msgstr "Documente"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import your data from SugarCRM :"
+msgstr "Importati-va datele din SugarCRM :"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Choose data you want to import. Click 'Import' to get data manually or "
+"'Schedule Reccurent Imports' to get recurrently and automatically data."
+msgstr ""
+"Alegeti datele pe care doriti sa le importati. Faceti click pe 'Importa' "
+"pentru a obtine datele manual sau 'Programeaza Importuri Recurente' pentru a "
+"obtine date in mod recurent si automat."
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,contact:0
+msgid "Contacts"
+msgstr "Contacte"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "HR"
+msgstr "RU"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,bug:0
+msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
+msgstr ""
+"Bifati aceasta casuta pentru a importa sugarCRM Bugs in problemele "
+"proiectului OpenERP"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,instance_name:0
+msgid "Instance's Name"
+msgstr "Numele Instantei"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project_task:0
+msgid "Project Tasks"
+msgstr "Sarcini Proiect"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_from:0
+msgid "Notify End Of Import To:"
+msgstr "Anuntati Finalizarea Importului la:"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,user:0
+msgid ""
+"Check this box to import sugarCRM Users into OpenERP users, warning if a "
+"user with the same login exist in OpenERP, user information will be erase by "
+"sugarCRM user information"
+msgstr ""
+"Bifati aceasta casuta pentru a importa Utilizatori sugarCRM in utilizatorii "
+"OpenERP, avertizare daca exista un utilizator cu acelasi nume de "
+"autentificare in OpenERP, informatiile despre utilizatori vor fi sterse de "
+"informatiile despre utilizatorii sugarCRM"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#, python-format
+msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
+msgstr ""
+"Va rugam sa instalati SOAP pentru pyhton - ZSI-2.0-rc3.tar.gz - python-zci"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Schedule Recurrent Imports"
+msgstr "_Programati Importuri Recurente"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Do not forget the email address to be notified of the success of the import."
+msgstr ""
+"Nu uitati adresa de e-mail la care sa fiti instiintat ca importul a avut "
+"succes."
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,call:0
+msgid "Check this box to import sugarCRM Calls into OpenERP calls"
+msgstr ""
+"Bifati aceasta casuta pentru a importa Apeluri sugarCRM in apeluri OpenERP"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"If you make recurrent or ponctual import, data already  in OpenERP will be "
+"updated by SugarCRM data."
+msgstr ""
+"Daca efectuati importuri recurente sau punctuale, datele deja existente in "
+"OpenERP vor fi actualizate cu datele SugarCRM."
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,employee:0
+msgid "Employee"
+msgstr "Angajat"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Document"
+msgstr "Document"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,document:0
+msgid "Check this box to import sugarCRM Documents into OpenERP documents"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import Data From SugarCRM"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "CRM"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid ""
+"Data are importing, the process is running in the background, an email will "
+"be sent to the given email address if it was defined."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,call:0
+msgid "Calls"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Multi Instance Management"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid "_Ok"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,opportunity:0
+msgid ""
+"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
+"and Opportunities"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_history:0
+msgid "Email and Note"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,url:0
+msgid ""
+"Webservice's url where to get the data.                      example : "
+"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
+"application "
+"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
+msgstr ""
+
+#. module: import_sugarcrm
+#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
+#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
+msgid "Import SugarCRM"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Import"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,user:0
+msgid "User"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "%s data required %s Module to be installed, Please install %s module"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,claim:0
+msgid "Cases"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,meeting:0
+msgid ""
+"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,email_history:0
+msgid ""
+"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
+"Messages and Attachments"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project:0
+msgid "Projects"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid ""
+"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
+"http://pypi.python.org/pypi/ZSI/"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project:0
+msgid "Check this box to import sugarCRM Projects into OpenERP projects"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Select Module to Import."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,meeting:0
+msgid "Meetings"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,employee:0
+msgid "Check this box to import sugarCRM Employees into OpenERP employees"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,url:0
+msgid "SugarSoap Api url:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Address Book"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,bug:0
+msgid "Bugs"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Project"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project_task:0
+msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,opportunity:0
+msgid "Leads & Opp"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password or bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,instance_name:0
+msgid ""
+"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
+"from different server."
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,contact:0
+msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,password:0
+msgid "Password"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Login Information"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,claim:0
+msgid "Check this box to import sugarCRM Cases into OpenERP claims"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Notification When Import is Finished"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,username:0
+msgid "User Name"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+#: model:ir.model,name:import_sugarcrm.model_import_message
+msgid "Import Message"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,account:0
+msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Online documentation:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,account:0
+msgid "Accounts"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid "ZSI Import Error!"
+msgstr ""
+
+#. module: import_sugarcrm
+#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
+msgid "Import SugarCRM DATA"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Address to Notify"
+msgstr ""
diff --git a/addons/l10n_be/i18n/ja.po b/addons/l10n_be/i18n/ja.po
index d70ff834981..baac9765b1f 100644
--- a/addons/l10n_be/i18n/ja.po
+++ b/addons/l10n_be/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
 "X-Generator: Launchpad (build 15288)\n"
 
 #. module: l10n_be
diff --git a/addons/lunch/i18n/ja.po b/addons/lunch/i18n/ja.po
index 445a960e7cc..186018e7cbc 100644
--- a/addons/lunch/i18n/ja.po
+++ b/addons/lunch/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
 "X-Generator: Launchpad (build 15288)\n"
 
 #. module: lunch
@@ -64,7 +64,7 @@ msgstr "    7日    "
 #. module: lunch
 #: view:lunch.cashmove:0 view:lunch.order:0
 msgid "Today"
-msgstr "今日"
+msgstr "本日"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po
index 200fbab9ab8..479c783ca64 100644
--- a/addons/mail/i18n/ja.po
+++ b/addons/mail/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2012-05-25 04:29+0000\n"
+"PO-Revision-Date: 2012-05-25 05:23+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
 "X-Generator: Launchpad (build 15288)\n"
 
 #. module: mail
@@ -156,7 +156,7 @@ msgstr "Eメールメッセージ"
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
-msgstr ""
+msgstr "送信"
 
 #. module: mail
 #: view:mail.message:0
@@ -184,137 +184,137 @@ msgstr "送信済"
 msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
-msgstr ""
+msgstr "メッセージのタイプ。通常はテキストあるいはリッチテキストを指定するための 「テキスト」あるいは「HTML」"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Recipients"
-msgstr ""
+msgstr "宛先"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Eメール作成ウィザード"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
 #: field:mail.message.common,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "関連する文書ID"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Advanced"
-msgstr ""
+msgstr "高度"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
 msgid "Re:"
-msgstr ""
+msgstr "Re："
 
 #. module: mail
 #: field:mail.compose.message,model:0 field:mail.message,model:0
 #: field:mail.message.common,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "関連する文書モデル"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Email Search"
-msgstr ""
+msgstr "Eメール検索"
 
 #. module: mail
 #: help:mail.message,original:0
 msgid "Original version of the message, as it was sent on the network"
-msgstr ""
+msgstr "ネットワークで送信された場合のメッセージの原型"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Partner Name"
-msgstr ""
+msgstr "パートナ名"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Retry"
-msgstr ""
+msgstr "再試行"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "送信"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Send Now"
-msgstr ""
+msgstr "今すぐ送信"
 
 #. module: mail
 #: field:mail.message,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "関係する取引先"
 
 #. module: mail
 #: view:mail.message:0
 msgid "User"
-msgstr ""
+msgstr "ユーザ"
 
 #. module: mail
 #: field:mail.compose.message,date:0 field:mail.message,date:0
 #: field:mail.message.common,date:0
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "拡張フィルタ…"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "%(sender_name)s wrote:"
-msgstr ""
+msgstr "%(sender_name)s さんの記述："
 
 #. module: mail
 #: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
 #: field:mail.message.common,body_html:0
 msgid "Rich-text Contents"
-msgstr ""
+msgstr "リッチテキストのコンテンツ"
 
 #. module: mail
 #: field:mail.message,original:0
 msgid "Original"
-msgstr ""
+msgstr "原文"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
-msgstr ""
+msgstr "履歴"
 
 #. module: mail
 #: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
 #: field:mail.message.common,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "メッセージID"
 
 #. module: mail
 #: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
 #: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "添付"
 
 #. module: mail
 #: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
 #: field:mail.message.common,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "写し(CC)"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:159
@@ -325,28 +325,28 @@ msgstr ""
 #. module: mail
 #: help:mail.message,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
-msgstr ""
+msgstr "送信後、このEメールを削除（スペース節約のため）"
 
 #. module: mail
 #: field:mail.compose.message,references:0 field:mail.message,references:0
 #: field:mail.message.common,references:0
 msgid "References"
-msgstr ""
+msgstr "参照"
 
 #. module: mail
 #: field:mail.message,display_text:0
 msgid "Display Text"
-msgstr ""
+msgstr "テキストの表示"
 
 #. module: mail
 #: view:mail.compose.message:0 view:mail.message:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open"
-msgstr ""
+msgstr "開く"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:434
@@ -357,7 +357,7 @@ msgstr ""
 #. module: mail
 #: field:mail.message,user_id:0
 msgid "Related User"
-msgstr ""
+msgstr "関連ユーザ"
 
 #. module: mail
 #: help:mail.compose.message,headers:0 help:mail.message,headers:0
@@ -365,29 +365,29 @@ msgstr ""
 msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
-msgstr ""
+msgstr "全メッセージヘッダー。例えばSMTPセッションのヘッダー（通常、受信メッセージのみ）。"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Creation Month"
-msgstr ""
+msgstr "作成月"
 
 #. module: mail
 #: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
 #: field:mail.message.common,email_to:0
 msgid "To"
-msgstr ""
+msgstr "宛先"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Details"
-msgstr ""
+msgstr "詳細"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
 #: view:mail.thread:0
 msgid "Email Threads"
-msgstr ""
+msgstr "Eメールスレッド"
 
 #. module: mail
 #: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
@@ -395,29 +395,29 @@ msgstr ""
 msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
-msgstr ""
+msgstr "メッセージの差出人。ユーザの優先設定から持って来られます。空白にすると、Eメールではなく、メッセージになります。"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Plain)"
-msgstr ""
+msgstr "本文（テキスト）"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "You"
-msgstr ""
+msgstr "あなた"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
 #: help:mail.message.common,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "メッセージ識別番号"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Rich)"
-msgstr ""
+msgstr "本文（リッチテキスト）"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:155
@@ -427,31 +427,34 @@ msgid ""
 " Subject: %s \n"
 "\t"
 msgstr ""
+"%s が %s について記述：\n"
+" 件名：%s \n"
+"\t"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.act_res_partner_emails
 #: view:mail.message:0 field:res.partner,emails:0
 msgid "Emails"
-msgstr ""
+msgstr "Eメール"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
 #: model:ir.ui.menu,name:mail.menu_email_message
 #: field:mail.thread,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "メッセージ"
 
 #. module: mail
 #: field:mail.compose.message,headers:0 field:mail.message,headers:0
 #: field:mail.message.common,headers:0
 msgid "Message Headers"
-msgstr ""
+msgstr "メッセージヘッダー"
 
 #. module: mail
 #: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
 #: field:mail.message.common,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "BCC"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_common
@@ -462,47 +465,47 @@ msgstr ""
 #: help:mail.compose.message,references:0 help:mail.message,references:0
 #: help:mail.message.common,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "メッセージの参照。前のメッセージの識別番号など"
 
 #. module: mail
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "エラー。再帰的な関係となる会員を作ることはできません。"
 
 #. module: mail
 #: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
 #: help:mail.message.common,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "CCメッセージの宛先"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "配信に失敗しました。"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "Eメールメッセージ"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
 msgid "Email Thread"
-msgstr ""
+msgstr "Eメールスレッド"
 
 #. module: mail
 #: field:mail.compose.message,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "フィルタ"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:220
 #, python-format
 msgid "Mail attachment"
-msgstr ""
+msgstr "メール添付"
 
 #. module: mail
 #: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
 #: help:mail.message.common,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "メッセージの優先返信アドレス"
diff --git a/addons/marketing_campaign/i18n/ja.po b/addons/marketing_campaign/i18n/ja.po
new file mode 100644
index 00000000000..be2f9543108
--- /dev/null
+++ b/addons/marketing_campaign/i18n/ja.po
@@ -0,0 +1,1106 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-26 21:33+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-27 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Manual Mode"
+msgstr "手動モード"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_from_id:0
+msgid "Previous Activity"
+msgstr "前のアクティビティ"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:818
+#, python-format
+msgid "The current step for this item has no email or report to preview."
+msgstr "この項目の現在の手順は、プレビューすべきEメールやレポートを持ちません。"
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.transition:0
+msgid "The To/From Activity of transition must be of the same Campaign "
+msgstr "トランザクションのTo / Fromアクティビティは同じキャンペーンである必要があります。 "
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr "時刻"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "Custom Action"
+msgstr "カスタムアクション"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,revenue:0
+msgid ""
+"Set an expected revenue if you consider that every campaign item that has "
+"reached this point has generated a certain revenue. You can get revenue "
+"statistics in the Reporting section"
+msgstr "全てのキャンペーン項目が生成するであろう、期待される売上を設定して下さい。売上統計はレポートセクションで取得できます。"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,trigger:0
+msgid "Trigger"
+msgstr "トリガー"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,count:0
+msgid "# of Actions"
+msgstr "アクションの数"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Campaign Editor"
+msgstr "キャンペーンエディタ"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign.workitem:0
+msgid "Today"
+msgstr "本日"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Running"
+msgstr "実行中"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,object_id:0
+msgid "Object"
+msgstr "オブジェクト"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: only records created after last sync"
+msgstr "同期モード：最終同期後に生成されたレコードのみ"
+
+#. module: marketing_campaign
+#: model:email.template,body_text:marketing_campaign.email_template_2
+msgid ""
+"Hello, We are happy to announce that you now become our Silver Partner."
+msgstr "拝啓、このたび御社は、弊社のシルバーパートナとなられたことをご報告申し上げます。"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Set to Draft"
+msgstr "ドラフトに設定"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,to_ids:0
+msgid "Next Activities"
+msgstr "次のアクティビティ"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronization"
+msgstr "同期"
+
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr "間隔は正または0である必要があります。"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:818
+#, python-format
+msgid "No preview"
+msgstr "プレビューなし"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,date_run:0
+msgid "Launch Date"
+msgstr "起動日"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Outgoing Transitions"
+msgstr "外向き遷移"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Reset"
+msgstr "リセット"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,object_id:0
+msgid "Choose the resource on which you want this campaign to be run"
+msgstr "このキャンペーンを実行するリソースを選択して下さい。"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_last_date:0
+msgid "Last Synchronization"
+msgstr "最終同期"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:214
+#, python-format
+msgid "You can not duplicate a campaign, it's not supported yet."
+msgstr "キャンペーンの重複はできません。これはまだサポートされていません。"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Year(s)"
+msgstr "年"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_last_date:0
+msgid ""
+"Date on which this segment was synchronized last time (automatically or "
+"manually)"
+msgstr "このセグメントが最後に同期された（自動または手動）日付"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Automatic"
+msgstr "自動"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,mode:0
+msgid ""
+"Test - It creates and process all the activities directly (without waiting "
+"for the delay on transitions) but does not send emails or produce reports.\n"
+"Test in Realtime - It creates and processes all the activities directly but "
+"does not send emails or produce reports.\n"
+"With Manual Confirmation - the campaigns runs normally, but the user has to "
+"validate all workitem manually.\n"
+"Normal - the campaign runs normally and automatically sends all emails and "
+"reports (be very careful with this mode, you're live!)"
+msgstr ""
+"テスト - 全てのアクティビティを直接作成し実行します（遷移の遅延を待たずに）が、Eメール送信やレポート生成はしません。\n"
+"リアルタイムテスト - 全てのアクティビティを直接作成し実行しますが、Eメール送信やレポート生成はしません。\n"
+"手動確認 - キャンペーンは正常に実行されますが、ユーザは全ての作業項目を手動で検証する必要があります。\n"
+"通常 - キャンペーンは正常に実行され、自動的に全てのEメールが送信されレポートされます（まさに本物。このモードはとても慎重に）。"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_run:0
+msgid "Initial start date of this segment."
+msgstr "このセグメントの最初の開始日"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,campaign_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign.activity,campaign_id:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,campaign_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,campaign_id:0
+msgid "Campaign"
+msgstr "キャンペーン"
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_3
+msgid "Congratulation! You become our Gold Partner."
+msgstr "おめでとうございます。あなたはゴールドパートナとなりました。"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,segment_id:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,segment_id:0
+msgid "Segment"
+msgstr "セグメント"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Cost / Revenue"
+msgstr "経費 / 売上"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,type:0
+msgid ""
+"The type of action to execute when an item enters this activity, such as:\n"
+"   - Email: send an email using a predefined email template\n"
+"   - Report: print an existing Report defined on the resource item and save "
+"it into a specific directory\n"
+"   - Custom Action: execute a predefined action, e.g. to modify the fields "
+"of the resource record\n"
+"  "
+msgstr ""
+"項目がこのアクティブティに入った時に実行するアクションのタイプです。例：\n"
+"　・ Eメール：Eメールテンプレートで事前定義されたEメールを送信します。\n"
+"　・ レポート：リソース項目に定義された既存のレポートを印刷し、特定のディレクトリに保存します。\n"
+"　・ カスタムアクション：事前定義されたアクションを実行します。例えば、リソースレコードの項目を変更します。\n"
+"  "
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_next_sync:0
+msgid "Next time the synchronization job is scheduled to run automatically"
+msgstr "次回は同期ジョブが自動的に実行されるようにスケジュールされます。"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Month(s)"
+msgstr "月"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,partner_id:0
+#: model:ir.model,name:marketing_campaign.model_res_partner
+#: field:marketing.campaign.workitem,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Transitions"
+msgstr "遷移"
+
+#. module: marketing_campaign
+#: model:ir.filters,name:marketing_campaign.filter0
+msgid "Partners"
+msgstr "パートナ"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid "Don't delete workitems"
+msgstr "作業項目を削除しないで下さい。"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,state:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Marketing Reports"
+msgstr "マーケティングレポート"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+msgid "New"
+msgstr "新規"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,type:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,name:0
+#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign.segment,name:0
+#: field:marketing.campaign.transition,name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_name:0
+msgid "Resource Name"
+msgstr "リソース名"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_mode:0
+msgid "Synchronization mode"
+msgstr "同期モード"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Run"
+msgstr "実行"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,from_ids:0
+msgid "Previous Activities"
+msgstr "前のアクティビティ"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_done:0
+msgid "Date this segment was last closed or cancelled."
+msgstr "このセグメントが最後に閉じたあるいはキャンセルされた日付"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Marketing Campaign Activities"
+msgstr "マーケティングキャンペーンアクティビティ"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,error_msg:0
+msgid "Error Message"
+msgstr "エラーメッセージ"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
+#: view:marketing.campaign:0
+msgid "Campaigns"
+msgstr "キャンペーン"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_type:0
+msgid "Interval Unit"
+msgstr "間隔の単位"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:792
+#, python-format
+msgid "Email Preview"
+msgstr "Eメールプレビュー"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_id:0
+#: selection:marketing.campaign.activity,type:0
+msgid "Report"
+msgstr "レポート"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
+msgid "Configuration"
+msgstr "設定"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,variable_cost:0
+msgid ""
+"Set a variable cost if you consider that every campaign item that has "
+"reached this point has entailed a certain cost. You can get cost statistics "
+"in the Reporting section"
+msgstr "全てのキャンペーン項目が必要とするであろう、変動経費を設定して下さい。経費統計はレポートセクションで取得できます。"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Hour(s)"
+msgstr "時"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "    Month-1    "
+msgstr "    月-1    "
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
+msgid "Campaign Segment"
+msgstr "キャンペーンセグメント"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid ""
+"By activating this option, workitems that aren't executed because the "
+"condition is not met are marked as cancelled instead of being deleted."
+msgstr "このオプションを有効にすることで、作業項目は実行されません。なぜなら、削除の代りにキャンセルされたとしてマークされた条件となるためです。"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Exceptions"
+msgstr "例外"
+
+#. module: marketing_campaign
+#: field:res.partner,workitem_ids:0
+msgid "Workitems"
+msgstr "作業項目"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,fixed_cost:0
+msgid "Fixed Cost"
+msgstr "固定経費"
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_2
+msgid "Congratulation! You become now our Silver Partner."
+msgstr "おめでとうございます。あなたはシルバーパートナとなりました。"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Modified"
+msgstr "新規に修正"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_nbr:0
+msgid "Interval Value"
+msgstr "間隔の値"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,revenue:0
+#: field:marketing.campaign.activity,revenue:0
+msgid "Revenue"
+msgstr "売上"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,partner_field_id:0
+msgid ""
+"The generated workitems will be linked to the partner related to the record. "
+"If the record is the partner itself leave this field empty. This is useful "
+"for reporting purposes, via the Campaign Analysis or Campaign Follow-up "
+"views."
+msgstr ""
+"生成された作業項目はパートナに関連したレコードとリンクされます。レコードがパートナ自身である場合、この項目を空のままとして下さい。これは、キャンペーンの分"
+"析やキャンペーンのフォローアップビューを介して、レポート目的のために役立ちます。"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_to_id:0
+msgid "Next Activity"
+msgstr "次のアクティビティ"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_followup
+msgid "Campaign Follow-up"
+msgstr "キャンペーンフォローアップ"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,email_template_id:0
+msgid "The e-mail to send when this activity is activated"
+msgstr "このアクティビティが有効化されたときにEメールを送信します。"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Test Mode"
+msgstr "テストモード"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records modified after last sync (no duplicates)"
+msgstr "最終同期後に変更されたレコードのみ（重複なし）"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat
+msgid "Campaign Statistics"
+msgstr "キャンペーン統計値"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,server_action_id:0
+msgid "The action to perform when this activity is activated"
+msgstr "このアクティビティが有効化された時にアクションを実行します。"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,partner_field_id:0
+msgid "Partner Field"
+msgstr "パートナ項目"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: model:ir.actions.act_window,name:marketing_campaign.action_campaign_analysis_all
+#: model:ir.model,name:marketing_campaign.model_campaign_analysis
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_campaign_analysis_all
+msgid "Campaign Analysis"
+msgstr "キャンペーンの分析"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_mode:0
+msgid ""
+"Determines an additional criterion to add to the filter when selecting new "
+"records to inject in the campaign. \"No duplicates\" prevents selecting "
+"records which have already entered the campaign previously.If the campaign "
+"has a \"unique field\" set, \"no duplicates\" will also prevent selecting "
+"records which have the same value for the unique field as other records that "
+"already entered the campaign."
+msgstr ""
+"キャンペーンに入れる新しいレコードの選択時に、フィルタに追加する追加基準を決定して下さい。重複なしは既に以前のキャンペーンに入れたレコードを選択するのを避"
+"けます。キャンペーンが固有項目セットと重複なしである場合、固有項目であるために同じ値を持つれレコードや既にキャンペーンで入力されたレコードを選択するのを避"
+"けます。"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test in Realtime"
+msgstr "リアルタイムテスト"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test Directly"
+msgstr "直接テスト"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_directory_id:0
+msgid "Directory"
+msgstr "ディレクトリ"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Preview"
+msgstr "プレビュー"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Related Resource"
+msgstr "関連するリソース"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Normal"
+msgstr "通常"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,start:0
+msgid "This activity is launched when the campaign starts."
+msgstr "キャンペーンが開始された時に、このアクティビティは起動します。"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,signal:0
+msgid ""
+"An activity with a signal can be called programmatically. Be careful, the "
+"workitem is always created when a signal is sent"
+msgstr "シグナルのアクティビティはプログラム化と呼ばれます。シグナルが送信された時に、作業項目はいつも作成されることに注意して下さい。"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_email_template
+msgid "Email Templates"
+msgstr "Eメールテンプレート"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: all records"
+msgstr "同期モード：全レコード"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "All records (no duplicates)"
+msgstr "全レコード（重複なし）"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Created"
+msgstr "新規に作成"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,date:0
+#: view:marketing.campaign.workitem:0
+msgid "Date"
+msgstr "日付"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,condition:0
+msgid "Condition"
+msgstr "条件"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_id:0
+msgid "The report to generate when this activity is activated"
+msgstr "このアクティビティが有効化された時に、レポートは生成されます。"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:148
+#, python-format
+msgid ""
+"The campaign cannot be started: it doesn't have any starting activity. "
+"Modify campaign's activities to mark one as the starting point."
+msgstr ""
+"このキャンペーンは開始できません：これは開始アクティビティを何も持っていません。キャンペーンのアクティビティのひとつを開始点としてマークする修正を加えて下"
+"さい。"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,unique_field_id:0
+msgid "Unique Field"
+msgstr "固有項目"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Exception"
+msgstr "例外"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,email_template_id:0
+msgid "Email Template"
+msgstr "Eメールテンプレート"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,date:0
+msgid "Execution Date"
+msgstr "実行日"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
+msgid "Campaign Workitem"
+msgstr "キャンペーン作業項目"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
+msgid "Campaign Activity"
+msgstr "キャンペーンアクティビティ"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_directory_id:0
+msgid "This folder is used to store the generated reports"
+msgstr "このフォルダは生成されたレポートを保存するのに使用されます。"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:136
+#: code:addons/marketing_campaign/marketing_campaign.py:148
+#: code:addons/marketing_campaign/marketing_campaign.py:158
+#, python-format
+msgid "Error"
+msgstr "エラー"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,server_action_id:0
+msgid "Action"
+msgstr "アクション"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:528
+#, python-format
+msgid "Automatic transition"
+msgstr "自動翻訳"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,start:0
+msgid "Start"
+msgstr "開始"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: view:res.partner:0
+msgid "History"
+msgstr "履歴"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Process"
+msgstr "処理"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:530
+#: selection:marketing.campaign.transition,trigger:0
+#, python-format
+msgid "Cosmetic"
+msgstr "化粧"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.transition,trigger:0
+msgid "How is the destination workitem triggered"
+msgstr "引き金となる宛先の作業項目の状態"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
+msgid ""
+"A marketing campaign is an event or activity that will help you manage and "
+"reach your partners with specific messages. A campaign can have many "
+"activities that will be triggered from a specific situation. One action "
+"could be sending an email template that has previously been created in the "
+"system."
+msgstr ""
+"マーケットキャンペーンは管理を助け、特定のメッセージをパートナに届けるイベントやアクティビティです。キャンペーンは特定の事態をきっかけとする多くのアクティ"
+"ビティを持ちます。あるアクションは以前にシステムに作られたEメールテンプレートを送信できます。"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:214
+#, python-format
+msgid "Operation not supported"
+msgstr "操作はサポートされていません。"
+
+#. module: marketing_campaign
+#: model:email.template,body_text:marketing_campaign.email_template_3
+msgid "Hello, We are happy to announce that you become our Gold Partner."
+msgstr "拝啓、このたび御社は、弊社のゴールドパートナとなられたことをご報告申し上げます。"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.segment:0
+msgid "Model of filter must be same as resource model of Campaign "
+msgstr "フィルタのモデルはキャンペーンのリソースモデルと同じである必要があります。 "
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,condition:0
+msgid ""
+"Python expression to decide whether the activity can be executed, otherwise "
+"it will be deleted or cancelled.The expression may use the following "
+"[browsable] variables:\n"
+"   - activity: the campaign activity\n"
+"   - workitem: the campaign workitem\n"
+"   - resource: the resource object this campaign item represents\n"
+"   - transitions: list of campaign transitions outgoing from this activity\n"
+"...- re: Python regular expression module"
+msgstr ""
+"アクティビティが実行できるかどうかを決定するPython式です。それ以外はそれは削除されるかキャンセルされます。式は次のような変数（参照可能）を許します："
+"\n"
+"   ・ activity：キャンペーンのアクティビティ\n"
+"   ・ workitem：キャンペーンの作業項目\n"
+"   ・ resource：このキャンペーン項目を代表するリソースオブジェクト\n"
+"   ・ transitions：このアクティビティから外向きのキャンペーン遷移のリスト\n"
+"   ・ re：Pythonの一般的な式のモジュール"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronize Manually"
+msgstr "手動同期"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
+msgstr "リソースID"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:136
+#, python-format
+msgid "The campaign cannot be started: there are no activities in it."
+msgstr "キャンペーンは開始できません：アクティビティがありません。"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
+msgid "Campaign Transition"
+msgstr "キャンペーン遷移"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "To Do"
+msgstr "ToDo"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Campaign Step"
+msgstr "キャンペーン手順"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form
+#: view:marketing.campaign.segment:0
+msgid "Segments"
+msgstr "セグメント"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
+msgid "All Segments"
+msgstr "全セグメント"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Incoming Transitions"
+msgstr "内向き遷移"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "E-mail"
+msgstr "Eメール"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Day(s)"
+msgstr "日"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,activity_ids:0
+#: view:marketing.campaign.activity:0
+msgid "Activities"
+msgstr "アクティビティ"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,unique_field_id:0
+msgid ""
+"If set, this field will help segments that work in \"no duplicates\" mode to "
+"avoid selecting similar records twice. Similar records are records that have "
+"the same value for this unique field. For example by choosing the "
+"\"email_from\" field for CRM Leads you would prevent sending the same "
+"campaign to the same email address again. If not set, the \"no duplicates\" "
+"segments will only avoid selecting the same record again if it entered the "
+"campaign previously. Only easily comparable fields like textfields, "
+"integers, selections or single relationships may be used."
+msgstr ""
+"設定した場合、この項目は類似レコードが２回選択されることを避ける重複なしモードをセグメントに適用するのに役立ちます。類似レコードはこの固有項目に同じ値を持"
+"つレコードのことです。例えば、CRMのリードのEメール送信者項目を選択すると、同じキャンペーンを同じEメールアドレスに再度送信することを防止します。設定し"
+"ない場合、重複なしセグメントは以前のキャンペーンで入れられた同じレコードが再び選択されるのを防ぐのみとなります。テキスト、整数といった項目のみと簡単に比較"
+"可能で、選択または単一の関連を持つもので使用できます。"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:529
+#, python-format
+msgid "After %(interval_nbr)d %(interval_type)s"
+msgstr "%(interval_nbr)d %(interval_type)s 後"
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_1
+msgid "Welcome in OpenERP Partner Channel!"
+msgstr "OpenERPパートナチャネルへ、ようこそおいで下さいました。"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign
+msgid "Marketing Campaign"
+msgstr "マーケティングキャンペーン"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_done:0
+msgid "End Date"
+msgstr "終了日"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,res_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,object_id:0
+#: field:marketing.campaign.segment,object_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,object_id:0
+msgid "Resource"
+msgstr "リソース"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,fixed_cost:0
+msgid ""
+"Fixed cost for running this campaign. You may also specify variable cost and "
+"revenue on each campaign activity. Cost and Revenue statistics are included "
+"in Campaign Reporting."
+msgstr ""
+"実行中のこのキャンペーンのための固定経費。各キャンペーンアクティビティに変動経費と売上を定義することができます。経費と売上統計はキャンペーンレポートに含ま"
+"れます。"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: only records updated after last sync"
+msgstr "同期モード：最終同期後の更新レコードのみ"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,country_id:0
+msgid "Country"
+msgstr "国"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,signal:0
+msgid "Signal"
+msgstr "シグナル"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.workitem,date:0
+msgid "If date is not set, this workitem has to be run manually"
+msgstr "日付が設定されない場合、この作業項目は手動で実行する必要があります。"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:158
+#, python-format
+msgid "The campaign cannot be marked as done before all segments are closed."
+msgstr "全セグメントが閉じない限り、このキャンペーンは完了とはマークされません。"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,mode:0
+msgid "Mode"
+msgstr "モード"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,activity_id:0
+#: view:marketing.campaign.activity:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,activity_id:0
+msgid "Activity"
+msgstr "アクティビティ"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,ir_filter_id:0
+msgid ""
+"Filter to select the matching resource records that belong to this segment. "
+"New filters can be created and saved using the advanced search on the list "
+"view of the Resource. If no filter is set, all records are selected without "
+"filtering. The synchronization mode may also add a criterion to the filter."
+msgstr ""
+"このセグメントに沿った一致したりソースレコードを選択するためのフィルタです。新しいフィルタを作成、保存することでリソースのリストビューで高度な検索に使うこ"
+"とができます。フィルタが設定されない場合、フィルタされることなく全レコードが選択されます。同期モードはまた、フィルタに対して基準を追加します。"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem
+msgid "Campaign Followup"
+msgstr "キャンペーンフォローアップ"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_next_sync:0
+msgid "Next Synchronization"
+msgstr "次の同期"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,ir_filter_id:0
+msgid "Filter"
+msgstr "フィルタ"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "All"
+msgstr "全て"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records created after last sync"
+msgstr "最終同期後に作成されたレコードのみ"
+
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "エラー。再帰的な関係となる会員を作ることはできません。"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,variable_cost:0
+msgid "Variable Cost"
+msgstr "変動経費"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "With Manual Confirmation"
+msgstr "手動確認"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,total_cost:0
+#: view:marketing.campaign:0
+msgid "Cost"
+msgstr "経費"
+
+#. module: marketing_campaign
+#: model:email.template,body_text:marketing_campaign.email_template_1
+msgid "Hello, We are very happy to send Welcome message."
+msgstr "こんにちは。これは歓迎メッセージです。"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,year:0
+msgid "Year"
+msgstr "年"
diff --git a/addons/marketing_campaign_crm_demo/i18n/ja.po b/addons/marketing_campaign_crm_demo/i18n/ja.po
new file mode 100644
index 00000000000..dcf5982da3b
--- /dev/null
+++ b/addons/marketing_campaign_crm_demo/i18n/ja.po
@@ -0,0 +1,187 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-25 22:02+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
+msgid "Marketing campaign demo report"
+msgstr "マーケティングキャンペーンデモレポート"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_1
+msgid ""
+"Hello,Thanks for generous interest you have shown in the "
+"openERP.Regards,OpenERP Team,"
+msgstr "拝啓、OpenERPにご興味を持っていただき、ありがとうございます。OpenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Company :"
+msgstr "会社："
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_4
+msgid "Thanks for buying the OpenERP book"
+msgstr "OpenERPブックのお買い上げのお礼"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on "
+"june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"拝啓、私どもは御社に適合した最適な提案を各種用意いたしております。\n"
+"            シルバーパートナの皆様に、2010年6月に有料の技術トレーニングを開催いたします。\n"
+"            より詳しい情報につきましては、どうぞお問い合わせ下さい。\n"
+"            それではよろしくお願いいたします。\n"
+"            OpenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_5
+msgid "Propose a free technical training to Gold partners"
+msgstr "ゴールドパートナの皆様へのに無料の技術トレーニングのご提案"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr "OpenERPディスカバリーディにご参加のお礼"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr "ダミーアクション"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr "パートナ："
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr "OpenERPにご興味を持っていただき、ありがとうございます。"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr "2010年5月開催のOpenERPディスカバリーディへの登録のご提案"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_7
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  offering Gold partnership.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"拝啓、私どもは御社に適合した最適な提案を各種用意いたしております。\n"
+"            シルバーパートナの皆様に、ゴールドパートナシップをご提案させていただきます。\n"
+"            より詳しい情報につきましては、どうぞお問い合わせ下さい。\n"
+"            それではよろしくお願いいたします。\n"
+"            OpenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
+msgstr "シルバーパートナの皆様にゴールドパートナシップのご提案"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_4
+msgid ""
+"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"拝啓、このたびはOpenERPブックのご購入、ありがとうございました。\n"
+"            より詳しい情報につきましては、どうぞお問い合わせ下さい。\n"
+"            それではよろしくお願いいたします。\n"
+"            OpenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_5
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our gold partners,We are arranging free technical training "
+"on june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"拝啓、私どもは御社に適合した最適な提案を各種用意いたしております。\n"
+"            ゴールドパートナの皆様に、2010年6月に、無料の技術トレーニングを企画いたしました。\n"
+"            より詳しい情報は、どうぞお問い合わせ下さい。\n"
+"            それではよろしくお願いいたします。\n"
+"            OpenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_3
+msgid ""
+"Hello,Thanks for showing intrest and for subscribing to the OpenERP "
+"Discovery Day.\n"
+"             If any further information required kindly revert back.\n"
+"             I really appreciate your co-operation on this.\n"
+"             Regards,OpenERP Team,"
+msgstr ""
+"拝啓、このたびはOpenERPディスカバリーディへのご登録をいただき、ありがとうございます。\n"
+"            より詳しい情報につきましては、どうぞお問い合わせ下さい。\n"
+"            それではよろしくお願いいたします。\n"
+"            OpenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr "技術トレーニング参加のお礼"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_2
+msgid ""
+"Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May "
+"2010.\n"
+"            If any further information required kindly revert back.\n"
+"            We really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"拝啓、私どもは御社に適合した最適な提案を各種用意いたしております。\n"
+"            私どもは、2010年5月に開催される、OpenERPディスカバリーディへのご参加をご案内申し上げます。\n"
+"            より詳しい情報につきましては、どうぞお問い合わせ下さい。\n"
+"            それではよろしくお願いいたします。\n"
+"            OpenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_8
+msgid ""
+"Hello, Thanks for showing intrest and for subscribing to technical "
+"training.If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"拝啓、このたびは技術トレーニングにご登録いただき、ありがとうございました。より詳しい情報につきましては、どうぞお問い合わせ下さい。それではよろしくお願いい"
+"たします。\n"
+"            OenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
+msgstr "シルバーパートナの皆様に有料トレーニングのご提案"
diff --git a/addons/membership/i18n/ja.po b/addons/membership/i18n/ja.po
new file mode 100644
index 00000000000..c5ad528226b
--- /dev/null
+++ b/addons/membership/i18n/ja.po
@@ -0,0 +1,874 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-27 02:57+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-27 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_invoicetoassociate0
+msgid "invoice to associate"
+msgstr "準会員への請求書"
+
+#. module: membership
+#: model:process.process,name:membership.process_process_membershipprocess0
+msgid "Membership Process"
+msgstr "会員処理"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Paid Member"
+msgstr "支払済会員"
+
+#. module: membership
+#: view:report.membership:0
+#: view:res.partner:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: membership
+#: field:report.membership,num_paid:0
+msgid "# Paid"
+msgstr "支払番号"
+
+#. module: membership
+#: field:report.membership,tot_earned:0
+msgid "Earned Amount"
+msgstr "稼いだ金額"
+
+#. module: membership
+#: model:ir.model,name:membership.model_report_membership
+msgid "Membership Analysis"
+msgstr "会員分析"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_setassociation0
+msgid "Set an associate member of partner."
+msgstr "パートナの準会員として設定"
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_invoicetopaid0
+msgid "Invoice is be paid."
+msgstr "請求書は支払済です。"
+
+#. module: membership
+#: field:membership.membership_line,company_id:0
+#: view:report.membership:0
+#: field:report.membership,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Ending Date Of Membership"
+msgstr ""
+
+#. module: membership
+#: field:product.product,membership_date_to:0
+msgid "Date to"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_waitingtoinvoice0
+msgid "Waiting to invoice"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "This will display paid, old and total earned columns"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Suppliers"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Non Member"
+msgstr ""
+
+#. module: membership
+#: model:product.template,name:membership.membership_2_product_template
+msgid "Basic Membership"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "All Members"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_stop:0
+msgid "Stop membership date"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_producttomember0
+msgid "Product to member"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Join Membership"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,associate_member:0
+msgid "Associate member"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_associatedmember0
+msgid "Member is associated."
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "   Month   "
+msgstr ""
+
+#. module: membership
+#: field:report.membership,tot_pending:0
+msgid "Pending Amount"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_associationpartner0
+msgid "Associated partner."
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Supplier Partners"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,num_invoiced:0
+msgid "# Invoiced"
+msgstr ""
+
+#. module: membership
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_report_membership_tree
+#: model:ir.ui.menu,name:membership.menu_report_membership
+msgid "Members Analysis"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "End Membership Date"
+msgstr ""
+
+#. module: membership
+#: field:product.product,membership_date_from:0
+msgid "Date from"
+msgstr ""
+
+#. module: membership
+#: code:addons/membership/membership.py:414
+#, python-format
+msgid "Partner doesn't have an address to make the invoice."
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_res_partner
+#: field:membership.membership_line,partner:0
+msgid "Partner"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_invoicetopaid0
+msgid "Invoice to paid"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Customer Partners"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Partners"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date_from:0
+msgid "From"
+msgstr ""
+
+#. module: membership
+#: constraint:membership.membership_line:0
+msgid "Error, this membership product is out of date"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,membership_state:0
+msgid ""
+"It indicates the membership state.\n"
+"                    -Non Member: A member who has not applied for any "
+"membership.\n"
+"                    -Cancelled Member: A member who has cancelled his "
+"membership.\n"
+"                    -Old Member: A member whose membership date has "
+"expired.\n"
+"                    -Waiting Member: A member who has applied for the "
+"membership and whose invoice is going to be created.\n"
+"                    -Invoiced Member: A member whose invoice has been "
+"created.\n"
+"                    -Paid Member: A member who has paid the membership "
+"amount."
+msgstr ""
+
+#. module: membership
+#: model:process.transition.action,name:membership.process_transition_action_create0
+msgid "Create"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Membership products"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_membership_membership_line
+msgid "Member line"
+msgstr ""
+
+#. module: membership
+#: help:report.membership,date_from:0
+#: field:res.partner,membership_start:0
+msgid "Start membership date"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Events created in current month"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "This will display waiting, invoiced and total pending columns"
+msgstr ""
+
+#. module: membership
+#: code:addons/membership/membership.py:410
+#: code:addons/membership/membership.py:413
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_paidmember0
+msgid "Paid member"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Events created in last month"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,num_waiting:0
+msgid "# Waiting"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Events created in current year"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members
+#: model:ir.ui.menu,name:membership.menu_members
+#: view:res.partner:0
+msgid "Members"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Invoiced/Paid/Free"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_invoicedmember0
+msgid "Open invoice."
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "July"
+msgstr ""
+
+#. module: membership
+#: model:product.template,name:membership.membership_0_product_template
+msgid "Golden Membership"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,associate_member:0
+msgid ""
+"A member with whom you want to associate your membership.It will consider "
+"the membership state of the associated member."
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,membership_id:0
+#: view:report.membership:0
+#: field:report.membership,membership_id:0
+msgid "Membership Product"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_producttomember0
+msgid "Define product for membership."
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_invoicetoassociate0
+msgid "Invoiced member may be Associated member."
+msgstr ""
+
+#. module: membership
+#: view:membership.invoice:0
+msgid "Join"
+msgstr ""
+
+#. module: membership
+#: help:product.product,membership_date_to:0
+#: help:res.partner,membership_stop:0
+msgid "Date until which membership remains active."
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_cancel:0
+msgid "Cancel membership date"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,free_member:0
+msgid "Select if you want to give membership free of cost."
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_setassociation0
+msgid "Set association"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid " Membership State"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Memberships"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_paidmember0
+msgid "Membership invoice paid."
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "September"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "December"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: membership
+#: help:membership.membership_line,state:0
+msgid ""
+"It indicates the membership state.\n"
+"                        -Non Member: A member who has not applied for any "
+"membership.\n"
+"                        -Cancelled Member: A member who has cancelled his "
+"membership.\n"
+"                        -Old Member: A member whose membership date has "
+"expired.\n"
+"                        -Waiting Member: A member who has applied for the "
+"membership and whose invoice is going to be created.\n"
+"                        -Invoiced Member: A member whose invoice has been "
+"created.\n"
+"                        -Paid Member: A member who has paid the membership "
+"amount."
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,month:0
+msgid "Month"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Group by..."
+msgstr ""
+
+#. module: membership
+#: code:addons/membership/membership.py:411
+#, python-format
+msgid "Partner is a free Member."
+msgstr ""
+
+#. module: membership
+#: model:product.pricelist,name:membership.list1m
+msgid "Member Sale Pricelist"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,associate_member_id:0
+#: view:res.partner:0
+msgid "Associate Member"
+msgstr ""
+
+#. module: membership
+#: help:product.product,membership_date_from:0
+#: help:res.partner,membership_start:0
+msgid "Date from which membership becomes active."
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_membership_invoice
+#: view:membership.invoice:0
+msgid "Membership Invoice"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,user_id:0
+#: view:res.partner:0
+msgid "Salesman"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_membershipproduct0
+msgid "Define membership product."
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Category"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Free Member"
+msgstr ""
+
+#. module: membership
+#: model:product.pricelist.version,name:membership.ver1m
+msgid "Member Sale Pricelist Version"
+msgstr ""
+
+#. module: membership
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Forecast"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,partner_id:0
+msgid "Member"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Date From"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_associatedmember0
+msgid "Associated member"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Accounting Info"
+msgstr ""
+
+#. module: membership
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Customers"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "August"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_products
+#: model:ir.ui.menu,name:membership.menu_membership_products
+#: view:product.product:0
+msgid "Membership Products"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "June"
+msgstr ""
+
+#. module: membership
+#: model:ir.ui.menu,name:membership.menu_membership
+#: field:membership.invoice,product_id:0
+#: view:product.product:0
+#: field:product.product,membership:0
+#: view:report.membership:0
+#: view:res.partner:0
+#: field:res.partner,member_lines:0
+msgid "Membership"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Invoiced Member"
+msgstr ""
+
+#. module: membership
+#: help:membership.membership_line,date:0
+msgid "Date on which member has joined the membership"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Waiting Member"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_associationpartner0
+msgid "Association Partner"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,date_from:0
+#: view:res.partner:0
+msgid "Start Date"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "November"
+msgstr ""
+
+#. module: membership
+#: help:product.product,membership:0
+msgid "Select if a product is a membership product."
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,state:0
+msgid "Membership State"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "October"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Sale Description"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "January"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Membership Partners"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Membership Fee"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_amount:0
+msgid "Membership amount"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,membership_amount:0
+msgid "The price negotiated by the partner"
+msgstr ""
+
+#. module: membership
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "None/Canceled/Old/Waiting"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Old Member"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date_to:0
+msgid "To"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,membership_state:0
+#: field:res.partner,membership_state:0
+msgid "Current Membership State"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "General"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_waitingtoinvoice0
+msgid "Draft invoice is now open."
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Inactive"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_account_invoice
+#: field:membership.membership_line,account_invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: membership
+#: view:membership.invoice:0
+msgid "Close"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "All non Members"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Information"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,account_invoice_line:0
+msgid "Account Invoice line"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Categorization"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_waitingmember0
+msgid "Draft invoice for membership."
+msgstr ""
+
+#. module: membership
+#: field:membership.invoice,member_price:0
+#: field:membership.membership_line,member_price:0
+#: model:product.price.type,name:membership.product_price_type_memberprice
+#: field:product.template,member_price:0
+msgid "Member Price"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Purchase Description"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Description"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,free_member:0
+msgid "Free member"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "May"
+msgstr ""
+
+#. module: membership
+#: model:product.template,name:membership.membership_1_product_template
+msgid "Silver Membership"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,date_to:0
+#: view:res.partner:0
+msgid "End Date"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "February"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_invoicedmember0
+msgid "Invoiced member"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "April"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Starting Date Of Membership"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,membership_cancel:0
+msgid "Date on which membership has been cancelled"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date_cancel:0
+msgid "Cancel date"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_waitingmember0
+msgid "Waiting member"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_invoice_view
+msgid "Invoice Membership"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_membershipproduct0
+msgid "Membership product"
+msgstr ""
+
+#. module: membership
+#: help:membership.membership_line,member_price:0
+msgid "Amount for the membership"
+msgstr ""
+
+#. module: membership
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Cancelled Member"
+msgstr ""
+
+#. module: membership
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,year:0
+msgid "Year"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Revenue Done"
+msgstr ""

From 40ac635b127dcaecfe8270f03b1758500e47f515 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 27 May 2012 11:49:23 +0200
Subject: [PATCH 448/452] [FIX] event seats chek is now done in
 check_registration_limits_before

bzr revid: al@openerp.com-20120527094923-j04wz9vp1r7chdwy
---
 addons/event/test/process/event_draft2done.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/addons/event/test/process/event_draft2done.yml b/addons/event/test/process/event_draft2done.yml
index dfe2b01cb33..eb40340befd 100644
--- a/addons/event/test/process/event_draft2done.yml
+++ b/addons/event/test/process/event_draft2done.yml
@@ -34,14 +34,6 @@
 -
    !python {model: event.registration}: |
      event_pool = self.pool.get("event.event")
-     for register in self.browse(cr, uid, [ref("event_registration1")], context):
-         nb_register = register.nb_register
-         event_id = register.event_id.id
-         available_seats = event_pool.check_available_seats(cr, uid, [event_id], context=context)
-         if available_seats and nb_register > available_seats:
-             assert available_seats, "seats available."
-         elif available_seats == 0:
-             assert available_seats, "No Tickets Available."
      self.registration_open(cr, uid, [ref("event_registration1")],context=context)
 -
    I check that registration is "confirmed"

From d81a1efbc54b813e726d77126c53bf97039b08a1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 27 May 2012 12:26:10 +0200
Subject: [PATCH 449/452] [IMP] improved CSS: separator, editable lists with
 many2one

bzr revid: fp@openerp.com-20120527102610-o8i26mxhskv5xkjq
---
 addons/web/static/src/css/base.css  | 7 +++----
 addons/web/static/src/css/base.sass | 9 ++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 01f5d21511f..a17c1cfb8b1 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1672,8 +1672,6 @@
 .openerp .oe_form .oe_form_field_url button img {
   vertical-align: top;
 }
-.openerp .oe_form .oe_form_field_translatable,
-.openerp .oe_form .oe_form_field_many2one,
 .openerp .oe_form .oe_form_field_date,
 .openerp .oe_form .oe_form_field_datetime {
   white-space: nowrap;
@@ -1790,8 +1788,9 @@
 }
 .openerp .oe_horizontal_separator {
   font-weight: bold;
-  font-size: 16px;
-  margin: 4px 0;
+  font-size: 20px;
+  margin: 20px 0px 10px 0px;
+  color: #aaaabb;
 }
 .openerp .oe_horizontal_separator:empty {
   height: 5px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 95571ee7caf..b4fd85034a7 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1335,7 +1335,7 @@ $colour4: #8a89ba
         select[readonly],
         textarea[readonly],
         input[disabled],
-        select[disabled],
+        select[disabled]
             background: #E5E5E5 !important
             color: #666
         textarea[disabled]
@@ -1359,8 +1359,6 @@ $colour4: #8a89ba
         .oe_form_field_email button img,
         .oe_form_field_url button img
             vertical-align: top
-        .oe_form_field_translatable,
-        .oe_form_field_many2one,
         .oe_form_field_date,
         .oe_form_field_datetime
             white-space: nowrap
@@ -1471,8 +1469,9 @@ $colour4: #8a89ba
         border-bottom: 1px solid black
     .oe_horizontal_separator
         font-weight: bold
-        font-size: 16px
-        margin: 4px 0
+        font-size: 20px
+        margin: 20px 0px 10px 0px
+        color: #aab
     .oe_horizontal_separator:empty
         height: 5px
     .oe_vertical_separator

From 5f7fa2c9096c47f5d00cc79e04ef96ef11354552 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 27 May 2012 12:45:04 +0200
Subject: [PATCH 450/452] [IMP] improved CSS, padding on editable lists

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index a17c1cfb8b1..fc49a064778 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1981,8 +1981,10 @@
 .openerp .oe-listview-content > tbody > tr {
   border-top: 1px solid #dddddd;
 }
-.openerp .oe-listview-content > tbody > tr > td, .openerp .oe-listview-content > tbody > tr > th {
+.openerp .oe-listview-content > tbody > tr > td.oe-field-cell {
   padding: 3px 6px;
+}
+.openerp .oe-listview-content > tbody > tr > td, .openerp .oe-listview-content > tbody > tr > th {
   line-height: 18px;
 }
 .openerp .oe-listview-content > tbody > tr > td > button, .openerp .oe-listview-content > tbody > tr > th > button {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b4fd85034a7..696defe6864 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1641,8 +1641,9 @@ $colour4: #8a89ba
             background: white
             > tr
                 border-top: 1px solid #ddd
-                > td, > th
+                > td.oe-field-cell
                     padding: 3px 6px
+                > td, > th
                     line-height: 18px
                     > button
                         border: none

From 23b63eaf8ac61d04b46decec905c64e324bc089a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 27 May 2012 12:50:49 +0200
Subject: [PATCH 451/452] [IMP] improved css: min width of fields (mainly for
 editable lists)

bzr revid: fp@openerp.com-20120527105049-g2r56gztqnwvq430
---
 addons/web/static/src/css/base.css  | 4 ++--
 addons/web/static/src/css/base.sass | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index fc49a064778..89b8cc1a38f 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1633,7 +1633,7 @@
   -webkit-border-radius: 3px;
   border-radius: 3px;
   background: white;
-  min-width: 90px;
+  min-width: 70px;
   color: #1f1f1f;
 }
 .openerp .oe_form input[readonly],
@@ -1867,7 +1867,7 @@
   -webkit-border-radius: 3px;
   border-radius: 3px;
   background: white;
-  min-width: 90px;
+  min-width: 50px;
 }
 .openerp .oe_form .oe_form_field_progressbar.ui-progressbar span {
   position: absolute;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 696defe6864..e013009f9b1 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1329,7 +1329,7 @@ $colour4: #8a89ba
             -webkit-border-radius: 3px
             border-radius: 3px
             background: white
-            min-width: 90px
+            min-width: 70px
             color: #1f1f1f
         input[readonly],
         select[readonly],
@@ -1537,7 +1537,7 @@ $colour4: #8a89ba
             -webkit-border-radius: 3px
             border-radius: 3px
             background: white
-            min-width: 90px
+            min-width: 50px
 
             span
                 position: absolute

From 099c4e574a5f11720c162216efb88cec48380be1 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 29 May 2012 04:46:17 +0000
Subject: [PATCH 452/452] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120528051815-kds7qsood2fiq2l6
bzr revid: launchpad_translations_on_behalf_of_openerp-20120529044617-zjqmk7vucdrf7q03
---
 .../analytic_journal_billing_rate/i18n/lv.po  |   79 +
 addons/crm_helpdesk/i18n/ja.po                |    9 +-
 addons/delivery/i18n/lv.po                    |  642 +++++
 addons/hr_expense/i18n/ja.po                  |   10 +-
 addons/knowledge/i18n/lv.po                   |   33 +
 addons/membership/i18n/ja.po                  |  310 +--
 addons/mrp/i18n/ja.po                         | 2233 +++++++++++++++++
 addons/mrp/i18n/lv.po                         | 2231 ++++++++++++++++
 addons/sale_journal/i18n/lv.po                |  130 +
 addons/sale_layout/i18n/lv.po                 |  254 ++
 10 files changed, 5775 insertions(+), 156 deletions(-)
 create mode 100644 addons/analytic_journal_billing_rate/i18n/lv.po
 create mode 100644 addons/delivery/i18n/lv.po
 create mode 100644 addons/knowledge/i18n/lv.po
 create mode 100644 addons/mrp/i18n/ja.po
 create mode 100644 addons/mrp/i18n/lv.po
 create mode 100644 addons/sale_journal/i18n/lv.po
 create mode 100644 addons/sale_layout/i18n/lv.po

diff --git a/addons/analytic_journal_billing_rate/i18n/lv.po b/addons/analytic_journal_billing_rate/i18n/lv.po
new file mode 100644
index 00000000000..01b645557dd
--- /dev/null
+++ b/addons/analytic_journal_billing_rate/i18n/lv.po
@@ -0,0 +1,79 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-05-28 13:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. module: analytic_journal_billing_rate
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,journal_id:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: view:analytic_journal_rate_grid:0
+msgid "Billing Rate per Journal for this Analytic Account"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,account_id:0
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
+msgid "Relation table between journals and billing rates"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:account.analytic.account,journal_rate_ids:0
+msgid "Invoicing Rate per Journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,rate_id:0
+msgid "Invoicing Rate"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
diff --git a/addons/crm_helpdesk/i18n/ja.po b/addons/crm_helpdesk/i18n/ja.po
index 836b26ca92c..3228f329919 100644
--- a/addons/crm_helpdesk/i18n/ja.po
+++ b/addons/crm_helpdesk/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-23 20:45+0000\n"
+"PO-Revision-Date: 2012-05-28 19:12+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-24 04:53+0000\n"
-"X-Generator: Launchpad (build 15135)\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -725,6 +725,9 @@ msgid ""
 "gateway: new emails may create issues, each of them automatically gets the "
 "history of the conversation with the customer."
 msgstr ""
+"ヘルプデスクとサポート機能を使って、あなたの介在を記録することができます。カスタマごとに注釈を加えたり、必要であればパートナとのやり取りを記録することがで"
+"きます。また，優先レベルを割り当てることもできます。OpenERPの問題システムを使ってサポート活動を管理することができます。問題をEメールゲートウェイと"
+"連動させて、新しいEメールが問題を作成して、カスタマとの対話の履歴を自動的に生成することができます。"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
diff --git a/addons/delivery/i18n/lv.po b/addons/delivery/i18n/lv.po
new file mode 100644
index 00000000000..e42f7e9adf9
--- /dev/null
+++ b/addons/delivery/i18n/lv.po
@@ -0,0 +1,642 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-28 08:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:45+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Ref."
+msgstr ""
+
+#. module: delivery
+#: model:product.template,name:delivery.delivery_product_product_template
+msgid "Delivery by Poste"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: view:delivery.grid:0
+msgid "Destination"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr ""
+
+#. module: delivery
+#: view:stock.picking:0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: view:delivery.grid:0
+msgid "Delivery grids"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.report.xml,name:delivery.report_shipping
+msgid "Delivery order"
+msgstr ""
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Deliveries Properties"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree4
+msgid "Picking to be invoiced"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: view:delivery.grid:0
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Delivery Order :"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,name:0
+#: view:delivery.sale.order:0
+#: field:delivery.sale.order,carrier_id:0
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:213
+#, python-format
+msgid "No price available!"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: delivery
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr ""
+
+#. module: delivery
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Grid Lines"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: view:delivery.grid:0
+msgid "Grid definition"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form1
+msgid ""
+"Define your delivery methods and their pricing. The delivery costs can be "
+"added on the sale order form or in the invoice, based on the delivery orders."
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Lot"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:213
+#, python-format
+msgid "No line matched this product or order in the choosed delivery grid."
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Invoiced to"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_sale_order
+msgid "Make Delievery"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:89
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:141
+#, python-format
+msgid "Default price"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_define_delivery_steps_wizard
+msgid "delivery.define.delivery.steps.wizard"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Date"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr ""
+
+#. module: delivery
+#: view:stock.move:0
+msgid "Weights"
+msgstr ""
+
+#. module: delivery
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: report:sale.shipping:0
+#: field:stock.move,weight:0
+#: field:stock.picking,weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+
+#. module: delivery
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+
+#. module: delivery
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:70
+#, python-format
+msgid "No grid available !"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:53
+#: code:addons/delivery/wizard/delivery_sale_order.py:73
+#, python-format
+msgid "Order not in draft state !"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.define.delivery.steps.wizard:0
+msgid "Choose Your Default Picking Policy"
+msgstr ""
+
+#. module: delivery
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Shipping Date"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Condition"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.define.delivery.steps.wizard,picking_policy:0
+msgid "Picking Policy"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr ""
+
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+
+#. module: delivery
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Quantity"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.define.delivery.steps.wizard:0
+#: model:ir.actions.act_window,name:delivery.action_define_delivery_steps
+msgid "Setup Your Picking Policy"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form1
+msgid "Define Delivery Methods"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+
+#. module: delivery
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+
+#. module: delivery
+#: view:delivery.define.delivery.steps.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:130
+#, python-format
+msgid "Free if more than %.2f"
+msgstr ""
+
+#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Define the delivery methods you are using and their pricing in order to "
+"reinvoice the delivery costs when you are doing invoicing based on delivery "
+"orders"
+msgstr ""
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr ""
+
+#. module: delivery
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If More Than"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "Create Deliveries"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: view:delivery.grid:0
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Description"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:70
+#, python-format
+msgid "No grid matching for this carrier !"
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "="
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:0
+msgid "Pricing Information"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.define.delivery.steps.wizard,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: report:sale.shipping:0
+#: field:stock.picking,carrier_id:0
+msgid "Carrier"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "_Apply"
+msgstr ""
+
+#. module: delivery
+#: field:sale.order,id:0
+msgid "ID"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:53
+#: code:addons/delivery/wizard/delivery_sale_order.py:73
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
+msgstr ""
+
+#. module: delivery
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_cost
+#: view:sale.order:0
+msgid "Delivery Costs"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.define.delivery.steps.wizard,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.define.delivery.steps.wizard:0
+msgid "Apply"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr ""
diff --git a/addons/hr_expense/i18n/ja.po b/addons/hr_expense/i18n/ja.po
index 0c9668d4890..d05a7215a7d 100644
--- a/addons/hr_expense/i18n/ja.po
+++ b/addons/hr_expense/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:26+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-05-29 01:29+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -851,7 +851,7 @@ msgstr "経費"
 #. module: hr_expense
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "エラー：無効な欧州統一商品番号です。"
+msgstr "エラー：無効な商品識別番号です。"
 
 #. module: hr_expense
 #: view:hr.expense.report:0 field:hr.expense.report,year:0
diff --git a/addons/knowledge/i18n/lv.po b/addons/knowledge/i18n/lv.po
new file mode 100644
index 00000000000..4a89de943d7
--- /dev/null
+++ b/addons/knowledge/i18n/lv.po
@@ -0,0 +1,33 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-05-28 12:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr ""
diff --git a/addons/membership/i18n/ja.po b/addons/membership/i18n/ja.po
index c5ad528226b..78e4abe3a5c 100644
--- a/addons/membership/i18n/ja.po
+++ b/addons/membership/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-27 02:57+0000\n"
+"PO-Revision-Date: 2012-05-29 01:29+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-27 04:39+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:45+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -43,12 +43,12 @@ msgstr "グループ化…"
 #. module: membership
 #: field:report.membership,num_paid:0
 msgid "# Paid"
-msgstr "支払番号"
+msgstr "支払済数"
 
 #. module: membership
 #: field:report.membership,tot_earned:0
 msgid "Earned Amount"
-msgstr "稼いだ金額"
+msgstr "獲得金額"
 
 #. module: membership
 #: model:ir.model,name:membership.model_report_membership
@@ -75,157 +75,157 @@ msgstr "請求書は支払済です。"
 #: view:report.membership:0
 #: field:report.membership,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "会社"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Ending Date Of Membership"
-msgstr ""
+msgstr "会員の終了日"
 
 #. module: membership
 #: field:product.product,membership_date_to:0
 msgid "Date to"
-msgstr ""
+msgstr "終了日"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_waitingtoinvoice0
 msgid "Waiting to invoice"
-msgstr ""
+msgstr "請求書待機中"
 
 #. module: membership
 #: view:report.membership:0
 msgid "This will display paid, old and total earned columns"
-msgstr ""
+msgstr "これは支払済、古い合計収入列を表示します。"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Suppliers"
-msgstr ""
+msgstr "仕入先"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Non Member"
-msgstr ""
+msgstr "非会員"
 
 #. module: membership
 #: model:product.template,name:membership.membership_2_product_template
 msgid "Basic Membership"
-msgstr ""
+msgstr "基本会員"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All Members"
-msgstr ""
+msgstr "全会員"
 
 #. module: membership
 #: field:res.partner,membership_stop:0
 msgid "Stop membership date"
-msgstr ""
+msgstr "脱退日"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
 msgid "Product to member"
-msgstr ""
+msgstr "会員への製品"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Join Membership"
-msgstr ""
+msgstr "会員への参加"
 
 #. module: membership
 #: field:res.partner,associate_member:0
 msgid "Associate member"
-msgstr ""
+msgstr "準会員"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_associatedmember0
 msgid "Member is associated."
-msgstr ""
+msgstr "会員は関連付けられました。"
 
 #. module: membership
 #: view:report.membership:0
 msgid "   Month   "
-msgstr ""
+msgstr "   月   "
 
 #. module: membership
 #: field:report.membership,tot_pending:0
 msgid "Pending Amount"
-msgstr ""
+msgstr "保留中金額"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
 msgid "Associated partner."
-msgstr ""
+msgstr "関連パートナ"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Supplier Partners"
-msgstr ""
+msgstr "仕入先パートナ"
 
 #. module: membership
 #: field:report.membership,num_invoiced:0
 msgid "# Invoiced"
-msgstr ""
+msgstr "請求済数"
 
 #. module: membership
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "無効なBBA（ブロードバンドアクセス）構造の通信"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_report_membership_tree
 #: model:ir.ui.menu,name:membership.menu_report_membership
 msgid "Members Analysis"
-msgstr ""
+msgstr "会員分析"
 
 #. module: membership
 #: view:res.partner:0
 msgid "End Membership Date"
-msgstr ""
+msgstr "会員の終了日"
 
 #. module: membership
 #: field:product.product,membership_date_from:0
 msgid "Date from"
-msgstr ""
+msgstr "開始日"
 
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
 msgid "Partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "パートナは請求書を作成するための住所を持っていません。"
 
 #. module: membership
 #: model:ir.model,name:membership.model_res_partner
 #: field:membership.membership_line,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "パートナ"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetopaid0
 msgid "Invoice to paid"
-msgstr ""
+msgstr "支払請求書"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Customer Partners"
-msgstr ""
+msgstr "顧客パートナ"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Partners"
-msgstr ""
+msgstr "パートナ"
 
 #. module: membership
 #: field:membership.membership_line,date_from:0
 msgid "From"
-msgstr ""
+msgstr "送信者"
 
 #. module: membership
 #: constraint:membership.membership_line:0
 msgid "Error, this membership product is out of date"
-msgstr ""
+msgstr "エラー。この会員製品は期間外です。"
 
 #. module: membership
 #: help:res.partner,membership_state:0
@@ -244,186 +244,193 @@ msgid ""
 "                    -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"会員の状態を次のように表します。\n"
+"                    ・ 非会員：どの会員にも申し込んでいない\n"
+"                    ・ キャンセル会員：会員をキャンセルした\n"
+"                    ・ 旧会員：会員の有効期限切れ\n"
+"                    ・ 待機会員：会員に申込を行い、請求書が作成される予定\n"
+"                    ・ 請求済会員：請求書を作成済\n"
+"                    ・ 支払済会員：会員金額を支払済"
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
 msgid "Create"
-msgstr ""
+msgstr "作成"
 
 #. module: membership
 #: view:product.product:0
 msgid "Membership products"
-msgstr ""
+msgstr "会員製品"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_membership_line
 msgid "Member line"
-msgstr ""
+msgstr "会員行"
 
 #. module: membership
 #: help:report.membership,date_from:0
 #: field:res.partner,membership_start:0
 msgid "Start membership date"
-msgstr ""
+msgstr "会員開始日"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "今月、作成したイベント"
 
 #. module: membership
 #: view:report.membership:0
 msgid "This will display waiting, invoiced and total pending columns"
-msgstr ""
+msgstr "これは待機中、請求済の合計保留中列を表示します。"
 
 #. module: membership
 #: code:addons/membership/membership.py:410
 #: code:addons/membership/membership.py:413
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "エラー"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_paidmember0
 msgid "Paid member"
-msgstr ""
+msgstr "支払番号"
 
 #. module: membership
 #: view:report.membership:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    月-1    "
 
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in last month"
-msgstr ""
+msgstr "先月、作成したイベント"
 
 #. module: membership
 #: field:report.membership,num_waiting:0
 msgid "# Waiting"
-msgstr ""
+msgstr "待機数"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in current year"
-msgstr ""
+msgstr "今年度に作成したイベント"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
 #: model:ir.ui.menu,name:membership.menu_members
 #: view:res.partner:0
 msgid "Members"
-msgstr ""
+msgstr "会員"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Invoiced/Paid/Free"
-msgstr ""
+msgstr "請求済 / 支払済 / 無料"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_invoicedmember0
 msgid "Open invoice."
-msgstr ""
+msgstr "請求書を開く"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: membership
 #: model:product.template,name:membership.membership_0_product_template
 msgid "Golden Membership"
-msgstr ""
+msgstr "ゴールド会員"
 
 #. module: membership
 #: help:res.partner,associate_member:0
 msgid ""
 "A member with whom you want to associate your membership.It will consider "
 "the membership state of the associated member."
-msgstr ""
+msgstr "あなたが関連付けたい会員。それは会員の関係性の会員状態を考慮します。"
 
 #. module: membership
 #: field:membership.membership_line,membership_id:0
 #: view:report.membership:0
 #: field:report.membership,membership_id:0
 msgid "Membership Product"
-msgstr ""
+msgstr "会員の製品"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_producttomember0
 msgid "Define product for membership."
-msgstr ""
+msgstr "会員のための製品を定義して下さい。"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetoassociate0
 msgid "Invoiced member may be Associated member."
-msgstr ""
+msgstr "請求済会員は会員と関係付けることができます。"
 
 #. module: membership
 #: view:membership.invoice:0
 msgid "Join"
-msgstr ""
+msgstr "参加"
 
 #. module: membership
 #: help:product.product,membership_date_to:0
 #: help:res.partner,membership_stop:0
 msgid "Date until which membership remains active."
-msgstr ""
+msgstr "会員の有効期限となる日付です。"
 
 #. module: membership
 #: field:res.partner,membership_cancel:0
 msgid "Cancel membership date"
-msgstr ""
+msgstr "会員キャンセル日"
 
 #. module: membership
 #: field:membership.membership_line,date:0
 msgid "Join Date"
-msgstr ""
+msgstr "参加日"
 
 #. module: membership
 #: help:res.partner,free_member:0
 msgid "Select if you want to give membership free of cost."
-msgstr ""
+msgstr "無料で与えたい会員を選択して下さい。"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
 msgid "Set association"
-msgstr ""
+msgstr "関連を設定"
 
 #. module: membership
 #: view:res.partner:0
 msgid " Membership State"
-msgstr ""
+msgstr " 会員状態"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Memberships"
-msgstr ""
+msgstr "会員"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_paidmember0
 msgid "Membership invoice paid."
-msgstr ""
+msgstr "会員請求書は支払済です。"
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "製品テンプレート"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "請求書行"
 
 #. module: membership
 #: help:membership.membership_line,state:0
@@ -442,138 +449,145 @@ msgid ""
 "                        -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"会員の状態を次のように表します。\n"
+"                    ・ 非会員：どの会員にも申し込んでいない\n"
+"                    ・ キャンセル会員：会員をキャンセルした\n"
+"                    ・ 旧会員：会員の有効期限切れ\n"
+"                    ・ 待機会員：会員に申込を行い、請求書が作成される予定\n"
+"                    ・ 請求済会員：請求書を作成済\n"
+"                    ・ 支払済会員：会員金額を支払済"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: membership
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "グル―化…"
 
 #. module: membership
 #: code:addons/membership/membership.py:411
 #, python-format
 msgid "Partner is a free Member."
-msgstr ""
+msgstr "パートナは無料会員です。"
 
 #. module: membership
 #: model:product.pricelist,name:membership.list1m
 msgid "Member Sale Pricelist"
-msgstr ""
+msgstr "会員販売価格表"
 
 #. module: membership
 #: field:report.membership,associate_member_id:0
 #: view:res.partner:0
 msgid "Associate Member"
-msgstr ""
+msgstr "関連会員"
 
 #. module: membership
 #: help:product.product,membership_date_from:0
 #: help:res.partner,membership_start:0
 msgid "Date from which membership becomes active."
-msgstr ""
+msgstr "会員として有効になる日付です。"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "関連パートナ"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_invoice
 #: view:membership.invoice:0
 msgid "Membership Invoice"
-msgstr ""
+msgstr "会員請求書"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,user_id:0
 #: view:res.partner:0
 msgid "Salesman"
-msgstr ""
+msgstr "販売員"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
 msgid "Define membership product."
-msgstr ""
+msgstr "会員製品を定義して下さい。"
 
 #. module: membership
 #: view:product.product:0
 msgid "Category"
-msgstr ""
+msgstr "分類"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Free Member"
-msgstr ""
+msgstr "無料会員"
 
 #. module: membership
 #: model:product.pricelist.version,name:membership.ver1m
 msgid "Member Sale Pricelist Version"
-msgstr ""
+msgstr "会員販売価格表バージョン"
 
 #. module: membership
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "エラー：デフォルトの単位と仕入単位は同じ分類でなければいけません。"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Forecast"
-msgstr ""
+msgstr "予測"
 
 #. module: membership
 #: field:report.membership,partner_id:0
 msgid "Member"
-msgstr ""
+msgstr "会員"
 
 #. module: membership
 #: view:product.product:0
 msgid "Date From"
-msgstr ""
+msgstr "開始日"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
 msgid "Associated member"
-msgstr ""
+msgstr "関連会員"
 
 #. module: membership
 #: view:product.product:0
 msgid "Accounting Info"
-msgstr ""
+msgstr "会計情報"
 
 #. module: membership
 #: help:report.membership,date_to:0
 msgid "End membership date"
-msgstr ""
+msgstr "会員終了日"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "顧客"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_products
 #: model:ir.ui.menu,name:membership.menu_membership_products
 #: view:product.product:0
 msgid "Membership Products"
-msgstr ""
+msgstr "会員製品"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_membership
@@ -584,167 +598,167 @@ msgstr ""
 #: view:res.partner:0
 #: field:res.partner,member_lines:0
 msgid "Membership"
-msgstr ""
+msgstr "会員"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Invoiced Member"
-msgstr ""
+msgstr "請求済会員"
 
 #. module: membership
 #: help:membership.membership_line,date:0
 msgid "Date on which member has joined the membership"
-msgstr ""
+msgstr "会員となった日付"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Waiting Member"
-msgstr ""
+msgstr "待機会員"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_associationpartner0
 msgid "Association Partner"
-msgstr ""
+msgstr "関連パートナ"
 
 #. module: membership
 #: field:report.membership,date_from:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "開始日"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: membership
 #: help:product.product,membership:0
 msgid "Select if a product is a membership product."
-msgstr ""
+msgstr "製品が会員製品の時に選択して下さい。"
 
 #. module: membership
 #: field:membership.membership_line,state:0
 msgid "Membership State"
-msgstr ""
+msgstr "会員状態"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Description"
-msgstr ""
+msgstr "販売説明"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Membership Partners"
-msgstr ""
+msgstr "会員パートナ"
 
 #. module: membership
 #: view:product.product:0
 msgid "Membership Fee"
-msgstr ""
+msgstr "会員料金"
 
 #. module: membership
 #: field:res.partner,membership_amount:0
 msgid "Membership amount"
-msgstr ""
+msgstr "会員金額"
 
 #. module: membership
 #: help:res.partner,membership_amount:0
 msgid "The price negotiated by the partner"
-msgstr ""
+msgstr "パートナ別交渉価格"
 
 #. module: membership
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "請求書番号は会社ごとに固有である必要があります。"
 
 #. module: membership
 #: view:res.partner:0
 msgid "None/Canceled/Old/Waiting"
-msgstr ""
+msgstr "非 / キャンセル / 旧 / 待機"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Old Member"
-msgstr ""
+msgstr "旧会員"
 
 #. module: membership
 #: field:membership.membership_line,date_to:0
 msgid "To"
-msgstr ""
+msgstr "終了"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,membership_state:0
 #: field:res.partner,membership_state:0
 msgid "Current Membership State"
-msgstr ""
+msgstr "現在の会員状態"
 
 #. module: membership
 #: view:product.product:0
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_waitingtoinvoice0
 msgid "Draft invoice is now open."
-msgstr ""
+msgstr "ドラフト請求書が今、開かれました。"
 
 #. module: membership
 #: view:product.product:0
 msgid "Inactive"
-msgstr ""
+msgstr "非アクティブ"
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice
 #: field:membership.membership_line,account_invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "請求書"
 
 #. module: membership
 #: view:membership.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "閉じる"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All non Members"
-msgstr ""
+msgstr "全非会員"
 
 #. module: membership
 #: view:product.product:0
 msgid "Information"
-msgstr ""
+msgstr "情報"
 
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
-msgstr ""
+msgstr "アカウント請求書行"
 
 #. module: membership
 #: view:product.product:0
 msgid "Categorization"
-msgstr ""
+msgstr "分類化"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
 msgid "Draft invoice for membership."
-msgstr ""
+msgstr "会員のためのドラフト請求書"
 
 #. module: membership
 #: field:membership.invoice,member_price:0
@@ -752,123 +766,123 @@ msgstr ""
 #: model:product.price.type,name:membership.product_price_type_memberprice
 #: field:product.template,member_price:0
 msgid "Member Price"
-msgstr ""
+msgstr "会員価格"
 
 #. module: membership
 #: view:product.product:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "仕入説明"
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "製品"
 
 #. module: membership
 #: view:product.product:0
 msgid "Description"
-msgstr ""
+msgstr "説明"
 
 #. module: membership
 #: field:res.partner,free_member:0
 msgid "Free member"
-msgstr ""
+msgstr "無料会員"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
 msgid "Silver Membership"
-msgstr ""
+msgstr "シルバー会員"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr ""
+msgstr "消費税"
 
 #. module: membership
 #: field:report.membership,date_to:0
 #: view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "終了日"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0
 msgid "Invoiced member"
-msgstr ""
+msgstr "請求済会員"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Starting Date Of Membership"
-msgstr ""
+msgstr "会員の開始日"
 
 #. module: membership
 #: help:res.partner,membership_cancel:0
 msgid "Date on which membership has been cancelled"
-msgstr ""
+msgstr "会員をキャンセルした日付"
 
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
 msgid "Cancel date"
-msgstr ""
+msgstr "キャンセル日"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_waitingmember0
 msgid "Waiting member"
-msgstr ""
+msgstr "待機会員"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_invoice_view
 msgid "Invoice Membership"
-msgstr ""
+msgstr "請求会員"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
 msgid "Membership product"
-msgstr ""
+msgstr "会員製粉"
 
 #. module: membership
 #: help:membership.membership_line,member_price:0
 msgid "Amount for the membership"
-msgstr ""
+msgstr "会員金額"
 
 #. module: membership
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "エラー。再帰的な関係となる会員を作ることはできません。"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Cancelled Member"
-msgstr ""
+msgstr "キャンセル済会員"
 
 #. module: membership
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "エラー：無効な商品識別番号です。"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
-msgstr ""
+msgstr "売上完了"
diff --git a/addons/mrp/i18n/ja.po b/addons/mrp/i18n/ja.po
new file mode 100644
index 00000000000..9168d24393a
--- /dev/null
+++ b/addons/mrp/i18n/ja.po
@@ -0,0 +1,2233 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:49+0000\n"
+"PO-Revision-Date: 2012-05-29 04:20+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:45+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr "配送ワークセンター"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action
+msgid ""
+"Manufacturing Orders are usually proposed automatically by OpenERP based on "
+"the bill of materials and the procurement rules, but you can also create "
+"manufacturing orders manually. OpenERP will handle the consumption of the "
+"raw materials (stock decrease) and the production of the finished products "
+"(stock increase) when the order is processed."
+msgstr ""
+"製造オーダーは通常はOpenERPにより部品表と調達ルールに基づき自動的に提案されます　。しかし、製造オーダーを手動で作成することもできます。OpenER"
+"Pはオーダーが処理される時に、原材料の消費（在庫減少）と最終製品の製造（在庫増加）を処理します。"
+
+#. module: mrp
+#: help:mrp.production,location_src_id:0
+msgid "Location where the system will look for components."
+msgstr "システムが部品を探す場所"
+
+#. module: mrp
+#: field:mrp.production,workcenter_lines:0
+msgid "Work Centers Utilisation"
+msgstr "ワークセンター活用"
+
+#. module: mrp
+#: model:product.template,name:mrp.product_sugar_product_template
+msgid "Sugar"
+msgstr "砂糖"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Cycles"
+msgstr "周期数"
+
+#. module: mrp
+#: field:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of Cycles"
+msgstr "周期数"
+
+#. module: mrp
+#: model:product.uom.categ,name:mrp.product_uom_categ_fluid
+msgid "Fluid"
+msgstr "流体"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
+msgid ""
+"The 'Minimum stock rule' allows the system to create procurement orders "
+"automatically as soon as the minimum stock is reached."
+msgstr "最小在庫ルールは最小在庫に達すると、システムが直ちに自動的に調達オーダーを作成します。"
+
+#. module: mrp
+#: field:mrp.production,picking_id:0
+msgid "Picking list"
+msgstr "集荷リスト"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Hourly Cost"
+msgstr "時間コスト"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#, python-format
+msgid "Cost Price per Uom"
+msgstr "単位当りのコスト価格"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Scrap Products"
+msgstr "スクラップ製品"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_routing_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
+msgid "Routings"
+msgstr "経路"
+
+#. module: mrp
+#: field:mrp.workcenter,product_id:0
+msgid "Work Center Product"
+msgstr "ワークセンター製品"
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Search Bill Of Material"
+msgstr "部品表の検索"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct1
+msgid "For stockable products and consumables"
+msgstr "在庫可能製品と消耗品"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockproduction0
+msgid "To Produce"
+msgstr "生産する"
+
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid ""
+"Number of iterations this work center has to do in the specified operation "
+"of the routing."
+msgstr "このワークセンターは配送の特定の操作の中で反復回数実行される必要があります。"
+
+#. module: mrp
+#: view:mrp.bom:0
+#: field:mrp.bom,code:0
+#: view:mrp.production:0
+#: field:mrp.production,name:0
+msgid "Reference"
+msgstr "参照"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Finished Products"
+msgstr "完成した製品"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Manufacturing Orders which are currently in production."
+msgstr "現在生産中の製造オーダー"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicerfq0
+#: model:process.transition,name:mrp.process_transition_stockrfq0
+msgid "To Buy"
+msgstr "購入のため"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_purchaseprocure0
+msgid "The system launches automatically a RFQ to the preferred supplier."
+msgstr "システムは優先仕入先にRFQ（見積依頼書）を自動的に起こします。"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Products to Finish"
+msgstr "終了する製品"
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "Set / Pack"
+msgstr "設定する / 包む"
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour:0
+msgid "Cost per hour"
+msgstr "時間当りのコスト"
+
+#. module: mrp
+#: model:product.template,name:mrp.product_orange_product_template
+msgid "Orange"
+msgstr "オレンジ"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemts0
+msgid ""
+"This is used in case of a service without any impact in the system, a "
+"training session for instance."
+msgstr "これは例えばトレーニングセッションといった、システムに何の影響も与えないでサービスをする場合に使用されます。"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "UOM"
+msgstr ""
+
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,product_id:0
+msgid ""
+"Fill this product to track easily your production costs in the analytic "
+"accounting."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_purchaseprocure0
+msgid "For purchased material"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,indice:0
+msgid "Revision"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.product_form_config_action
+msgid ""
+"Create a product form for everything you buy or sell. Specify a supplier if "
+"the product can be purchased."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle_account_id:0
+msgid "Cycle Account"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Work Cost"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "["
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
+msgid "Procurement of services"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Capacity Information"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_created_ids2:0
+msgid "Produced Products"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom
+msgid "Master Data"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockmts0
+msgid ""
+"The system waits for the products to be available in the stock. These "
+"products are typically procured manually or through a minimum stock rule."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Partner Ref"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,origin:0
+#: report:mrp.production.order:0
+msgid "Source Document"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_lines:0
+msgid "Scheduled goods"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Sets / Phantom"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,position:0
+msgid "Reference to a position in an external plan."
+msgstr ""
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_cloth_product_template
+msgid "Cloth"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_produce
+msgid "Product Produce"
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing_workcenter
+msgid "Work Center Usage"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
+msgid "Procurement of stockable Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Default UOM"
+msgstr ""
+
+#. module: mrp
+#: sql_constraint:mrp.production:0
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#: report:bom.structure:0
+#: field:mrp.product_price,number:0
+#: report:mrp.production.order:0
+#, python-format
+msgid "Quantity"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,hour:0
+msgid "Nbr of hours"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Confirm Production"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduct0
+msgid ""
+"The system creates an order (production or purchased) depending on the sold "
+"quantity and the products parameters."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduction0
+msgid ""
+"In case the Supply method of the product is Produce, the system creates a "
+"production order."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of materials for "
+"manufacturing a product when you have different ways of building the same "
+"product. You can assign several properties to each Bill of Materials. When a "
+"sales person creates a sales order, he can relate it to several properties "
+"and OpenERP will automatically select the BoM to use according the needs."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,picking_id:0
+msgid ""
+"This is the Internal Picking List that brings the finished product to the "
+"production plan"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
+msgid "Working Time"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,date_planned_date:0
+#: report:mrp.production.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Component Product"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Bill Of Material"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action2
+msgid "Bill of Materials Structure"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct0
+msgid "Product type is service"
+msgstr ""
+
+#. module: mrp
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bill of materials."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle:0
+msgid "Specify Cost of Work Center per cycle."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_bom0
+msgid "Manufacturing decomposition"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct1
+msgid "For Services."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,date:0
+msgid "Modification Date"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle_account_id:0
+#: help:mrp.workcenter,costs_hour_account_id:0
+msgid ""
+"Complete this only if you want automatic analytic accounting entries on "
+"production orders."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,cycle:0
+msgid "Nbr of cycles"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_orderrfq0
+#: model:process.node,note:mrp.process_node_rfq0
+msgid "Request for Quotation."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
+msgid ""
+"The Bill of Material is linked to a routing, i.e. the succession of work "
+"centers."
+msgstr ""
+
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_created_ids:0
+msgid "Products to Produce"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+#: field:mrp.routing,location_id:0
+msgid "Production Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Change Qty"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_configure_workcenter
+msgid "Configure your work centers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Force Reservation"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,author_id:0
+msgid "Author"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_product_bom_structure
+msgid "Product BoM Structure"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Search Production"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#, python-format
+msgid "Supplier Price per Uom"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of routing Work Centers."
+msgstr ""
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,child_complete_ids:0
+msgid "BoM Hierarchy"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uom:0
+#: field:mrp.production,product_uom:0
+#: field:mrp.production.product.line,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Picking Exception"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,bom_lines:0
+msgid "BoM Lines"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_start:0
+msgid "Time before prod."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
+msgid "Material Routing"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines2:0
+#: report:mrp.production.order:0
+msgid "Consumed Products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Work Center Load"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:43
+#, python-format
+msgid "No BoM defined for this product !"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
+msgid "Bill of Material Components"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_planning
+msgid "Planning"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Ready"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_buttons_product_template
+msgid "Shirt Buttons"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,routing_id:0
+msgid ""
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
+"plannification."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_cycle:0
+msgid "Time in hours for doing one cycle."
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "In Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_property
+msgid "Master Bill of Materials"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_uos:0
+msgid ""
+"Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
+"promotion of stock."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product_price:0
+#: view:mrp.workcenter.load:0
+msgid "Print"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.workcenter:0
+msgid "Type"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_minimumstockrule0
+msgid "Linked to the 'Minimum stock rule' supplying method."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per month"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/wizard/change_production_qty.py:78
+#: code:addons/mrp/wizard/change_production_qty.py:83
+#, python-format
+msgid "Couldn't find bill of material for product"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "Product Name"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:503
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_efficiency:0
+msgid "A factor of 0.9 means a loss of 10% within the production process."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:734
+#: code:addons/mrp/mrp.py:762
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Printing date"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_orderrfq0
+#: model:process.node,name:mrp.process_node_rfq0
+msgid "RFQ"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_producttostockrules0
+msgid "Procurement rule"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Partial"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "WorkCenter"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procureserviceproduct0
+msgid ""
+"Depending on the chosen method to 'supply' the service, the procurement "
+"order creates a RFQ for a subcontracting purchase order or waits until the "
+"service is done (= the delivery of the products)."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Manufacturing Orders which are waiting for raw materials."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allow you to create and manage manufacturing units.  They "
+"consist of workers and/or machines, which are considered as units for "
+"capacity and planning forecast.  Keep in mind that the working time and "
+"resource leave are not taken into account in the time computation of the "
+"work center."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
+msgid "Procurement of raw material"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,cycle_total:0
+msgid "Total Cycles"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Ready to Produce"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,name:0
+msgid "Modification name"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+msgid "Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,type:0
+msgid "BoM Type"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:45
+#, python-format
+msgid ""
+"Procurement '%s' has an exception: 'No BoM defined for this product !'"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property:0
+msgid "Search"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:626
+#, python-format
+msgid "Could not cancel manufacturing order !"
+msgstr ""
+
+#. module: mrp
+#: field:report.workcenter.load,cycle:0
+msgid "Nbr of cycle"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:627
+#, python-format
+msgid ""
+"You must first cancel related internal picking attached to this "
+"manufacturing order."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_minimumstockrule0
+#: model:process.node,name:mrp.process_node_productminimumstockrule0
+msgid "Minimum Stock"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:503
+#, python-format
+msgid "Cannot delete a manufacturing order in state '%s'"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menus_dash_mrp
+msgid "Dashboard"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:160
+#: code:addons/mrp/report/price.py:211
+#, python-format
+msgid "Total Cost of %s %s"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stockproduct0
+#: model:process.node,name:mrp.process_node_stockproduct1
+#: model:process.process,name:mrp.process_process_stockableproductprocess0
+msgid "Stockable Product"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Work Center name"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing,code:0
+msgid "Code"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Hours"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+msgid "Property Group"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Qty"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_production0
+msgid "Manufacturing Plan."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Inactive"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+#: view:mrp.product.produce:0
+#: view:mrp.product_price:0
+#: view:mrp.production:0
+#: view:mrp.workcenter.load:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/wizard/change_production_qty.py:63
+#, python-format
+msgid "Active Id is not found"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicerfq0
+msgid ""
+"If the service has a 'Buy' supply method, this creates a RFQ, a "
+"subcontracting demand for instance."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_prod_id:0
+msgid "Move product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Late"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_servicemts0
+msgid "Make to stock"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Name"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Start Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.open_board_manufacturing
+#: model:ir.ui.menu,name:mrp.menu_board_manufacturing
+msgid "Production Dashboard"
+msgstr ""
+
+#. module: mrp
+#: model:res.groups,name:mrp.group_mrp_manager
+msgid "Manager"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Source Loc."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,position:0
+msgid "Internal Reference"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_billofmaterial0
+msgid "Product's structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,name:0
+#: report:mrp.production.order:0
+#: field:mrp.production.product.line,name:0
+#: field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.product.produce,mode:0
+msgid "Mode"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "]"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter.load,measure_unit:0
+msgid "Amount measuring unit"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each production stage. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP is capable of automatically deciding on "
+"the manufacturing route depending on the needs of the company."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.todo.category,name:mrp.category_mrp_config
+msgid "MRP Management"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_hour:0
+msgid "Specify Cost of Work Center per hour."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,capacity_per_cycle:0
+msgid ""
+"Number of operations this Work Center can do in parallel. If this Work "
+"Center represents a team of 5 workers, the capacity per cycle is 5."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action3
+msgid "Manufacturing Orders in Progress"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+#: view:mrp.property:0
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Cycles Cost"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in cycles"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,location_dest_id:0
+msgid "Finished Products Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_pm_resources_config
+msgid "Resources"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,hour_nbr:0
+msgid ""
+"Time in hours for this Work Center to achieve the operation of the specified "
+"routing."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_journal_id:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
+#: field:mrp.routing,workcenter_lines:0
+msgid "Work Centers"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allow you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.product_form_config_action
+msgid "Create or Import Products"
+msgstr ""
+
+#. module: mrp
+#: field:report.workcenter.load,hour:0
+msgid "Nbr of hour"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Work Center Operations"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Notes"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Manufacturing Orders which are ready to start production."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom
+#: view:mrp.bom:0
+#: field:mrp.production,bom_id:0
+#: model:process.node,name:mrp.process_node_billofmaterial0
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter.load:0
+msgid "Select time unit"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Work Center load"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,routing_id:0
+msgid ""
+"Routing indicates all the Work Centers used, for how long and/or cycles.If "
+"Routing is indicated then,the third tab of a production order (Work Centers) "
+"will be automatically pre-completed."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_producttostockrules0
+msgid ""
+"The Minimum Stock Rule is an automatic procurement rule based on a mini and "
+"maxi quantity. It's available in the Inventory management menu and "
+"configured by product."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:187
+#, python-format
+msgid "Components Cost of %s %s"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Day by day"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Revisions"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_shirt_product_template
+msgid "Shirt"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:1000
+#, python-format
+msgid "Manufacturing order '%s' is scheduled for the %s."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Production Order N° :"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:647
+#, python-format
+msgid "Manufacturing order '%s' is ready to produce."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_product_line
+msgid "Production Scheduled Product"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:204
+#, python-format
+msgid "Work Cost of %s %s"
+msgstr ""
+
+#. module: mrp
+#: help:res.company,manufacturing_lead:0
+msgid "Security days for each manufacturing operation."
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_water_product_template
+msgid "Water"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Component Name"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_mts0
+#: model:process.transition,name:mrp.process_transition_servicemts0
+#: model:process.transition,name:mrp.process_transition_stockmts0
+msgid "Make to Stock"
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bills of Materials allow you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoMs to automatically propose manufacturing orders according to "
+"product needs. You can either create a bill of materials to define specific "
+"production steps or define a single multi-level bill of materials."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockrfq0
+msgid ""
+"In case the Supply method of the product is Buy, the system creates a "
+"purchase order."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
+#: view:mrp.product_price:0
+msgid "Product Cost Structure"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#, python-format
+msgid "Components suppliers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production Work Centers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Split in production lots"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Search for mrp workcenter"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "BoM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour_account_id:0
+msgid "Hour Account"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Destination Loc."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,method:0
+msgid "Method"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Pending"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:603
+#, python-format
+msgid "Couldn't find a bill of material for this product."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,active:0
+#: field:mrp.routing,active:0
+msgid "Active"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Work Center Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom_revision
+msgid "Bill of Material Revision"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,origin:0
+msgid ""
+"Reference of the document that generated this production order request."
+msgstr ""
+
+#. module: mrp
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_change_production_qty
+msgid "Change Quantity of Products"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productionorder0
+msgid "Drives the procurement orders for raw material."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "SO Number"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Done"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action4
+msgid "Manufacturing Orders Waiting Products"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action2
+msgid "Manufacturing Orders To Start"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter
+#: field:mrp.production.workcenter.line,workcenter_id:0
+#: field:mrp.routing.workcenter,workcenter_id:0
+#: view:mrp.workcenter:0
+#: field:report.workcenter.load,workcenter_id:0
+msgid "Work Center"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,capacity_per_cycle:0
+msgid "Capacity per Cycle"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_product_product
+#: view:mrp.bom:0
+#: field:mrp.bom,product_id:0
+#: view:mrp.production:0
+#: field:mrp.production,product_id:0
+#: report:mrp.production.order:0
+#: field:mrp.production.product.line,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,hour_total:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,location_src_id:0
+msgid "Raw Materials Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product_price:0
+msgid "Print Cost Structure of Product."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos:0
+#: field:mrp.production.product.line,product_uos:0
+msgid "Product UOS"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Consume Products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
+#: view:mrp.product.produce:0
+#: view:mrp.production:0
+msgid "Produce"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stock0
+#: model:process.transition,name:mrp.process_transition_servicemto0
+#: model:process.transition,name:mrp.process_transition_stockproduct0
+msgid "Make to Order"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:358
+#, python-format
+msgid "Copy"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,note:0
+msgid ""
+"Description of the Work Center. Explain here what's a cycle according to "
+"this Work Center."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_finished:0
+msgid "End Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,resource_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,date_start:0
+#: help:mrp.bom,date_stop:0
+msgid "Validity of this BoM or component. Keep empty if it's always valid."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,routing_id:0
+msgid ""
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
+"planning."
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Approve"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property.group:0
+msgid "Properties categories"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production.workcenter.line,sequence:0
+msgid "Gives the sequence order when displaying a list of work orders."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Source Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: view:mrp.production.product.line:0
+msgid "Scheduled Products"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products Consommation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_manufacturing_open
+#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+#: view:mrp.production:0
+msgid "Manufacturing Orders"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.product.produce,mode:0
+msgid ""
+"'Consume only' mode will only consume the products with the quantity "
+"selected.\n"
+"'Consume & Produce' mode will consume as well as produce the products with "
+"the quantity selected and it will finish the production order when total "
+"ordered quantities are produced."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle:0
+msgid "Cost per cycle"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_serviceproduct0
+#: model:process.node,name:mrp.process_node_serviceproduct1
+msgid "Service"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_uom:0
+msgid ""
+"UoM (Unit of Measure) is the unit of measurement for the inventory control"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:734
+#, python-format
+msgid ""
+"You are going to consume total %s quantities of \"%s\".\n"
+"But you can only consume up to total %s quantities."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_bom0
+msgid ""
+"The Bill of Material is the product's decomposition. The components (that "
+"are products themselves) can also have their own Bill of Material (multi-"
+"level)."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,company_id:0
+#: field:mrp.production,company_id:0
+#: field:mrp.routing,company_id:0
+#: field:mrp.routing.workcenter,company_id:0
+#: view:mrp.workcenter:0
+msgid "Company"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in hours"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_cycle:0
+msgid "Time for 1 cycle (hour)"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
+#: field:mrp.production.product.line,production_id:0
+#: field:mrp.production.workcenter.line,production_id:0
+#: model:process.node,name:mrp.process_node_production0
+#: model:process.node,name:mrp.process_node_productionorder0
+msgid "Production Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productminimumstockrule0
+msgid "Automatic procurement rule"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Compute Data"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_uos_qty:0
+msgid "Product UoS Qty"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#: view:mrp.bom:0
+#, python-format
+msgid "Components"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+#: model:ir.actions.report.xml,name:mrp.report_bom_structure
+msgid "BOM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,date_stop:0
+msgid "Valid Until"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,date_start:0
+msgid "Valid From"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Normal BoM"
+msgstr ""
+
+#. module: mrp
+#: field:res.company,manufacturing_lead:0
+msgid "Manufacturing Lead Time"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos_qty:0
+#: field:mrp.production.product.line,product_uos_qty:0
+msgid "Product UOS Qty"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product.produce:0
+msgid "Confirm"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_efficiency:0
+msgid "Manufacturing Efficiency"
+msgstr ""
+
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_rounding:0
+msgid "Product Rounding"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "New"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume Only"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Recreate Picking"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,type:0
+msgid ""
+"If a sub-product is used in several products, it can be useful to create its "
+"own BoM. Though if you don't want separated production orders for this sub-"
+"product, select Set/Phantom as BoM type. If a Phantom BoM is used for a root "
+"product, it will be sold and shipped as a set of components, instead of "
+"being produced."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,state:0
+msgid ""
+"When the production order is created the state is set to 'Draft'.\n"
+" If the order is confirmed the state is set to 'Waiting Goods'.\n"
+" If any exceptions are there, the state is set to 'Picking Exception'.       "
+"                             \n"
+"If the stock is available then the state is set to 'Ready to Produce'.\n"
+" When the production gets started then the state is set to 'In Production'.\n"
+" When the production is over, the state is set to 'Done'."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_stop:0
+msgid "Time after prod."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter.load,time_unit:0
+msgid "Type of period"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Total Qty"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,hour_nbr:0
+msgid "Number of Hours"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Costing Information"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_purchaseprocure0
+msgid "Procurement Orders"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_rounding:0
+msgid "Rounding applied on the product quantity."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stock0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,routing_id:0
+msgid "Parent Routing"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_start:0
+msgid "Time in hours for the setup."
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_orangejuice_product_template
+msgid "Orange Juice"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,bom_id:0
+#: field:procurement.order,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_mts0
+#: model:process.node,note:mrp.process_node_servicemts0
+msgid "Assignment from stock."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Waiting Goods"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,last_indice:0
+msgid "last indice"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,revision_ids:0
+#: view:mrp.bom.revision:0
+msgid "BoM Revisions"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0
+#: field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production started late"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_routing0
+msgid "Manufacturing Steps."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:146
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
+#, python-format
+msgid "Cost Structure"
+msgstr ""
+
+#. module: mrp
+#: model:res.groups,name:mrp.group_mrp_user
+msgid "User"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume & Produce"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,bom_id:0
+msgid "Parent BoM"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Ref"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM a specific "
+"component is used."
+msgstr ""
+
+#. module: mrp
+#: model:product.uom,name:mrp.product_uom_litre
+msgid "Litre"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:762
+#, python-format
+msgid ""
+"You are going to produce total %s quantities of \"%s\".\n"
+"But you can only produce up to total %s quantities."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct0
+msgid "Product type is Stockable or Consumable."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:603
+#: code:addons/mrp/wizard/change_production_qty.py:78
+#: code:addons/mrp/wizard/change_production_qty.py:83
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Production Started"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
+#: field:product.product,bom_ids:0
+msgid "Bill of Materials"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_action
+#: view:mrp.bom:0
+#: field:mrp.bom,property_ids:0
+#: view:mrp.property:0
+#: view:procurement.order:0
+#: field:procurement.order,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+#: view:mrp.workcenter:0
+msgid "General Information"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Productions"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing
+#: view:mrp.bom:0
+#: field:mrp.bom,routing_id:0
+#: view:mrp.production:0
+#: field:mrp.production,routing_id:0
+#: view:mrp.routing:0
+#: model:process.node,name:mrp.process_node_routing0
+msgid "Routing"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: mrp
+#: field:stock.move,production_id:0
+msgid "Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
+#: field:mrp.production.workcenter.line,name:0
+msgid "Work Order"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_price
+msgid "Product Price"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Change Quantity"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+#: model:ir.actions.act_window,name:mrp.action_change_production_qty
+msgid "Change Product Qty"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom.revision:0
+#: field:mrp.bom.revision,description:0
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+#: field:mrp.routing,note:0
+#: view:mrp.routing.workcenter:0
+#: field:mrp.routing.workcenter,note:0
+#: view:mrp.workcenter:0
+#: field:mrp.workcenter,note:0
+msgid "Description"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Manufacturing board"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned_end:0
+msgid "Scheduled End Date"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
+msgid "Manufacturing"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Next Production Orders"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
+msgid "Property Groups"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procurestockableproduct0
+msgid ""
+"Depending on the chosen method to supply the stockable products, the "
+"procurement order creates a RFQ, a production order, ... "
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:874
+#: code:addons/mrp/mrp.py:929
+#: code:addons/mrp/mrp.py:954
+#, python-format
+msgid "PROD: %s"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_stop:0
+msgid "Time in hours for the cleaning."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_purchaseprocure0
+msgid "Automatic RFQ"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemto0
+msgid ""
+"If the service has a 'Produce' supply method, this creates a task in the "
+"project management module of OpenERP."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_productionprocureproducts0
+msgid ""
+"In order to supply raw material (to be purchased or produced), the "
+"production order creates as much procurement orders as components listed in "
+"the BOM, through a run of the schedulers (MRP)."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.product_price,number:0
+msgid ""
+"Specify quantity of products to produce or buy. Report of Cost structure "
+"will be displayed base on this quantity."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Stock"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,sequence:0
+#: report:mrp.production.order:0
+#: field:mrp.production.workcenter.line,sequence:0
+#: field:mrp.routing.workcenter,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,sequence:0
+msgid "Gives the sequence order when displaying a list of bills of material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines:0
+#: report:mrp.production.order:0
+msgid "Products to Consume"
+msgstr ""
diff --git a/addons/mrp/i18n/lv.po b/addons/mrp/i18n/lv.po
new file mode 100644
index 00000000000..a259910f655
--- /dev/null
+++ b/addons/mrp/i18n/lv.po
@@ -0,0 +1,2231 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:49+0000\n"
+"PO-Revision-Date: 2012-05-28 13:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:45+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action
+msgid ""
+"Manufacturing Orders are usually proposed automatically by OpenERP based on "
+"the bill of materials and the procurement rules, but you can also create "
+"manufacturing orders manually. OpenERP will handle the consumption of the "
+"raw materials (stock decrease) and the production of the finished products "
+"(stock increase) when the order is processed."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,location_src_id:0
+msgid "Location where the system will look for components."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,workcenter_lines:0
+msgid "Work Centers Utilisation"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_sugar_product_template
+msgid "Sugar"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Cycles"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of Cycles"
+msgstr ""
+
+#. module: mrp
+#: model:product.uom.categ,name:mrp.product_uom_categ_fluid
+msgid "Fluid"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
+msgid ""
+"The 'Minimum stock rule' allows the system to create procurement orders "
+"automatically as soon as the minimum stock is reached."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,picking_id:0
+msgid "Picking list"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Hourly Cost"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#, python-format
+msgid "Cost Price per Uom"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Scrap Products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_routing_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
+msgid "Routings"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,product_id:0
+msgid "Work Center Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Search Bill Of Material"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct1
+msgid "For stockable products and consumables"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockproduction0
+msgid "To Produce"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid ""
+"Number of iterations this work center has to do in the specified operation "
+"of the routing."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: field:mrp.bom,code:0
+#: view:mrp.production:0
+#: field:mrp.production,name:0
+msgid "Reference"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Finished Products"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Manufacturing Orders which are currently in production."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicerfq0
+#: model:process.transition,name:mrp.process_transition_stockrfq0
+msgid "To Buy"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_purchaseprocure0
+msgid "The system launches automatically a RFQ to the preferred supplier."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Products to Finish"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "Set / Pack"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,state:0
+msgid "State"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour:0
+msgid "Cost per hour"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_orange_product_template
+msgid "Orange"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemts0
+msgid ""
+"This is used in case of a service without any impact in the system, a "
+"training session for instance."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "UOM"
+msgstr ""
+
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,product_id:0
+msgid ""
+"Fill this product to track easily your production costs in the analytic "
+"accounting."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_purchaseprocure0
+msgid "For purchased material"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,indice:0
+msgid "Revision"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.product_form_config_action
+msgid ""
+"Create a product form for everything you buy or sell. Specify a supplier if "
+"the product can be purchased."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle_account_id:0
+msgid "Cycle Account"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Work Cost"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "["
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
+msgid "Procurement of services"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Capacity Information"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_created_ids2:0
+msgid "Produced Products"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom
+msgid "Master Data"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockmts0
+msgid ""
+"The system waits for the products to be available in the stock. These "
+"products are typically procured manually or through a minimum stock rule."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Partner Ref"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,origin:0
+#: report:mrp.production.order:0
+msgid "Source Document"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_lines:0
+msgid "Scheduled goods"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Sets / Phantom"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,position:0
+msgid "Reference to a position in an external plan."
+msgstr ""
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_cloth_product_template
+msgid "Cloth"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_produce
+msgid "Product Produce"
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing_workcenter
+msgid "Work Center Usage"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
+msgid "Procurement of stockable Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Default UOM"
+msgstr ""
+
+#. module: mrp
+#: sql_constraint:mrp.production:0
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#: report:bom.structure:0
+#: field:mrp.product_price,number:0
+#: report:mrp.production.order:0
+#, python-format
+msgid "Quantity"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,hour:0
+msgid "Nbr of hours"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Confirm Production"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduct0
+msgid ""
+"The system creates an order (production or purchased) depending on the sold "
+"quantity and the products parameters."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduction0
+msgid ""
+"In case the Supply method of the product is Produce, the system creates a "
+"production order."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of materials for "
+"manufacturing a product when you have different ways of building the same "
+"product. You can assign several properties to each Bill of Materials. When a "
+"sales person creates a sales order, he can relate it to several properties "
+"and OpenERP will automatically select the BoM to use according the needs."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,picking_id:0
+msgid ""
+"This is the Internal Picking List that brings the finished product to the "
+"production plan"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
+msgid "Working Time"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,date_planned_date:0
+#: report:mrp.production.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Component Product"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Bill Of Material"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action2
+msgid "Bill of Materials Structure"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct0
+msgid "Product type is service"
+msgstr ""
+
+#. module: mrp
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bill of materials."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle:0
+msgid "Specify Cost of Work Center per cycle."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_bom0
+msgid "Manufacturing decomposition"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct1
+msgid "For Services."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,date:0
+msgid "Modification Date"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle_account_id:0
+#: help:mrp.workcenter,costs_hour_account_id:0
+msgid ""
+"Complete this only if you want automatic analytic accounting entries on "
+"production orders."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,cycle:0
+msgid "Nbr of cycles"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_orderrfq0
+#: model:process.node,note:mrp.process_node_rfq0
+msgid "Request for Quotation."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
+msgid ""
+"The Bill of Material is linked to a routing, i.e. the succession of work "
+"centers."
+msgstr ""
+
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_created_ids:0
+msgid "Products to Produce"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+#: field:mrp.routing,location_id:0
+msgid "Production Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Change Qty"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_configure_workcenter
+msgid "Configure your work centers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Force Reservation"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,author_id:0
+msgid "Author"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_product_bom_structure
+msgid "Product BoM Structure"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Search Production"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#, python-format
+msgid "Supplier Price per Uom"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of routing Work Centers."
+msgstr ""
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,child_complete_ids:0
+msgid "BoM Hierarchy"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uom:0
+#: field:mrp.production,product_uom:0
+#: field:mrp.production.product.line,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Picking Exception"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,bom_lines:0
+msgid "BoM Lines"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_start:0
+msgid "Time before prod."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
+msgid "Material Routing"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines2:0
+#: report:mrp.production.order:0
+msgid "Consumed Products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Work Center Load"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:43
+#, python-format
+msgid "No BoM defined for this product !"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
+msgid "Bill of Material Components"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_planning
+msgid "Planning"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Ready"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_buttons_product_template
+msgid "Shirt Buttons"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,routing_id:0
+msgid ""
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
+"plannification."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_cycle:0
+msgid "Time in hours for doing one cycle."
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "In Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_property
+msgid "Master Bill of Materials"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_uos:0
+msgid ""
+"Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
+"promotion of stock."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product_price:0
+#: view:mrp.workcenter.load:0
+msgid "Print"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.workcenter:0
+msgid "Type"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_minimumstockrule0
+msgid "Linked to the 'Minimum stock rule' supplying method."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per month"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/wizard/change_production_qty.py:78
+#: code:addons/mrp/wizard/change_production_qty.py:83
+#, python-format
+msgid "Couldn't find bill of material for product"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "Product Name"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:503
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_efficiency:0
+msgid "A factor of 0.9 means a loss of 10% within the production process."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:734
+#: code:addons/mrp/mrp.py:762
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Printing date"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_orderrfq0
+#: model:process.node,name:mrp.process_node_rfq0
+msgid "RFQ"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_producttostockrules0
+msgid "Procurement rule"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Partial"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "WorkCenter"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procureserviceproduct0
+msgid ""
+"Depending on the chosen method to 'supply' the service, the procurement "
+"order creates a RFQ for a subcontracting purchase order or waits until the "
+"service is done (= the delivery of the products)."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Manufacturing Orders which are waiting for raw materials."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allow you to create and manage manufacturing units.  They "
+"consist of workers and/or machines, which are considered as units for "
+"capacity and planning forecast.  Keep in mind that the working time and "
+"resource leave are not taken into account in the time computation of the "
+"work center."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
+msgid "Procurement of raw material"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,cycle_total:0
+msgid "Total Cycles"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Ready to Produce"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,name:0
+msgid "Modification name"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+msgid "Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,type:0
+msgid "BoM Type"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:45
+#, python-format
+msgid ""
+"Procurement '%s' has an exception: 'No BoM defined for this product !'"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property:0
+msgid "Search"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:626
+#, python-format
+msgid "Could not cancel manufacturing order !"
+msgstr ""
+
+#. module: mrp
+#: field:report.workcenter.load,cycle:0
+msgid "Nbr of cycle"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:627
+#, python-format
+msgid ""
+"You must first cancel related internal picking attached to this "
+"manufacturing order."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_minimumstockrule0
+#: model:process.node,name:mrp.process_node_productminimumstockrule0
+msgid "Minimum Stock"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:503
+#, python-format
+msgid "Cannot delete a manufacturing order in state '%s'"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menus_dash_mrp
+msgid "Dashboard"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:160
+#: code:addons/mrp/report/price.py:211
+#, python-format
+msgid "Total Cost of %s %s"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stockproduct0
+#: model:process.node,name:mrp.process_node_stockproduct1
+#: model:process.process,name:mrp.process_process_stockableproductprocess0
+msgid "Stockable Product"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Work Center name"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing,code:0
+msgid "Code"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Hours"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+msgid "Property Group"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Qty"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_production0
+msgid "Manufacturing Plan."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Inactive"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+#: view:mrp.product.produce:0
+#: view:mrp.product_price:0
+#: view:mrp.production:0
+#: view:mrp.workcenter.load:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/wizard/change_production_qty.py:63
+#, python-format
+msgid "Active Id is not found"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicerfq0
+msgid ""
+"If the service has a 'Buy' supply method, this creates a RFQ, a "
+"subcontracting demand for instance."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_prod_id:0
+msgid "Move product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Late"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_servicemts0
+msgid "Make to stock"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Name"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Start Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.open_board_manufacturing
+#: model:ir.ui.menu,name:mrp.menu_board_manufacturing
+msgid "Production Dashboard"
+msgstr ""
+
+#. module: mrp
+#: model:res.groups,name:mrp.group_mrp_manager
+msgid "Manager"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Source Loc."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,position:0
+msgid "Internal Reference"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_billofmaterial0
+msgid "Product's structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,name:0
+#: report:mrp.production.order:0
+#: field:mrp.production.product.line,name:0
+#: field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.product.produce,mode:0
+msgid "Mode"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "]"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter.load,measure_unit:0
+msgid "Amount measuring unit"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each production stage. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP is capable of automatically deciding on "
+"the manufacturing route depending on the needs of the company."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.todo.category,name:mrp.category_mrp_config
+msgid "MRP Management"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_hour:0
+msgid "Specify Cost of Work Center per hour."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,capacity_per_cycle:0
+msgid ""
+"Number of operations this Work Center can do in parallel. If this Work "
+"Center represents a team of 5 workers, the capacity per cycle is 5."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action3
+msgid "Manufacturing Orders in Progress"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+#: view:mrp.property:0
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Cycles Cost"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in cycles"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,location_dest_id:0
+msgid "Finished Products Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_pm_resources_config
+msgid "Resources"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,hour_nbr:0
+msgid ""
+"Time in hours for this Work Center to achieve the operation of the specified "
+"routing."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_journal_id:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
+#: field:mrp.routing,workcenter_lines:0
+msgid "Work Centers"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allow you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.product_form_config_action
+msgid "Create or Import Products"
+msgstr ""
+
+#. module: mrp
+#: field:report.workcenter.load,hour:0
+msgid "Nbr of hour"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Work Center Operations"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Notes"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Manufacturing Orders which are ready to start production."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom
+#: view:mrp.bom:0
+#: field:mrp.production,bom_id:0
+#: model:process.node,name:mrp.process_node_billofmaterial0
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter.load:0
+msgid "Select time unit"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Work Center load"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,routing_id:0
+msgid ""
+"Routing indicates all the Work Centers used, for how long and/or cycles.If "
+"Routing is indicated then,the third tab of a production order (Work Centers) "
+"will be automatically pre-completed."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_producttostockrules0
+msgid ""
+"The Minimum Stock Rule is an automatic procurement rule based on a mini and "
+"maxi quantity. It's available in the Inventory management menu and "
+"configured by product."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:187
+#, python-format
+msgid "Components Cost of %s %s"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Day by day"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Revisions"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_shirt_product_template
+msgid "Shirt"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:1000
+#, python-format
+msgid "Manufacturing order '%s' is scheduled for the %s."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Production Order N° :"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:647
+#, python-format
+msgid "Manufacturing order '%s' is ready to produce."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_product_line
+msgid "Production Scheduled Product"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:204
+#, python-format
+msgid "Work Cost of %s %s"
+msgstr ""
+
+#. module: mrp
+#: help:res.company,manufacturing_lead:0
+msgid "Security days for each manufacturing operation."
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_water_product_template
+msgid "Water"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Component Name"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_mts0
+#: model:process.transition,name:mrp.process_transition_servicemts0
+#: model:process.transition,name:mrp.process_transition_stockmts0
+msgid "Make to Stock"
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bills of Materials allow you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoMs to automatically propose manufacturing orders according to "
+"product needs. You can either create a bill of materials to define specific "
+"production steps or define a single multi-level bill of materials."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockrfq0
+msgid ""
+"In case the Supply method of the product is Buy, the system creates a "
+"purchase order."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
+#: view:mrp.product_price:0
+msgid "Product Cost Structure"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#, python-format
+msgid "Components suppliers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production Work Centers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Split in production lots"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Search for mrp workcenter"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "BoM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour_account_id:0
+msgid "Hour Account"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Destination Loc."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,method:0
+msgid "Method"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Pending"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:603
+#, python-format
+msgid "Couldn't find a bill of material for this product."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,active:0
+#: field:mrp.routing,active:0
+msgid "Active"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Work Center Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom_revision
+msgid "Bill of Material Revision"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,origin:0
+msgid ""
+"Reference of the document that generated this production order request."
+msgstr ""
+
+#. module: mrp
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_change_production_qty
+msgid "Change Quantity of Products"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productionorder0
+msgid "Drives the procurement orders for raw material."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "SO Number"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Done"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action4
+msgid "Manufacturing Orders Waiting Products"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action2
+msgid "Manufacturing Orders To Start"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter
+#: field:mrp.production.workcenter.line,workcenter_id:0
+#: field:mrp.routing.workcenter,workcenter_id:0
+#: view:mrp.workcenter:0
+#: field:report.workcenter.load,workcenter_id:0
+msgid "Work Center"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,capacity_per_cycle:0
+msgid "Capacity per Cycle"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_product_product
+#: view:mrp.bom:0
+#: field:mrp.bom,product_id:0
+#: view:mrp.production:0
+#: field:mrp.production,product_id:0
+#: report:mrp.production.order:0
+#: field:mrp.production.product.line,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,hour_total:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,location_src_id:0
+msgid "Raw Materials Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product_price:0
+msgid "Print Cost Structure of Product."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos:0
+#: field:mrp.production.product.line,product_uos:0
+msgid "Product UOS"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Consume Products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
+#: view:mrp.product.produce:0
+#: view:mrp.production:0
+msgid "Produce"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stock0
+#: model:process.transition,name:mrp.process_transition_servicemto0
+#: model:process.transition,name:mrp.process_transition_stockproduct0
+msgid "Make to Order"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:358
+#, python-format
+msgid "Copy"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,note:0
+msgid ""
+"Description of the Work Center. Explain here what's a cycle according to "
+"this Work Center."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_finished:0
+msgid "End Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,resource_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,date_start:0
+#: help:mrp.bom,date_stop:0
+msgid "Validity of this BoM or component. Keep empty if it's always valid."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,routing_id:0
+msgid ""
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
+"planning."
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Approve"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property.group:0
+msgid "Properties categories"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production.workcenter.line,sequence:0
+msgid "Gives the sequence order when displaying a list of work orders."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Source Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: view:mrp.production.product.line:0
+msgid "Scheduled Products"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products Consommation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_manufacturing_open
+#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+#: view:mrp.production:0
+msgid "Manufacturing Orders"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.product.produce,mode:0
+msgid ""
+"'Consume only' mode will only consume the products with the quantity "
+"selected.\n"
+"'Consume & Produce' mode will consume as well as produce the products with "
+"the quantity selected and it will finish the production order when total "
+"ordered quantities are produced."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle:0
+msgid "Cost per cycle"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_serviceproduct0
+#: model:process.node,name:mrp.process_node_serviceproduct1
+msgid "Service"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_uom:0
+msgid ""
+"UoM (Unit of Measure) is the unit of measurement for the inventory control"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:734
+#, python-format
+msgid ""
+"You are going to consume total %s quantities of \"%s\".\n"
+"But you can only consume up to total %s quantities."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_bom0
+msgid ""
+"The Bill of Material is the product's decomposition. The components (that "
+"are products themselves) can also have their own Bill of Material (multi-"
+"level)."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,company_id:0
+#: field:mrp.production,company_id:0
+#: field:mrp.routing,company_id:0
+#: field:mrp.routing.workcenter,company_id:0
+#: view:mrp.workcenter:0
+msgid "Company"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in hours"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_cycle:0
+msgid "Time for 1 cycle (hour)"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
+#: field:mrp.production.product.line,production_id:0
+#: field:mrp.production.workcenter.line,production_id:0
+#: model:process.node,name:mrp.process_node_production0
+#: model:process.node,name:mrp.process_node_productionorder0
+msgid "Production Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productminimumstockrule0
+msgid "Automatic procurement rule"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Compute Data"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_uos_qty:0
+msgid "Product UoS Qty"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#: view:mrp.bom:0
+#, python-format
+msgid "Components"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+#: model:ir.actions.report.xml,name:mrp.report_bom_structure
+msgid "BOM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,date_stop:0
+msgid "Valid Until"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,date_start:0
+msgid "Valid From"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Normal BoM"
+msgstr ""
+
+#. module: mrp
+#: field:res.company,manufacturing_lead:0
+msgid "Manufacturing Lead Time"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos_qty:0
+#: field:mrp.production.product.line,product_uos_qty:0
+msgid "Product UOS Qty"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product.produce:0
+msgid "Confirm"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_efficiency:0
+msgid "Manufacturing Efficiency"
+msgstr ""
+
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_rounding:0
+msgid "Product Rounding"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "New"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume Only"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Recreate Picking"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,type:0
+msgid ""
+"If a sub-product is used in several products, it can be useful to create its "
+"own BoM. Though if you don't want separated production orders for this sub-"
+"product, select Set/Phantom as BoM type. If a Phantom BoM is used for a root "
+"product, it will be sold and shipped as a set of components, instead of "
+"being produced."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,state:0
+msgid ""
+"When the production order is created the state is set to 'Draft'.\n"
+" If the order is confirmed the state is set to 'Waiting Goods'.\n"
+" If any exceptions are there, the state is set to 'Picking Exception'.       "
+"                             \n"
+"If the stock is available then the state is set to 'Ready to Produce'.\n"
+" When the production gets started then the state is set to 'In Production'.\n"
+" When the production is over, the state is set to 'Done'."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_stop:0
+msgid "Time after prod."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter.load,time_unit:0
+msgid "Type of period"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Total Qty"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,hour_nbr:0
+msgid "Number of Hours"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Costing Information"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_purchaseprocure0
+msgid "Procurement Orders"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_rounding:0
+msgid "Rounding applied on the product quantity."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stock0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,routing_id:0
+msgid "Parent Routing"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_start:0
+msgid "Time in hours for the setup."
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_orangejuice_product_template
+msgid "Orange Juice"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,bom_id:0
+#: field:procurement.order,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_mts0
+#: model:process.node,note:mrp.process_node_servicemts0
+msgid "Assignment from stock."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Waiting Goods"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,last_indice:0
+msgid "last indice"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,revision_ids:0
+#: view:mrp.bom.revision:0
+msgid "BoM Revisions"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0
+#: field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production started late"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_routing0
+msgid "Manufacturing Steps."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:146
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
+#, python-format
+msgid "Cost Structure"
+msgstr ""
+
+#. module: mrp
+#: model:res.groups,name:mrp.group_mrp_user
+msgid "User"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume & Produce"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,bom_id:0
+msgid "Parent BoM"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Ref"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM a specific "
+"component is used."
+msgstr ""
+
+#. module: mrp
+#: model:product.uom,name:mrp.product_uom_litre
+msgid "Litre"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:762
+#, python-format
+msgid ""
+"You are going to produce total %s quantities of \"%s\".\n"
+"But you can only produce up to total %s quantities."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct0
+msgid "Product type is Stockable or Consumable."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:603
+#: code:addons/mrp/wizard/change_production_qty.py:78
+#: code:addons/mrp/wizard/change_production_qty.py:83
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Production Started"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
+#: field:product.product,bom_ids:0
+msgid "Bill of Materials"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_action
+#: view:mrp.bom:0
+#: field:mrp.bom,property_ids:0
+#: view:mrp.property:0
+#: view:procurement.order:0
+#: field:procurement.order,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+#: view:mrp.workcenter:0
+msgid "General Information"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Productions"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing
+#: view:mrp.bom:0
+#: field:mrp.bom,routing_id:0
+#: view:mrp.production:0
+#: field:mrp.production,routing_id:0
+#: view:mrp.routing:0
+#: model:process.node,name:mrp.process_node_routing0
+msgid "Routing"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: mrp
+#: field:stock.move,production_id:0
+msgid "Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
+#: field:mrp.production.workcenter.line,name:0
+msgid "Work Order"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_price
+msgid "Product Price"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Change Quantity"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+#: model:ir.actions.act_window,name:mrp.action_change_production_qty
+msgid "Change Product Qty"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom.revision:0
+#: field:mrp.bom.revision,description:0
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+#: field:mrp.routing,note:0
+#: view:mrp.routing.workcenter:0
+#: field:mrp.routing.workcenter,note:0
+#: view:mrp.workcenter:0
+#: field:mrp.workcenter,note:0
+msgid "Description"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Manufacturing board"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned_end:0
+msgid "Scheduled End Date"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
+msgid "Manufacturing"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Next Production Orders"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
+msgid "Property Groups"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procurestockableproduct0
+msgid ""
+"Depending on the chosen method to supply the stockable products, the "
+"procurement order creates a RFQ, a production order, ... "
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:874
+#: code:addons/mrp/mrp.py:929
+#: code:addons/mrp/mrp.py:954
+#, python-format
+msgid "PROD: %s"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_stop:0
+msgid "Time in hours for the cleaning."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_purchaseprocure0
+msgid "Automatic RFQ"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemto0
+msgid ""
+"If the service has a 'Produce' supply method, this creates a task in the "
+"project management module of OpenERP."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_productionprocureproducts0
+msgid ""
+"In order to supply raw material (to be purchased or produced), the "
+"production order creates as much procurement orders as components listed in "
+"the BOM, through a run of the schedulers (MRP)."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.product_price,number:0
+msgid ""
+"Specify quantity of products to produce or buy. Report of Cost structure "
+"will be displayed base on this quantity."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Stock"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,sequence:0
+#: report:mrp.production.order:0
+#: field:mrp.production.workcenter.line,sequence:0
+#: field:mrp.routing.workcenter,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,sequence:0
+msgid "Gives the sequence order when displaying a list of bills of material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines:0
+#: report:mrp.production.order:0
+msgid "Products to Consume"
+msgstr ""
diff --git a/addons/sale_journal/i18n/lv.po b/addons/sale_journal/i18n/lv.po
new file mode 100644
index 00000000000..b7e28dd62c7
--- /dev/null
+++ b/addons/sale_journal/i18n/lv.po
@@ -0,0 +1,130 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-05-28 08:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. module: sale_journal
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,note:0
+msgid "Note"
+msgstr ""
+
+#. module: sale_journal
+#: field:res.partner,property_invoice_type:0
+msgid "Invoicing Type"
+msgstr ""
+
+#. module: sale_journal
+#: help:res.partner,property_invoice_type:0
+msgid ""
+"This invoicing type will be used, by default, for invoicing the current "
+"partner."
+msgstr ""
+
+#. module: sale_journal
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: sale_journal
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the invoice "
+"type without removing it."
+msgstr ""
+
+#. module: sale_journal
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
+#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
+#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
+msgid "Invoice Types"
+msgstr ""
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr ""
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
+msgid ""
+"Invoice types are used for partners, sales orders and delivery orders. You "
+"can create a specific invoicing journal to group your invoicing according to "
+"your customer's needs: daily, each Wednesday, monthly, etc."
+msgstr ""
+
+#. module: sale_journal
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_journal
+#: field:sale.order,invoice_type_id:0
+#: view:sale_journal.invoice.type:0
+#: field:sale_journal.invoice.type,name:0
+#: field:stock.picking,invoice_type_id:0
+msgid "Invoice Type"
+msgstr ""
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Invoicing"
+msgstr ""
diff --git a/addons/sale_layout/i18n/lv.po b/addons/sale_layout/i18n/lv.po
new file mode 100644
index 00000000000..a6c201c8f7c
--- /dev/null
+++ b/addons/sale_layout/i18n/lv.po
@@ -0,0 +1,254 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-05-28 08:16+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr ""
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Line Type"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr ""