From 48dbf92a9c0751af0d27af0890e4d19275ab2027 Mon Sep 17 00:00:00 2001
From: "Amit Parmar (OpenERP)" <aar@tinyerp.com>
Date: Fri, 27 May 2011 12:55:23 +0530
Subject: [PATCH 001/304] [EDI]: develop a ir_edi_document class

bzr revid: aar@tinyerp.com-20110527072523-v93lpjnpxm765bqd
---
 openerp/addons/base/ir/__init__.py |   2 +-
 openerp/addons/base/ir/ir_edi.py   | 215 +++++++++++++++++++++++++++++
 2 files changed, 216 insertions(+), 1 deletion(-)
 create mode 100644 openerp/addons/base/ir/ir_edi.py

diff --git a/openerp/addons/base/ir/__init__.py b/openerp/addons/base/ir/__init__.py
index 9b4eb96df5f..673c4f7e0ab 100644
--- a/openerp/addons/base/ir/__init__.py
+++ b/openerp/addons/base/ir/__init__.py
@@ -36,6 +36,6 @@ import ir_rule
 import wizard
 import ir_config_parameter
 import osv_memory_autovacuum
-
+import ir_edi
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
new file mode 100644
index 00000000000..8b980d4cf4c
--- /dev/null
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -0,0 +1,215 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import osv,fields
+import json
+import hashlib
+import time
+import base64
+import urllib2
+
+class ir_edi_document(osv.osv):
+    _name = 'ir.edi.document'
+    _description = 'ir_edi_document'
+    _columns = {
+                'name': fields.char('EDI token', size = 128),
+                'document': fields.text()
+                
+    }
+    
+    def safe_unique_id(model, database_id):
+
+        """Generate a unique string to represent a (model,database id) pair
+          without being too long, without revealing the database id, and
+          with a very low probability of collisions.
+       """
+        msg = "%s-%s-%s" % (model, time.time(), database_id)
+        digest = hashlib.sha1(msg).digest()
+        digest = ''.join(chr(ord(x) ^ ord(y)) for (x,y) in zip(digest[:9], digest[9:-2]))
+        # finally, use the b64-encoded folded digest as ID part of the unique ID:
+        digest = base64.urlsafe_b64encode(digest)
+        
+        return '%s' % (digest)
+    
+    def new_edi_token(self,cr,uid,ids,browse_records,database_id,context=None):
+        
+        """Generate new unique tokent value to uniquely identify each edi_document"""
+        
+        db_uuid = self.safe_unique_id(browse_records, database_id)
+        edi_token = hashlib.sha256('%s-%s-%s' % (time.time(),db_uuid,time.time())).hexdigest()
+
+
+        return edi_token
+    
+    def serialize(self,edi_list_of_dicts):
+        
+        """Serialize the list of dictionaries using json dumps method"""
+        
+        serialized_list = json.dumps(edi_list_of_dicts)
+        return serialized_list
+    
+    def generate_edi(self,browse_record_list):
+        
+        """ Generate the list of dictionaries using edi_export method of edi class """
+        
+        edi = edi()
+        edi_list = []
+        for record in browse_record_list:
+            edi_struct = edi.edi_export(record)
+            edi_list.append(edi_struct[0])
+        return self.serialize(edi_list)
+    
+    def get_document(self,cr,uid,ids,edi_token,context=None):
+        
+        """Get the edi document from database using given edi token """
+        
+        records = self.search(cr,uid,[('name','=',edi_token)],context=context)
+        if records:
+            doc_string = self.read(cr,uid,records,['document'],context=context)
+        else:
+            raise osv.except_osv(_('Error !'),
+                _('Desired EDI Document does not Exist'))  
+        
+        return True
+    
+    def load_edi(self,cr,uid,ids,edi_list_of_dicts,context=None):
+        
+        """loads the values from list of dictionaries to the corresponding OpenERP records
+            using the edi_import method of edi class"""
+        edi = edi()
+        edi_list = []
+        for record in edi_list_of_dicts:
+            edi_record = edi.edi_import(record)
+            
+        
+        return True
+    
+    def deserialize(self,edi_document_string):
+        """ Deserialized the edi document string"""
+        
+        deserialize_string = json.loads(edi_document_string)
+        return self.load_edi(deserialize_string)
+    
+    def export_doc(self, cr, uid, ids,browse_records,database_id,context=None):
+        """the method handles the flow of the edi document generation and store it in 
+            the database and return the edi_token of the particular document"""
+        
+        edi_document = {
+                     'name': self.new_edi_token(browse_records,database_id),
+                     'document': self.generate_edi(browse_records)
+                    }
+        
+        unique_id = self.create(cr,uid,edi_document,context=context)
+        return edi_document['name']
+    
+    def import_doc(self, cr, uid, ids, edi_document=None,edi_url=None,context=None):
+        
+        """the method handles the flow of importing particular edi document and 
+            updates the database values on the basis of the edi document using 
+            edi_loads method """
+        
+        if edi_document is not None:
+            self.deserialize(edi_document)
+        elif edi_url is not None:
+            edi_document = urllib2.urlopen(edi_url).read()
+            self.deserialize(edi_document)
+
+        return True
+    
+ir_edi_document()
+
+    
+class edi(object):
+    _name = 'edi'
+    _description = 'edi document handler'
+    
+    """Mixin class for OSV objects that want be exposed as EDI documents.
+       Classes that inherit from this mixin class should override the 
+       ``edi_import()`` and ``edi_export()`` methods to implement their
+       specific behavior, based on the primitives provided by this superclass."""
+    
+    
+    def edi_metadata(self, cr, uid, browse_rec_list, context=None):
+        """Return a list representing the boilerplate EDI structure for
+           exporting the record in the given browse_rec_list, including
+           the metadata fields"""
+        # generic implementation!
+        return
+
+    def edi_m2o(self, browse_rec, context=None):
+        """Return a list representing a M2O EDI value for
+           the given browse_record."""
+        # generic implementation!
+        return
+
+    def edi_o2m(self, browse_rec_list, context=None):
+        """Return a list representing a O2M EDI value for
+           the browse_records from the given browse_record_list."""
+        # generic implementation!
+        return
+
+    def edi_m2m(self, browse_rec_list, context=None):
+        """Return a list representing a M2M EDI value for
+           the browse_records from the given browse_record_list."""
+        # generic implementation!
+        return
+
+    def edi_export(self, cr, uid, ids, edi_struct=None, context=None):
+        """Returns a list of dicts representing an edi.document containing the
+           browse_records with ``ids``, using the generic algorithm.
+           :param edi_struct: if provided, edi_struct should be a dictionary
+                              with a skeleton of the OSV fields to export as edi.
+                              Basic fields can have any key as value, but o2m
+                              values should have a sample skeleton dict as value.
+                              For example, for a res.partner record:
+                              edi_struct: {
+                                   'name': True,
+                                   'company_id': True,
+                                   'address': {
+                                       'name': True,
+                                       'street': True,
+                                   }
+                              }
+                              Any field not specified in the edi_struct will not
+                              be included in the exported data.
+        """
+        # generic implementation!
+        
+        edi_struct = {
+                      'Openerp_fields':'',
+                      '__model':'',
+                      '__module':'',
+                      '__id':'',
+                      '__last_update':'',
+                      '__version':'',
+                      '__attachments':'',
+                      
+                      }
+        
+        
+            
+        return edi_struct
+    def edi_import(self, cr, uid, edi_document, context=None):
+        """Imports a list of dicts representing an edi.document, using the
+           generic algorithm.
+        """
+        # generic implementation!
+        pass

From 2e7ee8692142df851053967954e8eb55ffb13203 Mon Sep 17 00:00:00 2001
From: "Amit Parmar (OpenERP)" <aar@tinyerp.com>
Date: Fri, 27 May 2011 19:01:31 +0530
Subject: [PATCH 002/304] [EDI]: working on a edi class

bzr revid: aar@tinyerp.com-20110527133131-a1romjw8fft97950
---
 openerp/addons/base/ir/ir_edi.py | 35 +++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 8b980d4cf4c..2187b4f89ca 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -74,7 +74,7 @@ class ir_edi_document(osv.osv):
         edi_list = []
         for record in browse_record_list:
             edi_struct = edi.edi_export(record)
-            edi_list.append(edi_struct[0])
+            edi_list.append(edi_struct)
         return self.serialize(edi_list)
     
     def get_document(self,cr,uid,ids,edi_token,context=None):
@@ -193,8 +193,8 @@ class edi(object):
         """
         # generic implementation!
         
-        edi_struct = {
-                      'Openerp_fields':'',
+        self.edi_document = {
+                      
                       '__model':'',
                       '__module':'',
                       '__id':'',
@@ -203,10 +203,31 @@ class edi(object):
                       '__attachments':'',
                       
                       }
-        
-        
-            
-        return edi_struct
+        data_object = self.pool.get('ir.model.data')
+        fields_object = self.pool.get('ir.model.fields')
+        for field in edi_struct.keys():
+            if field in self.edi_document.keys():
+                if field == 'model':
+                    model_name = edi_struct['model']
+                    
+                    record_ids = data_object.search(cr,uid,[('model','=','hr.holidays')])
+                    for fname in data_object.browse(cr,uid,record_ids):
+                        if fname.name:
+                            xml_ID = fname.name
+                    self.edi_metadata(field,model_name)
+                else:
+                    self.metadata(field)
+            else:
+                
+                f_ids = fields_object.search(cr,uid,[('name','=',field),('model','=',model_name)],context=context)
+                for fname in fields_object.browse(cr,uid,f_ids):
+                    if fname.ttype == 'many2one':
+                        self.edi_document[field] = self.edi_m2o(edi_struct[field])
+                    elif fname.ttype == 'one2many':
+                        self.edi_ducument[field] = self.edi_o2m(edi_struct[field])
+                    elif fname.ttype == 'many2many':        
+                        self.edi_document[field] = self.edi_m2m(edi_struct[field])
+        return self.edi_document
     def edi_import(self, cr, uid, edi_document, context=None):
         """Imports a list of dicts representing an edi.document, using the
            generic algorithm.

From 2853ca743f27769f67803e405353c8656d7600b6 Mon Sep 17 00:00:00 2001
From: "Amit Parmar (OpenERP)" <aar@tinyerp.com>
Date: Sat, 28 May 2011 19:09:43 +0530
Subject: [PATCH 003/304] [EDI]: working on a edi class

bzr revid: aar@tinyerp.com-20110528133943-1r1hle6k75dvr17o
---
 openerp/addons/base/ir/ir_edi.py | 37 +++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 2187b4f89ca..251108cbf04 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -147,12 +147,16 @@ class edi(object):
        specific behavior, based on the primitives provided by this superclass."""
     
     
-    def edi_metadata(self, cr, uid, browse_rec_list, context=None):
+    def edi_metadata(self, cr, uid, browse_rec_list,model=None, context=None):
         """Return a list representing the boilerplate EDI structure for
            exporting the record in the given browse_rec_list, including
            the metadata fields"""
         # generic implementation!
-        return
+        if model is not None:
+            self.edi_document['__model'] = model
+        
+            
+        return True
 
     def edi_m2o(self, browse_rec, context=None):
         """Return a list representing a M2O EDI value for
@@ -195,28 +199,30 @@ class edi(object):
         
         self.edi_document = {
                       
-                      '__model':'',
-                      '__module':'',
-                      '__id':'',
-                      '__last_update':'',
-                      '__version':'',
-                      '__attachments':'',
+                      'model':'',
+                      'module':'',
+                      'id':'',
+                      'last_update':'',
+                      'version':'',
+                      'attachments':'',
                       
                       }
+        if 'model' not in edi_struct.keys():
+            return False
         data_object = self.pool.get('ir.model.data')
+      
         fields_object = self.pool.get('ir.model.fields')
-        for field in edi_struct.keys():
-            if field in self.edi_document.keys():
+        
+        for field in self.edi_document.keys():
+            
+            if field in edi_struct.keys():
                 if field == 'model':
                     model_name = edi_struct['model']
-                    
-                    record_ids = data_object.search(cr,uid,[('model','=','hr.holidays')])
+                    record_ids = data_object.search(cr,uid,[('model','=',model_name)])
                     for fname in data_object.browse(cr,uid,record_ids):
                         if fname.name:
                             xml_ID = fname.name
-                    self.edi_metadata(field,model_name)
-                else:
-                    self.metadata(field)
+                    
             else:
                 
                 f_ids = fields_object.search(cr,uid,[('name','=',field),('model','=',model_name)],context=context)
@@ -229,6 +235,7 @@ class edi(object):
                         self.edi_document[field] = self.edi_m2m(edi_struct[field])
         return self.edi_document
     def edi_import(self, cr, uid, edi_document, context=None):
+    
         """Imports a list of dicts representing an edi.document, using the
            generic algorithm.
         """

From d6f19568d0b08c2b2110a357fa443d176c9c515e Mon Sep 17 00:00:00 2001
From: "Amit Parmar (OpenERP)" <aar@tinyerp.com>
Date: Mon, 30 May 2011 19:04:28 +0530
Subject: [PATCH 004/304] [EDI]: working on edi import

bzr revid: aar@tinyerp.com-20110530133428-v68yubyv3rb9r4xb
---
 openerp/addons/base/ir/ir_edi.py | 161 ++++++++++++++++++++-----------
 1 file changed, 107 insertions(+), 54 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 251108cbf04..9d66d4ed866 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -26,6 +26,20 @@ import time
 import base64
 import urllib2
 
+def safe_unique_id(model, database_id):
+
+    """Generate a unique string to represent a (model,database id) pair
+    without being too long, without revealing the database id, and
+    with a very low probability of collisions.
+    """
+    msg = "%s-%s-%s" % (model, time.time(), database_id)
+    digest = hashlib.sha1(msg).digest()
+    digest = ''.join(chr(ord(x) ^ ord(y)) for (x,y) in zip(digest[:9], digest[9:-2]))
+    # finally, use the b64-encoded folded digest as ID part of the unique ID:
+    digest = base64.urlsafe_b64encode(digest)
+        
+    return '%s' % (digest)
+
 class ir_edi_document(osv.osv):
     _name = 'ir.edi.document'
     _description = 'ir_edi_document'
@@ -35,25 +49,13 @@ class ir_edi_document(osv.osv):
                 
     }
     
-    def safe_unique_id(model, database_id):
-
-        """Generate a unique string to represent a (model,database id) pair
-          without being too long, without revealing the database id, and
-          with a very low probability of collisions.
-       """
-        msg = "%s-%s-%s" % (model, time.time(), database_id)
-        digest = hashlib.sha1(msg).digest()
-        digest = ''.join(chr(ord(x) ^ ord(y)) for (x,y) in zip(digest[:9], digest[9:-2]))
-        # finally, use the b64-encoded folded digest as ID part of the unique ID:
-        digest = base64.urlsafe_b64encode(digest)
-        
-        return '%s' % (digest)
+    
     
     def new_edi_token(self,cr,uid,ids,browse_records,database_id,context=None):
         
         """Generate new unique tokent value to uniquely identify each edi_document"""
         
-        db_uuid = self.safe_unique_id(browse_records, database_id)
+        db_uuid = safe_unique_id(browse_records, database_id)
         edi_token = hashlib.sha256('%s-%s-%s' % (time.time(),db_uuid,time.time())).hexdigest()
 
 
@@ -88,7 +90,7 @@ class ir_edi_document(osv.osv):
             raise osv.except_osv(_('Error !'),
                 _('Desired EDI Document does not Exist'))  
         
-        return True
+        return doc_string
     
     def load_edi(self,cr,uid,ids,edi_list_of_dicts,context=None):
         
@@ -147,34 +149,91 @@ class edi(object):
        specific behavior, based on the primitives provided by this superclass."""
     
     
-    def edi_metadata(self, cr, uid, browse_rec_list,model=None, context=None):
+    def edi_metadata(self, cr, uid, ids, browse_rec_list, context=None):
         """Return a list representing the boilerplate EDI structure for
            exporting the record in the given browse_rec_list, including
            the metadata fields"""
         # generic implementation!
-        if model is not None:
-            self.edi_document['__model'] = model
+        data_object = self.pool.get('ir.model.data')
         
+        if self.edi_document['__model'] is not None:
+            model_ids = data_object.search(cr,uid,[('model','=',self.edi_document['__model'])],context=context)
+            for data in data_object.browse(cr,uid,model_ids):
+                self.edi_document['__module'] = data.module
+                if data.name is not None:
+                    self.edi_document['__id'] = context['active_id']+':'+data.name
+                self.edi_document['__last_updata'] = context['__last_update'].values()[0]
             
         return True
 
-    def edi_m2o(self, browse_rec, context=None):
+    def edi_m2o(self, cr, uid, ids, browse_rec,model=None,context=None):
         """Return a list representing a M2O EDI value for
            the given browse_record."""
         # generic implementation!
-        return
+        res = []
+        data_object = self.pool.get('ir.model.data')
+        uu_id = data_model.search(cr,uid,[('model','=',model)])
+        for xml in data_model.browse(cr,uid,uu_id):
+            if xml:
+                xml_ID = xml.name
+            else:
+                xml_ID = None
+        for data in browse_rec:
+            if data.name is not None:
+                if xml_ID is not None:
+                    res.append(safe_unique_id(model,data.id)+':'+xml_ID)
+                else:
+                    res.append(safe_unique_id(model,data.id)+':'+model+'-'+safe_unique_id(model,data.id))
+                res.append(data.name)
+        return res
 
-    def edi_o2m(self, browse_rec_list, context=None):
+    def edi_o2m(self, cr, uid, ids, browse_rec_list, model=None, context=None):
         """Return a list representing a O2M EDI value for
            the browse_records from the given browse_record_list."""
         # generic implementation!
-        return
+        res = []
+        init_data = {}
+        data_object = self.pool.get('ir.model.data')
+        uu_id = data_model.search(cr,uid,[('model','=',model)])
+        for xml in data_model.browse(cr,uid,uu_id):
+            if xml:
+                xml_ID = xml.name
+            else:
+                xml_ID = None
+        data_model = self.pool.get(model)
+        for record in browse_rec_list:
+            if xml_ID is not None:
+                init_data['__id'] = safe_unique_id(model,record.id)+':'+xml_ID
+            else:
+                init_data['__id'] = safe_unique_id(model,record.id)+':'+model+'-'+safe_unique_id(model,record.id)  
+            init_data['__last_update'] =record.write_date
+            init_data.update(datamodel.read(cr,uid,[record],[],context=context)[0])
+            res.append(init_data)
+        return res
 
-    def edi_m2m(self, browse_rec_list, context=None):
+    def edi_m2m(self, cr, uid, ids, browse_rec_list,model=None, context=None):
         """Return a list representing a M2M EDI value for
            the browse_records from the given browse_record_list."""
         # generic implementation!
-        return
+        res = []
+        init_data = []
+        data_object = self.pool.get('ir.model.data')
+        uu_id = data_model.search(cr,uid,[('model','=',model)])
+        for xml in data_model.browse(cr,uid,uu_id):
+            if xml:
+                xml_ID = xml.name
+            else:
+                xml_ID = None
+        data_model = self.pool.get(model)
+        for record in browse_rec_list:
+            if xml_ID is not None:
+                init_data.append(safe_unique_id(model,record.id)+':'+xml_ID)
+            else:
+                init_data.append(safe_unique_id(model,record.id)+':'+model+'-'+safe_unique_id(model,record.id))
+            if record.name is not None:
+                init_data.append('name:'+record.name)
+            res.append(init_data)    
+        return res
 
     def edi_export(self, cr, uid, ids, edi_struct=None, context=None):
         """Returns a list of dicts representing an edi.document containing the
@@ -199,40 +258,32 @@ class edi(object):
         
         self.edi_document = {
                       
-                      'model':'',
-                      'module':'',
-                      'id':'',
-                      'last_update':'',
-                      'version':'',
-                      'attachments':'',
+                      '__model':'',
+                      '__module':'',
+                      '__id':'',
+                      '__last_update':'',
+                      '__version':'',
+                      '__attachments':'',
                       
                       }
-        if 'model' not in edi_struct.keys():
-            return False
-        data_object = self.pool.get('ir.model.data')
-      
-        fields_object = self.pool.get('ir.model.fields')
+        self.edi_document['__model'] = self._name
         
-        for field in self.edi_document.keys():
-            
-            if field in edi_struct.keys():
-                if field == 'model':
-                    model_name = edi_struct['model']
-                    record_ids = data_object.search(cr,uid,[('model','=',model_name)])
-                    for fname in data_object.browse(cr,uid,record_ids):
-                        if fname.name:
-                            xml_ID = fname.name
+        
+        fields_object = self.pool.get('ir.model.fields')
+        model_object = self.pool.get(self.edi_document['__model'])
+        edi_metadata(context=context)
+        for field in self.edi_struct.keys():
+            f_ids = fields_object.search(cr,uid,[('name','=',field),('model','=',self.edi_document['__model'])],context=context)
+            for fname in fields_object.browse(cr,uid,f_ids):
+                if fname.ttype == 'many2one':
                     
-            else:
-                
-                f_ids = fields_object.search(cr,uid,[('name','=',field),('model','=',model_name)],context=context)
-                for fname in fields_object.browse(cr,uid,f_ids):
-                    if fname.ttype == 'many2one':
-                        self.edi_document[field] = self.edi_m2o(edi_struct[field])
-                    elif fname.ttype == 'one2many':
-                        self.edi_ducument[field] = self.edi_o2m(edi_struct[field])
-                    elif fname.ttype == 'many2many':        
-                        self.edi_document[field] = self.edi_m2m(edi_struct[field])
+                    self.edi_document[field] = self.edi_m2o(edi_struct[field],fname.relation)
+                elif fname.ttype == 'one2many':
+                    self.edi_ducument[field] = self.edi_o2m(edi_struct[field],fname.relation)
+                elif fname.ttype == 'many2many':        
+                    self.edi_document[field] = self.edi_m2m(edi_struct[field],fname.relation)
+                else:
+                    self.edi_document[field] = model_object.read(cr,uid,[context['active_id']],[field],context=context)
         return self.edi_document
     def edi_import(self, cr, uid, edi_document, context=None):
     
@@ -240,4 +291,6 @@ class edi(object):
            generic algorithm.
         """
         # generic implementation!
+        for field in edi_document.keys():
+            
         pass

From 4deb609685c4fa002d13bb102fb141b09b4f6782 Mon Sep 17 00:00:00 2001
From: "Amit Parmar (OpenERP)" <aar@tinyerp.com>
Date: Wed, 1 Jun 2011 19:03:10 +0530
Subject: [PATCH 005/304] [EDI]: working on edi import

bzr revid: aar@tinyerp.com-20110601133310-nklnhlymx8u38nsg
---
 openerp/addons/base/ir/ir_edi.py | 81 ++++++++++++++++++++++----------
 1 file changed, 56 insertions(+), 25 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 9d66d4ed866..a87453fd277 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -38,7 +38,7 @@ def safe_unique_id(model, database_id):
     # finally, use the b64-encoded folded digest as ID part of the unique ID:
     digest = base64.urlsafe_b64encode(digest)
         
-    return '%s' % (digest)
+    return '%s-%s' % (model,digest)
 
 class ir_edi_document(osv.osv):
     _name = 'ir.edi.document'
@@ -51,7 +51,7 @@ class ir_edi_document(osv.osv):
     
     
     
-    def new_edi_token(self,cr,uid,ids,browse_records,database_id,context=None):
+    def new_edi_token(self,browse_records,database_id):
         
         """Generate new unique tokent value to uniquely identify each edi_document"""
         
@@ -71,15 +71,14 @@ class ir_edi_document(osv.osv):
     def generate_edi(self,browse_record_list):
         
         """ Generate the list of dictionaries using edi_export method of edi class """
-        
-        edi = edi()
+                
         edi_list = []
         for record in browse_record_list:
-            edi_struct = edi.edi_export(record)
+            edi_struct = record.edi_export(record)
             edi_list.append(edi_struct)
         return self.serialize(edi_list)
     
-    def get_document(self,cr,uid,ids,edi_token,context=None):
+    def get_document(self,cr,uid,edi_token,context=None):
         
         """Get the edi document from database using given edi token """
         
@@ -96,21 +95,21 @@ class ir_edi_document(osv.osv):
         
         """loads the values from list of dictionaries to the corresponding OpenERP records
             using the edi_import method of edi class"""
-        edi = edi()
+       
         edi_list = []
         for record in edi_list_of_dicts:
-            edi_record = edi.edi_import(record)
+            edi_record = record.edi_import(record)
             
         
         return True
     
-    def deserialize(self,edi_document_string):
+    def deserialize(self,cr,uid,edi_document_string,context=None):
         """ Deserialized the edi document string"""
         
         deserialize_string = json.loads(edi_document_string)
-        return self.load_edi(deserialize_string)
+        return self.load_edi(cr,uid,deserialize_string,context=context)
     
-    def export_doc(self, cr, uid, ids,browse_records,database_id,context=None):
+    def export_doc(self, cr, uid, browse_records, database_id, context=None):
         """the method handles the flow of the edi document generation and store it in 
             the database and return the edi_token of the particular document"""
         
@@ -129,10 +128,10 @@ class ir_edi_document(osv.osv):
             edi_loads method """
         
         if edi_document is not None:
-            self.deserialize(edi_document)
+            self.deserialize(cr,uid,edi_document,context=context)
         elif edi_url is not None:
             edi_document = urllib2.urlopen(edi_url).read()
-            self.deserialize(edi_document)
+            self.deserialize(cr,uid,edi_document,context=context)
 
         return True
     
@@ -149,7 +148,7 @@ class edi(object):
        specific behavior, based on the primitives provided by this superclass."""
     
     
-    def edi_metadata(self, cr, uid, ids, browse_rec_list, context=None):
+    def edi_metadata(self, cr, uid,browse_rec_list, context=None):
         """Return a list representing the boilerplate EDI structure for
            exporting the record in the given browse_rec_list, including
            the metadata fields"""
@@ -162,14 +161,18 @@ class edi(object):
                 self.edi_document['__module'] = data.module
                 if data.name is not None:
                     self.edi_document['__id'] = context['active_id']+':'+data.name
+                else:
+                    self.edi_document['__id'] = context['active_id']+':'+safe_unique_id(data.model,)
                 self.edi_document['__last_updata'] = context['__last_update'].values()[0]
             
         return True
 
-    def edi_m2o(self, cr, uid, ids, browse_rec,model=None,context=None):
+    def edi_m2o(self, cr, uid,browse_rec):
         """Return a list representing a M2O EDI value for
            the given browse_record."""
         # generic implementation!
+      
+        model = browse_rec._name           
         res = []
         data_object = self.pool.get('ir.model.data')
         uu_id = data_model.search(cr,uid,[('model','=',model)])
@@ -183,23 +186,26 @@ class edi(object):
                 if xml_ID is not None:
                     res.append(safe_unique_id(model,data.id)+':'+xml_ID)
                 else:
-                    res.append(safe_unique_id(model,data.id)+':'+model+'-'+safe_unique_id(model,data.id))
+                    res.append(safe_unique_id(model,data.id)+':'+safe_unique_id(model,data.id))
                 res.append(data.name)
         return res
 
-    def edi_o2m(self, cr, uid, ids, browse_rec_list, model=None, context=None):
+    def edi_o2m(self, cr, uid,line = None,browse_rec_list, context=None):
         """Return a list representing a O2M EDI value for
            the browse_records from the given browse_record_list."""
         # generic implementation!
         res = []
         init_data = {}
+        model = browse_rec_list._name
         data_object = self.pool.get('ir.model.data')
         uu_id = data_model.search(cr,uid,[('model','=',model)])
+         
         for xml in data_model.browse(cr,uid,uu_id):
             if xml:
                 xml_ID = xml.name
             else:
                 xml_ID = None
+            
         data_model = self.pool.get(model)
         for record in browse_rec_list:
             if xml_ID is not None:
@@ -207,14 +213,16 @@ class edi(object):
             else:
                 init_data['__id'] = safe_unique_id(model,record.id)+':'+model+'-'+safe_unique_id(model,record.id)  
             init_data['__last_update'] =record.write_date
-            init_data.update(datamodel.read(cr,uid,[record],[],context=context)[0])
+            init_data.update(self.determine_type(cr,uid,ids,line,record,context=context))
+            
             res.append(init_data)
         return res
 
-    def edi_m2m(self, cr, uid, ids, browse_rec_list,model=None, context=None):
+    def edi_m2m(self, cr, uid, line = None, browse_rec_list, context=None):
         """Return a list representing a M2M EDI value for
            the browse_records from the given browse_record_list."""
         # generic implementation!
+        model = browse_rec_list[0]._name
         res = []
         init_data = []
         data_object = self.pool.get('ir.model.data')
@@ -271,20 +279,43 @@ class edi(object):
         
         fields_object = self.pool.get('ir.model.fields')
         model_object = self.pool.get(self.edi_document['__model'])
-        edi_metadata(context=context)
-        for field in self.edi_struct.keys():
+        edi_metadata(edi_struct,context=context)
+        record = model_object.read(cr,uid,ids,[],context=context)
+        for field in edi_struct.keys():
             f_ids = fields_object.search(cr,uid,[('name','=',field),('model','=',self.edi_document['__model'])],context=context)
+            
             for fname in fields_object.browse(cr,uid,f_ids):
                 if fname.ttype == 'many2one':
                     
-                    self.edi_document[field] = self.edi_m2o(edi_struct[field],fname.relation)
+                    self.edi_document[field] = self.edi_m2o(cr, uid, browse_rec = record[0][field])
                 elif fname.ttype == 'one2many':
-                    self.edi_ducument[field] = self.edi_o2m(edi_struct[field],fname.relation)
+                    
+                    self.edi_ducument[field] = self.edi_o2m(cr,uid,line = edi_struct[field],browse_rec_list = record[0][field])
                 elif fname.ttype == 'many2many':        
-                    self.edi_document[field] = self.edi_m2m(edi_struct[field],fname.relation)
+                    self.edi_document[field] = self.edi_m2m(cr,uid,line = edi_struct[field],browse_rec_list = record[0][field])
                 else:
-                    self.edi_document[field] = model_object.read(cr,uid,[context['active_id']],[field],context=context)
+                    self.edi_document[field] = record[0][field]
+        
+            
         return self.edi_document
+    def determine_type(self,cr,uid,ids,record_line,browse_record=None,context=None):
+        model = browse_record._name
+        fields_object = self.pool.get('ir.model.fields')
+        obj = self.pool.get(model)
+        field_data = obj.read(cr,uid,browse_record.id,record_line.keys())[0]
+        for field in field_data.keys():
+            field_ids = field_object.search(cr,uid,[field])
+            for field_type in field_object.browse(cr,uid,field_ids): 
+                if field_type.ttype == 'many2one':
+                    record_line.update(field,self.edi_m2o(cr,uid,browse_rec = field_data[field]))
+                elif field_type.ttype == 'one2many':
+                    pass
+                elif field_type.ttype == 'many2many':
+                    pass
+                else:
+                    record_line.update(field,field_data[field])
+        return record_line
+        
     def edi_import(self, cr, uid, edi_document, context=None):
     
         """Imports a list of dicts representing an edi.document, using the

From 1e3ae46ec7a48a80b8625ae18aa654c936a8876c Mon Sep 17 00:00:00 2001
From: "Amit Parmar (OpenERP)" <aar@tinyerp.com>
Date: Thu, 2 Jun 2011 19:12:18 +0530
Subject: [PATCH 006/304] [EDI]: developing edi_import method

bzr revid: aar@tinyerp.com-20110602134218-32aolwbdbwkp63qp
---
 openerp/addons/base/ir/ir_edi.py | 78 ++++++++++++++++++++++++++++++--
 1 file changed, 75 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index a87453fd277..d5146b4c655 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -240,7 +240,9 @@ class edi(object):
                 init_data.append(safe_unique_id(model,record.id)+':'+model+'-'+safe_unique_id(model,record.id))
             if record.name is not None:
                 init_data.append('name:'+record.name)
-            res.append(init_data)    
+            res.append(init_data) 
+            
+            # blob:   
         return res
 
     def edi_export(self, cr, uid, ids, edi_struct=None, context=None):
@@ -279,7 +281,7 @@ class edi(object):
         
         fields_object = self.pool.get('ir.model.fields')
         model_object = self.pool.get(self.edi_document['__model'])
-        edi_metadata(edi_struct,context=context)
+        edi_metadata(cr, uid, edi_struct, context=context)
         record = model_object.read(cr,uid,ids,[],context=context)
         for field in edi_struct.keys():
             f_ids = fields_object.search(cr,uid,[('name','=',field),('model','=',self.edi_document['__model'])],context=context)
@@ -322,6 +324,76 @@ class edi(object):
            generic algorithm.
         """
         # generic implementation!
+        new = True
+        resource = {}
+        model = edi_document['__model']
+        model_object = self.pool.get(model)
+        data_model = self.pool.get('ir.model.data')
+        field_model = self.pool.get('ir.model.fields')
         for field in edi_document.keys():
+            if field == '__id':
+                db_id , xml_ID = edi_document[field].split(':')
+                self.data_ids = data_model.search(cr,uid,[('name','=',xml_ID)])
             
-        pass
+               
+            f_ids = fields_object.search(cr,uid,[('name','=',field),('model','=',model)],context=context)
+            for fname in fields_object.browse(cr,uid,f_ids):
+                
+                if fname.ttype == 'many2one':
+                    field_ids,field_xml = edi_document[field][0].split(':')
+                    field_ids = int(field_ids)
+                    model_ids = data_model.search(cr,uid,[('name','=',field_xml)])
+                    if not len(model_ids):
+                        obj = self.pool.get(fname.relation)
+                        model1_ids = obj.search(cr,uid,[('name','=',edi_document[field][1])])
+                        if len(model1_ids) == 1:
+                            resourse[field] = data_model.create(cr,uid,{'module':'edi_import','name':field_xml,'res_id':model1_ids})[0]
+                          
+                        elif not len(model1_ids) or len(model1_ids) > 1:
+                            edi_document[field][1] = obj.create(cr,uid,{'name':edi_document[field][1]})
+                            resource[field] = data_model.create(cr,uid,{'module':'edi_import','name':field_xml,'res_id':edi_document[field][0]})[0]   
+                    else:
+                        resource[field] = model_ids[0]
+                                
+                elif fname.ttype == 'one2many':
+                    for records in edi_document[field]:
+                        res = {}
+                        field_ids,field_xml = records['__id'].split(':')
+                        field_ids = int(field_ids)
+                        model3_ids = data_model.search(cr,uid,[('name','=',field_xml)])
+                        for fields in records.keys():
+                            if fields != '__id' or fields != '__last_update':
+                                res[fields] = records[fields]
+                        if not len(model3_ids):
+                            resource[field][records] = (4,self.edi_import(cr,uid,res,context = context)[0])
+                        else:
+                            resource[field][records] = (4,model3_ids[0])obj = self.pool.get(model)
+                record_ids = obj.create(cr,uid,resource,context=context)
+                return record_ids
+                        
+                elif fname.ttype == 'many2many':        
+                    for records in edi_document[field]:
+                        field_ids,field_xml = records[0].split(':')
+                        field_ids = int(field_ids)
+                        model4_ids = data_model.search(cr,uid,[('name','=',field_xml)])
+                        if not len(model4_ids):
+                            obj = self.pool.get(fname.relation)
+                            name,value = records[1].split(':')
+                            model5_ids = obj.search(cr,uid,[(name,'=',value)])
+                            if len(model5_ids) == 1:
+                                resource[field][records] = data_model.create(cr,uid,{'module':'edi_import','name':field_xml,'res_id':model5_ids})[0]
+                            elif not len(model5_ids) or len(model5_ids) > 1:
+                                edi_document[field][records][1] = obj.create(cr,uid,{'name':edi_document[field][1]})
+                                resource[field] = (4,data_model.create(cr,uid,{'module':'edi_import','name':field_xml,'res_id':edi_document[field][records][1]})[0])  
+                        else:
+                            resource[field] = (4,model4_ids[0])
+                else:
+                    resource[field] = edi_document[field]
+        if len(self.data_ids):
+            obj = self.pool.get(model)
+            record_ids = obj.write(cr,uid,resource,context=context)
+            return record_ids
+        else:
+            obj = self.pool.get(model)
+            record_ids = obj.create(cr,uid,resource,context=context)
+            return record_ids

From f1ce7642fbf5edcb1cb392f4a7a1feb0a3725888 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 3 Jun 2011 12:59:50 +0530
Subject: [PATCH 007/304] [REVIEW] edi: optimize code

bzr revid: hmo@tinyerp.com-20110603072950-441p4kd4vyvzpo7a
---
 openerp/addons/base/ir/ir_edi.py | 344 +++++++++++++++++--------------
 1 file changed, 190 insertions(+), 154 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index d4d3692203d..2a0c9282de9 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -27,10 +27,24 @@ import base64
 import urllib2
 
 def safe_unique_id(model, database_id):
-
     """Generate a unique string to represent a (model,database id) pair
     without being too long, without revealing the database id, and
     with a very low probability of collisions.
+
+    Each EDI record and each relationship value are represented using a unique
+    database identifier. These database identifiers include the database unique
+    ID, as a way to uniquely refer to any record within any OpenERP instance,
+    without conflict.
+
+    For OpenERP records that have an existing "XML ID" (i.e. an entry in
+    ir.model.data), the EDI unique identifier for this record will be made of
+    "%s:%s" % (the database's UUID, the XML ID). The database's UUID MUST
+    NOT contain a colon characters (this is guaranteed by the UUID algorithm).
+
+    For OpenERP records that have no existing "XML ID", a new one should be
+    created during the EDI export. It is recommended that the generated XML ID
+    contains a readable reference to the record model, plus a unique value that
+    hides the database ID.
     """
     msg = "%s-%s-%s" % (model, time.time(), database_id)
     digest = hashlib.sha1(msg).digest()
@@ -42,10 +56,10 @@ def safe_unique_id(model, database_id):
 
 class ir_edi_document(osv.osv):
     _name = 'ir.edi.document'
-    _description = 'ir_edi_document'
+    _description = 'To represent the EDI export of any OpenERP record, it could be an invoice, a project task, etc.
     _columns = {
-                'name': fields.char("EDI token", size = 128),
-                'document': fields.text("Document")
+                'name': fields.char("EDI token", size = 128, help="EDI Token is a unique identifier for the EDI document."),
+                'document': fields.text("Document", help="hold the serialization of the EDI document.")
                 
     }
     _sql_constraints = [
@@ -53,90 +67,115 @@ class ir_edi_document(osv.osv):
     ]
     
     
-    def new_edi_token(self,browse_records,database_id):
-        
-        """Generate new unique tokent value to uniquely identify each edi_document"""
-        
-        db_uuid = safe_unique_id(browse_records, database_id)
-        edi_token = hashlib.sha256('%s-%s-%s' % (time.time(),db_uuid,time.time())).hexdigest()
-
-
+    def new_edi_token(self, record):
+        """
+        Return a new, random unique token to identify an edi.document
+        :param record: It's a object of browse_record of any model
+        """
+        db_uuid = safe_unique_id(record._name, record.id)
+        edi_token = hashlib.sha256('%s-%s-%s' % (time.time(), db_uuid, time.time())).hexdigest()
         return edi_token
     
-    def serialize(self,edi_list_of_dicts):
-        
-        """Serialize the list of dictionaries using json dumps method"""
-        
-        serialized_list = json.dumps(edi_list_of_dicts)
+    def serialize(self, edi_documents):
+        """Serialize the list of dictionaries using json dumps method
+        perform a JSON serialization of a list of dicts prepared by generate_edi() and return a UTF-8 encoded string that could be passed to deserialize()
+        :param edi_dicts: it's list of edi_dict
+        """
+        serialized_list = json.dumps(edi_dicts)
         return serialized_list
     
-    def generate_edi(self,browse_record_list):
-        
-        """ Generate the list of dictionaries using edi_export method of edi class """
-                
+    def generate_edi(self, cr, uid, records, context=None):
+        """
+        Generate the list of dictionaries using edi_export method of edi class 
+        :param records: it's a object of browse_record_list of any model
+        """
         edi_list = []
-        for record in browse_record_list:
-            edi_struct = record.edi_export(record)
+        for record in record_list:
+            edi_struct = record.edi_export(cr, uid, record, context=context)
             edi_list.append(edi_struct)
         return self.serialize(edi_list)
     
-    def get_document(self,cr,uid,edi_token,context=None):
+    def get_document(self, cr, uid, edi_token, context=None):
+        """
+        Get the edi document from database using given edi token 
+        returns the string serialization that is in the database (column: document) for the given edi_token or raise.
+        """
         
-        """Get the edi document from database using given edi token """
-        
-        records = self.search(cr,uid,[('name','=',edi_token)],context=context)
+        records = self.name_search(cr, uid, edi_token, context=context)
         if records:
-            doc_string = self.read(cr,uid,records,['document'],context=context)
+            edi = self.browse(cr, uid, records[0], context=context)
+            return edi.document
         else:
             raise osv.except_osv(_('Error !'),
                 _('Desired EDI Document does not Exist'))  
         
-        return doc_string
+        
     
-    def load_edi(self,cr,uid,ids,edi_list_of_dicts,context=None):
-        
-        """loads the values from list of dictionaries to the corresponding OpenERP records
-            using the edi_import method of edi class"""
-       
-        edi_list = []
-        for record in edi_list_of_dicts:
-            edi_record = record.edi_import(record)
-            
-        
-        return True
-    
-    def deserialize(self,cr,uid,edi_document_string,context=None):
-        """ Deserialized the edi document string"""
-        
-        deserialize_string = json.loads(edi_document_string)
-        return self.load_edi(cr,uid,deserialize_string,context=context)
-    
-    def export_doc(self, cr, uid, browse_records, database_id, context=None):
-        """the method handles the flow of the edi document generation and store it in 
-            the database and return the edi_token of the particular document"""
-        
-        edi_document = {
-                     'name': self.new_edi_token(browse_records,database_id),
-                     'document': self.generate_edi(browse_records)
-                    }
-        
-        unique_id = self.create(cr,uid,edi_document,context=context)
-        return edi_document['name']
-    
-    def import_doc(self, cr, uid, ids, edi_document=None,edi_url=None,context=None):
-        
-        """the method handles the flow of importing particular edi document and 
-            updates the database values on the basis of the edi document using 
-            edi_loads method """
-        
-        if edi_document is not None:
-            self.deserialize(cr,uid,edi_document,context=context)
-        elif edi_url is not None:
-            edi_document = urllib2.urlopen(edi_url).read()
-            self.deserialize(cr,uid,edi_document,context=context)
+    def load_edi(self, cr, uid, edi_documents, context=None):
+        """
+        loads the values from list of dictionaries to the corresponding OpenERP records
+        using the edi_import method of edi class
+        For each edi record (dict) in the list, call the corresponding osv.edi_import() method, based on the __model attribute (see section 2.4 of  for spec of 
+        osv.edi_import)
 
+        :param edi_dicts: list of edi_dict
+        """
+       
+        for edi_document in edi_documents:
+            model = edi_document.get('__model')
+            assert model, _('model should be provided in EDI Dict')
+            model_obj = self.pool.get(model)
+            model_obj.edi_import(cr, uid, edi_document, context=context)
         return True
     
+    def deserialize(self, edi_document_string):
+        """ Deserialized the edi document string
+        perform JSON deserialization from an edi document string, and returns a list of dicts
+        """
+        edi_document = json.loads(edi_document_string)
+        return edi_document
+    
+    def export(self, cr, uid, records, context=None):
+        """
+        The method handles the flow of the edi document generation and store it in 
+            the database and return the edi_token of the particular document
+        Steps: 
+        * call generate_edi() to get a serialization and new_edi_token() to get a unique ID
+        * serialize the list returned by generate_edi() using serialize(), and save it in database with unique ID.
+        * return the unique ID
+
+        : param records: list of browse_record of any model
+        """
+        exported_ids = []
+        for record in records:
+            document = self.generate_edi(cr, uid, [record], context)
+            token = self.new_edi_token(record)
+            self.create(cr, uid, {
+                         'name': token,
+                         'document': document
+                        }, context=context)
+        
+            exported_ids.append(token)
+        return exported_ids
+    
+    def import(self, cr, uid, edi_document=None, edi_url=None, context=None):
+        """
+        The method handles the flow of importing particular edi document and 
+        updates the database values on the basis of the edi document using 
+        edi_loads method
+        
+        * N: a serialized edi.document or the URL to download a serialized document
+        * If a URL is provided, download it first to get the document
+        * Calls deserialize() to get the resulting list of dicts from the document
+        * Call load_edi() with the list of dicts, to create or update the corresponding OpenERP records based on the edi.document.
+        """
+        
+        if edi_url and not edi_document:
+            edi_document = urllib2.urlopen(edi_url).read()
+        assert edi_document, _('EDI Document should be provided')            
+        edi_documents = self.deserialize(edi_document)
+        return self.load_edi(cr, uid, edi_documents, context=context)
+    
 ir_edi_document()
 
     
@@ -150,102 +189,99 @@ class edi(object):
        specific behavior, based on the primitives provided by this superclass."""
     
     
-    def edi_metadata(self, cr, uid,browse_rec_list, context=None):
+    def edi_metadata(self, cr, uid, records, context=None):
         """Return a list representing the boilerplate EDI structure for
            exporting the record in the given browse_rec_list, including
-           the metadata fields"""
-        # generic implementation!
-        data_object = self.pool.get('ir.model.data')
+           the metadata fields
         
-        if self.edi_document['__model'] is not None:
-            model_ids = data_object.search(cr,uid,[('model','=',self.edi_document['__model'])],context=context)
-            for data in data_object.browse(cr,uid,model_ids):
-                self.edi_document['__module'] = data.module
-                if data.name is not None:
-                    self.edi_document['__id'] = context['active_id']+':'+data.name
-                else:
-                    self.edi_document['__id'] = context['active_id']+':'+safe_unique_id(data.model,)
-                self.edi_document['__last_updata'] = context['__last_update'].values()[0]
+        The metadata fields MUST always include:
+        - __model': the OpenERP model name
+        - __module': the OpenERP module containing the model
+        - __id': the unique (cross-DB) identifier for this record
+        - __last_update': last update date of record, ISO date string in UTC
+        - __version': a list of components for the version
+        - __attachments': a list (possibly empty) of dicts describing the files attached to this record.
+        """
+        # generic implementation!
+        attachment_object = self.pool.get('ir.attachment')
+        edi_dict_list = []
+        for record in records:
+            attachment_ids = attachment_object.search(cr, uid, [('res_model','=', record._name), ('res_id', '=', record.id)])
+            attachment_dict_list = []
+            for attachment in attachment_object.browse(cr, uid, attachment_ids, context=context):
+                attachment_dict_list.append({
+                        'name' : attachment.name,
+                        'content': base64.encodestring(attachment.datas),
+                        'file_name': attachment.datas_fname,
+                })
+            edi_dict = {
+                '__model' : record._name,
+                '__module' : record._module,
+                '__id': record.id,
+                '__last_update': record.write_date, #TODO: convert into UTC
+                '__version': [], # ?
+                '__attachments': attachment_dict_list
+            }
+            edi_dict_list.append(edi_dict)
             
-        return True
+        return edi_dict_list
 
-    def edi_m2o(self, cr, uid,browse_rec):
+    def edi_m2o(self, cr, uid, record, context=None):
         """Return a list representing a M2O EDI value for
-           the given browse_record."""
+           the given browse_record.
+        M2O are passed as pair (ID, Name)
+        Exmaple: ['db-uuid:xml-id',  'Partner Name']
+        """
         # generic implementation!
-      
-        model = browse_rec._name           
-        res = []
         data_object = self.pool.get('ir.model.data')
-        uu_id = data_model.search(cr,uid,[('model','=',model)])
-        for xml in data_model.browse(cr,uid,uu_id):
-            if xml:
-                xml_ID = xml.name
-            else:
-                xml_ID = None
-        for data in browse_rec:
-            if data.name is not None:
-                if xml_ID is not None:
-                    res.append(safe_unique_id(model,data.id)+':'+xml_ID)
-                else:
-                    res.append(safe_unique_id(model,data.id)+':'+safe_unique_id(model,data.id))
-                res.append(data.name)
-        return res
+        db_uuid = safe_unique_id(record._name, record.id)
+        xml_ids = data_object.search(cr, uid, [('model','=',record._name),('res_id','=',record.id)])
+        if xml_ids:
+            xml_id = data_object.browse(cr, uid, xml_ids[0], context=context)
+            xml_id = xml_id.name
+            db_uuid = '%s:%s' %(db_uuid, xml_id)
+        name = record.name
+        return [db_uuid, name]
+        
 
-    def edi_o2m(self, cr, uid,line = None,browse_rec_list, context=None):
+    def edi_o2m(self, cr, uid, records, context=None):
         """Return a list representing a O2M EDI value for
-           the browse_records from the given browse_record_list."""
-        # generic implementation!
-        res = []
-        init_data = {}
-        model = browse_rec_list._name
-        data_object = self.pool.get('ir.model.data')
-        uu_id = data_model.search(cr,uid,[('model','=',model)])
-         
-        for xml in data_model.browse(cr,uid,uu_id):
-            if xml:
-                xml_ID = xml.name
-            else:
-                xml_ID = None
-            
-        data_model = self.pool.get(model)
-        for record in browse_rec_list:
-            if xml_ID is not None:
-                init_data['__id'] = safe_unique_id(model,record.id)+':'+xml_ID
-            else:
-                init_data['__id'] = safe_unique_id(model,record.id)+':'+model+'-'+safe_unique_id(model,record.id)  
-            init_data['__last_update'] =record.write_date
-            init_data.update(self.determine_type(cr,uid,ids,line,record,context=context))
-            
-            res.append(init_data)
-        return res
+           the browse_records from the given browse_record_list.
 
-    def edi_m2m(self, cr, uid, line = None, browse_rec_list, context=None):
-        """Return a list representing a M2M EDI value for
-           the browse_records from the given browse_record_list."""
+        Example:
+         [                                # O2M fields would be a list of dicts, with their
+           { '__id': 'db-uuid:xml-id',    # own __id.
+             '__last_update': 'iso date', # The update date, just in case...
+             'name': 'some name',
+             ...
+           }],
+        """
         # generic implementation!
-        model = browse_rec_list[0]._name
-        res = []
-        init_data = []
-        data_object = self.pool.get('ir.model.data')
-        uu_id = data_model.search(cr,uid,[('model','=',model)])
-        for xml in data_model.browse(cr,uid,uu_id):
-            if xml:
-                xml_ID = xml.name
-            else:
-                xml_ID = None
-        data_model = self.pool.get(model)
-        for record in browse_rec_list:
-            if xml_ID is not None:
-                init_data.append(safe_unique_id(model,record.id)+':'+xml_ID)
-            else:
-                init_data.append(safe_unique_id(model,record.id)+':'+model+'-'+safe_unique_id(model,record.id))
-            if record.name is not None:
-                init_data.append('name:'+record.name)
-            res.append(init_data) 
-            
-            # blob:   
-        return res
+        dict_list = []
+        for record in records:
+            model_obj = self.pool.get(record._name)
+            dict_list += model_obj.edi_export(cr, uid, [record.id], context=context)
+        return dict_list
+        
+
+    def edi_m2m(self, cr, uid, records, context=None):
+        """Return a list representing a M2M EDI value for
+           the browse_records from the given browse_record_list.
+
+        Example: 
+        'related_tasks': [                 # M2M fields would exported as a list of pairs,
+                  ['db-uuid:xml-id1',      # similar to a list of M2O values.
+                   'Task 01: bla bla'],
+                  ['db-uuid:xml-id2',
+                   'Task 02: bla bla']
+            ]
+        """
+        # generic implementation!
+        dict_list = []
+        for record in records:
+            dict_list.append(self.edi_o2m(cr, uid, record, context=None))
+           
+        return dict_list
 
     def edi_export(self, cr, uid, ids, edi_struct=None, context=None):
         """Returns a list of dicts representing an edi.document containing the

From ef7ee72f406efb58ea5c9863d4b3fa5d698f547a Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 3 Jun 2011 14:34:08 +0530
Subject: [PATCH 008/304] [REVIEW] edi: refactor code in import/export method

bzr revid: hmo@tinyerp.com-20110603090408-fcumns7va18trdwx
---
 openerp/addons/base/ir/ir_edi.py | 235 +++++++++++++++----------------
 1 file changed, 112 insertions(+), 123 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 2a0c9282de9..c428bca7cb2 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -89,10 +89,8 @@ class ir_edi_document(osv.osv):
         Generate the list of dictionaries using edi_export method of edi class 
         :param records: it's a object of browse_record_list of any model
         """
-        edi_list = []
-        for record in record_list:
-            edi_struct = record.edi_export(cr, uid, record, context=context)
-            edi_list.append(edi_struct)
+        
+        edi_list = self.edi_export(cr, uid, records, context=context)
         return self.serialize(edi_list)
     
     def get_document(self, cr, uid, edi_token, context=None):
@@ -283,6 +281,8 @@ class edi(object):
            
         return dict_list
 
+
+
     def edi_export(self, cr, uid, ids, edi_struct=None, context=None):
         """Returns a list of dicts representing an edi.document containing the
            browse_records with ``ids``, using the generic algorithm.
@@ -303,135 +303,124 @@ class edi(object):
                               be included in the exported data.
         """
         # generic implementation!
-        
-        self.edi_document = {
-                      
-                      '__model':'',
-                      '__module':'',
-                      '__id':'',
-                      '__last_update':'',
-                      '__version':'',
-                      '__attachments':'',
-                      
-                      }
-        self.edi_document['__model'] = self._name
+        if context is None:
+            context = {}
+        _fields = self.fields_get(cr, uid, context=context)
         
         
-        fields_object = self.pool.get('ir.model.fields')
-        model_object = self.pool.get(self.edi_document['__model'])
-        edi_metadata(cr, uid, edi_struct, context=context)
-        record = model_object.read(cr,uid,ids,[],context=context)
-        for field in edi_struct.keys():
-            f_ids = fields_object.search(cr,uid,[('name','=',field),('model','=',self.edi_document['__model'])],context=context)
-            
-            for fname in fields_object.browse(cr,uid,f_ids):
-                if fname.ttype == 'many2one':
-                    
-                    self.edi_document[field] = self.edi_m2o(cr, uid, browse_rec = record[0][field])
-                elif fname.ttype == 'one2many':
-                    
-                    self.edi_ducument[field] = self.edi_o2m(cr,uid,line = edi_struct[field],browse_rec_list = record[0][field])
-                elif fname.ttype == 'many2many':        
-                    self.edi_document[field] = self.edi_m2m(cr,uid,line = edi_struct[field],browse_rec_list = record[0][field])
+        fields_to_export = edi_struct and edi_struct.keys() or _fields.key()
+        
+        edi_dict_list = []
+        for row in self.browse(cr, uid, ids, fields_to_export, context):
+            edi_dict = {}
+            edi_dict.update(self.edi_metadata(cr, uid, [row.id], context=context)[0])
+            for field in fields_to_export:
+                cols = self._fields[field]
+                if cols['type'] == 'many2one':
+                    m2o_record = row.getattrs(field)
+                    value = self.m2o(cr, uid, m2o_record, context=context)
+                elif cols['type'] == 'many2many':
+                    m2m_records = row.getattrs(field)
+                    value = self.m2m(cr, uid, m2m_records, context=context)
+                elif cols['type'] == 'one2many':
+                    o2m_records = row.getattrs(field)
+                    value = self.o2m(cr, uid, o2m_records, context=context)
                 else:
-                    self.edi_document[field] = record[0][field]
+                    value = row.getattrs(field)
+                edi_dict[field] = value
+            edi_dict_list.append(edi_dict)
+        return edi_dict_list
         
-            
-        return self.edi_document
-    def determine_type(self,cr,uid,ids,record_line,browse_record=None,context=None):
-        model = browse_record._name
-        fields_object = self.pool.get('ir.model.fields')
-        obj = self.pool.get(model)
-        field_data = obj.read(cr,uid,browse_record.id,record_line.keys())[0]
-        for field in field_data.keys():
-            field_ids = field_object.search(cr,uid,[field])
-            for field_type in field_object.browse(cr,uid,field_ids): 
-                if field_type.ttype == 'many2one':
-                    record_line.update(field,self.edi_m2o(cr,uid,browse_rec = field_data[field]))
-                elif field_type.ttype == 'one2many':
-                    pass
-                elif field_type.ttype == 'many2many':
-                    pass
-                else:
-                    record_line.update(field,field_data[field])
-        return record_line
         
     def edi_import(self, cr, uid, edi_document, context=None):
     
         """Imports a list of dicts representing an edi.document, using the
            generic algorithm.
+
+             All relationship fields are exported in a special way, and provide their own
+             unique identifier, so that we can avoid duplication of records when importing.
+             Note: for all ir.model.data entries, the "module" value to use for read/write
+                   should always be "edi_import", and the "name" value should be the full
+                   db_id provided in the EDI.
+
+             1: Many2One
+             M2O fields are always exported as a pair [db_id, name], where db_id
+             is in the form "db_uuid:xml_id", both being values that come directly
+             from the original database.
+             The import should behave like this:
+                 a. Look in ir.model.data for a record that matches the db_id.
+                    If found, replace the m2o value with the correct database ID and stop.
+                    If not found, continue to next step.
+                 b. Perform name_search(name) to look for a record that matches the
+                    given m2o name. If only one record is found, create the missing
+                    ir.model.data record to link it to the db_id, and the replace the m2o
+                    value with the correct database ID, then stop. If zero result or
+                    multiple results are found, go to next step.
+                 c. Create the new record using the only field value that is known: the
+                    name, and create the ir.model.data entry to map to it.
+                    This should work for many models, and if not, the module should
+                    provide a custom EDI import logic to care for it.
+
+             2: One2Many
+             O2M fields are always exported as a list of dicts, where each dict corresponds
+             to a full EDI record. The import should not update existing records
+             if they already exist, it should only link them to the parent object.
+                 a. Look for a record that matches the db_id provided in the __id field. If
+                    found, keep the corresponding database id, and connect it to the parent
+                    using a write value like (4,db_id).
+                 b. If not found via db_id, create a new entry using the same method that
+                    imports a full EDI record (recursive call!), grab the resulting db id,
+                    and use it to connect to the parent via a write value like (4, db_id).
+
+             3: Many2Many
+             M2M fields are always exported as a list of pairs similar to M2O.
+             For each pair in the M2M:
+                 a. Perform the same steps as for a Many2One (see 1.2.1.1)
+                 b. After finding the database ID of the final record in the database,
+                    connect it to the parent record via a write value like (4, db_id).        
         """
         # generic implementation!
-        new = True
-        resource = {}
-        model = edi_document['__model']
-        model_object = self.pool.get(model)
-        data_model = self.pool.get('ir.model.data')
-        field_model = self.pool.get('ir.model.fields')
+        fields = edi_document.keys()
+        fields_to_import = []
+        data_line = []
+        _fields = self.fields_get(cr, uid, context=context)
         for field in edi_document.keys():
-            if field == '__id':
-                db_id , xml_ID = edi_document[field].split(':')
-                self.data_ids = data_model.search(cr,uid,[('name','=',xml_ID)])
-            
-               
-            f_ids = fields_object.search(cr,uid,[('name','=',field),('model','=',model)],context=context)
-            for fname in fields_object.browse(cr,uid,f_ids):
-                
-                if fname.ttype == 'many2one':
-                    field_ids,field_xml = edi_document[field][0].split(':')
-                    field_ids = int(field_ids)
-                    model_ids = data_model.search(cr,uid,[('name','=',field_xml)])
-                    if not len(model_ids):
-                        obj = self.pool.get(fname.relation)
-                        model1_ids = obj.search(cr,uid,[('name','=',edi_document[field][1])])
-                        if len(model1_ids) == 1:
-                            resourse[field] = data_model.create(cr,uid,{'module':'edi_import','name':field_xml,'res_id':model1_ids})[0]
-                          
-                        elif not len(model1_ids) or len(model1_ids) > 1:
-                            edi_document[field][1] = obj.create(cr,uid,{'name':edi_document[field][1]})
-                            resource[field] = data_model.create(cr,uid,{'module':'edi_import','name':field_xml,'res_id':edi_document[field][0]})[0]   
-                    else:
-                        resource[field] = model_ids[0]
-                                
-                elif fname.ttype == 'one2many':
-                    for records in edi_document[field]:
-                        res = {}
-                        field_ids,field_xml = records['__id'].split(':')
-                        field_ids = int(field_ids)
-                        model3_ids = data_model.search(cr,uid,[('name','=',field_xml)])
-                        for fields in records.keys():
-                            if fields != '__id' or fields != '__last_update':
-                                res[fields] = records[fields]
-                        if not len(model3_ids):
-                            resource[field][records] = (4,self.edi_import(cr,uid,res,context = context)[0])
-                        else:
-                            resource[field][records] = (4,model3_ids[0])obj = self.pool.get(model)
-                record_ids = obj.create(cr,uid,resource,context=context)
-                return record_ids
-                        
-                elif fname.ttype == 'many2many':        
-                    for records in edi_document[field]:
-                        field_ids,field_xml = records[0].split(':')
-                        field_ids = int(field_ids)
-                        model4_ids = data_model.search(cr,uid,[('name','=',field_xml)])
-                        if not len(model4_ids):
-                            obj = self.pool.get(fname.relation)
-                            name,value = records[1].split(':')
-                            model5_ids = obj.search(cr,uid,[(name,'=',value)])
-                            if len(model5_ids) == 1:
-                                resource[field][records] = data_model.create(cr,uid,{'module':'edi_import','name':field_xml,'res_id':model5_ids})[0]
-                            elif not len(model5_ids) or len(model5_ids) > 1:
-                                edi_document[field][records][1] = obj.create(cr,uid,{'name':edi_document[field][1]})
-                                resource[field] = (4,data_model.create(cr,uid,{'module':'edi_import','name':field_xml,'res_id':edi_document[field][records][1]})[0])  
-                        else:
-                            resource[field] = (4,model4_ids[0])
+            if not field.startwith('__'):
+                field_to_import.append(field)
+                edi_field_value = edi_document[field]
+                if _fields[field]['type'] == 'many2one':
+                    #Look in ir.model.data for a record that matches the db_id.
+                    #If found, replace the m2o value with the correct database ID and stop.
+                    #If not found, continue to next step.
+
+                    #Perform name_search(name) to look for a record that matches the
+                    #given m2o name. If only one record is found, create the missing
+                    #ir.model.data record to link it to the db_id, and the replace the m2o
+                    #value with the correct database ID, then stop. If zero result or
+                    #multiple results are found, go to next step.
+
+                    #Create the new record using the only field value that is known: the
+                    #name, and create the ir.model.data entry to map to it.
+                    #This should work for many models, and if not, the module should
+                    #provide a custom EDI import logic to care for it.
+                    pass
+                elif _fields[field]['type'] == 'one2many':
+                    #Look for a record that matches the db_id provided in the __id field. If
+                    #found, keep the corresponding database id, and connect it to the parent
+                    #using a write value like (4,db_id).
+
+                    #If not found via db_id, create a new entry using the same method that
+                    #imports a full EDI record (recursive call!), grab the resulting db id,
+                    #and use it to connect to the parent via a write value like (4, db_id).
+                elif _fields[field]['type'] == 'many2many':
+                    #Perform the same steps as for a Many2One (see 1.2.1.1)
+
+
+
+                    #After finding the database ID of the final record in the database,
+                    #connect it to the parent record via a write value like (4, db_id).
                 else:
-                    resource[field] = edi_document[field]
-        if len(self.data_ids):
-            obj = self.pool.get(model)
-            record_ids = obj.write(cr,uid,resource,context=context)
-            return record_ids
-        else:
-            obj = self.pool.get(model)
-            record_ids = obj.create(cr,uid,resource,context=context)
-            return record_ids
+                    data_line.append(edi_field_value)
+        
+        return self.import_data(cr, uid, field_to_import, [data_line], mode='init', current_module='edi_import', noupdate=False, context=context, filename=None)
+        

From eaec4a25f23e4182bc5620f1a9dcef664f811861 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 3 Jun 2011 14:41:09 +0530
Subject: [PATCH 009/304] [REVIEW] edi: refactor code in generate_edi()

bzr revid: hmo@tinyerp.com-20110603091109-e1gn7mr0gpcr88sy
---
 openerp/addons/base/ir/ir_edi.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index c428bca7cb2..1fc9371b66c 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -90,7 +90,10 @@ class ir_edi_document(osv.osv):
         :param records: it's a object of browse_record_list of any model
         """
         
-        edi_list = self.edi_export(cr, uid, records, context=context)
+        edi_list = []
+        for record in records:
+            record_model_obj = self.pool.get(record._name)
+            edi_list += record_model_obj.edi_export(cr, uid, [record], context=context)
         return self.serialize(edi_list)
     
     def get_document(self, cr, uid, edi_token, context=None):

From 9cb3205a6432ccc7ba2458416786774b39bc50d6 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 3 Jun 2011 15:25:26 +0530
Subject: [PATCH 010/304] [FIX] fix problem of search multiple conditions O2M
 with active=False then not work.

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

bzr revid: ysa@tinyerp.com-20110603095526-s26wgkahwc1d6zfd
---
 openerp/osv/expression.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index 1922d5e8388..4c74a11506a 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -108,6 +108,10 @@ class expression(object):
         self.__main_table = table
         self.__all_tables.add(table)
 
+        active = False
+        for exp in self.__exp:
+            if exp[0] == 'active':
+                active = exp
         i = -1
         while i + 1<len(self.__exp):
             i += 1
@@ -150,7 +154,10 @@ class expression(object):
                 # Making search easier when there is a left operand as field.o2m or field.m2m
                 if field._type in ['many2many','one2many']:
                     right = field_obj.search(cr, uid, [(fargs[1], operator, right)], context=context)
-                    right1 = table.search(cr, uid, [(fargs[0],'in', right)], context=context)
+                    if active:
+                        right1 = table.search(cr, uid, [(fargs[0],'in', right),active], context=context)
+                    else:
+                        right1 = table.search(cr, uid, [(fargs[0],'in', right)], context=context)
                     if right1 == []:
                         self.__exp[i] = ( 'id', '=', 0 )
                     else:
@@ -292,12 +299,12 @@ class expression(object):
                 else:
                     def _get_expression(field_obj,cr, uid, left, right, operator, context=None):
                         if context is None:
-                            context = {}                        
+                            context = {}
                         c = context.copy()
                         c['active_test'] = False
                         #Special treatment to ill-formed domains
                         operator = ( operator in ['<','>','<=','>='] ) and 'in' or operator
-                        
+
                         dict_op = {'not in':'!=','in':'=','=':'in','!=':'not in','<>':'not in'}
                         if isinstance(right,tuple):
                             right = list(right)
@@ -319,7 +326,7 @@ class expression(object):
                         elif isinstance(right,(list,tuple)):
                             m2o_str = True
                             for ele in right:
-                                if not isinstance(ele, basestring): 
+                                if not isinstance(ele, basestring):
                                     m2o_str = False
                                     break
                     elif right == []:
@@ -335,7 +342,7 @@ class expression(object):
                             new_op = '!='
                         #Is it ok to put 'left' and not 'id' ?
                         self.__exp[i] = (left,new_op,False)
-                        
+
                     if m2o_str:
                         self.__exp[i] = _get_expression(field_obj,cr, uid, left, right, operator, context=context)
             else:

From 2a9a5e2a0e3fdf1bc104e1a5c923baf85f1d963b Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 3 Jun 2011 15:42:17 +0530
Subject: [PATCH 011/304] Improve code.

bzr revid: ysa@tinyerp.com-20110603101217-v69rcqtpcfics925
---
 openerp/osv/expression.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index 4c74a11506a..8fb85ce7612 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -154,10 +154,10 @@ class expression(object):
                 # Making search easier when there is a left operand as field.o2m or field.m2m
                 if field._type in ['many2many','one2many']:
                     right = field_obj.search(cr, uid, [(fargs[1], operator, right)], context=context)
+                    domain = [(fargs[0],'in', right)]
                     if active:
-                        right1 = table.search(cr, uid, [(fargs[0],'in', right),active], context=context)
-                    else:
-                        right1 = table.search(cr, uid, [(fargs[0],'in', right)], context=context)
+                        domain.append(active)
+                    right1 = table.search(cr, uid, domain, context=context)
                     if right1 == []:
                         self.__exp[i] = ( 'id', '=', 0 )
                     else:

From 332d385390a48cd82670182c6b76e92bbf35397e Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 3 Jun 2011 16:15:39 +0530
Subject: [PATCH 012/304] [REVIEW] edi: refactor code of edi_import

bzr revid: hmo@tinyerp.com-20110603104539-nh0i45zv6zna2wau
---
 openerp/addons/base/ir/ir_edi.py | 96 ++++++++++++++++++++++++--------
 1 file changed, 72 insertions(+), 24 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 1fc9371b66c..35b1b411a38 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -386,44 +386,92 @@ class edi(object):
         fields = edi_document.keys()
         fields_to_import = []
         data_line = []
+        model_data = self.pool.get('ir.model.data')
         _fields = self.fields_get(cr, uid, context=context)
+        current_module = 'edi_import'
+        values = {}
         for field in edi_document.keys():
             if not field.startwith('__'):
                 field_to_import.append(field)
                 edi_field_value = edi_document[field]
-                if _fields[field]['type'] == 'many2one':
-                    #Look in ir.model.data for a record that matches the db_id.
-                    #If found, replace the m2o value with the correct database ID and stop.
-                    #If not found, continue to next step.
+                if _fields[field]['type'] in ('many2one', 'many2many'):
 
-                    #Perform name_search(name) to look for a record that matches the
-                    #given m2o name. If only one record is found, create the missing
-                    #ir.model.data record to link it to the db_id, and the replace the m2o
-                    #value with the correct database ID, then stop. If zero result or
-                    #multiple results are found, go to next step.
+                    if _fields[field]['type'] == 'many2one':
+                        edi_parent_documents = [edi_field_value]
+                    else:
+                        edi_parent_documents = edi_field_value
 
-                    #Create the new record using the only field value that is known: the
-                    #name, and create the ir.model.data entry to map to it.
-                    #This should work for many models, and if not, the module should
-                    #provide a custom EDI import logic to care for it.
-                    pass
+                    parent_lines = []
+
+                    for edi_parent_document in edi_parent_documents:
+                        #Look in ir.model.data for a record that matches the db_id.
+                        #If found, replace the m2o value with the correct database ID and stop.
+                        #If not found, continue to next step
+
+                        db_uuid, xml_id =  tuple(edi_parent_document[0].split(':'))
+                        data_ids = model_data.name_search(cr, uid, xml_id)
+                        if data_ids:
+                            d = model_data.browse(cr, uid, data_ids[0], context=context)
+                            parent_lines.append(d.res_id)
+                            
+                        else:
+                            #Perform name_search(name) to look for a record that matches the
+                            #given m2o name. If only one record is found, create the missing
+                            #ir.model.data record to link it to the db_id, and the replace the m2o
+                            #value with the correct database ID, then stop. If zero result or
+                            #multiple results are found, go to next step.
+                            #Create the new record using the only field value that is known: the
+                            #name, and create the ir.model.data entry to map to it.
+
+                            relation_object = self.get.pool(_fields[field]['relation'])
+                            relation_ids = relation_object.name_search(cr, uid, edi_parent_document[1])
+                            if relation_ids and len(relation_ids) == 1:
+                                relation_id = relation_ids[0]
+                            else:
+                                relation_id = relation_object.create(cr, uid, {'name': edi_parent_document[1]}, context=context)
+                            model_data.create(cr, uid, {
+                                                'name': xml_id,
+                                                'model': relation_object._name,
+                                                #'module':relation_object._module,
+                                                'res_id':relation_id,
+                                                },context=context)
+                            
+                            parent_lines.append(relation_id)
+
+                    if _fields[field]['type'] == 'many2one':
+                        values[field] = parent_lines[0]
+                    else:
+                        many2many_ids = []
+                        for m2m_id in parent_lines:
+                            many2many_ids.append((4,m2m_id))
+                        values[field] = many2many_ids
+                        
+                    
                 elif _fields[field]['type'] == 'one2many':
                     #Look for a record that matches the db_id provided in the __id field. If
                     #found, keep the corresponding database id, and connect it to the parent
                     #using a write value like (4,db_id).
-
                     #If not found via db_id, create a new entry using the same method that
                     #imports a full EDI record (recursive call!), grab the resulting db id,
                     #and use it to connect to the parent via a write value like (4, db_id).
-                elif _fields[field]['type'] == 'many2many':
-                    #Perform the same steps as for a Many2One (see 1.2.1.1)
-
-
-
-                    #After finding the database ID of the final record in the database,
-                    #connect it to the parent record via a write value like (4, db_id).
+            
+                    relations = []
+                    relation_object = self.get.pool(_fields[field]['relation'])
+                    for edi_relation_document in edi_field_value:
+                        db_uuid, xml_id = tuple(edi_relation_document.get('__id').split(':'))
+                        data_ids = model_data.name_search(cr, uid, xml_id)
+                        if data_ids:
+                            d = model_data.browse(cr, uid, data_ids[0], context=context)
+                            relations.append(d.res_id)
+                        else:
+                            r = relation_object.edi_import(cr, uid, edi_relation_document, context=context)
+                            relations.append(r)
+                    one2many_ids = []
+                    for o2m_id in relations:
+                        one2many_ids.append((4,o2m_id))
+                    values[field] = one2many_ids
                 else:
-                    data_line.append(edi_field_value)
+                    values[field] = edi_field_value
         
-        return self.import_data(cr, uid, field_to_import, [data_line], mode='init', current_module='edi_import', noupdate=False, context=context, filename=None)
+        return model_data._update(cr, uid, self._name, current_module, values, context=context)
         

From 023ce68e841d91ae3610bf50774f61b2be7de090 Mon Sep 17 00:00:00 2001
From: "Amit Parmar (OpenERP)" <aar@tinyerp.com>
Date: Mon, 6 Jun 2011 11:22:57 +0530
Subject: [PATCH 013/304] [EDI]: worked on the local time to UTC time
 conversion

bzr revid: aar@tinyerp.com-20110606055257-d33gwzaidwxufn64
---
 openerp/addons/base/ir/ir_edi.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 4ed7b0a4d3a..2cb40c4dfa7 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -26,6 +26,7 @@ import time
 import base64
 import urllib2
 import release
+import datetime
 
 def safe_unique_id(model, database_id):
     """Generate a unique string to represent a (model,database id) pair
@@ -216,14 +217,21 @@ class edi(object):
                         'content': base64.encodestring(attachment.datas),
                         'file_name': attachment.datas_fname,
                 })
+            ''' Here we are obtaining the release version '''
             version = []
             for ver in release.version.split('.'):
                 version.append(int(ver))
+            ''' Here we are converting local time into UTC time'''
+            UTC_OFFSET_TIMEDELTA = datetime.datetime.utcnow() - datetime.datetime.now()
+            local_datetime = datetime.datetime.strptime(record.write_date, "%Y-%m-%d %H:%M:%S")
+            result_utc_datetime = local_datetime - UTC_OFFSET_TIMEDELTA
+            write_date = result_utc_datetime.strftime("%Y-%m-%d %H:%M:%S")
+            
             edi_dict = {
                 '__model' : record._name,
                 '__module' : record._module,
                 '__id': record.id,
-                '__last_update': record.write_date, #TODO: convert into UTC
+                '__last_update': write_date, #TODO: convert into UTC
                 '__version': version,
                 '__attachments': attachment_dict_list
             }

From 110483e93d4a6cf1f461002be93a607b4fb1ec65 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 8 Jun 2011 16:11:28 +0530
Subject: [PATCH 014/304] [FIX] fix problem of ir.property created if same
 value exists then record not create in ir.property object.

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

bzr revid: ysa@tinyerp.com-20110608104128-7mdykmk0ovqenz6u
---
 openerp/osv/fields.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 306e7d007f3..ec1845344ab 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1047,7 +1047,14 @@ class property(function):
 
         default_val = self._get_default(obj, cr, uid, prop_name, context)
 
-        if id_val is not default_val:
+        property_create = False
+        if hasattr(default_val, '_id'):
+            if default_val._id != id_val:
+                property_create = True
+        elif id_val != default_val:
+            property_create = True
+
+        if property_create:
             def_id = self._field_get(cr, uid, obj._name, prop_name)
             company = obj.pool.get('res.company')
             cid = company._company_default_get(cr, uid, obj._name, def_id,

From 4203df9c260fda5bcc5f2e60504483d1078b770c Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 13 Jun 2011 11:40:41 +0530
Subject: [PATCH 015/304] [IMP] add yaml test case.

bzr revid: ysa@tinyerp.com-20110613061041-15edtf67mj0oa8hq
---
 .../addons/base/test/test_osv_expression.yml  | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml
index 4916fe06203..1f76a210293 100644
--- a/openerp/addons/base/test/test_osv_expression.yml
+++ b/openerp/addons/base/test/test_osv_expression.yml
@@ -40,7 +40,7 @@
 -
     !assert {model: res.partner, search: "[('category_id', '=', False)]"}:
         - category_id in (False, None, [])
-- 
+-
     Filtering on invalid value across x2many relationship should return an empty set
 -
     !assert {model: res.partner, search: "[('address.city','=','foo')]", count: 0, string: "Searching for address.city = foo should give empty results"}
@@ -110,4 +110,21 @@
         res_ids = self.search(cr, uid, [('company_id.partner_id', 'not in', [])])
         res_ids.sort()
         assert res_ids == all_ids, "Searching against empty set failed, returns %r" % res_ids
-
+-
+    Testing for Many2Many field with category supplier and active=False
+-
+    !python {model: res.partner }: |
+        vals = {'category_id': [(6, 0, [ref("base.res_partner_category_8")])],
+                'name': 'OpenERP Test',
+                'active': False,
+                'address': [(0, 0, {'country_id': ref("base.be")})]
+                }
+        self.create(cr, uid, vals, context=context)
+        res_ids = self.search(cr, uid, [('category_id', 'ilike', 'supplier'), ('active', '=', False)])
+        assert len(res_ids) != 0, "Record not Found with category supplier and active False."
+-
+    Testing for One2Many field with country Belgium and active=False
+-
+    !python {model: res.partner }: |
+        res_ids = self.search(cr, uid, [('address.country_id','=','Belgium'),('active','=',False)])
+        assert len(res_ids) != 0, "Record not Found with country Belgium and active False."

From ab62f7b7802571f56a56fce7389b777d6fee2583 Mon Sep 17 00:00:00 2001
From: "Amit Parmar (OpenERP)" <aar@tinyerp.com>
Date: Tue, 21 Jun 2011 18:46:32 +0530
Subject: [PATCH 016/304] [EDI] revised edi class

bzr revid: aar@tinyerp.com-20110621131632-rdwn6in74q5t1wkj
---
 openerp/addons/base/__openerp__.py |   3 +-
 openerp/addons/base/ir/ir_edi.py   | 316 +++++++++++++++++------------
 2 files changed, 191 insertions(+), 128 deletions(-)

diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 75e0a8c56d0..b0c437352f9 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -71,7 +71,7 @@
         'res/partner/wizard/partner_clear_ids_view.xml',
         'res/partner/wizard/partner_wizard_ean_check_view.xml',
         'res/partner/partner_data.xml',
-
+        #'test/test_edi_document.yml',
         'res/ir_property_view.xml',
         'security/base_security.xml',
         'publisher_warranty/publisher_warranty_view.xml',
@@ -96,6 +96,7 @@
         'test/test_ir_rule.yml', # <-- These tests modify/add/delete ir_rules.
         'test/test_config_users.yml',
         'test/test_ir_values.yml',
+        
     ],
     'installable': True,
     'active': True,
diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 2cb40c4dfa7..fe8320491bf 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -20,14 +20,13 @@
 ##############################################################################
 
 from osv import osv,fields
-import json
+import simplejson
 import hashlib
 import time
 import base64
 import urllib2
-import release
-import datetime
-
+import unicodedata
+import openerp.release as release
 def safe_unique_id(model, database_id):
     """Generate a unique string to represent a (model,database id) pair
     without being too long, without revealing the database id, and
@@ -58,7 +57,7 @@ def safe_unique_id(model, database_id):
 
 class ir_edi_document(osv.osv):
     _name = 'ir.edi.document'
-    _description = 'To represent the EDI export of any OpenERP record, it could be an invoice, a project task, etc.'
+    _description = 'To represent'
     _columns = {
                 'name': fields.char("EDI token", size = 128, help="EDI Token is a unique identifier for the EDI document."),
                 'document': fields.text("Document", help="hold the serialization of the EDI document.")
@@ -83,7 +82,7 @@ class ir_edi_document(osv.osv):
         perform a JSON serialization of a list of dicts prepared by generate_edi() and return a UTF-8 encoded string that could be passed to deserialize()
         :param edi_dicts: it's list of edi_dict
         """
-        serialized_list = json.dumps(edi_dicts)
+        serialized_list = simplejson.dumps(edi_documents)
         return serialized_list
     
     def generate_edi(self, cr, uid, records, context=None):
@@ -95,7 +94,7 @@ class ir_edi_document(osv.osv):
         edi_list = []
         for record in records:
             record_model_obj = self.pool.get(record._name)
-            edi_list += record_model_obj.edi_export(cr, uid, [record], context=context)
+            edi_list += record_model_obj.edi_export(cr, uid, [record],context=context)
         return self.serialize(edi_list)
     
     def get_document(self, cr, uid, edi_token, context=None):
@@ -104,14 +103,12 @@ class ir_edi_document(osv.osv):
         returns the string serialization that is in the database (column: document) for the given edi_token or raise.
         """
         
-        records = self.name_search(cr, uid, edi_token, context=context)
+        records = self.search(cr, uid, [('name','=',edi_token)])
         if records:
-            edi = self.browse(cr, uid, records[0], context=context)
-            return edi.document
-        else:
-            raise osv.except_osv(_('Error !'),
-                _('Desired EDI Document does not Exist'))  
-        
+            for edi in self.browse(cr, uid, records, context=context):
+                return edi.document
+        else:  
+            pass
         
     
     def load_edi(self, cr, uid, edi_documents, context=None):
@@ -135,10 +132,11 @@ class ir_edi_document(osv.osv):
         """ Deserialized the edi document string
         perform JSON deserialization from an edi document string, and returns a list of dicts
         """
-        edi_document = json.loads(edi_document_string)
+        edi_document = simplejson.loads(edi_document_string)
+        
         return edi_document
     
-    def export(self, cr, uid, records, context=None):
+    def export_edi(self, cr, uid, records, context=None):
         """
         The method handles the flow of the edi document generation and store it in 
             the database and return the edi_token of the particular document
@@ -161,7 +159,7 @@ class ir_edi_document(osv.osv):
             exported_ids.append(token)
         return exported_ids
     
-    def import(self, cr, uid, edi_document=None, edi_url=None, context=None):
+    def import_edi(self, cr, uid, edi_document=None, edi_url=None, context=None):
         """
         The method handles the flow of importing particular edi document and 
         updates the database values on the basis of the edi document using 
@@ -175,8 +173,10 @@ class ir_edi_document(osv.osv):
         
         if edi_url and not edi_document:
             edi_document = urllib2.urlopen(edi_url).read()
-        assert edi_document, _('EDI Document should be provided')            
-        edi_documents = self.deserialize(edi_document)
+        #assert edi_document, _('EDI Document should be provided')
+        else:
+                        
+            edi_documents = self.deserialize(edi_document)
         return self.load_edi(cr, uid, edi_documents, context=context)
     
 ir_edi_document()
@@ -206,8 +206,11 @@ class edi(object):
         - __attachments': a list (possibly empty) of dicts describing the files attached to this record.
         """
         # generic implementation!
+        model_data = self.pool.get('ir.model.data')
+        data_ids = []
         attachment_object = self.pool.get('ir.attachment')
         edi_dict_list = []
+        db_uuid = ''
         for record in records:
             attachment_ids = attachment_object.search(cr, uid, [('res_model','=', record._name), ('res_id', '=', record.id)])
             attachment_dict_list = []
@@ -217,22 +220,24 @@ class edi(object):
                         'content': base64.encodestring(attachment.datas),
                         'file_name': attachment.datas_fname,
                 })
-            ''' Here we are obtaining the release version '''
             version = []
-            for ver in release.version.split('.'):
-                version.append(int(ver))
-            ''' Here we are converting local time into UTC time'''
-            UTC_OFFSET_TIMEDELTA = datetime.datetime.utcnow() - datetime.datetime.now()
-            local_datetime = datetime.datetime.strptime(record.write_date, "%Y-%m-%d %H:%M:%S")
-            result_utc_datetime = local_datetime - UTC_OFFSET_TIMEDELTA
-            write_date = result_utc_datetime.strftime("%Y-%m-%d %H:%M:%S")
+           
+            for ver in release.major_version.split('.'):
+                version.append(ver)
             
+            data_ids = model_data.search(cr, uid, [('res_id','=',record.id)])
+            
+            if len(data_ids):
+                xml_obj = model_data.browse(cr,uid,data_ids[0])
+                uuid = safe_unique_id(record._name,record.id)
+                db_uuid = '%s:%s' % (uuid,xml_obj.name)
+                
             edi_dict = {
                 '__model' : record._name,
                 '__module' : record._module,
-                '__id': record.id,
-                '__last_update': write_date, #TODO: convert into UTC
-                '__version': version,
+                '__id': db_uuid,
+                '__last_update': False, #record.write_date, #TODO: convert into UTC
+                '__version': version, # ?
                 '__attachments': attachment_dict_list
             }
             edi_dict_list.append(edi_dict)
@@ -249,10 +254,15 @@ class edi(object):
         data_object = self.pool.get('ir.model.data')
         db_uuid = safe_unique_id(record._name, record.id)
         xml_ids = data_object.search(cr, uid, [('model','=',record._name),('res_id','=',record.id)])
+        
         if xml_ids:
             xml_id = data_object.browse(cr, uid, xml_ids[0], context=context)
             xml_id = xml_id.name
-            db_uuid = '%s:%s' %(db_uuid, xml_id)
+        else:
+            xml_id = record._name    
+        db_uuid = '%s:%s' %(db_uuid, xml_id)
+        
+        
         name = record.name
         return [db_uuid, name]
         
@@ -271,9 +281,12 @@ class edi(object):
         """
         # generic implementation!
         dict_list = []
+        
         for record in records:
+            
             model_obj = self.pool.get(record._name)
-            dict_list += model_obj.edi_export(cr, uid, [record.id], context=context)
+            dict_list += model_obj.edi_export(cr, uid, [record], context=context)
+        
         return dict_list
         
 
@@ -291,14 +304,15 @@ class edi(object):
         """
         # generic implementation!
         dict_list = []
+        
         for record in records:
-            dict_list.append(self.edi_o2m(cr, uid, record, context=None))
-           
+            dict_list.append(self.edi_o2m(cr, uid, [record], context=None))
+      
         return dict_list
 
 
 
-    def edi_export(self, cr, uid, ids, edi_struct=None, context=None):
+    def edi_export(self, cr, uid, records, edi_struct=None, context=None):
         """Returns a list of dicts representing an edi.document containing the
            browse_records with ``ids``, using the generic algorithm.
            :param edi_struct: if provided, edi_struct should be a dictionary
@@ -318,32 +332,39 @@ class edi(object):
                               be included in the exported data.
         """
         # generic implementation!
+        
         if context is None:
             context = {}
         _fields = self.fields_get(cr, uid, context=context)
         
         
-        fields_to_export = edi_struct and edi_struct.keys() or _fields.key()
-        
+        fields_to_export = edi_struct and edi_struct.keys() or _fields.keys()
         edi_dict_list = []
-        for row in self.browse(cr, uid, ids, fields_to_export, context):
+        value = None
+        for row in records:
             edi_dict = {}
-            edi_dict.update(self.edi_metadata(cr, uid, [row.id], context=context)[0])
+            edi_dict.update(self.edi_metadata(cr, uid, [row], context=context)[0])
+            
             for field in fields_to_export:
-                cols = self._fields[field]
-                if cols['type'] == 'many2one':
-                    m2o_record = row.getattrs(field)
-                    value = self.m2o(cr, uid, m2o_record, context=context)
-                elif cols['type'] == 'many2many':
-                    m2m_records = row.getattrs(field)
-                    value = self.m2m(cr, uid, m2m_records, context=context)
-                elif cols['type'] == 'one2many':
-                    o2m_records = row.getattrs(field)
-                    value = self.o2m(cr, uid, o2m_records, context=context)
+                cols = _fields[field]
+                if _fields[field].has_key('function') or _fields[field].has_key('related_columns'):
+                    
+                    pass
                 else:
-                    value = row.getattrs(field)
+                    if cols['type'] == 'many2one':
+                        m2o_record = getattr(row, field)
+                        value = self.edi_m2o(cr, uid, m2o_record, context=context)
+                    elif cols['type'] == 'many2many':
+                        m2m_records = getattr(row, field)
+                        value = self.edi_m2m(cr, uid, m2m_records, context=context)
+                    elif cols['type'] == 'one2many':
+                        o2m_records = getattr(row, field)
+                        value = self.edi_o2m(cr, uid, o2m_records, context=context )
+                    else:
+                        value = getattr(row, field)
                 edi_dict[field] = value
             edi_dict_list.append(edi_dict)
+         
         return edi_dict_list
         
         
@@ -395,6 +416,19 @@ class edi(object):
                     connect it to the parent record via a write value like (4, db_id).        
         """
         # generic implementation!
+        
+        def convert(data):
+            if isinstance(data, unicode):
+                return str(data)
+            elif isinstance(data, dict):
+                return dict(map(convert, data.iteritems()))
+            elif isinstance(data, (list, tuple, set, frozenset)):
+                return type(data)(map(convert, data))
+            else:
+                return data
+        #edi_document = convert(edi_document)
+        
+        
         fields = edi_document.keys()
         fields_to_import = []
         data_line = []
@@ -403,87 +437,115 @@ class edi(object):
         current_module = 'edi_import'
         values = {}
         for field in edi_document.keys():
-            if not field.startwith('__'):
-                field_to_import.append(field)
+            if field.startswith('__') and field == '__id':
+                db_uuid, xml_ids =  tuple(edi_document[field].split(':'))
+                
+            elif not field.startswith('__'):
+                
+                
+                fields_to_import.append(field)
                 edi_field_value = edi_document[field]
-                if _fields[field]['type'] in ('many2one', 'many2many'):
-
-                    if _fields[field]['type'] == 'many2one':
-                        edi_parent_documents = [edi_field_value]
-                    else:
-                        edi_parent_documents = edi_field_value
-
-                    parent_lines = []
-
-                    for edi_parent_document in edi_parent_documents:
-                        #Look in ir.model.data for a record that matches the db_id.
-                        #If found, replace the m2o value with the correct database ID and stop.
-                        #If not found, continue to next step
-
-                        db_uuid, xml_id =  tuple(edi_parent_document[0].split(':'))
-                        data_ids = model_data.name_search(cr, uid, xml_id)
-                        if data_ids:
-                            d = model_data.browse(cr, uid, data_ids[0], context=context)
-                            parent_lines.append(d.res_id)
-                            
-                        else:
-                            #Perform name_search(name) to look for a record that matches the
-                            #given m2o name. If only one record is found, create the missing
-                            #ir.model.data record to link it to the db_id, and the replace the m2o
-                            #value with the correct database ID, then stop. If zero result or
-                            #multiple results are found, go to next step.
-                            #Create the new record using the only field value that is known: the
-                            #name, and create the ir.model.data entry to map to it.
-
-                            relation_object = self.get.pool(_fields[field]['relation'])
-                            relation_ids = relation_object.name_search(cr, uid, edi_parent_document[1])
-                            if relation_ids and len(relation_ids) == 1:
-                                relation_id = relation_ids[0]
-                            else:
-                                relation_id = relation_object.create(cr, uid, {'name': edi_parent_document[1]}, context=context)
-                            model_data.create(cr, uid, {
-                                                'name': xml_id,
-                                                'model': relation_object._name,
-                                                #'module':relation_object._module,
-                                                'res_id':relation_id,
-                                                },context=context)
-                            
-                            parent_lines.append(relation_id)
-
-                    if _fields[field]['type'] == 'many2one':
-                        values[field] = parent_lines[0]
-                    else:
-                        many2many_ids = []
-                        for m2m_id in parent_lines:
-                            many2many_ids.append((4,m2m_id))
-                        values[field] = many2many_ids
-                        
+                if _fields[field].has_key('function') or _fields[field].has_key('related_columns'):
                     
-                elif _fields[field]['type'] == 'one2many':
-                    #Look for a record that matches the db_id provided in the __id field. If
-                    #found, keep the corresponding database id, and connect it to the parent
-                    #using a write value like (4,db_id).
-                    #If not found via db_id, create a new entry using the same method that
-                    #imports a full EDI record (recursive call!), grab the resulting db id,
-                    #and use it to connect to the parent via a write value like (4, db_id).
-            
-                    relations = []
-                    relation_object = self.get.pool(_fields[field]['relation'])
-                    for edi_relation_document in edi_field_value:
-                        db_uuid, xml_id = tuple(edi_relation_document.get('__id').split(':'))
-                        data_ids = model_data.name_search(cr, uid, xml_id)
-                        if data_ids:
-                            d = model_data.browse(cr, uid, data_ids[0], context=context)
-                            relations.append(d.res_id)
+                    pass
+                else:
+                    if _fields[field]['type'] in ('many2one', 'many2many'):
+                        
+                        if _fields[field]['type'] == 'many2one':
+                            edi_parent_documents = [edi_field_value]
+                            
                         else:
+                            edi_parent_documents = edi_field_value
+
+                        parent_lines = []
+
+                        for edi_parent_document in edi_parent_documents:
+                            #Look in ir.model.data for a record that matches the db_id.
+                            #If found, replace the m2o value with the correct database ID and stop.
+                            #If not found, continue to next step
+                            if edi_parent_document[0].find(':') != -1 and edi_parent_document[1] != None:
+                                db_uuid, xml_id =  tuple(edi_parent_document[0].split(':'))
+                                data_ids = model_data.name_search(cr, uid, xml_id)
+                                if data_ids:
+                                    for data in model_data.browse(cr, uid, [data_ids[0][0]], context=context):
+                                        parent_lines.append(data.res_id)
+                                        print "..............................................",data.res_id
+                                else:
+                                    #Perform name_search(name) to look for a record that matches the
+                                    #given m2o name. If only one record is found, create the missing
+                                    #ir.model.data record to link it to the db_id, and the replace the m2o
+                                    #value with the correct database ID, then stop. If zero result or
+                                    #multiple results are found, go to next step.
+                                    #Create the new record using the only field value that is known: the
+                                    #name, and create the ir.model.data entry to map to it.
+
+                                    relation_object = self.pool.get(_fields[field]['relation'])
+                                    print "parent_document",edi_parent_document[1]
+                                    relation_ids = relation_object.search(cr, uid, [('name','=',edi_parent_document[1])])
+                                    if relation_ids and len(relation_ids) == 1:
+                                        relation_id = relation_ids[0]
+                                    else:
+                                        relation_id = relation_object.create(cr, uid, {'name': edi_parent_document[1]}, context=context)
+                                    model_data.create(cr, uid, {
+                                                        'name': xml_id,
+                                                        'model': relation_object._name,
+                                                        'module':relation_object._module,
+                                                        'res_id':relation_id 
+                                                        }, context=context)
+                                    
+                                    parent_lines.append(relation_id)
+                                    
+                            else:
+                                pass
+                        if len(parent_lines):   
+                            if _fields[field]['type'] == 'many2one':
+                                values[field] = parent_lines[0]
+                                
+                            else:
+                                many2many_ids = []
+                                for m2m_id in parent_lines:
+                                    many2many_ids.append((4,m2m_id))
+                                values[field] = many2many_ids
+                            
+                        
+                    elif _fields[field]['type'] == 'one2many':
+                        #Look for a record that matches the db_id provided in the __id field. If
+                        #found, keep the corresponding database id, and connect it to the parent
+                        #using a write value like (4,db_id).
+                        #If not found via db_id, create a new entry using the same method that
+                        #imports a full EDI record (recursive call!), grab the resulting db id,
+                        #and use it to connect to the parent via a write value like (4, db_id).
+                
+                        relations = []
+                        relation_object = self.pool.get(_fields[field]['relation'])
+                        for edi_relation_document in edi_field_value:
+                            '''print "pppppppppppppppppppppppppppppppppppppppppp"
+                            print edi_field_value
+                            print ":::::::::::::::::::::::::::::::::::::::::::::"
+                            print edi_relation_document
+                            print edi_parent_document
+                            print "ppppppppppppppppppppppppppppppppppp"
+                            if edi_relation_document['__id'].find(':') != -1:
+                                db_uuid, xml_id = tuple(edi_relation_document['__id'].split(':'))
+                                print xml_id
+                                data_ids = model_data.name_search(cr, uid, xml_id)
+                                print "dddddddddddddddddddddddddddddddddddddddddddddd",data_ids
+                                if data_ids:
+                                    for data in model_data.browse(cr,uid,[data_ids[0][0]]):
+                                        relations.append(data.res_id)
+                                else:'''
                             r = relation_object.edi_import(cr, uid, edi_relation_document, context=context)
                             relations.append(r)
-                    one2many_ids = []
-                    for o2m_id in relations:
-                        one2many_ids.append((4,o2m_id))
-                    values[field] = one2many_ids
-                else:
-                    values[field] = edi_field_value
+                            print "relation id ssssssssssssssssssss",relations
+                        one2many_ids = []
+                        for o2m_id in relations:
+                            one2many_ids.append((4,o2m_id))
+                        values[field] = one2many_ids
+                    else:
+                        values[field] = edi_field_value
         
+        for val in values.keys():
+            print '::::::::::::::::::::::',val,'::::::::::;;;;;;;;;;;;;;;;;;;;;;'
+            print values[val]               
         return model_data._update(cr, uid, self._name, current_module, values, context=context)
-        
+# vim: ts=4 sts=4 sw=4 si et
\ No newline at end of file

From e60caf7d51b5f86f3597d610708a42ba3eeadbc6 Mon Sep 17 00:00:00 2001
From: "Amit Parmar (OpenERP)" <aar@tinyerp.com>
Date: Tue, 21 Jun 2011 18:49:27 +0530
Subject: [PATCH 017/304] [EDI] revised edi class

bzr revid: aar@tinyerp.com-20110621131927-872hkmor321f1gdf
---
 openerp/addons/base/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index b0c437352f9..bccaf7f660b 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -71,7 +71,7 @@
         'res/partner/wizard/partner_clear_ids_view.xml',
         'res/partner/wizard/partner_wizard_ean_check_view.xml',
         'res/partner/partner_data.xml',
-        #'test/test_edi_document.yml',
+        'test/test_edi_document.yml',
         'res/ir_property_view.xml',
         'security/base_security.xml',
         'publisher_warranty/publisher_warranty_view.xml',

From 395b953f47d1098732aab9999535a8e6bca88329 Mon Sep 17 00:00:00 2001
From: "Amit Parmar (OpenERP)" <aar@tinyerp.com>
Date: Tue, 21 Jun 2011 18:51:33 +0530
Subject: [PATCH 018/304] [EDI] revised edi class

bzr revid: aar@tinyerp.com-20110621132133-g24z7zi1ln16h06d
---
 openerp/addons/base/test/test_edi_documents.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 openerp/addons/base/test/test_edi_documents.yml

diff --git a/openerp/addons/base/test/test_edi_documents.yml b/openerp/addons/base/test/test_edi_documents.yml
new file mode 100644
index 00000000000..1b66caaf4dc
--- /dev/null
+++ b/openerp/addons/base/test/test_edi_documents.yml
@@ -0,0 +1,16 @@
+-
+  Tesing of Export functionality
+-
+  !python {model: ir.edi.document}: |
+    partner_obj = self.pool.get('res.partner')
+    partner_ids = partner_obj.search(cr, uid, [])
+    
+    if partner_ids:
+      partners = partner_obj.browse(cr, uid, partner_ids)
+      tokens = self.export_edi(cr, uid, partners)
+      print '>>>>>>>>>>',tokens
+    for token in tokens:
+      document = self.get_document(cr, uid, token, context=context)
+      a = self.import_edi(cr, uid, edi_document = document)
+      print '////////////',a
+

From 6d4b05e3d4840629fe04bffb75ef078174dfa65b Mon Sep 17 00:00:00 2001
From: "Amit Parmar (OpenERP)" <aar@tinyerp.com>
Date: Wed, 22 Jun 2011 14:41:23 +0530
Subject: [PATCH 019/304] [EDI] refactored code of edi class

bzr revid: aar@tinyerp.com-20110622091123-6zal2su3vy8nv1nm
---
 openerp/addons/base/__openerp__.py            |  2 +-
 openerp/addons/base/ir/ir_edi.py              | 79 +++----------------
 .../addons/base/test/test_edi_documents.yml   |  4 +-
 3 files changed, 15 insertions(+), 70 deletions(-)

diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index bccaf7f660b..6406ec7b716 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -71,7 +71,6 @@
         'res/partner/wizard/partner_clear_ids_view.xml',
         'res/partner/wizard/partner_wizard_ean_check_view.xml',
         'res/partner/partner_data.xml',
-        'test/test_edi_document.yml',
         'res/ir_property_view.xml',
         'security/base_security.xml',
         'publisher_warranty/publisher_warranty_view.xml',
@@ -96,6 +95,7 @@
         'test/test_ir_rule.yml', # <-- These tests modify/add/delete ir_rules.
         'test/test_config_users.yml',
         'test/test_ir_values.yml',
+        'test/test_edi_documents.yml',
         
     ],
     'installable': True,
diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index fe8320491bf..fa41da161cc 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -20,12 +20,11 @@
 ##############################################################################
 
 from osv import osv,fields
-import simplejson
 import hashlib
+import json
 import time
 import base64
 import urllib2
-import unicodedata
 import openerp.release as release
 def safe_unique_id(model, database_id):
     """Generate a unique string to represent a (model,database id) pair
@@ -82,7 +81,7 @@ class ir_edi_document(osv.osv):
         perform a JSON serialization of a list of dicts prepared by generate_edi() and return a UTF-8 encoded string that could be passed to deserialize()
         :param edi_dicts: it's list of edi_dict
         """
-        serialized_list = simplejson.dumps(edi_documents)
+        serialized_list = json.dumps(edi_documents)
         return serialized_list
     
     def generate_edi(self, cr, uid, records, context=None):
@@ -94,7 +93,7 @@ class ir_edi_document(osv.osv):
         edi_list = []
         for record in records:
             record_model_obj = self.pool.get(record._name)
-            edi_list += record_model_obj.edi_export(cr, uid, [record],context=context)
+            edi_list += record_model_obj.edi_export(cr, uid, [record], context=context)
         return self.serialize(edi_list)
     
     def get_document(self, cr, uid, edi_token, context=None):
@@ -103,13 +102,12 @@ class ir_edi_document(osv.osv):
         returns the string serialization that is in the database (column: document) for the given edi_token or raise.
         """
         
-        records = self.search(cr, uid, [('name','=',edi_token)])
+        records = self.name_search(cr, uid, edi_token)
         if records:
-            for edi in self.browse(cr, uid, records, context=context):
-                return edi.document
+            edi = self.browse(cr, uid, records, context=context)
+            return edi.document
         else:  
             pass
-        
     
     def load_edi(self, cr, uid, edi_documents, context=None):
         """
@@ -132,7 +130,7 @@ class ir_edi_document(osv.osv):
         """ Deserialized the edi document string
         perform JSON deserialization from an edi document string, and returns a list of dicts
         """
-        edi_document = simplejson.loads(edi_document_string)
+        edi_document = json.loads(edi_document_string)
         
         return edi_document
     
@@ -173,15 +171,13 @@ class ir_edi_document(osv.osv):
         
         if edi_url and not edi_document:
             edi_document = urllib2.urlopen(edi_url).read()
-        #assert edi_document, _('EDI Document should be provided')
+            assert edi_document, _('EDI Document should be provided')
         else:
-                        
             edi_documents = self.deserialize(edi_document)
         return self.load_edi(cr, uid, edi_documents, context=context)
     
 ir_edi_document()
 
-    
 class edi(object):
     _name = 'edi'
     _description = 'edi document handler'
@@ -191,7 +187,6 @@ class edi(object):
        ``edi_import()`` and ``edi_export()`` methods to implement their
        specific behavior, based on the primitives provided by this superclass."""
     
-    
     def edi_metadata(self, cr, uid, records, context=None):
         """Return a list representing the boilerplate EDI structure for
            exporting the record in the given browse_rec_list, including
@@ -221,11 +216,10 @@ class edi(object):
                         'file_name': attachment.datas_fname,
                 })
             version = []
-           
             for ver in release.major_version.split('.'):
                 version.append(ver)
             
-            data_ids = model_data.search(cr, uid, [('res_id','=',record.id)])
+            data_ids = model_data.search(cr, uid, [('res_id','=',record.id),('model','=',record._name)])
             
             if len(data_ids):
                 xml_obj = model_data.browse(cr,uid,data_ids[0])
@@ -261,12 +255,9 @@ class edi(object):
         else:
             xml_id = record._name    
         db_uuid = '%s:%s' %(db_uuid, xml_id)
-        
-        
         name = record.name
         return [db_uuid, name]
         
-
     def edi_o2m(self, cr, uid, records, context=None):
         """Return a list representing a O2M EDI value for
            the browse_records from the given browse_record_list.
@@ -289,7 +280,6 @@ class edi(object):
         
         return dict_list
         
-
     def edi_m2m(self, cr, uid, records, context=None):
         """Return a list representing a M2M EDI value for
            the browse_records from the given browse_record_list.
@@ -310,8 +300,6 @@ class edi(object):
       
         return dict_list
 
-
-
     def edi_export(self, cr, uid, records, edi_struct=None, context=None):
         """Returns a list of dicts representing an edi.document containing the
            browse_records with ``ids``, using the generic algorithm.
@@ -336,19 +324,15 @@ class edi(object):
         if context is None:
             context = {}
         _fields = self.fields_get(cr, uid, context=context)
-        
-        
         fields_to_export = edi_struct and edi_struct.keys() or _fields.keys()
         edi_dict_list = []
         value = None
         for row in records:
             edi_dict = {}
             edi_dict.update(self.edi_metadata(cr, uid, [row], context=context)[0])
-            
             for field in fields_to_export:
                 cols = _fields[field]
                 if _fields[field].has_key('function') or _fields[field].has_key('related_columns'):
-                    
                     pass
                 else:
                     if cols['type'] == 'many2one':
@@ -364,10 +348,8 @@ class edi(object):
                         value = getattr(row, field)
                 edi_dict[field] = value
             edi_dict_list.append(edi_dict)
-         
         return edi_dict_list
         
-        
     def edi_import(self, cr, uid, edi_document, context=None):
     
         """Imports a list of dicts representing an edi.document, using the
@@ -417,18 +399,6 @@ class edi(object):
         """
         # generic implementation!
         
-        def convert(data):
-            if isinstance(data, unicode):
-                return str(data)
-            elif isinstance(data, dict):
-                return dict(map(convert, data.iteritems()))
-            elif isinstance(data, (list, tuple, set, frozenset)):
-                return type(data)(map(convert, data))
-            else:
-                return data
-        #edi_document = convert(edi_document)
-        
-        
         fields = edi_document.keys()
         fields_to_import = []
         data_line = []
@@ -437,23 +407,15 @@ class edi(object):
         current_module = 'edi_import'
         values = {}
         for field in edi_document.keys():
-            if field.startswith('__') and field == '__id':
-                db_uuid, xml_ids =  tuple(edi_document[field].split(':'))
-                
-            elif not field.startswith('__'):
-                
-                
+            if not field.startswith('__'):
                 fields_to_import.append(field)
                 edi_field_value = edi_document[field]
                 if _fields[field].has_key('function') or _fields[field].has_key('related_columns'):
-                    
                     pass
                 else:
                     if _fields[field]['type'] in ('many2one', 'many2many'):
-                        
                         if _fields[field]['type'] == 'many2one':
                             edi_parent_documents = [edi_field_value]
-                            
                         else:
                             edi_parent_documents = edi_field_value
 
@@ -469,7 +431,6 @@ class edi(object):
                                 if data_ids:
                                     for data in model_data.browse(cr, uid, [data_ids[0][0]], context=context):
                                         parent_lines.append(data.res_id)
-                                        print "..............................................",data.res_id
                                 else:
                                     #Perform name_search(name) to look for a record that matches the
                                     #given m2o name. If only one record is found, create the missing
@@ -506,8 +467,6 @@ class edi(object):
                                 for m2m_id in parent_lines:
                                     many2many_ids.append((4,m2m_id))
                                 values[field] = many2many_ids
-                            
-                        
                     elif _fields[field]['type'] == 'one2many':
                         #Look for a record that matches the db_id provided in the __id field. If
                         #found, keep the corresponding database id, and connect it to the parent
@@ -519,24 +478,15 @@ class edi(object):
                         relations = []
                         relation_object = self.pool.get(_fields[field]['relation'])
                         for edi_relation_document in edi_field_value:
-                            '''print "pppppppppppppppppppppppppppppppppppppppppp"
-                            print edi_field_value
-                            print ":::::::::::::::::::::::::::::::::::::::::::::"
-                            print edi_relation_document
-                            print edi_parent_document
-                            print "ppppppppppppppppppppppppppppppppppp"
                             if edi_relation_document['__id'].find(':') != -1:
                                 db_uuid, xml_id = tuple(edi_relation_document['__id'].split(':'))
-                                print xml_id
                                 data_ids = model_data.name_search(cr, uid, xml_id)
-                                print "dddddddddddddddddddddddddddddddddddddddddddddd",data_ids
                                 if data_ids:
                                     for data in model_data.browse(cr,uid,[data_ids[0][0]]):
                                         relations.append(data.res_id)
-                                else:'''
-                            r = relation_object.edi_import(cr, uid, edi_relation_document, context=context)
-                            relations.append(r)
-                            print "relation id ssssssssssssssssssss",relations
+                                else:
+                                    r = relation_object.edi_import(cr, uid, edi_relation_document, context=context)
+                                    relations.append(r)
                         one2many_ids = []
                         for o2m_id in relations:
                             one2many_ids.append((4,o2m_id))
@@ -544,8 +494,5 @@ class edi(object):
                     else:
                         values[field] = edi_field_value
         
-        for val in values.keys():
-            print '::::::::::::::::::::::',val,'::::::::::;;;;;;;;;;;;;;;;;;;;;;'
-            print values[val]               
         return model_data._update(cr, uid, self._name, current_module, values, context=context)
 # vim: ts=4 sts=4 sw=4 si et
\ No newline at end of file
diff --git a/openerp/addons/base/test/test_edi_documents.yml b/openerp/addons/base/test/test_edi_documents.yml
index 1b66caaf4dc..06656800d4f 100644
--- a/openerp/addons/base/test/test_edi_documents.yml
+++ b/openerp/addons/base/test/test_edi_documents.yml
@@ -4,13 +4,11 @@
   !python {model: ir.edi.document}: |
     partner_obj = self.pool.get('res.partner')
     partner_ids = partner_obj.search(cr, uid, [])
-    
     if partner_ids:
       partners = partner_obj.browse(cr, uid, partner_ids)
       tokens = self.export_edi(cr, uid, partners)
-      print '>>>>>>>>>>',tokens
     for token in tokens:
       document = self.get_document(cr, uid, token, context=context)
       a = self.import_edi(cr, uid, edi_document = document)
-      print '////////////',a
+      
 

From b5050763692468b73263455c54b28ad0351bba5c Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 24 Jun 2011 14:16:56 +0530
Subject: [PATCH 020/304] [FIX] add get method in refrence field and check if
 refrence id not exists then return false.

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

bzr revid: ysa@tinyerp.com-20110624084656-c2jd3xskk10fwt35
---
 openerp/osv/fields.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index f55e4b9c027..aa042ca6541 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -148,9 +148,23 @@ class integer_big(_column):
 
 class reference(_column):
     _type = 'reference'
+    _classic_read = False # post-process to handle missing target
+
     def __init__(self, string, selection, size, **args):
         _column.__init__(self, string=string, size=size, selection=selection, **args)
 
+    def get(self, cr, obj, ids, name, uid=None, context=None, values=None):
+        result = {}
+        # copy initial values fetched previously.
+        for row in values:
+            result[row['id']] = row[name]
+        # verify target object exists
+        for id, value in result.iteritems():
+            if value:
+                model, res_id = value.split(',')
+                if not obj.pool.get(model).exists(cr, uid, [int(res_id)], context=context):
+                    result[id] = False
+        return result
 
 class char(_column):
     _type = 'char'

From 5ac271fa1fa85fc24a34c76ca5258d45a422955f Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 27 Jun 2011 13:59:45 +0530
Subject: [PATCH 021/304] [IMP] edi: improve metadata function to create xml
 record if does not found

bzr revid: hmo@tinyerp.com-20110627082945-xtoibwmlsl8187yg
---
 openerp/addons/base/ir/ir_edi.py | 50 ++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index ad9fd2a2adf..8db5b397116 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -26,6 +26,9 @@ import time
 import base64
 import urllib2
 import openerp.release as release
+
+edi_module = 'edi_import'
+
 def safe_unique_id(model, database_id):
     """Generate a unique string to represent a (model,database id) pair
     without being too long, without revealing the database id, and
@@ -201,8 +204,9 @@ class edi(object):
         - __version': a list of components for the version
         - __attachments': a list (possibly empty) of dicts describing the files attached to this record.
         """
-        # generic implementation!
-        model_data = self.pool.get('ir.model.data')
+        if context is None:
+            context = {}
+        model_data_pool = self.pool.get('ir.model.data')
         data_ids = []
         attachment_object = self.pool.get('ir.attachment')
         edi_dict_list = []
@@ -214,6 +218,7 @@ class edi(object):
             except:
                 pass
             version.append(ver)
+
         for record in records:
             attachment_ids = attachment_object.search(cr, uid, [('res_model','=', record._name), ('res_id', '=', record.id)])
             attachment_dict_list = []
@@ -225,21 +230,32 @@ class edi(object):
                 })
             
             
-            data_ids = model_data.search(cr, uid, [('res_id','=',record.id),('model','=',record._name)])
-            
+            data_ids = model_data_pool.search(cr, uid, [('res_id','=',record.id),('model','=',record._name)])
+            uuid = safe_unique_id(record._name, record.id)
+
             if len(data_ids):
-                xml_record = model_data.browse(cr, uid, data_ids[0])
-                uuid = safe_unique_id(record._name, record.id)
-                db_uuid = '%s:%s.%s' % (uuid, xml_record.module, xml_record.name)
-                
+                xml_record_id = data_ids[0]
+            else:
+                xml_record_id = model_data_pool.create(cr, uid, {
+                    'name': uuid,
+                    'model': record._name,
+                    'module': edi_module,
+                    'res_id': record.id}, context=context)
+
+            xml_record = model_data_pool.browse(cr, uid, xml_record_id, context=context)
+            db_uuid = '%s:%s.%s' % (uuid, xml_record.module, xml_record.name)
+            
             edi_dict = {
-                '__model' : record._name,
-                '__module' : record._module,
                 '__id': db_uuid,
                 '__last_update': False, #record.write_date, #TODO: convert into UTC
-                '__version': version,
-                '__attachments': attachment_dict_list
             }
+            if not context.get('o2m_export'):
+                edi_dict.update({
+                    '__model' : record._name,
+                    '__module' : record._module,
+                    '__version': version,
+                    '__attachments': attachment_dict_list
+                })
             edi_dict_list.append(edi_dict)
             
         return edi_dict_list
@@ -278,11 +294,14 @@ class edi(object):
         """
         # generic implementation!
         dict_list = []
-        
+        if context is None:
+            context = {}
+        ctx = context.copy()
+        ctx.update({'o2m_export':True})
         for record in records:
             
             model_obj = self.pool.get(record._name)
-            dict_list += model_obj.edi_export(cr, uid, [record], context=context)
+            dict_list += model_obj.edi_export(cr, uid, [record], context=ctx)
         
         return dict_list
         
@@ -410,7 +429,6 @@ class edi(object):
         data_line = []
         model_data = self.pool.get('ir.model.data')
         _fields = self.fields_get(cr, uid, context=context)
-        current_module = 'edi_import'
         values = {}
         for field in edi_document.keys():
             if not field.startswith('__'):
@@ -500,5 +518,5 @@ class edi(object):
                 else:
                     values[field] = edi_field_value
         
-        return model_data._update(cr, uid, self._name, current_module, values, context=context)
+        return model_data._update(cr, uid, self._name, edi_module, values, context=context)
 # vim: ts=4 sts=4 sw=4 si et

From 25dcd09489096441f2588b06db2ad23bab0fd462 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 27 Jun 2011 17:51:45 +0530
Subject: [PATCH 022/304] [IMP] EDI: introduce new methods in edi class
 edi_import_relation: create record of relation object if does not match with
 relation value edi_xml_id: generate xml id with unique db id. create record
 of ir.model.data if xml id is not found for particular record.

bzr revid: hmo@tinyerp.com-20110627122145-v2d2wtkjut68rcba
---
 openerp/addons/base/ir/ir_edi.py | 74 ++++++++++++++++----------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 8db5b397116..9672b9a2207 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -190,6 +190,22 @@ class edi(object):
        Classes that inherit from this mixin class should override the 
        ``edi_import()`` and ``edi_export()`` methods to implement their
        specific behavior, based on the primitives provided by this superclass."""
+
+    def edi_xml_id(self, cr, uid, record, context=None):
+        model_data_pool = self.pool.get('ir.model.data')
+        uuid = safe_unique_id(record._name, record.id)
+        data_ids = model_data_pool.search(cr, uid, [('res_id','=',record.id),('model','=',record._name)])
+        if len(data_ids):
+            xml_record_id = data_ids[0]
+        else:
+            xml_record_id = model_data_pool.create(cr, uid, {
+                'name': uuid,
+                'model': record._name,
+                'module': edi_module,
+                'res_id': record.id}, context=context)
+        xml_record = model_data_pool.browse(cr, uid, xml_record_id, context=context)
+        db_uuid = '%s:%s.%s' % (uuid, xml_record.module, xml_record.name)
+        return db_uuid
     
     def edi_metadata(self, cr, uid, records, context=None):
         """Return a list representing the boilerplate EDI structure for
@@ -206,7 +222,6 @@ class edi(object):
         """
         if context is None:
             context = {}
-        model_data_pool = self.pool.get('ir.model.data')
         data_ids = []
         attachment_object = self.pool.get('ir.attachment')
         edi_dict_list = []
@@ -230,21 +245,7 @@ class edi(object):
                 })
             
             
-            data_ids = model_data_pool.search(cr, uid, [('res_id','=',record.id),('model','=',record._name)])
-            uuid = safe_unique_id(record._name, record.id)
-
-            if len(data_ids):
-                xml_record_id = data_ids[0]
-            else:
-                xml_record_id = model_data_pool.create(cr, uid, {
-                    'name': uuid,
-                    'model': record._name,
-                    'module': edi_module,
-                    'res_id': record.id}, context=context)
-
-            xml_record = model_data_pool.browse(cr, uid, xml_record_id, context=context)
-            db_uuid = '%s:%s.%s' % (uuid, xml_record.module, xml_record.name)
-            
+            db_uuid = self.edi_xml_id(cr, uid, record, context=context)
             edi_dict = {
                 '__id': db_uuid,
                 '__last_update': False, #record.write_date, #TODO: convert into UTC
@@ -267,20 +268,13 @@ class edi(object):
         Exmaple: ['db-uuid:xml-id',  'Partner Name']
         """
         # generic implementation!
-        data_object = self.pool.get('ir.model.data')
-        db_uuid = safe_unique_id(record._name, record.id)
-        xml_ids = data_object.search(cr, uid, [('model','=',record._name),('res_id','=',record.id)])
-        
-        if xml_ids:
-            xml_id = data_object.browse(cr, uid, xml_ids[0], context=context)
-            xml_id = '%s.%s' %(xml_id.module, xml_id.name)
-        else:
-            xml_id = record._name    
-        db_uuid = '%s:%s' %(db_uuid, xml_id)
-        name = record.name
+        db_uuid = self.edi_xml_id(cr, uid, record, context=context)
+        relation_model_pool = self.pool.get(record._name)  
+        name = relation_model_pool.name_get(cr, uid, [record.id], context=context)
+        name = name and name[0][1] or False
         return [db_uuid, name]
         
-    def edi_o2m(self, cr, uid, records, context=None):
+    def edi_o2m(self, cr, uid, records, edi_struct=None, context=None):
         """Return a list representing a O2M EDI value for
            the browse_records from the given browse_record_list.
 
@@ -301,7 +295,7 @@ class edi(object):
         for record in records:
             
             model_obj = self.pool.get(record._name)
-            dict_list += model_obj.edi_export(cr, uid, [record], context=ctx)
+            dict_list += model_obj.edi_export(cr, uid, [record], edi_struct=edi_struct, context=ctx)
         
         return dict_list
         
@@ -368,12 +362,22 @@ class edi(object):
                 elif cols['type'] == 'many2many':
                     value = self.edi_m2m(cr, uid, record, context=context)
                 elif cols['type'] == 'one2many':
-                    value = self.edi_o2m(cr, uid, record, context=context )
+                    value = self.edi_o2m(cr, uid, record, edi_struct=edi_struct.get(field, {}), context=context )
                 else:
                     value = record
                 edi_dict[field] = value
             edi_dict_list.append(edi_dict)
         return edi_dict_list
+
+    def edi_import_relation(self, cr, uid, relation_model, relation_value, values={}, context=None):
+        relation_object = self.pool.get(relation_model)
+        relation_ids = relation_object.name_search(cr, uid, relation_value, context=context)
+        if relation_ids and len(relation_ids) == 1:
+            relation_id = relation_ids[0][0]
+        else:
+            values.update({'name': relation_value})
+            relation_id = relation_object.create(cr, uid, values, context=context)
+        return relation_id
         
     def edi_import(self, cr, uid, edi_document, context=None):
     
@@ -465,13 +469,9 @@ class edi(object):
                                 #multiple results are found, go to next step.
                                 #Create the new record using the only field value that is known: the
                                 #name, and create the ir.model.data entry to map to it.
-
-                                relation_object = self.pool.get(_fields[field]['relation'])
-                                relation_ids = relation_object.search(cr, uid, [('name','=',edi_parent_document[1])])
-                                if relation_ids and len(relation_ids) == 1:
-                                    relation_id = relation_ids[0]
-                                else:
-                                    relation_id = relation_object.create(cr, uid, {'name': edi_parent_document[1]}, context=context)
+                                relation_model = _fields[field]['relation']
+                                relation_id = self.edi_import_relation(cr, uid, relation_model, edi_parent_document[1], context=context)
+                                relation_object = self.pool.get(relation_model)
                                 model_data.create(cr, uid, {
                                                     'name': xml_id,
                                                     'model': relation_object._name,

From 3be8619d32f3ca9ca3859fde34585ccb3f3d3ae8 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 29 Jun 2011 12:10:37 +0530
Subject: [PATCH 023/304] [IMP] web_service: introduce EDI Services to provide
 service like get_edi_document, import_edi_document, import_edi_url

bzr revid: hmo@tinyerp.com-20110629064037-2wb76qua48m1g2bh
---
 openerp/service/web_services.py | 42 +++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 39457807868..37dadc195fb 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -37,6 +37,47 @@ import openerp.modules
 import locale
 import logging
 from cStringIO import StringIO
+import threading
+
+class edi(netsvc.ExportService):
+    def exp_get_edi_document(self, edi_token):
+        db_name = getattr(threading.currentThread(), 'dbname', None)
+        if db_name:
+            cr = pooler.get_db_only(db_name).cursor()
+        else:
+            raise Exception("No database cursor found!")
+        pool = pooler.get_pool(db_name)
+        edi_pool = pool.get('ir.edi.document')
+        return edi_pool.get_document(cr, 1, edi_token)
+
+    def exp_import_edi_document(self, db, uid, passwd, edi_document, context=None):
+        cr = pooler.get_db_only(db).cursor()
+        pool = pooler.get_pool(db)
+        edi_pool = pool.get('ir.edi.document')
+        return edi_pool.import_edi(cr, uid, edi_document=edi_document, context=context)
+
+    def exp_import_edi_url(self, db, uid, passwd, edi_url, context=None):
+        cr = pooler.get_db_only(db).cursor()
+        pool = pooler.get_pool(db)
+        edi_pool = pool.get('ir.edi.document')
+        return edi_pool.import_edi(cr, uid, edi_url=edi_url, context=context)
+
+    def __init__(self, name="edi"):
+        netsvc.ExportService.__init__(self, name)
+        self.joinGroup("web-services")
+
+    def dispatch(self, method, auth, params):
+        if method in ['import_edi_document',  'import_edi_url']:
+            (db, uid, passwd ) = params[0:3]
+            security.check(db, uid, passwd)
+        elif method in ['get_edi_document']:
+            # params = params
+            # No security check for these methods
+            pass
+        else:
+            raise KeyError("Method not found: %s" % method)
+        fn = getattr(self, 'exp_'+method)
+        return fn(*params)
 
 class db(netsvc.ExportService):
     def __init__(self, name="db"):
@@ -763,6 +804,7 @@ def start_web_services():
     objects_proxy()
     wizard()
     report_spool()
+    edi()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 784b6af17c37b278c30c8b8d14e8ad3be9751abb Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 29 Jun 2011 15:49:28 +0530
Subject: [PATCH 024/304] [FIX] edi: In export_edi method, edi_struct should be
 have blank dict if None value

bzr revid: hmo@tinyerp.com-20110629101928-djc9hvlm0pmqm362
---
 openerp/addons/base/ir/ir_edi.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 9672b9a2207..0ee29e13a3a 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -342,6 +342,8 @@ class edi(object):
         
         if context is None:
             context = {}
+        if edi_struct is None:
+            edi_struct = {}
         _fields = self.fields_get(cr, uid, context=context)
         fields_to_export = edi_struct and edi_struct.keys() or _fields.keys()
         edi_dict_list = []

From 70b65e0922b75901d594ac782b95464d0f0affa1 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 11 Jul 2011 13:30:17 +0530
Subject: [PATCH 025/304] [IMP+FIX] edi_service: fixed wrong method call to
 get_db into import_edi_url service and return list of tuple (mobel,record_id)
 from load_edi function. it will be useful to redirect document after import
 successful

bzr revid: hmo@tinyerp.com-20110711080017-chgth42d2409o81m
---
 openerp/addons/base/ir/ir_edi.py | 8 ++++----
 openerp/service/web_services.py  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 0ee29e13a3a..b37abbb7747 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -122,13 +122,14 @@ class ir_edi_document(osv.osv):
 
         :param edi_dicts: list of edi_dict
         """
-       
+        res = []
         for edi_document in edi_documents:
             model = edi_document.get('__model')
             assert model, _('model should be provided in EDI Dict')
             model_obj = self.pool.get(model)
-            model_obj.edi_import(cr, uid, edi_document, context=context)
-        return True
+            record_id = model_obj.edi_import(cr, uid, edi_document, context=context)
+            res.append((model,record_id))
+        return res
     
     def deserialize(self, edi_document_string):
         """ Deserialized the edi document string
@@ -175,7 +176,6 @@ class ir_edi_document(osv.osv):
         
         if edi_url and not edi_document:
             edi_document = urllib2.urlopen(edi_url).read()
-
         assert edi_document, _('EDI Document should be provided')
         edi_documents = self.deserialize(edi_document)
         return self.load_edi(cr, uid, edi_documents, context=context)
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 116eefdd1a1..ec2a3c7507e 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -69,7 +69,7 @@ class edi(netsvc.ExportService):
 
     def exp_import_edi_url(self, db, uid, passwd, edi_url, context=None):
         res = None
-        cr = pooler.get_db_only(db).cursor()
+        cr = pooler.get_db(db).cursor()
         pool = pooler.get_pool(db)
         edi_pool = pool.get('ir.edi.document')
         try:

From 841cc683c6d0fb91f2dde005cc7c42658bd12442 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 11 Jul 2011 13:56:03 +0530
Subject: [PATCH 026/304] [IMP] edi: yml of edi document

bzr revid: hmo@tinyerp.com-20110711082603-56r1dmtfc2h0lxgt
---
 openerp/addons/base/test/partner.pdf          | 118 ++++++++++++++++++
 .../addons/base/test/test_edi_documents.yml   |  15 ++-
 2 files changed, 125 insertions(+), 8 deletions(-)
 create mode 100644 openerp/addons/base/test/partner.pdf

diff --git a/openerp/addons/base/test/partner.pdf b/openerp/addons/base/test/partner.pdf
new file mode 100644
index 00000000000..1b1c7f0daac
--- /dev/null
+++ b/openerp/addons/base/test/partner.pdf
@@ -0,0 +1,118 @@
+%PDF-1.3
+%���� ReportLab Generated PDF document http://www.reportlab.com
+% 'BasicFonts': class PDFDictionary 
+1 0 obj
+% The standard fonts dictionary
+<< /F1 2 0 R
+ /F2 3 0 R
+ /F3 4 0 R >>
+endobj
+% 'F1': class PDFType1Font 
+2 0 obj
+% Font Helvetica
+<< /BaseFont /Helvetica
+ /Encoding /WinAnsiEncoding
+ /Name /F1
+ /Subtype /Type1
+ /Type /Font >>
+endobj
+% 'F2': class PDFType1Font 
+3 0 obj
+% Font Helvetica-Bold
+<< /BaseFont /Helvetica-Bold
+ /Encoding /WinAnsiEncoding
+ /Name /F2
+ /Subtype /Type1
+ /Type /Font >>
+endobj
+% 'F3': class PDFType1Font 
+4 0 obj
+% Font Times-Roman
+<< /BaseFont /Times-Roman
+ /Encoding /WinAnsiEncoding
+ /Name /F3
+ /Subtype /Type1
+ /Type /Font >>
+endobj
+% 'Page1': class PDFPage 
+5 0 obj
+% Page dictionary
+<< /Contents 9 0 R
+ /MediaBox [ 0
+ 0
+ 841.8898
+ 595.2756 ]
+ /Parent 8 0 R
+ /Resources << /Font 1 0 R
+ /ProcSet [ /PDF
+ /Text
+ /ImageB
+ /ImageC
+ /ImageI ] >>
+ /Rotate 0
+ /Trans <<  >>
+ /Type /Page >>
+endobj
+% 'R6': class PDFCatalog 
+6 0 obj
+% Document Root
+<< /Outlines 10 0 R
+ /PageMode /UseNone
+ /Pages 8 0 R
+ /Type /Catalog >>
+endobj
+% 'R7': class PDFInfo 
+7 0 obj
+<< /Author (Generated by OpenERP, Fabien Pinckaers)
+ /CreationDate (20100421145542)
+ /Keywords ()
+ /Producer (ReportLab http://www.reportlab.com)
+ /Subject (\(unspecified\))
+ /Title (Partner) >>
+endobj
+% 'R8': class PDFPages 
+8 0 obj
+% page tree
+<< /Count 1
+ /Kids [ 5 0 R ]
+ /Type /Pages >>
+endobj
+% 'R9': class PDFStream 
+9 0 obj
+% page stream
+<< /Filter [ /ASCII85Decode
+ /FlateDecode ]
+ /Length 524 >>
+stream
+Gat=(?#P<K'R_@f5MSc<`6.HPV2s@dQRlarfjrE>3i<Y4(hW<qY=/IHPo2nd;U2u=SpPc46=:icfCoF922oN\83q_*El(+<i)0C.\*qSa'orY`+p(cC^oTpn8t,B-+=I?_Q1#SGXQbKWJ5-M7"aXRSQCBTu'NHJF046Jno-.K&2kW+&Ddh9bXc1q%)-e?DSC(5(4%=lk+ql;XaX3m]F#7K:"]hph/QW?(0_J4kXQiP</;'9K=]Wd,jeGe.Ma6pqJ&iD]r%qkNclhVq5Q/gSmK+r&6mr`*Z[m8(n)Usu)MZo%TNta^h'I^g6m5Vp92+>e[>S,B2ME\)S7:@oo6@nF8`I+h##OY3a-n#Qm!>5jiD.9pQ@E1#Xj$=)27)F3RmD%fbqZh,T`gJd0/,?A3`0:_VVm`"l`>oOf9p&HGF7>WCGVJoD2&_+c#BDb)/&0>>rL5@]KY$9YOA<rrt#g)1a61mS([/:0_[`)!ctOhSA/p@bq]>qZHTJq8k]!o+?4a5\-KbB#NYJC'`~>endstream
+
+endobj
+% 'R10': class PDFOutlines 
+10 0 obj
+<< /Count 0
+ /Type /Outlines >>
+endobj
+xref
+0 11
+0000000000 65535 f
+0000000113 00000 n
+0000000233 00000 n
+0000000398 00000 n
+0000000573 00000 n
+0000000740 00000 n
+0000001017 00000 n
+0000001152 00000 n
+0000001395 00000 n
+0000001500 00000 n
+0000002169 00000 n
+trailer
+<< /ID 
+ % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
+ [(\210\344\006bE\230CUUi\010[\)Qif) (\210\344\006bE\230CUUi\010[\)Qif)] 
+
+ /Info 7 0 R
+ /Root 6 0 R
+ /Size 11 >>
+startxref
+2221
+%%EOF
diff --git a/openerp/addons/base/test/test_edi_documents.yml b/openerp/addons/base/test/test_edi_documents.yml
index 85a350bf3a9..03dbe623ede 100644
--- a/openerp/addons/base/test/test_edi_documents.yml
+++ b/openerp/addons/base/test/test_edi_documents.yml
@@ -1,5 +1,5 @@
 -
-  create partner
+  I create partner
 -
   !record {model: res.partner, id: res_partner_test33}:
     name: Ivan
@@ -17,7 +17,7 @@
     company_id: base.main_company
     
 -
-    I am creating one Document to be stored in ".
+    I am creating one Document to be attached in partner ".
 -
     !record {model: 'ir.attachment', id: document_4}:
         name : "My partner document"
@@ -25,7 +25,7 @@
         type : binary
 
 -
-    Attach a pdf file in "My partner document"
+    I attach a pdf file in "My partner document"
 -
     !python {model: 'ir.attachment'}: |
         import addons
@@ -34,15 +34,14 @@
         self.write(cr, uid, [ref("document_4")], {'res_id':ref("res_partner_test33"), 'datas_fname': 'partner.pdf', 'datas' : base64.encodestring(pdf_file.read())}, context)
       
 -
-  Testing import and export
+  I am Tesing of EDI functionality. so first export partner and than import it again.
 -      
 
   !python {model: ir.edi.document}: |
       partner_obj = self.pool.get('res.partner')
       partners = [partner_obj.browse(cr, uid, ref("res_partner_test33"))]
       tokens = self.export_edi(cr, uid, partners)
-      for token in tokens:
-        document = self.get_document(cr, uid, token, context=context)
-        print document
-        a = self.import_edi(cr, uid, edi_document = document)
+      assert tokens, 'Token is not generated.'
+      document = self.get_document(cr, uid, tokens[0], context=context)
+      a = self.import_edi(cr, uid, edi_document = document)
 

From db70049e4d4ed37c83d71f3cafc8d5722a27b6ad Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 15 Jul 2011 14:05:09 +0530
Subject: [PATCH 027/304] [ADD] base: add configuration parameter to store
 web.base.url

bzr revid: hmo@tinyerp.com-20110715083509-j0dyh2dq1j9c9t0q
---
 openerp/addons/base/base_data.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 3f8208b8ec4..5b9a1e07e7f 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record id="parameter_web_base_url" model="ir.config_parameter">
+            <field name="key">web.base.url</field>
+            <field name="value">http://localhost:8002</field>
+        </record>
         <record id="view_menu" model="ir.ui.view">
             <field name="name">ir.ui.menu.tree</field>
             <field name="model">ir.ui.menu</field>

From 045b42b03a65b6120b2457f8afd64980514fb230 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 15 Jul 2011 14:05:56 +0530
Subject: [PATCH 028/304] [FIX] base.ir_edi: value of function fields should be
 exported on EDI Document

bzr revid: hmo@tinyerp.com-20110715083556-u60zjo42ync4d47w
---
 openerp/addons/base/ir/ir_edi.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index b37abbb7747..208f69dabac 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -356,9 +356,9 @@ class edi(object):
                 record = getattr(row, field)
                 if not record:
                     continue
-                if _fields[field].has_key('function') or _fields[field].has_key('related_columns'):
-                    # Do not Export Function Fields and related fields
-                    continue
+                #if _fields[field].has_key('function') or _fields[field].has_key('related_columns'):
+                #    # Do not Export Function Fields and related fields
+                #    continue
                 elif cols['type'] == 'many2one':
                     value = self.edi_m2o(cr, uid, record, context=context)
                 elif cols['type'] == 'many2many':

From 1d7eb0cdc25ce45a0d48881f5732f1b010d47ff1 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 15 Jul 2011 15:20:59 +0530
Subject: [PATCH 029/304] [FIX] service: put autocommit true on EDI import
 service to store imported data

bzr revid: hmo@tinyerp.com-20110715095059-96rrh2pu4acevzj4
---
 openerp/addons/base/ir/ir_edi.py | 3 +--
 openerp/service/web_services.py  | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 208f69dabac..7347625c622 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -519,6 +519,5 @@ class edi(object):
                     values[field] = one2many_ids
                 else:
                     values[field] = edi_field_value
-        
-        return model_data._update(cr, uid, self._name, edi_module, values, context=context)
+        return self.pool.get(self._name).create(cr, uid, values, context=context)
 # vim: ts=4 sts=4 sw=4 si et
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index ec2a3c7507e..58b31ede7ff 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -62,6 +62,7 @@ class edi(netsvc.ExportService):
         pool = pooler.get_pool(db)
         edi_pool = pool.get('ir.edi.document')
         try:
+            cr.autocommit(True)
             res = edi_pool.import_edi(cr, uid, edi_document=edi_document, context=context)
         finally:
             cr.close()
@@ -73,6 +74,7 @@ class edi(netsvc.ExportService):
         pool = pooler.get_pool(db)
         edi_pool = pool.get('ir.edi.document')
         try:
+            cr.autocommit(True)
             res = edi_pool.import_edi(cr, uid, edi_url=edi_url, context=context)
         finally:
             cr.close()

From 69259d01711f41349f251cbc610087c9a3acfc0b Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 15 Jul 2011 16:27:39 +0530
Subject: [PATCH 030/304] [FIX] base.ir_edi: call _update method of
 ir.model.data on import

bzr revid: hmo@tinyerp.com-20110715105739-6vvwjlmghh19pjsu
---
 openerp/addons/base/ir/ir_edi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 7347625c622..1d13b84aedc 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -519,5 +519,5 @@ class edi(object):
                     values[field] = one2many_ids
                 else:
                     values[field] = edi_field_value
-        return self.pool.get(self._name).create(cr, uid, values, context=context)
+        return model_data._update(cr, uid, self._name, edi_module, values, context=context)
 # vim: ts=4 sts=4 sw=4 si et

From 7417f09da100f46f77dc78d75af3ef5b69d5ff1e Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Fri, 19 Aug 2011 18:54:22 +0530
Subject: [PATCH 031/304] [IMP]: made changes and removed unwanted code

bzr revid: han@tinyerp.com-20110819132422-5frpi82rdhczpykb
---
 openerp/addons/base/ir/ir_edi.py           | 18 +++++++++++++-----
 openerp/addons/base/res/partner/partner.py |  4 ++--
 openerp/service/web_services.py            |  6 ++----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 225df8d9944..44d6d8f4303 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -26,6 +26,8 @@ import time
 import base64
 import urllib2
 import openerp.release as release
+from tools.translate import _
+import netsvc
 
 edi_module = 'edi_import'
 
@@ -122,13 +124,19 @@ class ir_edi_document(osv.osv):
 
         :param edi_dicts: list of edi_dict
         """
+        module_obj =self.pool.get('ir.module.module')
         res = []
         for edi_document in edi_documents:
-            model = edi_document.get('__model')
-            assert model, _('model should be provided in EDI Dict')
-            model_obj = self.pool.get(model)
-            record_id = model_obj.edi_import(cr, uid, edi_document, context=context)
-            res.append((model,record_id))
+            module = edi_document.get('__module')
+            module_id = module_obj.search(cr, uid, [('name','=',module),('state','=','installed')])
+            if module_id:
+                model = edi_document.get('__model')
+                assert model, _('model should be provided in EDI Dict')
+                model_obj = self.pool.get(model)
+                record_id = model_obj.edi_import(cr, uid, edi_document, context=context)
+                res.append((model,record_id))
+            else:
+                raise osv.except_osv(_('Invalid action !'), _('Module is not Installed'))
         return res
     
     def deserialize(self, edi_document_string):
diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py
index de8fce3c5e9..e1e71f4996d 100644
--- a/openerp/addons/base/res/partner/partner.py
+++ b/openerp/addons/base/res/partner/partner.py
@@ -111,7 +111,7 @@ class res_partner(osv.osv):
     _order = "name"
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
-        'opt_out':fields.boolean('Opt-out'),
+        'opt_out':fields.boolean('Opt-out', help='After enable opt-out, Automated Mail will not be sent to provided email address of partner'),
         'date': fields.date('Date', select=1),
         'title': fields.many2one('res.partner.title','Partner Firm'),
         'parent_id': fields.many2one('res.partner','Parent Partner'),
@@ -150,7 +150,7 @@ class res_partner(osv.osv):
         'customer': lambda *a: 1,
         'category_id': _default_category,
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c),
-        'opt_out' : False
+        'opt_out' : True
     }
     def copy(self, cr, uid, id, default={}, context={}):
         name = self.read(cr, uid, [id], ['name'])[0]['name']
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 58b31ede7ff..0e8acc6bb7a 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -40,10 +40,8 @@ from cStringIO import StringIO
 import threading
 
 class edi(netsvc.ExportService):
-    def exp_get_edi_document(self, edi_token, db_name=None):
+    def exp_get_edi_document(self, edi_token, db_name):
         res = None
-        if not db_name:
-            db_name = getattr(threading.currentThread(), 'dbname', None)
         if db_name:
             cr = pooler.get_db(db_name).cursor()
         else:
@@ -74,8 +72,8 @@ class edi(netsvc.ExportService):
         pool = pooler.get_pool(db)
         edi_pool = pool.get('ir.edi.document')
         try:
-            cr.autocommit(True)
             res = edi_pool.import_edi(cr, uid, edi_url=edi_url, context=context)
+            cr.commit()
         finally:
             cr.close()
         return res

From fc5bf7ae26b6e7cea45cae8e072bc78ee1dd28c3 Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Tue, 23 Aug 2011 17:06:32 +0530
Subject: [PATCH 032/304] [IMP]

bzr revid: han@tinyerp.com-20110823113632-3k859oxwq5k7kwzw
---
 openerp/addons/base/ir/ir_edi.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 44d6d8f4303..443a1d12ec6 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -129,14 +129,14 @@ class ir_edi_document(osv.osv):
         for edi_document in edi_documents:
             module = edi_document.get('__module')
             module_id = module_obj.search(cr, uid, [('name','=',module),('state','=','installed')])
-            if module_id:
+            if  not module_id:
+                raise Exception("The document you are trying to import requires the OpenERP" +module+ "application")
+            else:
                 model = edi_document.get('__model')
                 assert model, _('model should be provided in EDI Dict')
                 model_obj = self.pool.get(model)
                 record_id = model_obj.edi_import(cr, uid, edi_document, context=context)
                 res.append((model,record_id))
-            else:
-                raise osv.except_osv(_('Invalid action !'), _('Module is not Installed'))
         return res
     
     def deserialize(self, edi_document_string):
@@ -323,7 +323,7 @@ class edi(object):
         dict_list = []
         
         for record in records:
-            dict_list.append(self.edi_o2m(cr, uid, [record], context=None))
+            dict_list.append(self.edi_m2o(cr, uid, [record], context=None))
       
         return dict_list
 

From 2b0109060c081d9a2b80d6317b0d2fb8a925083b Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 29 Aug 2011 13:17:32 +0530
Subject: [PATCH 033/304] [IMP] ir.edi: improve edi_import_relation and
 edi_xml_id with better xml_id, uuid

bzr revid: hmo@tinyerp.com-20110829074732-lq2q9k2wh2ywnooy
---
 openerp/addons/base/ir/ir_edi.py | 117 +++++++++++++++----------------
 openerp/service/web_services.py  |   2 +
 2 files changed, 58 insertions(+), 61 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 9af5bb325f8..2fd11338ffb 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -29,8 +29,6 @@ import openerp.release as release
 from tools.translate import _
 import netsvc
 
-edi_module = 'edi_import'
-
 def safe_unique_id(database_id, model, record_id):
     """Generate a unique string to represent a (database id,model,record_id) pair
     without being too long, without revealing the database id, and
@@ -42,7 +40,7 @@ def safe_unique_id(database_id, model, record_id):
     # finally, use the b64-encoded folded digest as ID part of the unique ID:
     digest = base64.urlsafe_b64encode(digest)
         
-    return '%s-%s' % (model,digest)
+    return '%s-%s' % (model.replace('.','_'), digest)
 
 class ir_edi_document(osv.osv):
     _name = 'ir.edi.document'
@@ -185,6 +183,15 @@ class edi(object):
        ``edi_import()`` and ``edi_export()`` methods to implement their
        specific behavior, based on the primitives provided by this superclass."""
 
+    def record_xml_id(self, cr, uid, record, context=None):
+        model_data_pool = self.pool.get('ir.model.data')
+        data_ids = model_data_pool.search(cr, uid, [('res_id','=',record.id),('model','=',record._name)])
+        if not data_ids:
+            return False
+        xml_record_id = data_ids[0]
+        xml_record = model_data_pool.browse(cr, uid, xml_record_id, context=context)
+        return xml_record.module, xml_record.name
+
     def edi_xml_id(self, cr, uid, record, context=None):
         """
         Generate a unique string to represent a pair of (the database's UUID, the XML ID).
@@ -206,20 +213,21 @@ class edi(object):
         model_data_pool = self.pool.get('ir.model.data')
         db_uuid = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
 
-        data_ids = model_data_pool.search(cr, uid, [('res_id','=',record.id),('model','=',record._name)])
-        if len(data_ids):
-            xml_record_id = data_ids[0]
-            xml_record = model_data_pool.browse(cr, uid, xml_record_id, context=context)
-            uuid = '%s:%s' % (db_uuid, xml_record.name)
+        _record_xml = self.record_xml_id(cr, uid, record, context=context)
+        if _record_xml:
+            module, xml_id = _record_xml
+            xml_id = '%s:%s.%s' % (db_uuid, module, xml_id)
         else:
-            xml_id = safe_unique_id(db_uuid, record._name, record.id)
-            uuid = '%s:%s' % (db_uuid, xml_id)
+            uuid = safe_unique_id(db_uuid, record._name, record.id)
+            xml_id = '%s:%s.%s' % (db_uuid, record._module, uuid)
+            assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
+            module, xml_id2 = xml_id.split('.')
             xml_record_id = model_data_pool.create(cr, uid, {
-                'name': xml_id,
+                'name': xml_id2,
                 'model': record._name,
-                'module': uuid,
+                'module': module,
                 'res_id': record.id}, context=context)
-        return uuid
+        return xml_id
     
     def edi_metadata(self, cr, uid, records, context=None):
         """Return a list representing the boilerplate EDI structure for
@@ -385,14 +393,29 @@ class edi(object):
             edi_dict_list.append(edi_dict)
         return edi_dict_list
 
-    def edi_import_relation(self, cr, uid, relation_model, relation_value, values={}, context=None):
+    def edi_import_relation(self, cr, uid, relation_model, relation_value, xml_id=None, context=None):
+        relation_id = False
+        model_data = self.pool.get('ir.model.data')
         relation_object = self.pool.get(relation_model)
         relation_ids = relation_object.name_search(cr, uid, relation_value, context=context)
         if relation_ids and len(relation_ids) == 1:
             relation_id = relation_ids[0][0]
-        else:
-            values.update({'name': relation_value})
+        values = {relation_object._rec_name: relation_value}
+        if not relation_id:
             relation_id = relation_object.create(cr, uid, values, context=context)
+
+        relation_record = relation_object.browse(cr, uid, relation_id, context=context)
+        record_xml = self.record_xml_id(cr, uid, relation_record, context=context)
+        if record_xml:
+            module, xml_id = record_xml
+            xml_id = '%s.%s' % (module, xml_id)
+        if not xml_id:
+            xml_id = self.edi_xml_id(cr, uid, relation_record, context=context)
+        if xml_id:
+            assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
+            module, xml_id2 = xml_id.split('.')
+        #TODO: update record from values
+        #relation_id = model_data._update(cr, uid, relation_model, module, values, xml_id=xml_id, context=context)
         return relation_id
         
     def edi_import(self, cr, uid, edi_document, context=None):
@@ -443,24 +466,28 @@ class edi(object):
                     connect it to the parent record via a write value like (4, db_id).        
         """
         # generic implementation!
-        
         fields = edi_document.keys()
         fields_to_import = []
         data_line = []
         model_data = self.pool.get('ir.model.data')
         _fields = self.fields_get(cr, uid, context=context)
         values = {}
+        xml_id = edi_document['__id']
+        assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
+        module, xml_id2 = xml_id.split('.')
         for field in edi_document.keys():
             if not field.startswith('__'):
                 fields_to_import.append(field)
                 edi_field_value = edi_document[field]
+                field_type = _fields[field]['type']
+                relation_model = _fields[field].get('relation')
                 if not edi_field_value:
                     continue
                 if _fields[field].has_key('function') or _fields[field].has_key('related_columns'):
                     # DO NOT IMPORT FUNCTION FIELD AND RELATED FIELD
                     continue
-                elif _fields[field]['type'] in ('many2one', 'many2many'):
-                    if _fields[field]['type'] == 'many2one':
+                elif field_type in ('many2one', 'many2many'):
+                    if field_type == 'many2one':
                         edi_parent_documents = [edi_field_value]
                     else:
                         edi_parent_documents = edi_field_value
@@ -468,41 +495,19 @@ class edi(object):
                     parent_lines = []
 
                     for edi_parent_document in edi_parent_documents:
-                        #Look in ir.model.data for a record that matches the db_id.
-                        #If found, replace the m2o value with the correct database ID and stop.
-                        #If not found, continue to next step
-                        xml_id =  edi_parent_document[0]
-                        data_ids = model_data.name_search(cr, uid, xml_id)
-                        if data_ids:
-                            for data in model_data.browse(cr, uid, [data_ids[0][0]], context=context):
-                                parent_lines.append(data.res_id)
-                        else:
-                            #Perform name_search(name) to look for a record that matches the
-                            #given m2o name. If only one record is found, create the missing
-                            #ir.model.data record to link it to the db_id, and the replace the m2o
-                            #value with the correct database ID, then stop. If zero result or
-                            #multiple results are found, go to next step.
-                            #Create the new record using the only field value that is known: the
-                            #name, and create the ir.model.data entry to map to it.
-                            relation_model = _fields[field]['relation']
-                            relation_id = self.edi_import_relation(cr, uid, relation_model, edi_parent_document[1], context=context)
-                            relation_object = self.pool.get(relation_model)
-                            relation_record = relation_object.browse(cr, uid, relation_id, context=context)
-                            self.edi_xml_id(cr, uid, relation_record, context=context)
-                            
-                            parent_lines.append(relation_id)
-                                
+                        relation_id = self.edi_import_relation(cr, uid, relation_model, edi_parent_document[1], edi_parent_document[0], context=context)
+                        parent_lines.append(relation_id)
                         
                     if len(parent_lines):   
-                        if _fields[field]['type'] == 'many2one':
+                        if field_type == 'many2one':
                             values[field] = parent_lines[0]
                             
                         else:
                             many2many_ids = []
                             for m2m_id in parent_lines:
-                                many2many_ids.append((4,m2m_id))
+                                many2many_ids.append((4, m2m_id))
                             values[field] = many2many_ids
-                elif _fields[field]['type'] == 'one2many':
+                elif field_type == 'one2many':
                     #Look for a record that matches the db_id provided in the __id field. If
                     #found, keep the corresponding database id, and connect it to the parent
                     #using a write value like (4,db_id).
@@ -511,22 +516,12 @@ class edi(object):
                     #and use it to connect to the parent via a write value like (4, db_id).
             
                     relations = []
-                    relation_object = self.pool.get(_fields[field]['relation'])
+                    relation_object = self.pool.get(relation_model)
                     for edi_relation_document in edi_field_value:
-                        if edi_relation_document['__id'].find(':') != -1:
-                            db_uuid, xml_id = tuple(edi_relation_document['__id'].split(':'))
-                            data_ids = model_data.name_search(cr, uid, xml_id)
-                            if data_ids:
-                                for data in model_data.browse(cr,uid,[data_ids[0][0]]):
-                                    relations.append(data.res_id)
-                            else:
-                                r = relation_object.edi_import(cr, uid, edi_relation_document, context=context)
-                                relations.append(r)
-                    one2many_ids = []
-                    for o2m_id in relations:
-                        one2many_ids.append((4,o2m_id))
-                    values[field] = one2many_ids
+                        relation_id = relation_object.edi_import(cr, uid, edi_relation_document, context=context)
+                        relations.append((4, relation_id))
+                    values[field] = relations
                 else:
                     values[field] = edi_field_value
-        return model_data._update(cr, uid, self._name, edi_module, values, context=context)
+        return model_data._update(cr, uid, self._name, module, values, xml_id=xml_id, context=context)
 # vim: ts=4 sts=4 sw=4 si et
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index f6b4ff23df0..5be6629bb49 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -63,6 +63,7 @@ class edi(netsvc.ExportService):
             res = edi_pool.import_edi(cr, uid, edi_document=edi_document, context=context)
             cr.commit()
         except:
+            print traceback.format_exc()
             cr.rollback()
         finally:
             cr.close()
@@ -77,6 +78,7 @@ class edi(netsvc.ExportService):
             res = edi_pool.import_edi(cr, uid, edi_url=edi_url, context=context)
             cr.commit()
         except:
+            print traceback.format_exc()
             cr.rollback()
         finally:
             cr.close()

From 75e0749542e51ce76fa29a9d2f4b6a02cb4067d1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 1 Sep 2011 20:12:54 +0200
Subject: [PATCH 034/304] [IMP] ir.values: separated defaults and actions API,
 added different views

This should prepare for a future split of the two parts
currently composing ir.values entries: user defaults and
action bindings to a model's UI.

bzr revid: odo@openerp.com-20110901181254-g14lyeogs0wv23bz
---
 openerp/addons/base/ir/ir.xml               | 130 +++--
 openerp/addons/base/ir/ir_values.py         | 511 ++++++++++++++------
 openerp/addons/base/test/test_ir_values.yml |   3 +
 3 files changed, 415 insertions(+), 229 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 011ad437cca..eda044336df 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -7,44 +7,50 @@
             <field name="name">ir.values.form.action</field>
             <field name="model">ir.values</field>
             <field name="type">form</field>
-            <field name="priority">20</field>
             <field name="arch" type="xml">
-                <form string="Connect Events to Actions">
-                   <field name="name" required="1"/>
+                <form string="Action Bindings">
+                   <field name="name"/>
                    <newline/>
                     <group col="2" colspan="2">
-                        <separator string="Action Source" colspan="2"/>
+                        <separator string="Action Binding" colspan="2"/>
                         <field name="model_id" on_change="onchange_object_id(model_id)"/>
+                        <field name="model"/>
                         <field name="res_id"/>
-                        <field name="key2" required="1"/>
+                        <field name="key2"/>
                     </group>
                     <group col="2" colspan="2">
-                        <separator string="Action To Launch" colspan="2"/>
+                        <separator string="Action" colspan="2"/>
                         <field name="action_id" on_change="onchange_action_id(action_id)"/>
+                        <field name="value_unpickle" colspan="4" string="Action Reference"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-                        <field name="object" readonly="1"/>
-
+        <record id="values_view_form_defaults" model="ir.ui.view">
+            <field name="name">ir.values.form.defaults</field>
+            <field name="model">ir.values</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="User-defined Defaults">
+                   <field name="name"/>
+                   <newline/>
+                    <group col="2" colspan="2">
+                        <separator string="Model" colspan="2"/>
+                        <field name="model_id" on_change="onchange_object_id(model_id)"/>
+                        <field name="model"/>
+                        <field name="key2" string="Condition"/>
                     </group>
                     <group col="2" colspan="2">
-                        <separator string="Values for Event Type" colspan="2"/>
-                        <label string="client_action_multi, client_action_relate" colspan="2"/>
-                        <label string="tree_but_action, client_print_multi"  colspan="2"/>
+                        <separator string="Value" colspan="2"/>
+                        <field name="value_unpickle" colspan="4" nolabel="1"/>
                     </group>
                     <group col="2" colspan="2">
-                        <separator colspan="2" string="Value"/>
-                         <field name="value_unpickle" nolabel="1" colspan="4"/>
+                        <separator colspan="2" string="Default Value Scope"/>
+                        <field name="user_id"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
                     </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Metadata"/>
-                        <field name="meta_unpickle" nolabel="1"/>
-                    </group>
-                    <group col="2" colspan="2">
-                    <separator colspan="2" string=""/>
-                    <field name="user_id"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    </group>
-              </form>
-
+                </form>
             </field>
         </record>
 
@@ -53,11 +59,11 @@
             <field name="model">ir.values</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Client Actions">
+                <tree string="Action Bindings/Defaults">
                     <field name="name"/>
                     <field name="model"/>
-                    <field name="action_id"/>
                     <field name="key2"/>
+                    <field name="value_unpickled"/>
                 </tree>
             </field>
         </record>
@@ -73,7 +79,7 @@
                     <field name="key2"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Model" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'key2'}"/>
                     </group>
                 </search>
@@ -81,23 +87,21 @@
         </record>
 
         <record id="act_values_form_action" model="ir.actions.act_window">
-            <field name="name">Client Events</field>
+            <field name="name">Action Bindings</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.values</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="values_view_search_action"/>
             <field name="domain">[('key','=','action')]</field>
-            <field name="context">{'read':'default','default_object':1}</field>
+            <field name="context">{'default_object':1,'default_key':'action'}</field>
         </record>
-
         <record model="ir.actions.act_window.view" id="action_values_tree_view">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="values_view_tree_action"/>
             <field name="act_window_id" ref="act_values_form_action"/>
         </record>
-
         <record model="ir.actions.act_window.view" id="action_values_form_view">
             <field name="sequence" eval="2"/>
             <field name="view_mode">form</field>
@@ -105,54 +109,27 @@
             <field name="act_window_id" ref="act_values_form_action"/>
         </record>
 
-
-
-
-        <!-- Values -->
-
-        <record id="values_view_form" model="ir.ui.view">
-            <field name="name">ir.values.form</field>
-            <field name="model">ir.values</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Values">
-                    <field name="name" select="1"/>
-                    <field name="model" select="1"/>
-                    <field name="key" select="1"/>
-                    <field name="key2" select="2"/>
-                    <field name="object" select="2"/>
-                    <field name="res_id"/>
-                    <field name="user_id" select="2"/>
-                    <field name="company_id" select="2"/>
-                    <field name="value_unpickle"/>
-                    <field name="meta_unpickle"/>
-                </form>
-            </field>
-        </record>
-
-        <record id="values_view_tree" model="ir.ui.view">
-            <field name="name">ir.values.tree</field>
-            <field name="model">ir.values</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Values">
-                    <field name="name"/>
-                    <field name="model"/>
-                    <field name="key"/>
-                    <field name="key2"/>
-                    <field name="user_id"/>
-                    <field name="company_id"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="act_values_form" model="ir.actions.act_window">
-            <field name="name">Client Actions Connections</field>
+        <record id="act_values_form_defaults" model="ir.actions.act_window">
+            <field name="name">User-defined Defaults</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.values</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="values_view_tree"/>
-            <field name="context">{'read':'default'}</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="values_view_search_action"/>
+            <field name="domain">[('key','=','default')]</field>
+            <field name="context">{'default_object':0,'default_key':'default','default_key2':''}</field>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_values_defaults_tree_view">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="values_view_tree_action"/>
+            <field name="act_window_id" ref="act_values_form_defaults"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_values_defaults_form_view">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="values_view_form_defaults"/>
+            <field name="act_window_id" ref="act_values_form_defaults"/>
         </record>
 
         <!-- Sequences -->
@@ -342,6 +319,7 @@
         <menuitem id="next_id_6" name="Actions" parent="base.next_id_4" sequence="1"/>
         <menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/>
         <menuitem action="act_values_form_action" id="menu_values_form_action" parent="next_id_6"/>
+        <menuitem action="act_values_form_defaults" id="menu_values_form_defaults" parent="next_id_6"/>
 
         <!--Filters form view-->
 
diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index c2a59ada55e..c75831f9c2f 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -28,7 +28,76 @@ EXCLUDED_FIELDS = set((
     'report_sxw_content', 'report_rml_content', 'report_sxw', 'report_rml',
     'report_sxw_content_data', 'report_rml_content_data', 'search_view', ))
 
+#: Possible slots to bind an action to with :meth:`~.set_action`
+ACTION_SLOTS = [
+                "client_action_multi",  # sidebar wizard action
+                "client_print_multi",   # sidebar report printing button
+                "client_action_relate", # sidebar related link
+                "tree_but_open",        # double-click on item in tree view
+                "tree_but_action",      # deprecated: same as tree_but_open
+               ]
+
+
 class ir_values(osv.osv):
+    """Holds internal model-specific action bindings and user-defined default
+       field values. definitions. This is a legacy internal model, mixing
+       two different concepts, and will likely be updated or replaced in a
+       future version by cleaner, separate models. You should not depend
+       explicitly on it.
+
+       The purpose of each ``ir.values`` entry depends on its type, defined
+       by the ``key`` column:
+
+        * 'default': user-defined default values, used when creating new
+          records of this model:
+        * 'action': binding of an action to a particular *action slot* of
+          this model, making the action easily available in the user
+          interface for this model.
+
+       The ``key2`` column acts as a qualifier, further refining the type
+       of the entry. The possible values are:
+
+        * for 'default' entries: an optional condition restricting the
+          cases where this particular default value will be applicable,
+          or ``False`` for no condition
+        * for 'action' entries: the ``key2`` qualifier is one of the available
+          action slots, defining how this action can be invoked:
+
+            * ``'client_print_multi'`` for report printing actions that will
+              be available on views displaying items from this model
+            * ``'client_action_multi'`` for assistants (wizards) actions
+              that will be available in views displaying objects of this model
+            * ``'client_action_relate'`` for links towards related documents
+              that should be available in views displaying objects of this model
+            * ``'tree_but_open'`` for actions that will be triggered when
+              double-clicking an item from this model in a hierarchical tree view
+
+       Each entry is specific to a model (``model`` column), and for ``'actions'``
+       type, may even be made specific to a given record of that model when the
+       ``res_id`` column contains a record ID (``False`` means it's global for
+       all records).
+
+       The content of the entry is defined by the ``value`` column, which may either
+       contain an arbitrary value (for default values - when the ``object`` column
+       is False), or a reference string defining the action that should be executed.
+
+       .. rubric:: Usage: default values
+       
+       The ``'default'`` entries are usually defined manually by the
+       users, and set by their UI clients calling :meth:`~.set_default`.
+       These default values are then automatically used by the
+       ORM every time a new record is about to be created, i.e. when
+       :meth:`~openerp.osv.osv.osv.default_get`
+       or :meth:`~openerp.osv.osv.osv.create` are called.
+
+       .. rubric:: Usage: action bindings
+
+       Business applications will usually bind their actions during
+       installation, and OpenERP UI clients will apply them as defined,
+       based on the list of actions included in the result of
+       :meth:`~openerp.osv.osv.osv.fields_view_get`,
+       or directly returned by explicit calls to :meth:`~.get_actions`.
+    """
     _name = 'ir.values'
 
     def _value_unpickle(self, cursor, user, ids, name, arg, context=None):
@@ -38,7 +107,7 @@ class ir_values(osv.osv):
             if not report.object and value:
                 try:
                     value = str(pickle.loads(value))
-                except:
+                except Exception:
                     pass
             res[report.id] = value
         return res
@@ -53,44 +122,69 @@ class ir_values(osv.osv):
             value = pickle.dumps(value)
         self.write(cursor, user, id, {name[:-9]: value}, context=ctx)
 
-    def onchange_object_id(self, cr, uid, ids, object_id, context={}):
+    def onchange_object_id(self, cr, uid, ids, object_id, context=None):
         if not object_id: return {}
         act = self.pool.get('ir.model').browse(cr, uid, object_id, context=context)
         return {
                 'value': {'model': act.model}
         }
 
-    def onchange_action_id(self, cr, uid, ids, action_id, context={}):
+    def onchange_action_id(self, cr, uid, ids, action_id, context=None):
         if not action_id: return {}
         act = self.pool.get('ir.actions.actions').browse(cr, uid, action_id, context=context)
         return {
                 'value': {'value_unpickle': act.type+','+str(act.id)}
         }
 
+    def onchange_key(self, cr, uid, ids, key, context=None):
+        return {
+                'value': {'object': key == 'action'}
+        }
+
     _columns = {
-        'name': fields.char('Name', size=128),
-        'model_id': fields.many2one('ir.model', 'Object', size=128,
-            help="This field is not used, it only helps you to select a good model."),
-        'model': fields.char('Object Name', size=128, select=True),
-        'action_id': fields.many2one('ir.actions.actions', 'Action',
-            help="This field is not used, it only helps you to select the right action."),
-        'value': fields.text('Value'),
+        'name': fields.char('Name', size=128, required=True),
+        'model': fields.char('Model Name', size=128, select=True, required=True,
+                             help="Model to which this entry applies"),
+
+        # TODO: model_id and action_id should be read-write function fields
+        'model_id': fields.many2one('ir.model', 'Model (change only)', size=128,
+                                    help="Model to which this entry applies - "
+                                         "helper field for setting a model, will "
+                                         "automatically set the correct model name"),
+        'action_id': fields.many2one('ir.actions.actions', 'Action (change only)',
+                                     help="Action bound to this entry - "
+                                         "helper field for binding an action, will "
+                                         "automatically set the correct reference"),
+
+        'value': fields.text('Value', help="Default value (pickled) or reference to an action"),
         'value_unpickle': fields.function(_value_unpickle, fnct_inv=_value_pickle,
-            method=True, type='text', string='Value'),
-        'object': fields.boolean('Is Object'),
-        'key': fields.selection([('action','Action'),('default','Default')], 'Type', size=128, select=True),
-        'key2' : fields.char('Event Type',help="The kind of action or button in the client side that will trigger the action.", size=128, select=True),
-        'meta': fields.text('Meta Datas'),
-        'meta_unpickle': fields.function(_value_unpickle, fnct_inv=_value_pickle,
-            method=True, type='text', string='Metadata'),
-        'res_id': fields.integer('Object ID', help="Keep 0 if the action must appear on all resources.", select=True),
-        'user_id': fields.many2one('res.users', 'User', ondelete='cascade', select=True),
-        'company_id': fields.many2one('res.company', 'Company', select=True)
+                                          type='text',
+                                          string='Default value or action reference'),
+        'object': fields.boolean('No value serialization', help="Should be enabled when Type is Action"),
+        'key': fields.selection([('action','Action'),('default','Default')],
+                                'Action Type', size=128, select=True, required=True,
+                                help="- Action: an action attached to one slot of the given model\n"
+                                     "- Default: a default value for a model field"),
+        'key2' : fields.char('Action Qualifier', size=128, select=True,
+                             help="For actions, one of the possible action slots: \n"
+                                  "  - client_action_multi\n"
+                                  "  - client_print_multi\n"
+                                  "  - client_action_relate\n"
+                                  "  - tree_but_open\n"
+                                  "For defaults, an optional condition"
+                             ,),
+        'res_id': fields.integer('Record ID', select=True,
+                                 help="Database identifier of the record to which this applies."
+                                      "0 = for all records"),
+        'user_id': fields.many2one('res.users', 'User', ondelete='cascade', select=True,
+                                   help="If set, action binding only applies for this user."),
+        'company_id': fields.many2one('res.company', 'Company', ondelete='cascade', select=True,
+                                      help="If set, action binding only applies for this company")
     }
     _defaults = {
-        'key': lambda *a: 'action',
-        'key2': lambda *a: 'tree_but_open',
-        'company_id': lambda *a: False
+        'key': 'action',
+        'key2': 'tree_but_open',
+        'object': True,
     }
 
     def _auto_init(self, cr, context=None):
@@ -99,140 +193,251 @@ class ir_values(osv.osv):
         if not cr.fetchone():
             cr.execute('CREATE INDEX ir_values_key_model_key2_res_id_user_id_idx ON ir_values (key, model, key2, res_id, user_id)')
 
-    def set(self, cr, uid, key, key2, name, models, value, replace=True, isobject=False, meta=False, preserve_user=False, company=False):
+    def set_default(self, cr, uid, model, field_name, value, for_all_users=True, company_id=False, condition=False):
+        """Defines a default value for the given model and field_name. Any previous
+           default will be replaced and lost in the process.
+
+           :param string model: model name
+           :param string field_name: field name to which the default applies
+           :param value: the default field value to set
+           :type value: any serializable Python value
+           :param bool for_all_users: whether the default should apply to everybody or only
+                                      the user calling the method
+           :param int company_id: optional ID of the company to which the default should
+                                  apply. If omitted, the default will be global. If True
+                                  is passed, the current user's company will be used.
+           :param string condition: optional condition specification that can be used to
+                                    restrict the applicability of the default values
+                                    (e.g. based on another field's value)
+           :return: id of the newly created ir.values entry
+        """
         if isinstance(value, unicode):
             value = value.encode('utf8')
-        if not isobject:
-            value = pickle.dumps(value)
-        if meta:
-            meta = pickle.dumps(meta)
-        assert isinstance(models, (list, tuple)), models
-        ids_res = []
-        for model in models:
-            if isinstance(model, (list, tuple)):
-                model,res_id = model
-            else:
-                res_id = False
-            if replace:
-                search_criteria = [
-                    ('key', '=', key),
-                    ('key2', '=', key2),
-                    ('model', '=', model),
-                    ('res_id', '=', res_id),
-                    ('user_id', '=', preserve_user and uid)
-                ]
-                if key in ('meta', 'default'):
-                    search_criteria.append(('name', '=', name))
-                else:
-                    search_criteria.append(('value', '=', value))
+        if company_id is True:
+            # should be company-specific, need to get company id
+            user = self.pool.get('res.users').browse(cr, uid, uid)
+            company_id = user.company_id.id
 
-                self.unlink(cr, uid, self.search(cr, uid, search_criteria))
-            vals = {
-                'name': name,
-                'value': value,
-                'model': model,
-                'object': isobject,
-                'key': key,
-                'key2': key2 and key2[:200],
-                'meta': meta,
-                'user_id': preserve_user and uid,
-            }
-            if company:
-                cid = self.pool.get('res.users').browse(cr, uid, uid, context={}).company_id.id
-                vals['company_id']=cid
-            if res_id:
-                vals['res_id']= res_id
-            ids_res.append(self.create(cr, uid, vals))
-        return ids_res
+        # remove existing defaults for the same scope
+        search_criteria = [
+            ('key', '=', 'default'),
+            ('key2', '=', condition),
+            ('model', '=', model),
+            ('name', '=', field_name),
+            ('user_id', '=', False if for_all_users else uid),
+            ('company_id','=', company_id)
+            ]
+        self.unlink(cr, uid, self.search(cr, uid, search_criteria))
+
+        return self.create(cr, uid, {
+            'name': field_name,
+            'value': pickle.dumps(value),
+            'model': model,
+            'object': False,
+            'key': 'default',
+            'key2': condition and condition[:200],
+            'user_id': False if for_all_users else uid,
+            'company_id': company_id,
+        })
+
+    def get_defaults(self, cr, uid, model, condition=False):
+        """Returns any user-defined values registered for the given model.
+           This is not field-specific, but an optional ``condition`` can be
+           provided to query for default values that should be applied only
+           when the given condition is met (usually another field's value).
+           Defaults that have been set for the user herself will have higher
+           priority that those that have been set for everyone
+           (see :meth:`~.set_default`).
+
+           :param string model: model name
+           :param string condition: optional condition specification that can be used to
+                                    restrict the applicability of the default values
+                                    (e.g. based on another field's value)
+           :return: list of default values tuples of the form ``(id, field_name, value)``
+                    (``id`` is the ID of the default entry, usually irrelevant)
+        """
+        # use a direct SQL query for performance reasons,
+        # this is called very often
+        query = """SELECT v.id, v.name, v.value FROM ir_values v
+                      LEFT JOIN res_users u ON (v.user_id = u.id)
+                   WHERE v.key = %%s AND v.model = %%s
+                      AND (v.user_id = %%s OR v.user_id IS NULL)
+                      AND (u.company_id IS NULL OR
+                           u.company_id =
+                             (SELECT company_id from res_users where id = %%s)
+                          )
+                      %s
+                   ORDER BY v.user_id, u.company_id"""
+        query = query % ('AND v.key2 = %s' if condition else '')
+        params = ('default', model, uid, uid)
+        if condition:
+            params += (condition,)
+        cr.execute(query, params)
+
+        # keep only the highest priority default for each field
+        defaults = {}
+        for row in cr.dictfetchall():
+            defaults.setdefault(row['name'],
+                (row['id'], row['name'], pickle.loads(row['value'].encode('utf-8'))))
+        return defaults.values()
+
+    def set_action(self, cr, uid, name, action_slot, model, action, res_id=False):
+        """Binds an the given action to the given model's action slot - for later
+           retrieval via :meth:`~.get_actions`. Any existing binding of the same action
+           to the same slot is first removed, allowing an update of the action's name.
+           See the class description for more details about the various action
+           slots: :class:`~ir_values`.
+
+           :param string name: action label, usually displayed by UI client
+           :param string action_slot: the action slot to which the action should be
+                                      bound to - one of ``client_action_multi``,
+                                      ``client_print_multi``, ``client_action_relate``,
+                                      ``tree_but_open``.
+           :param string model: model name
+           :param string action: action reference, in the form ``'model,id'``
+           :param int res_id: optional record id - will bind the action only to a
+                              specific record of the model, not all records.
+           :return: id of the newly created ir.values entry
+        """
+        assert isinstance(action, basestring) and ',' in action, \
+               'Action definition must be an action reference, e.g. "ir.actions.act_window,42"'
+        assert action_slot in ACTION_SLOTS, \
+               'Action slot (%s) must be one of: %r' % (action_slot, ACTION_SLOTS)
+
+        # remove existing action definition of same slot and value
+        search_criteria = [
+            ('key', '=', 'action'),
+            ('key2', '=', action_slot),
+            ('model', '=', model),
+            ('res_id', '=', res_id),
+            ('value', '=', action),
+            ]
+        self.unlink(cr, uid, self.search(cr, uid, search_criteria))
+
+        return self.create(cr, uid, {
+            'key': 'action',
+            'key2': action_slot,
+            'object': True,
+            'model': model,
+            'res_id': res_id or False,
+            'name': name,
+            'value': action,
+        })
+
+    def get_actions(self, cr, uid, action_slot, model, res_id=False, context=None):
+        """Retrieves the list of actions bound to the given model's action slot.
+           See the class description for more details about the various action
+           slots: :class:`~.ir_values`.
+
+           :param string action_slot: the action slot to which the actions should be
+                                      bound to - one of ``client_action_multi``,
+                                      ``client_print_multi``, ``client_action_relate``,
+                                      ``tree_but_open``.
+           :param string model: model name
+           :param int res_id: optional record id - will bind the action only to a
+                              specific record of the model, not all records.
+           :return: list of action tuples of the form ``(id, name, action_def)``,
+                    where ``id`` is the ID of the default entry, ``name`` is the
+                    action label, and ``action_def`` is a dict containing the
+                    action definition as obtained by calling
+                    :meth:`~openerp.osv.osv.osv.read` on the action record.
+        """
+        assert action_slot in ACTION_SLOTS, 'Illegal action slot value: %s' % action_slot
+        # use a direct SQL query for performance reasons,
+        # this is called very often
+        query = """SELECT v.id, v.name, v.value FROM ir_values v
+                   WHERE v.key = %s AND v.key2 = %s
+                        AND v.model = %s
+                        AND (v.res_id = %s
+                             OR v.res_id IS NULL
+                             OR v.res_id = 0)
+                   ORDER BY v.id"""
+        cr.execute(query, ('action', action_slot, model, res_id or None))
+        results = {}
+        for action in cr.dictfetchall():
+            action_model,id = action['value'].split(',')
+            fields = [
+                    field
+                    for field in self.pool.get(action_model)._all_columns
+                    if field not in EXCLUDED_FIELDS]
+            # FIXME: needs cleanup
+            try:
+                action_def = self.pool.get(action_model).read(cr, uid, int(id), fields, context)
+                if action_def:
+                    if action_model in ('ir.actions.report.xml','ir.actions.act_window',
+                                        'ir.actions.wizard'):
+                        groups = action_def.get('groups_id')
+                        if groups:
+                            cr.execute('SELECT 1 FROM res_groups_users_rel WHERE gid IN %s AND uid=%s',
+                                       (tuple(groups), uid))
+                            if not cr.fetchone():
+                                if action['name'] == 'Menuitem':
+                                    raise osv.except_osv('Error !',
+                                                         'You do not have the permission to perform this operation !!!')
+                                continue
+                # keep only the first action registered for each action name
+                results[action['name']] = (action['id'], action['name'], action_def)
+            except except_orm, e:
+                continue
+        return results.values()
+
+    def _map_legacy_model_list(self, model_list, map_fn):
+        """Apply map_fn to the various models passed, according to
+           legacy way to specify models/records.
+
+           :param model_list: list of models/records reference in the form ``[model,..]``
+                              or ``[(model,res_id), ...]``
+           :param map_fn: the map function to apply - should expect 2 arguments:
+                          ``model`` and ``res_id``.
+        """
+        assert isinstance(model_list, (list, tuple)), \
+            "model_list should be in the form [model,..] or [(model,res_id), ..]"
+        results = []
+        for model in model_list:
+            res_id = False
+            if isinstance(model, (list, tuple)):
+                model, res_id = model
+            result = map_fn(model, res_id)
+            # some of the functions return one result at a time (tuple or id)
+            # and some return a list of many of them - care for both
+            if isinstance(result,list):
+                results.extend(result)
+            else:
+                results.append(result)
+        return results
+
+    # Backards-compatibility adapter layer to retrofit into split API
+    def set(self, cr, uid, key, key2, name, models, value, replace=True, isobject=False, meta=False, preserve_user=False, company=False):
+        """Deprecated legacy method to set default values and bind actions to models' action slots.
+           Now dispatches to the newer API methods according to the value of ``key``: :meth:`~.set_default`
+           (``key=='default'``) or :meth:`~.set_action` (``key == 'action'``).
+
+          :deprecated: As of v6.1, ``set_default()`` or ``set_action()`` should be used directly.
+        """
+        assert key in ['default', 'action'], "ir.values entry keys must be in ['default','action']"
+        if key == 'default':
+            def do_set(model,res_id):
+                return self.set_default(cr, uid, model, field_name=name, value=value,
+                                        for_all_users=(not preserve_user), company_id=company,
+                                        condition=key2)
+        elif key == 'action':
+            def do_set(model,res_id):
+                return self.set_action(cr, uid, name, action_slot=key2, model=model, action=value, res_id=res_id)
+        return self._map_legacy_model_list(models, do_set)
 
     def get(self, cr, uid, key, key2, models, meta=False, context=None, res_id_req=False, without_user=True, key2_req=True):
-        if context is None:
-            context = {}
-        result = []
-        assert isinstance(models, (list, tuple)), models
+        """Deprecated legacy method to get the list of default values or actions bound to models' action slots.
+           Now dispatches to the newer API methods according to the value of ``key``: :meth:`~.get_defaults`
+           (``key=='default'``) or :meth:`~.get_actions` (``key == 'action'``)
 
-        for m in models:
-            if isinstance(m, (list, tuple)):
-                m, res_id = m
-            else:
-                res_id = False
+          :deprecated: As of v6.1, ``get_defaults()`` or ``get_actions()`` should be used directly.
 
-            where = ['key=%s','model=%s']
-            params = [key, str(m)]
-            if key2:
-                where.append('key2=%s')
-                params.append(key2[:200])
-            elif key2_req and not meta:
-                where.append('key2 is null')
-            if res_id_req and (models[-1][0] == m):
-                if res_id:
-                    where.append('res_id=%s')
-                    params.append(res_id)
-                else:
-                    where.append('(res_id is NULL)')
-            elif res_id:
-                if (models[-1][0]==m):
-                    where.append('(res_id=%s or (res_id is null))')
-                    params.append(res_id)
-                else:
-                    where.append('res_id=%s')
-                    params.append(res_id)
-            order = 'id'
-            if key == 'default':
-                # Make sure we get first the values for specific users, then
-                # the global values. The map/filter below will retain the first
-                # value for any given name. The 'order by' will put the null
-                # values last; this may be postgres specific (it is the
-                # behavior in postgres at least since 8.2).
-                order = 'user_id'
-            where.append('(user_id=%s or (user_id IS NULL)) order by '+ order)
-            params.append(uid)
-            clause = ' and '.join(where)
-            cr.execute('select id,name,value,object,meta, key from ir_values where ' + clause, params)
-            result = cr.fetchall()
-            if result:
-                break
-
-        if not result:
-            return []
-
-        def _result_get(x, keys):
-            if x[1] in keys:
-                return False
-            keys.append(x[1])
-            if x[3]:
-                model,id = x[2].split(',')
-                # FIXME: It might be a good idea to opt-in that kind of stuff
-                # FIXME: instead of arbitrarily removing random fields
-                fields = [
-                    field
-                    for field in self.pool.get(model).fields_get_keys(cr, uid)
-                    if field not in EXCLUDED_FIELDS]
-
-                try:
-                    datas = self.pool.get(model).read(cr, uid, [int(id)], fields, context)
-                except except_orm, e:
-                    return False
-                datas = datas and datas[0]
-                if not datas:
-                    return False
-            else:
-                datas = pickle.loads(x[2].encode('utf-8'))
-            if meta:
-                return (x[0], x[1], datas, pickle.loads(x[4]))
-            return (x[0], x[1], datas)
-        keys = []
-        res = filter(None, map(lambda x: _result_get(x, keys), result))
-        res2 = res[:]
-        for r in res:
-            if isinstance(r[2], dict) and r[2].get('type') in ('ir.actions.report.xml','ir.actions.act_window','ir.actions.wizard'):
-                groups = r[2].get('groups_id')
-                if groups:
-                    cr.execute('SELECT COUNT(1) FROM res_groups_users_rel WHERE gid IN %s AND uid=%s',(tuple(groups), uid))
-                    cnt = cr.fetchone()[0]
-                    if not cnt:
-                        res2.remove(r)
-                    if r[1] == 'Menuitem' and not res2:
-                        raise osv.except_osv('Error !','You do not have the permission to perform this operation !!!')
-        return res2
-ir_values()
+        """
+        assert key in ['default', 'action'], "ir.values entry keys must be in ['default','action']"
+        if key == 'default':
+            def do_get(model,res_id):
+                return self.get_defaults(cr, uid, model, condition=key2)
+        elif key == 'action':
+            def do_get(model,res_id):
+                return self.get_actions(cr, uid, action_slot=key2, model=model, res_id=res_id, context=context)
+        return self._map_legacy_model_list(models, do_get)
diff --git a/openerp/addons/base/test/test_ir_values.yml b/openerp/addons/base/test/test_ir_values.yml
index b4c08db31ff..da26b9837b5 100644
--- a/openerp/addons/base/test/test_ir_values.yml
+++ b/openerp/addons/base/test/test_ir_values.yml
@@ -21,5 +21,8 @@
 -
     !python {model: ir.values }: |
         d = self.get(cr, uid, 'default', False, ['unexisting_model'])
+        assert len(d) == 1, "Only one default must be returned per field"
         assert d[0][1] == u'my_test_ir_value', "Can't retrieve the created default value."
         assert d[0][2] == 'specific value', "Can't retrieve the created default value."
+
+# TODO: ADD tests for action bindings too, the other half of ir_values.
\ No newline at end of file

From 38ddb76960c21af0bf097112abd1eca78316bea1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 2 Sep 2011 12:15:30 +0200
Subject: [PATCH 035/304] [IMP] ir.values: minor cleanup/view improvements

bzr revid: odo@openerp.com-20110902101530-13r328uwhwdpudn5
---
 openerp/addons/base/ir/ir.xml       |  3 +--
 openerp/addons/base/ir/ir_values.py | 17 ++++++-----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index eda044336df..3f9c48b467f 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -42,7 +42,7 @@
                         <field name="key2" string="Condition"/>
                     </group>
                     <group col="2" colspan="2">
-                        <separator string="Value" colspan="2"/>
+                        <separator string="Default Value" colspan="2"/>
                         <field name="value_unpickle" colspan="4" nolabel="1"/>
                     </group>
                     <group col="2" colspan="2">
@@ -63,7 +63,6 @@
                     <field name="name"/>
                     <field name="model"/>
                     <field name="key2"/>
-                    <field name="value_unpickled"/>
                 </tree>
             </field>
         </record>
diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index c75831f9c2f..f3faacfd4d4 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -162,10 +162,10 @@ class ir_values(osv.osv):
                                           string='Default value or action reference'),
         'object': fields.boolean('No value serialization', help="Should be enabled when Type is Action"),
         'key': fields.selection([('action','Action'),('default','Default')],
-                                'Action Type', size=128, select=True, required=True,
+                                'Type', size=128, select=True, required=True,
                                 help="- Action: an action attached to one slot of the given model\n"
                                      "- Default: a default value for a model field"),
-        'key2' : fields.char('Action Qualifier', size=128, select=True,
+        'key2' : fields.char('Qualifier', size=128, select=True,
                              help="For actions, one of the possible action slots: \n"
                                   "  - client_action_multi\n"
                                   "  - client_print_multi\n"
@@ -174,7 +174,7 @@ class ir_values(osv.osv):
                                   "For defaults, an optional condition"
                              ,),
         'res_id': fields.integer('Record ID', select=True,
-                                 help="Database identifier of the record to which this applies."
+                                 help="Database identifier of the record to which this applies. "
                                       "0 = for all records"),
         'user_id': fields.many2one('res.users', 'User', ondelete='cascade', select=True,
                                    help="If set, action binding only applies for this user."),
@@ -381,14 +381,9 @@ class ir_values(osv.osv):
                 continue
         return results.values()
 
-    def _map_legacy_model_list(self, model_list, map_fn):
+    def _map_legacy_model_list(self, model_list, map_fn, merge_results=False):
         """Apply map_fn to the various models passed, according to
            legacy way to specify models/records.
-
-           :param model_list: list of models/records reference in the form ``[model,..]``
-                              or ``[(model,res_id), ...]``
-           :param map_fn: the map function to apply - should expect 2 arguments:
-                          ``model`` and ``res_id``.
         """
         assert isinstance(model_list, (list, tuple)), \
             "model_list should be in the form [model,..] or [(model,res_id), ..]"
@@ -400,7 +395,7 @@ class ir_values(osv.osv):
             result = map_fn(model, res_id)
             # some of the functions return one result at a time (tuple or id)
             # and some return a list of many of them - care for both
-            if isinstance(result,list):
+            if merge_results:
                 results.extend(result)
             else:
                 results.append(result)
@@ -440,4 +435,4 @@ class ir_values(osv.osv):
         elif key == 'action':
             def do_get(model,res_id):
                 return self.get_actions(cr, uid, action_slot=key2, model=model, res_id=res_id, context=context)
-        return self._map_legacy_model_list(models, do_get)
+        return self._map_legacy_model_list(models, do_get, merge_results=True)

From e0624cbc954b946bb962fc8da252eb1ffed80cc8 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 2 Sep 2011 14:40:38 +0200
Subject: [PATCH 036/304] [IMP] ir.values: smoke test for action bindings

bzr revid: odo@openerp.com-20110902124038-36ip41ccytr2f9vt
---
 openerp/addons/base/test/test_ir_values.yml | 54 +++++++++++++++++++--
 1 file changed, 49 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/test/test_ir_values.yml b/openerp/addons/base/test/test_ir_values.yml
index da26b9837b5..a8912e0ad3b 100644
--- a/openerp/addons/base/test/test_ir_values.yml
+++ b/openerp/addons/base/test/test_ir_values.yml
@@ -2,27 +2,71 @@
     Create some default value for some (non-existing) model, for all users.
 -
     !python {model: ir.values }: |
-        self.set(cr, uid, 'default', False, 'my_test_ir_value',['unexisting_model'], 'global value')
+        self.set(cr, uid, 'default', False, 'my_test_field',['unexisting_model'], 'global value')
 -
     Retrieve it.
 -
     !python {model: ir.values }: |
         # d is a list of triple (id, name, value)
         d = self.get(cr, uid, 'default', False, ['unexisting_model'])
-        assert d[0][1] == u'my_test_ir_value', "Can't retrieve the created default value."
+        assert d[0][1] == 'my_test_field', "Can't retrieve the created default value."
         assert d[0][2] == 'global value', "Can't retrieve the created default value."
 -
     Do it again but for a specific user.
 -
     !python {model: ir.values }: |
-        self.set(cr, uid, 'default', False, 'my_test_ir_value',['unexisting_model'], 'specific value', preserve_user=True)
+        self.set(cr, uid, 'default', False, 'my_test_field',['unexisting_model'], 'specific value', preserve_user=True)
 -
     Retrieve it and check it is the one for the current user.
 -
     !python {model: ir.values }: |
         d = self.get(cr, uid, 'default', False, ['unexisting_model'])
         assert len(d) == 1, "Only one default must be returned per field"
-        assert d[0][1] == u'my_test_ir_value', "Can't retrieve the created default value."
+        assert d[0][1] == 'my_test_field', "Can't retrieve the created default value."
         assert d[0][2] == 'specific value', "Can't retrieve the created default value."
+-
+    Create some action bindings for a non-existing model
+-
+    !python {model: ir.values }: |
+        self.set(cr, uid, 'action', 'tree_but_open', 'OnDblClick Action', ['unexisting_model'], 'ir.actions.act_window,10', isobject=True)
+        self.set(cr, uid, 'action', 'tree_but_open', 'OnDblClick Action 2', ['unexisting_model'], 'ir.actions.act_window,11', isobject=True)
+        self.set(cr, uid, 'action', 'client_action_multi', 'Side Wizard', ['unexisting_model'], 'ir.actions.act_window,12', isobject=True)
+        self.set(cr, uid, 'action', 'client_print_multi', 'Nice Report', ['unexisting_model'], 'ir.actions.report.xml,2', isobject=True)
+        self.set(cr, uid, 'action', 'client_action_relate', 'Related Stuff', ['unexisting_model'], 'ir.actions.act_window,14', isobject=True)
+-
+    Replace one action binding to set a new name
+-
+    !python {model: ir.values }: |
+        self.set(cr, uid, 'action', 'tree_but_open', 'OnDblClick Action New', ['unexisting_model'], 'ir.actions.act_window,10', isobject=True)
+-
+    Retrieve the action bindings and check they're correct
+-
+    !python {model: ir.values }: |
+        actions = self.get(cr, uid, 'action', 'tree_but_open', ['unexisting_model'])
+        assert len(actions) == 2, "Mismatching number of bound actions"
+        #first action
+        assert len(actions[0]) == 3, "Malformed action definition"
+        assert actions[0][1] == 'OnDblClick Action 2', 'Bound action does not match definition'
+        assert isinstance(actions[0][2], dict) and actions[0][2]['id'] == 11, 'Bound action does not match definition'
+        #second action - this ones comes last because it was re-created with a different name
+        assert len(actions[1]) == 3, "Malformed action definition"
+        assert actions[1][1] == 'OnDblClick Action New', 'Re-Registering an action should replace it'
+        assert isinstance(actions[1][2], dict) and actions[1][2]['id'] == 10, 'Bound action does not match definition'
 
-# TODO: ADD tests for action bindings too, the other half of ir_values.
\ No newline at end of file
+        actions = self.get(cr, uid, 'action', 'client_action_multi', ['unexisting_model'])
+        assert len(actions) == 1, "Mismatching number of bound actions"
+        assert len(actions[0]) == 3, "Malformed action definition"
+        assert actions[0][1] == 'Side Wizard', 'Bound action does not match definition'
+        assert isinstance(actions[0][2], dict) and actions[0][2]['id'] == 12, 'Bound action does not match definition'
+
+        actions = self.get(cr, uid, 'action', 'client_print_multi', ['unexisting_model'])
+        assert len(actions) == 1, "Mismatching number of bound actions"
+        assert len(actions[0]) == 3, "Malformed action definition"
+        assert actions[0][1] == 'Nice Report', 'Bound action does not match definition'
+        assert isinstance(actions[0][2], dict) and actions[0][2]['id'] == 2, 'Bound action does not match definition'
+
+        actions = self.get(cr, uid, 'action', 'client_action_relate', ['unexisting_model'])
+        assert len(actions) == 1, "Mismatching number of bound actions"
+        assert len(actions[0]) == 3, "Malformed action definition"
+        assert actions[0][1] == 'Related Stuff', 'Bound action does not match definition'
+        assert isinstance(actions[0][2], dict) and actions[0][2]['id'] == 14, 'Bound action does not match definition'

From 32020e13531267301abb0e58711bed70c65ff8e7 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 2 Sep 2011 14:56:48 +0200
Subject: [PATCH 037/304] [FIX] ir.values: re-binding of actions should
 properly delete the previous one

bzr revid: odo@openerp.com-20110902125648-x0cir5m7818h9ba6
---
 openerp/addons/base/ir/ir_values.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index f3faacfd4d4..acb0da72159 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -309,7 +309,7 @@ class ir_values(osv.osv):
             ('key', '=', 'action'),
             ('key2', '=', action_slot),
             ('model', '=', model),
-            ('res_id', '=', res_id),
+            ('res_id', '=', res_id or 0), # int field -> NULL == 0
             ('value', '=', action),
             ]
         self.unlink(cr, uid, self.search(cr, uid, search_criteria))
@@ -319,7 +319,7 @@ class ir_values(osv.osv):
             'key2': action_slot,
             'object': True,
             'model': model,
-            'res_id': res_id or False,
+            'res_id': res_id,
             'name': name,
             'value': action,
         })

From d0af2f830c933a5dab635170d45b79a8278b99aa Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 2 Sep 2011 17:14:42 +0200
Subject: [PATCH 038/304] [FIX] ir.values: get_defaults() should cut the
 condition at 200 chars to match the conditions that were set

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

diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index acb0da72159..ca2973f948e 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -271,7 +271,7 @@ class ir_values(osv.osv):
         query = query % ('AND v.key2 = %s' if condition else '')
         params = ('default', model, uid, uid)
         if condition:
-            params += (condition,)
+            params += (condition[:200],)
         cr.execute(query, params)
 
         # keep only the highest priority default for each field

From 083691b392b1f9556dd64787f46e7536e7d2f7c3 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 5 Sep 2011 14:37:56 +0200
Subject: [PATCH 039/304] [IMP] ir.values: improve security: users can only
 write to their personal defaults

Administrator access is required to set defaults for
everybody, as well as to alter the action bindings.

bzr revid: odo@openerp.com-20110905123756-oqum5k2pnbyoa11r
---
 openerp/addons/base/security/base_security.xml   | 7 +++++++
 openerp/addons/base/security/ir.model.access.csv | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index 00aca6613d6..fe3a10fdaed 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -65,6 +65,13 @@
         <field name="domain_force">[('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
+    <record model="ir.rule" id="ir_values_default_rule">
+        <field name="name">Defaults: alter personal values only</field>
+        <field name="model_id" ref="model_ir_values"/>
+        <field name="domain_force">[('key','=','default'),('user_id','=',user.id)]</field>
+        <field name="perm_read" eval="False"/>
+    </record>
+
     </data>
 </openerp>
 
diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index 8949052f89b..6460c06d1f7 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -38,8 +38,7 @@
 "access_ir_ui_view_custom_group_user","ir_ui_view_custom_group_user","model_ir_ui_view_custom",,1,0,0,0
 "access_ir_ui_view_custom_group_system","ir_ui_view_custom_group_system","model_ir_ui_view_custom","group_system",1,1,1,1
 "access_ir_ui_view_sc_group_user","ir_ui_view_sc group_user","model_ir_ui_view_sc",,1,1,1,1
-"access_ir_values_group_erp_manager","ir_values group_erp_manager","model_ir_values","group_erp_manager",1,1,1,1
-"access_ir_values_group_all","ir_values group_all","model_ir_values",,1,0,1,0
+"access_ir_values_group_all","ir_values group_all","model_ir_values",,1,1,1,1
 "access_res_company_group_erp_manager","res_company group_erp_manager","model_res_company","group_erp_manager",1,1,1,1
 "access_res_company_group_user","res_company group_user","model_res_company",,1,0,0,0
 "access_res_country_group_all","res_country group_user_all","model_res_country",,1,0,0,0

From e333a2eb2e81763cb532b3cd514a80892f185fa1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 5 Sep 2011 16:10:58 +0200
Subject: [PATCH 040/304] [IMP] ir.values: improved defaults doc + removed
 `object` column completely

The `object` column actually directly depended on the value of
the `key` column, so it can be totally removed with no side-effects.
Docstrings updated following review comments.

bzr revid: odo@openerp.com-20110905141058-xa01o77l1rto6hg9
---
 openerp/addons/base/ir/ir.xml       |  4 +-
 openerp/addons/base/ir/ir_values.py | 73 +++++++++++++++++++----------
 2 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 3f9c48b467f..3ab0bb3f167 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -93,7 +93,7 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="values_view_search_action"/>
             <field name="domain">[('key','=','action')]</field>
-            <field name="context">{'default_object':1,'default_key':'action'}</field>
+            <field name="context">{'default_key':'action'}</field>
         </record>
         <record model="ir.actions.act_window.view" id="action_values_tree_view">
             <field name="sequence" eval="1"/>
@@ -116,7 +116,7 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="values_view_search_action"/>
             <field name="domain">[('key','=','default')]</field>
-            <field name="context">{'default_object':0,'default_key':'default','default_key2':''}</field>
+            <field name="context">{'default_key':'default','default_key2':''}</field>
         </record>
         <record model="ir.actions.act_window.view" id="action_values_defaults_tree_view">
             <field name="sequence" eval="1"/>
diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index ca2973f948e..2eb7b97d18a 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -78,8 +78,8 @@ class ir_values(osv.osv):
        all records).
 
        The content of the entry is defined by the ``value`` column, which may either
-       contain an arbitrary value (for default values - when the ``object`` column
-       is False), or a reference string defining the action that should be executed.
+       contain an arbitrary value, or a reference string defining the action that
+       should be executed.
 
        .. rubric:: Usage: default values
        
@@ -102,14 +102,15 @@ class ir_values(osv.osv):
 
     def _value_unpickle(self, cursor, user, ids, name, arg, context=None):
         res = {}
-        for report in self.browse(cursor, user, ids, context=context):
-            value = report[name[:-9]]
-            if not report.object and value:
+        for record in self.browse(cursor, user, ids, context=context):
+            value = record[name[:-9]]
+            if record.key == 'default' and value:
+                # default values are pickled on the fly
                 try:
                     value = str(pickle.loads(value))
                 except Exception:
                     pass
-            res[report.id] = value
+            res[record.id] = value
         return res
 
     def _value_pickle(self, cursor, user, id, name, value, arg, context=None):
@@ -118,7 +119,9 @@ class ir_values(osv.osv):
         ctx = context.copy()
         if self.CONCURRENCY_CHECK_FIELD in ctx:
             del ctx[self.CONCURRENCY_CHECK_FIELD]
-        if not self.browse(cursor, user, id, context=context).object:
+        record = self.browse(cursor, user, id, context=context)
+        if record.key == 'default':
+            # default values are pickled on the fly
             value = pickle.dumps(value)
         self.write(cursor, user, id, {name[:-9]: value}, context=ctx)
 
@@ -136,11 +139,6 @@ class ir_values(osv.osv):
                 'value': {'value_unpickle': act.type+','+str(act.id)}
         }
 
-    def onchange_key(self, cr, uid, ids, key, context=None):
-        return {
-                'value': {'object': key == 'action'}
-        }
-
     _columns = {
         'name': fields.char('Name', size=128, required=True),
         'model': fields.char('Model Name', size=128, select=True, required=True,
@@ -160,7 +158,6 @@ class ir_values(osv.osv):
         'value_unpickle': fields.function(_value_unpickle, fnct_inv=_value_pickle,
                                           type='text',
                                           string='Default value or action reference'),
-        'object': fields.boolean('No value serialization', help="Should be enabled when Type is Action"),
         'key': fields.selection([('action','Action'),('default','Default')],
                                 'Type', size=128, select=True, required=True,
                                 help="- Action: an action attached to one slot of the given model\n"
@@ -184,7 +181,6 @@ class ir_values(osv.osv):
     _defaults = {
         'key': 'action',
         'key2': 'tree_but_open',
-        'object': True,
     }
 
     def _auto_init(self, cr, context=None):
@@ -195,7 +191,17 @@ class ir_values(osv.osv):
 
     def set_default(self, cr, uid, model, field_name, value, for_all_users=True, company_id=False, condition=False):
         """Defines a default value for the given model and field_name. Any previous
-           default will be replaced and lost in the process.
+           default for the same scope (model, field_name, value, for_all_users, company_id, condition)
+           will be replaced and lost in the process.
+
+           Defaults can be later retrieved via :meth:`~.get_defaults`, which will return
+           the highest priority default for any given field. Defaults that are more specific
+           have a higher priority, in the following order (highest to lowest):
+
+               * specific to user and company
+               * specific to user only
+               * specific to company only
+               * global to everyone
 
            :param string model: model name
            :param string field_name: field name to which the default applies
@@ -208,7 +214,13 @@ class ir_values(osv.osv):
                                   is passed, the current user's company will be used.
            :param string condition: optional condition specification that can be used to
                                     restrict the applicability of the default values
-                                    (e.g. based on another field's value)
+                                    (e.g. based on another field's value). This is an
+                                    opaque string as far as the API is concerned, but client
+                                    stacks typically use single-field conditions in the
+                                    form ``'key=stringified_value'``.
+                                    (Currently, the condition is trimmed to 200 characters,
+                                    so values that share the same first 200 characters always
+                                    match)
            :return: id of the newly created ir.values entry
         """
         if isinstance(value, unicode):
@@ -233,7 +245,6 @@ class ir_values(osv.osv):
             'name': field_name,
             'value': pickle.dumps(value),
             'model': model,
-            'object': False,
             'key': 'default',
             'key2': condition and condition[:200],
             'user_id': False if for_all_users else uid,
@@ -241,18 +252,29 @@ class ir_values(osv.osv):
         })
 
     def get_defaults(self, cr, uid, model, condition=False):
-        """Returns any user-defined values registered for the given model.
-           This is not field-specific, but an optional ``condition`` can be
-           provided to query for default values that should be applied only
-           when the given condition is met (usually another field's value).
-           Defaults that have been set for the user herself will have higher
-           priority that those that have been set for everyone
-           (see :meth:`~.set_default`).
+        """Returns any default values that are defined for the current model and user,
+           (and match ``condition``, if specified), previously registered via
+           :meth:`~.set_default`.
+
+           Defaults are global to a model, not field-specific, but an optional
+           ``condition`` can be provided to restrict matching default values
+           to those that were defined for the same condition (usually based
+           on another field's value).
+
+           Default values also have priorities depending on whom they apply
+           to: only the highest priority value will be returned for any
+           field. See :meth:`~.set_default` for more details.
 
            :param string model: model name
            :param string condition: optional condition specification that can be used to
                                     restrict the applicability of the default values
-                                    (e.g. based on another field's value)
+                                    (e.g. based on another field's value). This is an
+                                    opaque string as far as the API is concerned, but client
+                                    stacks typically use single-field conditions in the
+                                    form ``'key=stringified_value'``.
+                                    (Currently, the condition is trimmed to 200 characters,
+                                    so values that share the same first 200 characters always
+                                    match)
            :return: list of default values tuples of the form ``(id, field_name, value)``
                     (``id`` is the ID of the default entry, usually irrelevant)
         """
@@ -317,7 +339,6 @@ class ir_values(osv.osv):
         return self.create(cr, uid, {
             'key': 'action',
             'key2': action_slot,
-            'object': True,
             'model': model,
             'res_id': res_id,
             'name': name,

From 3ba75e5d50b95f6ba01400afcf1c31ce3ee0f10e Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 8 Sep 2011 15:15:46 +0530
Subject: [PATCH 041/304] [IMP] base.ir_edi: dont use fields_get or _columns to
 get the list of fields, use the new "self._all_columns" (map of column_info
 records) which also contains inherited fields and is already cached (see in
 ORM for the definition of the column_info object)

bzr revid: hmo@tinyerp.com-20110908094546-4zy2dbqk8zyrzr26
---
 openerp/addons/base/ir/ir_edi.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 2fd11338ffb..5588e4d041f 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -366,26 +366,27 @@ class edi(object):
             context = {}
         if edi_struct is None:
             edi_struct = {}
-        _fields = self.fields_get(cr, uid, context=context)
-        fields_to_export = edi_struct and edi_struct.keys() or _fields.keys()
+        _columns = self._all_columns
+        fields_to_export = edi_struct and edi_struct.keys() or _columns.keys()
         edi_dict_list = []
         value = None
         for row in records:
             edi_dict = {}
             edi_dict.update(self.edi_metadata(cr, uid, [row], context=context)[0])
             for field in fields_to_export:
-                cols = _fields[field]
+                _column = _columns[field].column
+                _column_dict = fields.field_to_dict(self, cr, uid, context, _column)
                 record = getattr(row, field)
                 if not record:
                     continue
                 #if _fields[field].has_key('function') or _fields[field].has_key('related_columns'):
                 #    # Do not Export Function Fields and related fields
                 #    continue
-                elif cols['type'] == 'many2one':
+                elif _column_dict['type'] == 'many2one':
                     value = self.edi_m2o(cr, uid, record, context=context)
-                elif cols['type'] == 'many2many':
+                elif _column_dict['type'] == 'many2many':
                     value = self.edi_m2m(cr, uid, record, context=context)
-                elif cols['type'] == 'one2many':
+                elif _column_dict['type'] == 'one2many':
                     value = self.edi_o2m(cr, uid, record, edi_struct=edi_struct.get(field, {}), context=context )
                 else:
                     value = record
@@ -466,24 +467,26 @@ class edi(object):
                     connect it to the parent record via a write value like (4, db_id).        
         """
         # generic implementation!
-        fields = edi_document.keys()
         fields_to_import = []
         data_line = []
         model_data = self.pool.get('ir.model.data')
-        _fields = self.fields_get(cr, uid, context=context)
+        _columns = self._all_columns
         values = {}
         xml_id = edi_document['__id']
         assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
         module, xml_id2 = xml_id.split('.')
         for field in edi_document.keys():
             if not field.startswith('__'):
+                _column = _columns[field].column
+                _column_dict = fields.field_to_dict(self, cr, uid, context, _column)
+            
                 fields_to_import.append(field)
                 edi_field_value = edi_document[field]
-                field_type = _fields[field]['type']
-                relation_model = _fields[field].get('relation')
+                field_type = _column_dict['type']
+                relation_model = _column_dict.get('relation')
                 if not edi_field_value:
                     continue
-                if _fields[field].has_key('function') or _fields[field].has_key('related_columns'):
+                if _column_dict.has_key('function') or _column_dict.has_key('related_columns'):
                     # DO NOT IMPORT FUNCTION FIELD AND RELATED FIELD
                     continue
                 elif field_type in ('many2one', 'many2many'):

From fbb6e5e56aaf36ff652edbec0181a0fcb95a3601 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Sep 2011 13:38:33 +0200
Subject: [PATCH 042/304] [FIX] ir.values.get_defaults: typo in SQL query -
 spotted by Naresh, thanks!

bzr revid: odo@openerp.com-20110908113833-z2cgkj093940usys
---
 openerp/addons/base/ir/ir_values.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index 2eb7b97d18a..d908c2096b3 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -284,8 +284,8 @@ class ir_values(osv.osv):
                       LEFT JOIN res_users u ON (v.user_id = u.id)
                    WHERE v.key = %%s AND v.model = %%s
                       AND (v.user_id = %%s OR v.user_id IS NULL)
-                      AND (u.company_id IS NULL OR
-                           u.company_id =
+                      AND (v.company_id IS NULL OR
+                           v.company_id =
                              (SELECT company_id from res_users where id = %%s)
                           )
                       %s

From 09b63ae6ea0dfe2e173218097dde865d791ac529 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 9 Sep 2011 16:15:41 +0200
Subject: [PATCH 043/304] [FIX] don't *eval* field names to get the field type
 associated with a function field

bzr revid: xmo@openerp.com-20110909141541-p172s7jqu597sjc9
---
 openerp/osv/orm.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index b87672c012d..341f14e00e2 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -514,9 +514,9 @@ def get_pg_type(f):
             f_type = ('int4', 'INTEGER')
         else:
             f_type = ('varchar', 'VARCHAR(%d)' % f_size)
-    elif isinstance(f, fields.function) and eval('fields.'+(f._type), globals()) in type_dict:
-        t = eval('fields.'+(f._type), globals())
-        f_type = (type_dict[t], type_dict[t])
+    elif isinstance(f, fields.function) and getattr(fields, f._type, None) in type_dict:
+        t = type_dict[getattr(fields, f._type)]
+        f_type = (t, t)
     elif isinstance(f, fields.function) and f._type == 'float':
         if f.digits:
             f_type = ('numeric', 'NUMERIC')

From cf44b49c939c7209111fea41b9a506d21b96dbee Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 9 Sep 2011 16:33:49 +0200
Subject: [PATCH 044/304] [IMP] extract VARCHAR typing, if no size is provided
 (or the size is 0) don't put a limit on the varchar

bzr revid: xmo@openerp.com-20110909143349-5sykc4lpsn3rxf5w
---
 openerp/osv/orm.py | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 341f14e00e2..8041628626d 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -475,6 +475,18 @@ class browse_record(object):
 
     __repr__ = __str__
 
+def pg_varchar(size=0):
+    """ Returns the VARCHAR declaration for the provided size:
+
+    * If no size (or an empty size is provided) return an 'infinite' VARCHAR
+    * Otherwise return a VARCHAR(n)
+
+    :type int size: varchar size, optional
+    :rtype: str
+    """
+    if size:
+        return 'VARCHAR(%d)' % size
+    return 'VARCHAR'
 
 def get_pg_type(f):
     """
@@ -501,19 +513,19 @@ def get_pg_type(f):
         else:
             f_type = ('float8', 'DOUBLE PRECISION')
     elif isinstance(f, (fields.char, fields.reference)):
-        f_type = ('varchar', 'VARCHAR(%d)' % (f.size,))
+        f_type = ('varchar', pg_varchar(f.size))
     elif isinstance(f, fields.selection):
         if isinstance(f.selection, list) and isinstance(f.selection[0][0], (str, unicode)):
-            f_size = reduce(lambda x, y: max(x, len(y[0])), f.selection, f.size or 16)
+            f_size = reduce(lambda x, y: max(x, len(y[0])), f.selection, f.size)
         elif isinstance(f.selection, list) and isinstance(f.selection[0][0], int):
             f_size = -1
         else:
-            f_size = getattr(f, 'size', None) or 16
+            f_size = getattr(f, 'size', None)
 
         if f_size == -1:
             f_type = ('int4', 'INTEGER')
         else:
-            f_type = ('varchar', 'VARCHAR(%d)' % f_size)
+            f_type = ('varchar', pg_varchar(f_size))
     elif isinstance(f, fields.function) and getattr(fields, f._type, None) in type_dict:
         t = type_dict[getattr(fields, f._type)]
         f_type = (t, t)
@@ -525,7 +537,7 @@ def get_pg_type(f):
     elif isinstance(f, fields.function) and f._type == 'selection':
         f_type = ('text', 'text')
     elif isinstance(f, fields.function) and f._type == 'char':
-        f_type = ('varchar', 'VARCHAR(%d)' % (f.size))
+        f_type = ('varchar', pg_varchar(f.size))
     else:
         logger = netsvc.Logger()
         logger.notifyChannel("init", netsvc.LOG_WARNING, '%s type not supported!' % (type(f)))
@@ -2838,7 +2850,7 @@ class orm(orm_template):
                         if f_obj_type:
                             ok = False
                             casts = [
-                                ('text', 'char', 'VARCHAR(%d)' % (f.size or 0,), '::VARCHAR(%d)'%(f.size or 0,)),
+                                ('text', 'char', pg_varchar(f.size), '::%s' % pg_varchar(f.size),
                                 ('varchar', 'text', 'TEXT', ''),
                                 ('int4', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
                                 ('date', 'datetime', 'TIMESTAMP', '::TIMESTAMP'),
@@ -2848,8 +2860,8 @@ class orm(orm_template):
                             ]
                             if f_pg_type == 'varchar' and f._type == 'char' and f_pg_size < f.size:
                                 cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO temp_change_size' % (self._table, k))
-                                cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" VARCHAR(%d)' % (self._table, k, f.size))
-                                cr.execute('UPDATE "%s" SET "%s"=temp_change_size::VARCHAR(%d)' % (self._table, k, f.size))
+                                cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" %s' % (self._table, k, pg_varchar(f.size)))
+                                cr.execute('UPDATE "%s" SET "%s"=temp_change_size::%s' % (self._table, k, pg_varchar(f.size)))
                                 cr.execute('ALTER TABLE "%s" DROP COLUMN temp_change_size CASCADE' % (self._table,))
                                 cr.commit()
                                 self.__schema.debug("Table '%s': column '%s' (type varchar) changed size from %s to %s",

From 8668ad7ed3d9d2b406c179f1e111b2d63c875ad6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 9 Sep 2011 16:52:13 +0200
Subject: [PATCH 045/304] [IMP] have function fields delegate their pg_type
 discovery to get_pg_type

* add a type override to get_pg_type, so the function field can pass itself as another field type
* special-case the 'selection' role, not sure it's correct but it was pretty special last time around (I guess since we don't have the field's values available we can't just do the type/size inference of get_pg_type)

bzr revid: xmo@openerp.com-20110909145213-y172z8eyfnond43w
---
 openerp/osv/orm.py | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 8041628626d..97c4ef89c60 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -488,11 +488,14 @@ def pg_varchar(size=0):
         return 'VARCHAR(%d)' % size
     return 'VARCHAR'
 
-def get_pg_type(f):
+def get_pg_type(f, type_override=None):
     """
-    returns a tuple
-    (type returned by postgres when the column was created, type expression to create the column)
+    :param fields._column f: field to get a Postgres type for
+    :param type type_override: use the provided type for dispatching instead of the field's own type
+    :returns: (postgres_identification_type, postgres_type_specification)
+    :rtype: (str, str)
     """
+    field_type = type_override or type(f)
 
     type_dict = {
             fields.boolean: 'bool',
@@ -505,8 +508,8 @@ def get_pg_type(f):
             fields.binary: 'bytea',
             fields.many2one: 'int4',
             }
-    if type(f) in type_dict:
-        f_type = (type_dict[type(f)], type_dict[type(f)])
+    if field_type in type_dict:
+        f_type = (type_dict[field_type], type_dict[field_type])
     elif isinstance(f, fields.float):
         if f.digits:
             f_type = ('numeric', 'NUMERIC')
@@ -526,21 +529,15 @@ def get_pg_type(f):
             f_type = ('int4', 'INTEGER')
         else:
             f_type = ('varchar', pg_varchar(f_size))
-    elif isinstance(f, fields.function) and getattr(fields, f._type, None) in type_dict:
-        t = type_dict[getattr(fields, f._type)]
-        f_type = (t, t)
-    elif isinstance(f, fields.function) and f._type == 'float':
-        if f.digits:
-            f_type = ('numeric', 'NUMERIC')
+
+    elif isinstance(f, fields.function):
+        if f._type = 'selection':
+            f_type = ('varchar', pg_varchar())
         else:
-            f_type = ('float8', 'DOUBLE PRECISION')
-    elif isinstance(f, fields.function) and f._type == 'selection':
-        f_type = ('text', 'text')
-    elif isinstance(f, fields.function) and f._type == 'char':
-        f_type = ('varchar', pg_varchar(f.size))
+            f_type = get_pg_type(f, getattr(fields, f._type))
     else:
         logger = netsvc.Logger()
-        logger.notifyChannel("init", netsvc.LOG_WARNING, '%s type not supported!' % (type(f)))
+        logger.notifyChannel("init", netsvc.LOG_WARNING, '%s type not supported!' % (field_type))
         f_type = None
     return f_type
 

From 7a3960f736436bb395e237153207c54214aa8dd2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 9 Sep 2011 17:23:07 +0200
Subject: [PATCH 046/304] [IMP] remove size inference for selection lists with
 str|unicode value choices, simplify selection pg_type selection

* if the first element of the choices list is an integer, use int4
* if the field has a size, use that size
* else use an unrestricted varchar

bzr revid: xmo@openerp.com-20110909152307-ralzt1g8l1b3e46x
---
 openerp/osv/orm.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 97c4ef89c60..2892a32c440 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -518,18 +518,10 @@ def get_pg_type(f, type_override=None):
     elif isinstance(f, (fields.char, fields.reference)):
         f_type = ('varchar', pg_varchar(f.size))
     elif isinstance(f, fields.selection):
-        if isinstance(f.selection, list) and isinstance(f.selection[0][0], (str, unicode)):
-            f_size = reduce(lambda x, y: max(x, len(y[0])), f.selection, f.size)
-        elif isinstance(f.selection, list) and isinstance(f.selection[0][0], int):
-            f_size = -1
-        else:
-            f_size = getattr(f, 'size', None)
-
-        if f_size == -1:
+        if isinstance(f.selection, list) and isinstance(f.selection[0][0], int):
             f_type = ('int4', 'INTEGER')
         else:
-            f_type = ('varchar', pg_varchar(f_size))
-
+            f_type = ('varchar', pg_varchar(getattr(f, 'size', None)))
     elif isinstance(f, fields.function):
         if f._type = 'selection':
             f_type = ('varchar', pg_varchar())

From b9ed013504639a536b0d5c419507985e9bf9ded4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 9 Sep 2011 17:24:45 +0200
Subject: [PATCH 047/304] [IMP] use logging API in get_pg_types

bzr revid: xmo@openerp.com-20110909152445-pol8ko3ckzc6p7s0
---
 openerp/osv/orm.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 2892a32c440..692368cd44d 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -528,8 +528,7 @@ def get_pg_type(f, type_override=None):
         else:
             f_type = get_pg_type(f, getattr(fields, f._type))
     else:
-        logger = netsvc.Logger()
-        logger.notifyChannel("init", netsvc.LOG_WARNING, '%s type not supported!' % (field_type))
+        logging.getLogger('orm').warn('%s type not supported!', field_type)
         f_type = None
     return f_type
 

From f74c55182a5371c88f64af326cbbb3f56958fbb0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 9 Sep 2011 17:26:22 +0200
Subject: [PATCH 048/304] [IMP] lift mapping from field types to PGTYPES
 outside get_pg_type

bzr revid: xmo@openerp.com-20110909152622-114y4401x6gw6a79
---
 openerp/osv/orm.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 692368cd44d..f20b759f6f8 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -488,6 +488,17 @@ def pg_varchar(size=0):
         return 'VARCHAR(%d)' % size
     return 'VARCHAR'
 
+FIELDS_TO_PGTYPES = {
+    fields.boolean: 'bool',
+    fields.integer: 'int4',
+    fields.integer_big: 'int8',
+    fields.text: 'text',
+    fields.date: 'date',
+    fields.time: 'time',
+    fields.datetime: 'timestamp',
+    fields.binary: 'bytea',
+    fields.many2one: 'int4',
+}
 def get_pg_type(f, type_override=None):
     """
     :param fields._column f: field to get a Postgres type for
@@ -497,19 +508,8 @@ def get_pg_type(f, type_override=None):
     """
     field_type = type_override or type(f)
 
-    type_dict = {
-            fields.boolean: 'bool',
-            fields.integer: 'int4',
-            fields.integer_big: 'int8',
-            fields.text: 'text',
-            fields.date: 'date',
-            fields.time: 'time',
-            fields.datetime: 'timestamp',
-            fields.binary: 'bytea',
-            fields.many2one: 'int4',
-            }
-    if field_type in type_dict:
-        f_type = (type_dict[field_type], type_dict[field_type])
+    if field_type in FIELDS_TO_PGTYPES:
+        f_type = (FIELDS_TO_PGTYPES[field_type], FIELDS_TO_PGTYPES[field_type])
     elif isinstance(f, fields.float):
         if f.digits:
             f_type = ('numeric', 'NUMERIC')

From 4b8be3a051cc20f2079e146f583919b77e662e88 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 9 Sep 2011 17:39:35 +0200
Subject: [PATCH 049/304] [IMP] use early returns instead of a single return
 point

bzr revid: xmo@openerp.com-20110909153935-uk4cggyv78nfdjqt
---
 openerp/osv/orm.py | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index f20b759f6f8..977c3c3deb4 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -509,28 +509,23 @@ def get_pg_type(f, type_override=None):
     field_type = type_override or type(f)
 
     if field_type in FIELDS_TO_PGTYPES:
-        f_type = (FIELDS_TO_PGTYPES[field_type], FIELDS_TO_PGTYPES[field_type])
+        return (FIELDS_TO_PGTYPES[field_type], FIELDS_TO_PGTYPES[field_type])
     elif isinstance(f, fields.float):
         if f.digits:
-            f_type = ('numeric', 'NUMERIC')
-        else:
-            f_type = ('float8', 'DOUBLE PRECISION')
+            return ('numeric', 'NUMERIC')
+        return ('float8', 'DOUBLE PRECISION')
     elif isinstance(f, (fields.char, fields.reference)):
-        f_type = ('varchar', pg_varchar(f.size))
+        return ('varchar', pg_varchar(f.size))
     elif isinstance(f, fields.selection):
         if isinstance(f.selection, list) and isinstance(f.selection[0][0], int):
-            f_type = ('int4', 'INTEGER')
-        else:
-            f_type = ('varchar', pg_varchar(getattr(f, 'size', None)))
+            return ('int4', 'INTEGER')
+        return ('varchar', pg_varchar(getattr(f, 'size', None)))
     elif isinstance(f, fields.function):
         if f._type = 'selection':
-            f_type = ('varchar', pg_varchar())
-        else:
-            f_type = get_pg_type(f, getattr(fields, f._type))
-    else:
-        logging.getLogger('orm').warn('%s type not supported!', field_type)
-        f_type = None
-    return f_type
+            return ('varchar', pg_varchar())
+        return get_pg_type(f, getattr(fields, f._type))
+    logging.getLogger('orm').warn('%s type not supported!', field_type)
+    return
 
 
 class MetaModel(type):

From cbaa36c8ccf31d960d497834f72a2a79b0edb014 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 9 Sep 2011 17:42:42 +0200
Subject: [PATCH 050/304] [FIX] typo, might want to launch the software from
 time to time while changing stuff

bzr revid: xmo@openerp.com-20110909154242-gve3dgsbmg6crkya
---
 openerp/osv/orm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 977c3c3deb4..4c592a53342 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -521,7 +521,7 @@ def get_pg_type(f, type_override=None):
             return ('int4', 'INTEGER')
         return ('varchar', pg_varchar(getattr(f, 'size', None)))
     elif isinstance(f, fields.function):
-        if f._type = 'selection':
+        if f._type == 'selection':
             return ('varchar', pg_varchar())
         return get_pg_type(f, getattr(fields, f._type))
     logging.getLogger('orm').warn('%s type not supported!', field_type)
@@ -2833,7 +2833,7 @@ class orm(orm_template):
                         if f_obj_type:
                             ok = False
                             casts = [
-                                ('text', 'char', pg_varchar(f.size), '::%s' % pg_varchar(f.size),
+                                ('text', 'char', pg_varchar(f.size), '::%s' % pg_varchar(f.size)),
                                 ('varchar', 'text', 'TEXT', ''),
                                 ('int4', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
                                 ('date', 'datetime', 'TIMESTAMP', '::TIMESTAMP'),

From 0d965c2fca76a73bc301da6769d34e1360a9e418 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 9 Sep 2011 17:58:48 +0200
Subject: [PATCH 051/304] [FIX] if types can be overridden, type-checking
 against the overriden type instead of the non-overridden instance might be a
 good idea as well

bzr revid: xmo@openerp.com-20110909155848-5no3pvtfugqmhm8q
---
 openerp/osv/orm.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 4c592a53342..92a22a29f9a 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -510,17 +510,17 @@ def get_pg_type(f, type_override=None):
 
     if field_type in FIELDS_TO_PGTYPES:
         return (FIELDS_TO_PGTYPES[field_type], FIELDS_TO_PGTYPES[field_type])
-    elif isinstance(f, fields.float):
+    elif issubclass(field_type, fields.float):
         if f.digits:
             return ('numeric', 'NUMERIC')
         return ('float8', 'DOUBLE PRECISION')
-    elif isinstance(f, (fields.char, fields.reference)):
+    elif issubclass(field_type, (fields.char, fields.reference)):
         return ('varchar', pg_varchar(f.size))
-    elif isinstance(f, fields.selection):
+    elif issubclass(field_type, fields.selection):
         if isinstance(f.selection, list) and isinstance(f.selection[0][0], int):
             return ('int4', 'INTEGER')
         return ('varchar', pg_varchar(getattr(f, 'size', None)))
-    elif isinstance(f, fields.function):
+    elif issubclass(field_type, fields.function):
         if f._type == 'selection':
             return ('varchar', pg_varchar())
         return get_pg_type(f, getattr(fields, f._type))

From 9c83238f18dd651e0df0bde54c050cfc4a08a694 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 9 Sep 2011 18:16:23 +0200
Subject: [PATCH 052/304] [FIX] reimplement quality selection field API

a size attribute of -1 means the selection field is an int4, even if the selection is a callable

bzr revid: xmo@openerp.com-20110909161623-nab218ea48ucj4qt
---
 openerp/osv/orm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 92a22a29f9a..6f794469529 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -517,7 +517,8 @@ def get_pg_type(f, type_override=None):
     elif issubclass(field_type, (fields.char, fields.reference)):
         return ('varchar', pg_varchar(f.size))
     elif issubclass(field_type, fields.selection):
-        if isinstance(f.selection, list) and isinstance(f.selection[0][0], int):
+        if (isinstance(f.selection, list) and isinstance(f.selection[0][0], int))\
+                or getattr(f, 'size', None) == -1:
             return ('int4', 'INTEGER')
         return ('varchar', pg_varchar(getattr(f, 'size', None)))
     elif issubclass(field_type, fields.function):

From e575211116c099e24ae294e0e5c08f617ae3a9fb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 9 Sep 2011 18:29:29 +0200
Subject: [PATCH 053/304] [IMP] add a pair of assertions on the parameter to
 VARCHAR, just in case

bzr revid: xmo@openerp.com-20110909162929-w1l328oh14ccn7f8
---
 openerp/osv/orm.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 6f794469529..9492e3d812b 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -485,6 +485,12 @@ def pg_varchar(size=0):
     :rtype: str
     """
     if size:
+        if not isinstance(size, int):
+            raise TypeError("VARCHAR parameter should be an int, got %s"
+                            % type(size))
+        if size < 0:
+            raise ValueError("VARCHAR parameter can not be negative, got %d"
+                             % size)
         return 'VARCHAR(%d)' % size
     return 'VARCHAR'
 

From 7ce7230c4010cf5e7099bbd7c34b4cba19b54388 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 13 Sep 2011 18:24:56 +0530
Subject: [PATCH 054/304] [IMP] base.ir.edi: improve edi import process, split
 in different methods [ADD] base.res.edi_company: introduce new methods in
 res.company to import company as parter and export company address

bzr revid: hmo@tinyerp.com-20110913125456-j9ipisqu5lf6tdyq
---
 openerp/addons/base/ir/ir_edi.py           | 188 ++++++++++++---------
 openerp/addons/base/res/__init__.py        |   2 +
 openerp/addons/base/res/edi_res_company.py | 103 +++++++++++
 3 files changed, 214 insertions(+), 79 deletions(-)
 create mode 100644 openerp/addons/base/res/edi_res_company.py

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 5588e4d041f..1d36a879036 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -91,7 +91,7 @@ class ir_edi_document(osv.osv):
         returns the string serialization that is in the database (column: document) for the given edi_token or raise.
         """
         
-        records = self.name_search(cr, uid, edi_token, context=context)
+        records = self.name_search(cr, uid, edi_token, operator='=', context=context)
         if records:
             record = records[0][0]
             edi = self.browse(cr, uid, record, context=context)
@@ -192,7 +192,7 @@ class edi(object):
         xml_record = model_data_pool.browse(cr, uid, xml_record_id, context=context)
         return xml_record.module, xml_record.name
 
-    def edi_xml_id(self, cr, uid, record, context=None):
+    def edi_xml_id(self, cr, uid, record, xml_id=None, context=None):
         """
         Generate a unique string to represent a pair of (the database's UUID, the XML ID).
         Each EDI record and each relationship value are represented using a unique
@@ -218,8 +218,9 @@ class edi(object):
             module, xml_id = _record_xml
             xml_id = '%s:%s.%s' % (db_uuid, module, xml_id)
         else:
-            uuid = safe_unique_id(db_uuid, record._name, record.id)
-            xml_id = '%s:%s.%s' % (db_uuid, record._module, uuid)
+            if not xml_id:
+                uuid = safe_unique_id(db_uuid, record._name, record.id)
+                xml_id = '%s:%s.%s' % (db_uuid, record._module, uuid)
             assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
             module, xml_id2 = xml_id.split('.')
             xml_record_id = model_data_pool.create(cr, uid, {
@@ -337,7 +338,7 @@ class edi(object):
         dict_list = []
         
         for record in records:
-            dict_list.append(self.edi_m2o(cr, uid, [record], context=None))
+            dict_list.append(self.edi_m2o(cr, uid, record, context=None))
       
         return dict_list
 
@@ -394,30 +395,51 @@ class edi(object):
             edi_dict_list.append(edi_dict)
         return edi_dict_list
 
-    def edi_import_relation(self, cr, uid, relation_model, relation_value, xml_id=None, context=None):
-        relation_id = False
-        model_data = self.pool.get('ir.model.data')
-        relation_object = self.pool.get(relation_model)
-        relation_ids = relation_object.name_search(cr, uid, relation_value, context=context)
-        if relation_ids and len(relation_ids) == 1:
-            relation_id = relation_ids[0][0]
-        values = {relation_object._rec_name: relation_value}
-        if not relation_id:
-            relation_id = relation_object.create(cr, uid, values, context=context)
 
-        relation_record = relation_object.browse(cr, uid, relation_id, context=context)
-        record_xml = self.record_xml_id(cr, uid, relation_record, context=context)
+    def edi_get_object_by_name(self, cr, uid, value, model_name, context=None):
+        openobject = False
+        model = self.pool.get(model_name)
+        object_ids = model.name_search(cr, uid, value, operator='=', context=context)
+        if object_ids and len(object_ids) == 1:
+            object_id = object_ids[0][0]
+            openobject = model.browse(cr, uid, object_id, context=context)
+        return openobject
+
+    def edi_get_object(self, cr, uid, xml_id, model, context=None):
+        model_data = self.pool.get('ir.model.data')
+        assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
+        module, xml_id2 = xml_id.split('.')
+        openobject = False
+        data_ids = model_data.search(cr, uid, [('model','=', model), ('name','=', xml_id2)])
+        if data_ids:
+            model = self.pool.get(model)
+            data = model_data.browse(cr, uid, data_ids[0], context=context)
+            openobject = model.browse(cr, uid, data.res_id, context=context)
+        return openobject
+
+    def edi_import_relation(self, cr, uid, relation_model, relation_value, xml_id=None, context=None):
+        relation = False
+        if xml_id:
+            relation = self.edi_get_object(cr, uid, xml_id, relation_model, context=context)
+        if not relation:
+            relation = self.edi_get_object_by_name(cr, uid, relation_value, relation_model, context=context)
+        if not relation:
+            relation_model = self.pool.get(relation_model)
+            values = {} #relation_model.default_get(cr, uid, fields, context=context)
+            values[relation_model._rec_name] = relation_value            
+            relation_id = relation_model.create(cr, uid, values, context=context)
+            relation = relation_model.browse(cr, uid, relation_id, context=context)
+
+        record_xml = self.record_xml_id(cr, uid, relation, context=context)
         if record_xml:
             module, xml_id = record_xml
             xml_id = '%s.%s' % (module, xml_id)
         if not xml_id:
-            xml_id = self.edi_xml_id(cr, uid, relation_record, context=context)
-        if xml_id:
-            assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
-            module, xml_id2 = xml_id.split('.')
-        #TODO: update record from values
+            xml_id = self.edi_xml_id(cr, uid, relation, context=context)
+        
+        #TODO: update record from values ?
         #relation_id = model_data._update(cr, uid, relation_model, module, values, xml_id=xml_id, context=context)
-        return relation_id
+        return relation and relation.id or False
         
     def edi_import(self, cr, uid, edi_document, context=None):
     
@@ -467,64 +489,72 @@ class edi(object):
                     connect it to the parent record via a write value like (4, db_id).        
         """
         # generic implementation!
-        fields_to_import = []
-        data_line = []
         model_data = self.pool.get('ir.model.data')
-        _columns = self._all_columns
-        values = {}
-        xml_id = edi_document['__id']
-        assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
-        module, xml_id2 = xml_id.split('.')
-        for field in edi_document.keys():
-            if not field.startswith('__'):
-                _column = _columns[field].column
-                _column_dict = fields.field_to_dict(self, cr, uid, context, _column)
-            
-                fields_to_import.append(field)
-                edi_field_value = edi_document[field]
-                field_type = _column_dict['type']
-                relation_model = _column_dict.get('relation')
-                if not edi_field_value:
+        assert self._name == edi_document['__model'], 'EDI Document could not import. Model of EDI Document and current model are does not match'
+        def process(datas, model_name):
+            values = {}
+            model_pool = self.pool.get(model_name)
+            xml_id = datas['__id']
+            assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
+            module, xml_id2 = xml_id.split('.')
+            _columns = model_pool._all_columns
+            for field in datas.keys():
+                if field not in _columns:
                     continue
-                if _column_dict.has_key('function') or _column_dict.has_key('related_columns'):
-                    # DO NOT IMPORT FUNCTION FIELD AND RELATED FIELD
-                    continue
-                elif field_type in ('many2one', 'many2many'):
-                    if field_type == 'many2one':
-                        edi_parent_documents = [edi_field_value]
-                    else:
-                        edi_parent_documents = edi_field_value
-
-                    parent_lines = []
-
-                    for edi_parent_document in edi_parent_documents:
-                        relation_id = self.edi_import_relation(cr, uid, relation_model, edi_parent_document[1], edi_parent_document[0], context=context)
-                        parent_lines.append(relation_id)
-                        
-                    if len(parent_lines):   
+                if not field.startswith('__'):
+                    _column = _columns[field].column
+                    _column_dict = fields.field_to_dict(self, cr, uid, context, _column)
+                
+                    edi_field_value = datas[field]
+                    field_type = _column_dict['type']
+                    relation_model = _column_dict.get('relation')
+                    #print '???????', field, edi_field_value, relation_model, field_type
+                    if not edi_field_value:
+                        continue
+                    if _column_dict.has_key('function') or _column_dict.has_key('related_columns'):
+                        # DO NOT IMPORT FUNCTION FIELD AND RELATED FIELD
+                        continue
+                    elif field_type == 'one2many':
+                        # recursive call for getting children and returning [(0,0,{})] or [(1,ID,{})]
+                        relations = []
+                        relation_object = self.pool.get(relation_model)
+                        for edi_relation_document in edi_field_value:
+                            relation = self.edi_get_object(cr, uid, edi_relation_document['__id'], relation_model, context=context)
+                            if not relation and edi_relation_document.get('name'):
+                                relation = self.edi_get_object_by_name(cr, uid, edi_relation_document['name'], relation_model, context=context)
+                            if relation:
+                                self.edi_xml_id(cr, uid, relation, \
+                                                    xml_id=edi_relation_document['__id'], context=context)
+                                relations.append((4, relation.id))
+                            res_module, res_xml_id, newrow = process(edi_relation_document, relation_model)
+                            relations.append( (relation and 1 or 0, relation and relation.id or 0, newrow))
+                        values[field] = relations
+                    elif field_type in ('many2one', 'many2many'):
                         if field_type == 'many2one':
-                            values[field] = parent_lines[0]
-                            
+                            edi_parent_documents = [edi_field_value]
                         else:
-                            many2many_ids = []
-                            for m2m_id in parent_lines:
-                                many2many_ids.append((4, m2m_id))
-                            values[field] = many2many_ids
-                elif field_type == 'one2many':
-                    #Look for a record that matches the db_id provided in the __id field. If
-                    #found, keep the corresponding database id, and connect it to the parent
-                    #using a write value like (4,db_id).
-                    #If not found via db_id, create a new entry using the same method that
-                    #imports a full EDI record (recursive call!), grab the resulting db id,
-                    #and use it to connect to the parent via a write value like (4, db_id).
-            
-                    relations = []
-                    relation_object = self.pool.get(relation_model)
-                    for edi_relation_document in edi_field_value:
-                        relation_id = relation_object.edi_import(cr, uid, edi_relation_document, context=context)
-                        relations.append((4, relation_id))
-                    values[field] = relations
-                else:
-                    values[field] = edi_field_value
-        return model_data._update(cr, uid, self._name, module, values, xml_id=xml_id, context=context)
+                            edi_parent_documents = edi_field_value
+
+                        parent_lines = []
+
+                        for edi_parent_document in edi_parent_documents:
+                            relation_id = self.edi_import_relation(cr, uid, relation_model, edi_parent_document[1], edi_parent_document[0], context=context)
+                            parent_lines.append(relation_id)
+                            
+                        if len(parent_lines):   
+                            if field_type == 'many2one':
+                                values[field] = parent_lines[0]
+                                
+                            else:
+                                many2many_ids = []
+                                for m2m_id in parent_lines:
+                                    many2many_ids.append((4, m2m_id))
+                                values[field] = many2many_ids
+                    
+                    else:
+                        values[field] = edi_field_value
+            return module, xml_id2, values
+        
+        module, xml_id, data_values = process(edi_document, self._name)
+        return model_data._update(cr, uid, self._name, module, data_values, xml_id=xml_id, context=context)
 # vim: ts=4 sts=4 sw=4 si et
diff --git a/openerp/addons/base/res/__init__.py b/openerp/addons/base/res/__init__.py
index de00fc54153..6f20b5c4f0e 100644
--- a/openerp/addons/base/res/__init__.py
+++ b/openerp/addons/base/res/__init__.py
@@ -34,3 +34,5 @@ import res_log
 import ir_property
 import res_widget
 
+import edi_res_company
+
diff --git a/openerp/addons/base/res/edi_res_company.py b/openerp/addons/base/res/edi_res_company.py
new file mode 100644
index 00000000000..0eabd39781e
--- /dev/null
+++ b/openerp/addons/base/res/edi_res_company.py
@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+
+class res_company(osv.osv):
+    _inherit = "res.company"
+
+    def edi_import_as_partner(self, cr, uid, edi_document, values=None, context=None):
+        """
+        import company as a new partner
+        company_address data used to add address to new partner
+
+        edi_document is a dict to have company datas
+        edi_document = {
+            'company_address': {
+                'street': True,
+                'street2': True,
+                'zip': True,
+                'city': True,
+                'state_id': True,
+                'country_id': True,
+                'email': True,
+                'phone': True,
+                       
+            },
+            'company_id': True,
+        }
+        values is a dict to have other datas of partner which are need to import of partner record
+        values = {
+            'customer': True,
+            'supplier': True,
+        }
+        """
+        if values is None:
+            values = {}
+        partner_pool = self.pool.get('res.partner')
+        edi_document_partner = {
+            '__model': 'res.partner',
+            '__id' : edi_document['company_id'][0],
+            'name' : edi_document['company_id'][1],
+            'address': [edi_document['company_address']]
+        }
+        edi_document_partner.update(values)
+        return partner_pool.edi_import(cr, uid, edi_document_partner, context=context)
+
+    def edi_export_address(self, cr, uid, records, edi_address_struct=None, context=None):
+        if context is None:
+            context = {}
+        partner_pool = self.pool.get('res.partner')
+        partner_address_pool = self.pool.get('res.partner.address')
+        if edi_address_struct is None:
+            edi_address_struct = {
+                'street': True,
+                'street2': True,
+                'zip': True,
+                'city': True,
+                'state_id': True,
+                'country_id': True,
+                'email': True,
+                'phone': True,
+                       
+            }
+        edi_company_dict = {}
+        for company in records:
+            edi_doc = {}
+            company_address = False
+            res = partner_pool.address_get(cr, uid, [company.partner_id.id], ['contact', 'invoice'])
+            addr_id = res['invoice'] or res['contact']
+            if addr_id:
+                address = partner_address_pool.browse(cr, uid, addr_id, context=context)
+                ctx = context.copy()
+                ctx.update({'o2m_export':True})
+                edi_address_dict_list = partner_address_pool.edi_export(cr, uid, [address], edi_struct=edi_address_struct, context=ctx)
+                if edi_address_dict_list:
+                    company_address = edi_address_dict_list[0]
+            edi_doc.update({
+                'company_address': company_address,
+                #'company_logo': company.logo,#TODO
+            })
+            edi_company_dict[company.id] = edi_doc
+        return edi_company_dict
+res_company()

From 701d20fa258ce98476ff75b1afdd2b06638c46e9 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 13 Sep 2011 18:54:16 +0530
Subject: [PATCH 055/304] [IMP] base.ir.edi: introduce new method: split_xml_id
 to split module and xml_id from uuid of edi_document

bzr revid: hmo@tinyerp.com-20110913132416-1putaa2y3rxzqunc
---
 openerp/addons/base/ir/ir_edi.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 1d36a879036..062517b1f87 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -29,6 +29,11 @@ import openerp.release as release
 from tools.translate import _
 import netsvc
 
+def split_xml_id(xml_id):
+    assert len(xml_id.split('.'))==2, \
+            _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
+    return xml_id.split('.')
+
 def safe_unique_id(database_id, model, record_id):
     """Generate a unique string to represent a (database id,model,record_id) pair
     without being too long, without revealing the database id, and
@@ -221,8 +226,7 @@ class edi(object):
             if not xml_id:
                 uuid = safe_unique_id(db_uuid, record._name, record.id)
                 xml_id = '%s:%s.%s' % (db_uuid, record._module, uuid)
-            assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
-            module, xml_id2 = xml_id.split('.')
+            module, xml_id2 = split_xml_id(xml_id)
             xml_record_id = model_data_pool.create(cr, uid, {
                 'name': xml_id2,
                 'model': record._name,
@@ -407,8 +411,7 @@ class edi(object):
 
     def edi_get_object(self, cr, uid, xml_id, model, context=None):
         model_data = self.pool.get('ir.model.data')
-        assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
-        module, xml_id2 = xml_id.split('.')
+        module, xml_id2 = split_xml_id(xml_id)
         openobject = False
         data_ids = model_data.search(cr, uid, [('model','=', model), ('name','=', xml_id2)])
         if data_ids:
@@ -495,8 +498,7 @@ class edi(object):
             values = {}
             model_pool = self.pool.get(model_name)
             xml_id = datas['__id']
-            assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
-            module, xml_id2 = xml_id.split('.')
+            module, xml_id2 = split_xml_id(xml_id)
             _columns = model_pool._all_columns
             for field in datas.keys():
                 if field not in _columns:
@@ -508,7 +510,6 @@ class edi(object):
                     edi_field_value = datas[field]
                     field_type = _column_dict['type']
                     relation_model = _column_dict.get('relation')
-                    #print '???????', field, edi_field_value, relation_model, field_type
                     if not edi_field_value:
                         continue
                     if _column_dict.has_key('function') or _column_dict.has_key('related_columns'):

From 0e1765a4d5ac181bb351d8adc3cc40999eab22a5 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 14 Sep 2011 15:55:05 +0530
Subject: [PATCH 056/304] [FIX] workflow: pass active_model in context on run
 server action

bzr revid: hmo@tinyerp.com-20110914102505-03tzr0ncfsngnqnu
---
 openerp/workflow/wkf_expr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/workflow/wkf_expr.py b/openerp/workflow/wkf_expr.py
index 468e5225212..608af34d118 100644
--- a/openerp/workflow/wkf_expr.py
+++ b/openerp/workflow/wkf_expr.py
@@ -60,7 +60,7 @@ def _eval_expr(cr, ident, workitem, action):
 
 def execute_action(cr, ident, workitem, activity):
     obj = pooler.get_pool(cr.dbname).get('ir.actions.server')
-    ctx = {'active_id':ident[2], 'active_ids':[ident[2]]}
+    ctx = {'active_model':ident[1], 'active_id':ident[2], 'active_ids':[ident[2]]}
     result = obj.run(cr, ident[0], [activity['action_id']], ctx)
     return result
 

From 8a9c0dbad7323509b07cda605aed84bf51584753 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 15 Sep 2011 13:12:13 +0200
Subject: [PATCH 057/304] [IMP] bulk-update fields_view_get result via
 dict.update instead of a bunch of __setitem__

bzr revid: xmo@openerp.com-20110915111213-zigij077k9ss9p6e
---
 openerp/osv/orm.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 7efe2272754..315d2bce0de 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1954,14 +1954,13 @@ class orm_template(object):
 
         # if a view was found
         if sql_res:
-            result['type'] = sql_res['type']
-            result['view_id'] = sql_res['id']
-
             source = etree.fromstring(encode(sql_res['arch']))
-            result['arch'] = apply_view_inheritance(source, result['view_id'])
-
-            result['name'] = sql_res['name']
-            result['field_parent'] = sql_res['field_parent'] or False
+            result.update(
+                arch=apply_view_inheritance(source, sql_res['id']),
+                type=sql_res['type'],
+                view_id=sql_res['id'],
+                name=sql_res['name'],
+                field_parent=sql_res['field_parent'] or False)
         else:
 
             # otherwise, build some kind of default view
@@ -1994,10 +1993,11 @@ class orm_template(object):
             else:
                 # what happens here, graph case?
                 raise except_orm(_('Invalid Architecture!'), _("There is no view of type '%s' defined for the structure!") % view_type)
-            result['arch'] = etree.fromstring(encode(xml))
-            result['name'] = 'default'
-            result['field_parent'] = False
-            result['view_id'] = 0
+            result.update(
+                arch=etree.fromstring(encode(xml)),
+                name='default',
+                field_parent=False,
+                view_id=0)
 
         if parent_view_model != self._name:
             ctx = context.copy()

From 734c1a43a0e4a208185ab967cc1bf087a2d15e5d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 15 Sep 2011 13:12:21 +0200
Subject: [PATCH 058/304] [REF] extract the two inlined default view generators
 left into fields_view_get into their own methods

follow the preexisting __get_default_$name_view

bzr revid: xmo@openerp.com-20110915111221-20ktl1bi2qne5wz7
---
 openerp/osv/orm.py | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 315d2bce0de..960217b4de8 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1689,6 +1689,28 @@ class orm_template(object):
                 raise except_orm('View error', msg)
         return arch, fields
 
+    def __get_default_form_view(self, cr, user, context=None):
+        # TODO it seems fields_get can be replaced by _all_columns (no need for translation)
+        res = self.fields_get(cr, user, context=context)
+        xml = '<?xml version="1.0" encoding="utf-8"?> ' \
+              '<form string="%s">' % (self._description,)
+        for x in res:
+            if res[x]['type'] not in ('one2many', 'many2many'):
+                xml += '<field name="%s"/>' % (x,)
+                if res[x]['type'] == 'text':
+                    xml += "<newline/>"
+        xml += "</form>"
+        return xml
+
+    def __get_default_tree_view(self, cr, user, context=None):
+        _rec_name = self._rec_name
+        if _rec_name not in self._columns:
+            _rec_name = self._columns.keys()[0]
+        xml = '<?xml version="1.0" encoding="utf-8"?>' \
+              '<tree string="%s"><field name="%s"/></tree>' \
+              % (self._description, _rec_name)
+        return xml
+
     def __get_default_calendar_view(self):
         """Generate a default calendar view (For internal use only).
         """
@@ -1965,24 +1987,10 @@ class orm_template(object):
 
             # otherwise, build some kind of default view
             if view_type == 'form':
-                # TODO it seems fields_get can be replaced by _all_columns (no need for translation)
-                res = self.fields_get(cr, user, context=context)
-                xml = '<?xml version="1.0" encoding="utf-8"?> ' \
-                     '<form string="%s">' % (self._description,)
-                for x in res:
-                    if res[x]['type'] not in ('one2many', 'many2many'):
-                        xml += '<field name="%s"/>' % (x,)
-                        if res[x]['type'] == 'text':
-                            xml += "<newline/>"
-                xml += "</form>"
+                xml = self.__get_default_form_view(cr, user, context)
 
             elif view_type == 'tree':
-                _rec_name = self._rec_name
-                if _rec_name not in self._columns:
-                    _rec_name = self._columns.keys()[0]
-                xml = '<?xml version="1.0" encoding="utf-8"?>' \
-                       '<tree string="%s"><field name="%s"/></tree>' \
-                       % (self._description, _rec_name)
+                xml = self.__get_default_tree_view(cr, user, context)
 
             elif view_type == 'calendar':
                 xml = self.__get_default_calendar_view()

From ebb2072207c23fe1ad12310207a72ac27e2a754e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 15 Sep 2011 13:12:55 +0200
Subject: [PATCH 059/304] [IMP] regroup all __get_default_$name_view calls into
 a single parametric getattr

Also rename __get_default_ to _get_default_ so it can be found by getattr

bzr revid: xmo@openerp.com-20110915111255-1i0y555er3nwtkzg
---
 openerp/osv/orm.py | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 960217b4de8..773feb5808d 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1689,7 +1689,7 @@ class orm_template(object):
                 raise except_orm('View error', msg)
         return arch, fields
 
-    def __get_default_form_view(self, cr, user, context=None):
+    def _get_default_form_view(self, cr, user, context=None):
         # TODO it seems fields_get can be replaced by _all_columns (no need for translation)
         res = self.fields_get(cr, user, context=context)
         xml = '<?xml version="1.0" encoding="utf-8"?> ' \
@@ -1702,7 +1702,7 @@ class orm_template(object):
         xml += "</form>"
         return xml
 
-    def __get_default_tree_view(self, cr, user, context=None):
+    def _get_default_tree_view(self, cr, user, context=None):
         _rec_name = self._rec_name
         if _rec_name not in self._columns:
             _rec_name = self._columns.keys()[0]
@@ -1711,7 +1711,7 @@ class orm_template(object):
               % (self._description, _rec_name)
         return xml
 
-    def __get_default_calendar_view(self):
+    def _get_default_calendar_view(self, cr, user, context=None):
         """Generate a default calendar view (For internal use only).
         """
         # TODO could return an etree instead of a string
@@ -1758,7 +1758,7 @@ class orm_template(object):
 
         return arch
 
-    def __get_default_search_view(self, cr, uid, context=None):
+    def _get_default_search_view(self, cr, uid, context=None):
         form_view = self.fields_view_get(cr, uid, False, 'form', context=context)
         tree_view = self.fields_view_get(cr, uid, False, 'tree', context=context)
 
@@ -1984,23 +1984,14 @@ class orm_template(object):
                 name=sql_res['name'],
                 field_parent=sql_res['field_parent'] or False)
         else:
-
             # otherwise, build some kind of default view
-            if view_type == 'form':
-                xml = self.__get_default_form_view(cr, user, context)
-
-            elif view_type == 'tree':
-                xml = self.__get_default_tree_view(cr, user, context)
-
-            elif view_type == 'calendar':
-                xml = self.__get_default_calendar_view()
-
-            elif view_type == 'search':
-                xml = self.__get_default_search_view(cr, user, context)
-
-            else:
+            try:
+                xml = getattr(self, '_get_default_%s_view' % view_type)(
+                    cr, user, context)
+            except AttributeError:
                 # what happens here, graph case?
                 raise except_orm(_('Invalid Architecture!'), _("There is no view of type '%s' defined for the structure!") % view_type)
+
             result.update(
                 arch=etree.fromstring(encode(xml)),
                 name='default',

From 005e2b87a57bba82cec4b73b26ce8af6392ffc4d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 15 Sep 2011 14:04:29 +0200
Subject: [PATCH 060/304] [IMP] etree-ify default view generations

* Search already used etree internally, remove serialization to string
* form and tree were easy to convert
* pull down fvg's parsing (etree.fromstring) into calendar generator before converting it

bzr revid: xmo@openerp.com-20110915120429-syz190w61iq52rel
---
 openerp/osv/orm.py | 70 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 21 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 773feb5808d..c60c440af24 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1690,32 +1690,53 @@ class orm_template(object):
         return arch, fields
 
     def _get_default_form_view(self, cr, user, context=None):
+        """ Generates a default single-line form view using all fields
+        of the current model except the m2m and o2m ones.
+
+        :param cr: database cursor
+        :param int user: user id
+        :param dict context: connection context
+        :returns: a form view as an lxml document
+        :rtype: etree._Element
+        """
+        view = etree.Element('form', string=self._description)
         # TODO it seems fields_get can be replaced by _all_columns (no need for translation)
-        res = self.fields_get(cr, user, context=context)
-        xml = '<?xml version="1.0" encoding="utf-8"?> ' \
-              '<form string="%s">' % (self._description,)
-        for x in res:
-            if res[x]['type'] not in ('one2many', 'many2many'):
-                xml += '<field name="%s"/>' % (x,)
-                if res[x]['type'] == 'text':
-                    xml += "<newline/>"
-        xml += "</form>"
-        return xml
+        for field, descriptor in self.fields_get(cr, user, context=context).iteritems():
+            if descriptor['type'] in ('one2many', 'many2many'):
+                continue
+            etree.SubElement(view, 'field', name=field)
+            if descriptor['type'] == 'text':
+                etree.SubElement(view, 'newline')
+        return view
 
     def _get_default_tree_view(self, cr, user, context=None):
+        """ Generates a single-field tree view, using _rec_name if
+        it's one of the columns or the first column it finds otherwise
+
+        :param cr: database cursor
+        :param int user: user id
+        :param dict context: connection context
+        :returns: a tree view as an lxml document
+        :rtype: etree._Element
+        """
         _rec_name = self._rec_name
         if _rec_name not in self._columns:
             _rec_name = self._columns.keys()[0]
-        xml = '<?xml version="1.0" encoding="utf-8"?>' \
-              '<tree string="%s"><field name="%s"/></tree>' \
-              % (self._description, _rec_name)
-        return xml
+
+        view = etree.Element('tree', string=self._description)
+        etree.SubElement(view, 'field', name=_rec_name)
+        return view
 
     def _get_default_calendar_view(self, cr, user, context=None):
-        """Generate a default calendar view (For internal use only).
+        """ Generates a default calendar view by trying to infer
+        calendar fields from a number of pre-set attribute names
+        
+        :param cr: database cursor
+        :param int user: user id
+        :param dict context: connection context
+        :returns: a calendar view
+        :rtype: etree._Element
         """
-        # TODO could return an etree instead of a string
-
         arch = ('<?xml version="1.0" encoding="utf-8"?>\n'
                 '<calendar string="%s"') % (self._description)
 
@@ -1756,9 +1777,16 @@ class orm_template(object):
                  '  <field name="%s"/>\n'
                  '</calendar>') % (self._rec_name)
 
-        return arch
+        return etree.fromstring(arch.encode('utf-8'))
 
     def _get_default_search_view(self, cr, uid, context=None):
+        """
+        :param cr: database cursor
+        :param int user: user id
+        :param dict context: connection context
+        :returns: an lxml document of the view
+        :rtype: etree._Element
+        """
         form_view = self.fields_view_get(cr, uid, False, 'form', context=context)
         tree_view = self.fields_view_get(cr, uid, False, 'tree', context=context)
 
@@ -1783,7 +1811,7 @@ class orm_template(object):
             field_group.append(etree.Element("field", attrib={'name': field_name}))
 
         #TODO tostring can be removed as fromstring is call directly after...
-        return etree.tostring(search_view, encoding="utf-8").replace('\t', '')
+        return search_view
 
     #
     # if view_id, view_type is not required
@@ -1986,14 +2014,14 @@ class orm_template(object):
         else:
             # otherwise, build some kind of default view
             try:
-                xml = getattr(self, '_get_default_%s_view' % view_type)(
+                view = getattr(self, '_get_default_%s_view' % view_type)(
                     cr, user, context)
             except AttributeError:
                 # what happens here, graph case?
                 raise except_orm(_('Invalid Architecture!'), _("There is no view of type '%s' defined for the structure!") % view_type)
 
             result.update(
-                arch=etree.fromstring(encode(xml)),
+                arch=view,
                 name='default',
                 field_parent=False,
                 view_id=0)

From 4cdda26b6c959d2c6c7323dd9e173f352e83c788 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 15 Sep 2011 14:11:29 +0200
Subject: [PATCH 061/304] [IMP] convert default calendar view generation (from
 fields_view_get) to lxml.etree

bzr revid: xmo@openerp.com-20110915121129-fcdq8e0rix2ocpwt
---
 openerp/osv/orm.py | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c60c440af24..e8556dbc9d4 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1737,8 +1737,8 @@ class orm_template(object):
         :returns: a calendar view
         :rtype: etree._Element
         """
-        arch = ('<?xml version="1.0" encoding="utf-8"?>\n'
-                '<calendar string="%s"') % (self._description)
+        view = etree.Element('calendar', string=self._description)
+        etree.SubElement(view, 'field', name=self._rec_name)
 
         if (self._date_name not in self._columns):
             date_found = False
@@ -1750,34 +1750,25 @@ class orm_template(object):
 
             if not date_found:
                 raise except_orm(_('Invalid Object Architecture!'), _("Insufficient fields for Calendar View!"))
-
-        if self._date_name:
-            arch += ' date_start="%s"' % (self._date_name)
+        view.set('date_start', self._date_name)
 
         for color in ["user_id", "partner_id", "x_user_id", "x_partner_id"]:
             if color in self._columns:
-                arch += ' color="' + color + '"'
+                view.set('color', color)
                 break
 
-        dt_stop_flag = False
-
         for dt_stop in ["date_stop", "date_end", "x_date_stop", "x_date_end"]:
             if dt_stop in self._columns:
-                arch += ' date_stop="' + dt_stop + '"'
-                dt_stop_flag = True
+                view.set('date_stop', dt_stop)
                 break
 
-        if not dt_stop_flag:
+        if not view.get('date_stop'):
             for dt_delay in ["date_delay", "planned_hours", "x_date_delay", "x_planned_hours"]:
                 if dt_delay in self._columns:
-                    arch += ' date_delay="' + dt_delay + '"'
+                    view.set('date_delay', dt_delay)
                     break
 
-        arch += ('>\n'
-                 '  <field name="%s"/>\n'
-                 '</calendar>') % (self._rec_name)
-
-        return etree.fromstring(arch.encode('utf-8'))
+        return view
 
     def _get_default_search_view(self, cr, uid, context=None):
         """

From 74e98f422043bec3b2b10067b1e5665eeb9f9aff Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 15 Sep 2011 14:15:44 +0200
Subject: [PATCH 062/304] [ADD] error when neither date_stop nor date_delay can
 be generated for a default calendar view

bzr revid: xmo@openerp.com-20110915121544-eq3mumulb0qp9yfa
---
 openerp/osv/orm.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index e8556dbc9d4..1d9fb9ccfa0 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1761,12 +1761,15 @@ class orm_template(object):
             if dt_stop in self._columns:
                 view.set('date_stop', dt_stop)
                 break
-
-        if not view.get('date_stop'):
+        if 'date_stop' not in view.attrib:
             for dt_delay in ["date_delay", "planned_hours", "x_date_delay", "x_planned_hours"]:
                 if dt_delay in self._columns:
                     view.set('date_delay', dt_delay)
                     break
+            if 'date_delay' not in view.attrib:
+                raise except_orm(
+                    _('Invalid Object Architecture!'),
+                    _("Insufficient fields to generate a Calendar View for %s, missing a date_stop or a date_delay" % (self._name)))
 
         return view
 

From e878560c7450f4f3bbf7b43d93aa04214218a07a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 15 Sep 2011 14:24:43 +0200
Subject: [PATCH 063/304] [ADD] small helper to calendar generation code, in
 order to make flow clearer

bzr revid: xmo@openerp.com-20110915122443-hvk1u2372ppd77m1
---
 openerp/osv/orm.py | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 1d9fb9ccfa0..c0ca7e9d696 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1737,6 +1737,19 @@ class orm_template(object):
         :returns: a calendar view
         :rtype: etree._Element
         """
+        def set_first_of(seq, in_, to):
+            """Sets the first value of ``set`` also found in ``in`` to
+            the ``to`` attribute of the view being closed over.
+
+            Returns whether it's found a suitable value (and set it on
+            the attribute) or not
+            """
+            for item in seq:
+                if item in in_:
+                    view.set(key, item)
+                    return True
+            return False
+
         view = etree.Element('calendar', string=self._description)
         etree.SubElement(view, 'field', name=self._rec_name)
 
@@ -1752,21 +1765,13 @@ class orm_template(object):
                 raise except_orm(_('Invalid Object Architecture!'), _("Insufficient fields for Calendar View!"))
         view.set('date_start', self._date_name)
 
-        for color in ["user_id", "partner_id", "x_user_id", "x_partner_id"]:
-            if color in self._columns:
-                view.set('color', color)
-                break
+        set_first_of(["user_id", "partner_id", "x_user_id", "x_partner_id"],
+                     self._columns, 'color')
 
-        for dt_stop in ["date_stop", "date_end", "x_date_stop", "x_date_end"]:
-            if dt_stop in self._columns:
-                view.set('date_stop', dt_stop)
-                break
-        if 'date_stop' not in view.attrib:
-            for dt_delay in ["date_delay", "planned_hours", "x_date_delay", "x_planned_hours"]:
-                if dt_delay in self._columns:
-                    view.set('date_delay', dt_delay)
-                    break
-            if 'date_delay' not in view.attrib:
+        if not set_first_of(["date_stop", "date_end", "x_date_stop", "x_date_end"],
+                            self._columns, 'date_stop'):
+            if not set_first_of(["date_delay", "planned_hours", "x_date_delay", "x_planned_hours"],
+                                self._columns, 'date_delay'):
                 raise except_orm(
                     _('Invalid Object Architecture!'),
                     _("Insufficient fields to generate a Calendar View for %s, missing a date_stop or a date_delay" % (self._name)))

From eeb31efa882408be3bbdb98afb928bd8a297edb7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 15 Sep 2011 14:28:34 +0200
Subject: [PATCH 064/304] [IMP] automatic search view generation:
 comprehensions are awesome

bzr revid: xmo@openerp.com-20110915122834-0ec4dkaznbhtc0kc
---
 openerp/osv/orm.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c0ca7e9d696..48b607273de 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1789,12 +1789,11 @@ class orm_template(object):
         form_view = self.fields_view_get(cr, uid, False, 'form', context=context)
         tree_view = self.fields_view_get(cr, uid, False, 'tree', context=context)
 
-        fields_to_search = set()
         # TODO it seems _all_columns could be used instead of fields_get (no need for translated fields info)
         fields = self.fields_get(cr, uid, context=context)
-        for field in fields:
-            if fields[field].get('select'):
-                fields_to_search.add(field)
+        fields_to_search = set(
+            field for field, descriptor in fields.iteritems()
+            if descriptor.get('select'))
         for view in (form_view, tree_view):
             view_root = etree.fromstring(view['arch'])
             # Only care about select=1 in xpath below, because select=2 is covered

From 7bb856b834b6ba30f406459d0b36b34dcd351973 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 15 Sep 2011 14:31:55 +0200
Subject: [PATCH 065/304] [IMP] search view generation: update fields set in
 place instead of creating a new set via union

bzr revid: xmo@openerp.com-20110915123155-a5ht8nhfp9kq0kst
---
 openerp/osv/orm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 48b607273de..625247d464f 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1794,11 +1794,12 @@ class orm_template(object):
         fields_to_search = set(
             field for field, descriptor in fields.iteritems()
             if descriptor.get('select'))
+
         for view in (form_view, tree_view):
             view_root = etree.fromstring(view['arch'])
             # Only care about select=1 in xpath below, because select=2 is covered
             # by the custom advanced search in clients
-            fields_to_search = fields_to_search.union(view_root.xpath("//field[@select=1]/@name"))
+            fields_to_search.update(view_root.xpath("//field[@select=1]/@name"))
 
         tree_view_root = view_root # as provided by loop above
         search_view = etree.Element("search", attrib={'string': tree_view_root.get("string", "")})

From a09be0e9b94626d45db20272ba9ecab469aa8c66 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 15 Sep 2011 14:37:07 +0200
Subject: [PATCH 066/304] [IMP] simplify search view generation: rely on
 etree.SubElement to graft new nodes to the search view

bzr revid: xmo@openerp.com-20110915123707-901mkfkz8e6ikre4
---
 openerp/osv/orm.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 625247d464f..8070d56d9e4 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1802,14 +1802,12 @@ class orm_template(object):
             fields_to_search.update(view_root.xpath("//field[@select=1]/@name"))
 
         tree_view_root = view_root # as provided by loop above
-        search_view = etree.Element("search", attrib={'string': tree_view_root.get("string", "")})
-        field_group = etree.Element("group")
-        search_view.append(field_group)
+        search_view = etree.Element("search", string=tree_view_root.get("string", ""))
 
+        field_group = etree.SubElement(search_view, "group")
         for field_name in fields_to_search:
-            field_group.append(etree.Element("field", attrib={'name': field_name}))
+            etree.SubElement(field_group, "field", name=field_name))
 
-        #TODO tostring can be removed as fromstring is call directly after...
         return search_view
 
     #

From 662c8842f4eef498feb6711c87a3fdd2c75a3611 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 15 Sep 2011 14:47:41 +0200
Subject: [PATCH 067/304] [IMP] fields_view_get: listcomps are still awesome

also use itertools.chain to iterate over multiple lists in sequence, instead of concatenating them

bzr revid: xmo@openerp.com-20110915124741-v5uneqmt2c3v6cmp
---
 openerp/osv/orm.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 8070d56d9e4..c08fe1e2357 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -44,6 +44,7 @@
 import calendar
 import copy
 import datetime
+import itertools
 import logging
 import warnings
 import operator
@@ -2052,13 +2053,11 @@ class orm_template(object):
             resrelate = ir_values_obj.get(cr, user, 'action',
                     'client_action_relate', [(self._name, False)], False,
                     context)
-            resprint = map(clean, resprint)
-            resaction = map(clean, resaction)
-            resaction = filter(lambda x: not x.get('multi', False), resaction)
-            resprint = filter(lambda x: not x.get('multi', False), resprint)
+            resaction = [clean(action) for action in resaction if not action.get('multi')]
+            resprint = [clean(print_) for print_ in resprint if not print_.get('multi')]
             resrelate = map(lambda x: x[2], resrelate)
 
-            for x in resprint + resaction + resrelate:
+            for x in itertools.chain(resprint, resaction, resrelate):
                 x['string'] = x['name']
 
             result['toolbar'] = {

From 52c5e2971031f0ada8497e631ac1cdb2f9e23d7e Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 16 Sep 2011 15:23:28 +0530
Subject: [PATCH 068/304] [FIX] edi_company: add default addess

bzr revid: hmo@tinyerp.com-20110916095328-8wlmqjz4wjfrt0ir
---
 openerp/addons/base/res/edi_res_company.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/edi_res_company.py b/openerp/addons/base/res/edi_res_company.py
index 0eabd39781e..945678c3259 100644
--- a/openerp/addons/base/res/edi_res_company.py
+++ b/openerp/addons/base/res/edi_res_company.py
@@ -85,8 +85,8 @@ class res_company(osv.osv):
         for company in records:
             edi_doc = {}
             company_address = False
-            res = partner_pool.address_get(cr, uid, [company.partner_id.id], ['contact', 'invoice'])
-            addr_id = res['invoice'] or res['contact']
+            res = partner_pool.address_get(cr, uid, [company.partner_id.id], ['default', 'contact', 'invoice'])
+            addr_id = res['invoice'] or res['contact'] or res['default']
             if addr_id:
                 address = partner_address_pool.browse(cr, uid, addr_id, context=context)
                 ctx = context.copy()

From 63987af41eac0814801dfdb7bc97f6d7109472ab Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 16 Sep 2011 16:38:00 +0530
Subject: [PATCH 069/304] [FIX] edi: get partner already exits or not using
 get_object and get_object_by_name.

bzr revid: hmo@tinyerp.com-20110916110800-8dec58lrgyilv144
---
 openerp/addons/base/ir/ir_edi.py           | 11 +++++----
 openerp/addons/base/res/edi_res_company.py | 26 +++++++++++++++++-----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 062517b1f87..e830e18428f 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -420,6 +420,12 @@ class edi(object):
             openobject = model.browse(cr, uid, data.res_id, context=context)
         return openobject
 
+    def edi_create_relation(self, cr, uid, relation_model, relation_value, context=None):
+        relation_model = self.pool.get(relation_model)
+        values = {} #relation_model.default_get(cr, uid, fields, context=context)
+        values[relation_model._rec_name] = relation_value            
+        return relation_model.create(cr, uid, values, context=context)
+
     def edi_import_relation(self, cr, uid, relation_model, relation_value, xml_id=None, context=None):
         relation = False
         if xml_id:
@@ -427,10 +433,7 @@ class edi(object):
         if not relation:
             relation = self.edi_get_object_by_name(cr, uid, relation_value, relation_model, context=context)
         if not relation:
-            relation_model = self.pool.get(relation_model)
-            values = {} #relation_model.default_get(cr, uid, fields, context=context)
-            values[relation_model._rec_name] = relation_value            
-            relation_id = relation_model.create(cr, uid, values, context=context)
+            relation_id = self.edi_create_relation(cr, uid, relation_model, relation_value, context=context)
             relation = relation_model.browse(cr, uid, relation_id, context=context)
 
         record_xml = self.record_xml_id(cr, uid, relation, context=context)
diff --git a/openerp/addons/base/res/edi_res_company.py b/openerp/addons/base/res/edi_res_company.py
index 945678c3259..53ddf487996 100644
--- a/openerp/addons/base/res/edi_res_company.py
+++ b/openerp/addons/base/res/edi_res_company.py
@@ -54,13 +54,29 @@ class res_company(osv.osv):
         """
         if values is None:
             values = {}
-        partner_pool = self.pool.get('res.partner')
+        partner_model = 'res.partner'
+        partner_pool = self.pool.get(partner_model)
+        xml_id = edi_document['company_id'][0]
+        company_address = edi_document.get('company_address', False)
+        partner_name = edi_document['company_id'][1]
+        partner = partner_pool.edi_get_object(cr, uid, xml_id, partner_model, context=context)
+        if not partner:
+            partner = partner_pool.edi_get_object_by_name(cr, uid, partner_name, partner_model, context=context)
+
+        if partner:
+            record_xml = partner_pool.record_xml_id(cr, uid, partner, context=context)
+            if record_xml:
+                module, xml_id = record_xml
+                xml_id = '%s.%s' % (module, xml_id)
+
         edi_document_partner = {
-            '__model': 'res.partner',
-            '__id' : edi_document['company_id'][0],
-            'name' : edi_document['company_id'][1],
-            'address': [edi_document['company_address']]
+            '__model': partner_model,
+            '__id' : xml_id,
+            'name' : partner_name,
         }
+        if company_address:
+            edi_document_partner['address'] = [company_address]
+
         edi_document_partner.update(values)
         return partner_pool.edi_import(cr, uid, edi_document_partner, context=context)
 

From d57135eaefa4ff9bc0e9c80838a2a3b163e92f4b Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 16 Sep 2011 16:02:52 +0200
Subject: [PATCH 070/304] [IMP] fetchmail: Add a new type for the incoming
 server and generate a zip file with the script of the mailgateway and the
 right configuration

bzr revid: stw@openerp.com-20110916140252-movu1cxjubt0bc44
---
 addons/fetchmail/fetchmail.py       | 63 +++++++++++++++++++++++++++--
 addons/fetchmail/fetchmail_view.xml | 16 ++++++--
 2 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index b7460965c3b..1df9ba998b1 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -25,6 +25,14 @@ from imaplib import IMAP4
 from imaplib import IMAP4_SSL
 from poplib import POP3
 from poplib import POP3_SSL
+try:
+    import cStringIO as StringIO
+except ImportError:
+    import StringIO
+
+import zipfile
+import base64
+import addons
 
 import netsvc
 from osv import osv, fields
@@ -46,11 +54,12 @@ class fetchmail_server(osv.osv):
             ('draft', 'Not Confirmed'),
             ('done', 'Confirmed'),
         ], 'State', select=True, readonly=True),
-        'server' : fields.char('Server Name', size=256, required=True, readonly=True, help="Hostname or IP of the mail server", states={'draft':[('readonly', False)]}),
-        'port' : fields.integer('Port', required=True, readonly=True, states={'draft':[('readonly', False)]}),
+        '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([
             ('pop', 'POP Server'),
             ('imap', 'IMAP Server'),
+            ('private_mta', 'Private Mail Server'),
         ], 'Server Type', select=True, required=True, readonly=False),
         'is_ssl':fields.boolean('SSL/TLS', help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP3S=995)"),
         'attach':fields.boolean('Keep Attachments', help="Whether attachments should be downloaded. "
@@ -58,7 +67,8 @@ class fetchmail_server(osv.osv):
         'original':fields.boolean('Keep Original', help="Whether a full original copy of each email should be kept for reference"
                                                         "and attached to each processed message. This will usually double the size of your message database."),
         'date': fields.datetime('Last Fetch Date', readonly=True),
-        'user' : fields.char('Username', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}),
+        'user' : fields.char('Username', size=256, readonly=True, states={'draft':[('readonly', False)]}),
+        'user_id' : fields.many2one('res.users', 'User', states={'draft' : [('readonly', False)]}),
         'password' : fields.char('Password', size=1024, required=True, readonly=True, states={'draft':[('readonly', False)]}),
         'note': fields.text('Description'),
         'action_id':fields.many2one('ir.actions.server', 'Server Action', help="Optional custom server action to trigger for each incoming mail, "
@@ -70,6 +80,9 @@ class fetchmail_server(osv.osv):
         'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Defines the order of processing, "
                                                                                                                   "lower values mean higher priority"),
         'message_ids': fields.one2many('mail.message', 'fetchmail_server_id', 'Messages', readonly=True),
+        'configuration' : fields.text('Configuration', readonly=True),
+        'archive' : fields.binary('Archive', readonly=True),
+        'archive_filename' : fields.char('Filename', size=128, readonly=True),
     }
     _defaults = {
         'state': "draft",
@@ -78,13 +91,55 @@ class fetchmail_server(osv.osv):
         'attach': True,
     }
 
+    def generate_configuration(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids[0], context=context)
+
+        configuration = """You should use this command line with your Mail Transport Agent (MTA)
+openerp_mailgate.py -u %(user_id)d -p PASSWORD -o %(model)s -d %(database)s --host=HOSTNAME --port=PORT
+        """ % {'user_id' : this.user_id.id,
+               'model' : this.object_id.model,
+               'database' : cr.dbname,
+              }
+
+        values = dict(
+            configuration=configuration,
+        )
+
+        try:
+            archive_io = StringIO.StringIO()
+            archive = zipfile.ZipFile(archive_io, 'w')
+            content = open(
+                addons.get_module_resource('mail', 'scripts', 'openerp_mailgate', 'openerp_mailgate.py'),
+                'rb'
+            ).read()
+            archive.writestr('openerp_mailgate.py', content)
+            archive.writestr('README', configuration)
+            archive_io.seek(0)
+            
+            values.update(
+                archive_filename = 'openerp-mailgate.zip',
+                archive = base64.encodestring(archive_io.getvalue())
+            )
+
+        finally:
+            archive.close()
+            archive_io.close()
+
+        return this.write(values)
+
     def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False):
         port = 0
+        values = {}
         if server_type == 'pop':
             port = ssl and 995 or 110
         elif server_type == 'imap':
             port = ssl and 993 or 143
-        return {'value':{'port':port}}
+        else:
+            values['server'] = ''
+
+        values['port'] = port
+
+        return {'value':values}
 
     def set_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids , {'state':'draft'})
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 05f62f4b9fb..ceb28284a6c 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -32,15 +32,16 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Server &amp; Login">
-                            <group col="4" colspan="2">
+                            <group col="4" colspan="2" attrs="{'readonly' : [('type', '=', 'private_mta')]}">
                                 <separator string="Server Information" colspan="2"/>
-                                <field name="server" colspan="4"/>
-                                <field name="port" />
+                                <field name="server" colspan="4" attrs="{'required' : [('type', '!=', 'private_mta')]}" />
+                                <field name="port" required="1" attrs="{'required' : [('type', '!=', 'private_mta')]}" />
                                 <field name="is_ssl" select="1" on_change="onchange_server_type(type, is_ssl)"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator string="Login Information" colspan="2"/>
-                                <field name="user" />
+                                <field name="user" attrs="{'required' : [('type', '!=', 'private_mta')], 'invisible' : [('type', '=', 'private_mta')]}"/>
+                                <field name="user_id" attrs="{'invisible' : [('type', '!=', 'private_mta')], 'required' : [('type', '=', 'private_mta')]}" />
                                 <field name="password" password="True" />
                             </group>
                             <group col="2" colspan="2">
@@ -50,6 +51,13 @@
                             </group>
                             <separator string="Description" colspan="4"/>
                             <field name="note" colspan="4" nolabel="1"/>
+                            <group attrs="{'invisible' : [('type', '!=', 'private_mta')]}" colspan="4">
+                                <separator string="Configuration" colspan="4" />
+                                <field name="configuration" colspan="4" />
+                                <button name="generate_configuration" type="object" string="Generate Configuration" colspan="4" />
+                                <field name="archive_filename" invisible="1" />
+                                <field name="archive" filename="archive_filename" />
+                            </group>
                         </page>
                         <page string="Advanced">
                             <group colspan="2" col="2">

From 4e90af3e4ebc82577847a2aa4fe0a8687052c182 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 21 Sep 2011 10:20:44 +0200
Subject: [PATCH 071/304] [IMP] orm: get_pg_type() does not use early return.
 This is the style advocated by the R&D team. But in fact, I am not that sure
 it proves more readable... Bike shedding is hard.

bzr revid: vmt@openerp.com-20110921082044-cfqksvka6yqvkfci
---
 openerp/osv/orm.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 9492e3d812b..2b35ae696c6 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -515,24 +515,30 @@ def get_pg_type(f, type_override=None):
     field_type = type_override or type(f)
 
     if field_type in FIELDS_TO_PGTYPES:
-        return (FIELDS_TO_PGTYPES[field_type], FIELDS_TO_PGTYPES[field_type])
+        pg_type =  (FIELDS_TO_PGTYPES[field_type], FIELDS_TO_PGTYPES[field_type])
     elif issubclass(field_type, fields.float):
         if f.digits:
-            return ('numeric', 'NUMERIC')
-        return ('float8', 'DOUBLE PRECISION')
+            pg_type = ('numeric', 'NUMERIC')
+        else:
+            pg_type = ('float8', 'DOUBLE PRECISION')
     elif issubclass(field_type, (fields.char, fields.reference)):
-        return ('varchar', pg_varchar(f.size))
+        pg_type = ('varchar', pg_varchar(f.size))
     elif issubclass(field_type, fields.selection):
         if (isinstance(f.selection, list) and isinstance(f.selection[0][0], int))\
                 or getattr(f, 'size', None) == -1:
-            return ('int4', 'INTEGER')
-        return ('varchar', pg_varchar(getattr(f, 'size', None)))
+            pg_type = ('int4', 'INTEGER')
+        else:
+            pg_type = ('varchar', pg_varchar(getattr(f, 'size', None)))
     elif issubclass(field_type, fields.function):
         if f._type == 'selection':
-            return ('varchar', pg_varchar())
-        return get_pg_type(f, getattr(fields, f._type))
-    logging.getLogger('orm').warn('%s type not supported!', field_type)
-    return
+            pg_type = ('varchar', pg_varchar())
+        else:
+            pg_type = get_pg_type(f, getattr(fields, f._type))
+    else:
+        logging.getLogger('orm').warn('%s type not supported!', field_type)
+        pg_type = None
+
+    return pg_type
 
 
 class MetaModel(type):

From 57911141bc9a14087767fe4be2915a5702e4c3e1 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 26 Sep 2011 18:43:23 +0200
Subject: [PATCH 072/304] [IMP] Move all installers into base_setup

bzr revid: stw@openerp.com-20110926164323-ob28bw1zgfmaih9c
---
 addons/account/account_installer.xml          |  20 --
 addons/account/installer.py                   |  22 --
 addons/association/__init__.py                |   1 -
 addons/association/profile_association.py     |  53 -----
 addons/association/profile_association.xml    |  18 --
 addons/base_setup/base_setup.py               | 194 +++++++++++++++++-
 addons/base_setup/base_setup_views.xml        | 123 +++++++++--
 addons/crm/__init__.py                        |   1 -
 addons/crm/crm_installer.py                   |  59 ------
 addons/crm/crm_installer_view.xml             |  24 ---
 addons/hr/__init__.py                         |   3 +-
 addons/hr/hr_installer.xml                    |  23 ---
 addons/hr/installer.py                        |  52 -----
 addons/knowledge/__init__.py                  |   1 -
 addons/knowledge/__openerp__.py               |   1 -
 addons/knowledge/installer.py                 |  52 -----
 addons/knowledge/knowledge_installer.xml      |  23 ---
 addons/marketing/__init__.py                  |   1 -
 addons/marketing/marketing_view.xml           |  18 --
 addons/marketing/marketing_wizard.py          |  40 ----
 addons/mrp/__init__.py                        |   1 -
 addons/mrp/installer.py                       |  52 -----
 addons/mrp/mrp_installer.xml                  |  21 --
 addons/profile_tools/__init__.py              |   1 -
 addons/profile_tools/__openerp__.py           |   1 -
 addons/profile_tools/installer.py             |  40 ----
 addons/profile_tools/misc_tools_installer.xml |  24 ---
 addons/project/__init__.py                    |   1 -
 addons/project/installer.py                   |  51 -----
 addons/project/project_installer.xml          |  21 --
 addons/purchase/wizard/purchase_installer.py  |   9 -
 addons/purchase/wizard/purchase_installer.xml |  16 --
 addons/report_designer/__init__.py            |   1 -
 addons/report_designer/__openerp__.py         |   1 -
 addons/report_designer/installer.py           |  35 ----
 .../report_designer_installer.xml             |  20 --
 addons/sale/__init__.py                       |   1 -
 addons/sale/__openerp__.py                    |   1 -
 addons/sale/sale_installer.py                 |  43 ----
 addons/sale/sale_installer.xml                |  23 ---
 40 files changed, 299 insertions(+), 793 deletions(-)
 delete mode 100644 addons/association/profile_association.py
 delete mode 100644 addons/crm/crm_installer.py
 delete mode 100644 addons/hr/installer.py
 delete mode 100644 addons/knowledge/installer.py
 delete mode 100644 addons/knowledge/knowledge_installer.xml
 delete mode 100644 addons/marketing/marketing_wizard.py
 delete mode 100644 addons/mrp/installer.py
 delete mode 100644 addons/profile_tools/installer.py
 delete mode 100644 addons/profile_tools/misc_tools_installer.xml
 delete mode 100644 addons/project/installer.py
 delete mode 100644 addons/report_designer/installer.py
 delete mode 100644 addons/report_designer/report_designer_installer.xml
 delete mode 100644 addons/sale/sale_installer.py
 delete mode 100644 addons/sale/sale_installer.xml

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 361a371fb97..2ef7e982846 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -43,26 +43,6 @@
             </field>
         </record>
 
-        <record id="view_account_modules_installer" model="ir.ui.view">
-            <field name="name">account.installer.modules.form</field>
-            <field name="model">base.setup.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//group[@name='account_accountant']" position="replace">
-                    <newline/>
-                    <separator string="Accounting &amp; Finance Features" colspan="4"/>
-                    <field name="account_followup"/>
-                    <field name="account_payment"/>
-                    <field name="account_analytic_plans"/>
-                    <field name="account_anglo_saxon"/>
-                    <field name="account_asset"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
         <record id="action_account_configuration_installer" model="ir.actions.act_window">
             <field name="name">Accounting Chart Configuration</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 33ddaa94b12..a6f60743d3d 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -239,26 +239,4 @@ class account_installer(osv.osv_memory):
 
 account_installer()
 
-class account_installer_modules(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-    _columns = {
-        'account_analytic_plans': fields.boolean('Multiple Analytic Plans',
-            help="Allows invoice lines to impact multiple analytic accounts "
-                 "simultaneously."),
-        'account_payment': fields.boolean('Suppliers Payment Management',
-            help="Streamlines invoice payment and creates hooks to plug "
-                 "automated payment systems in."),
-        'account_followup': fields.boolean('Followups Management',
-            help="Helps you generate reminder letters for unpaid invoices, "
-                 "including multiple levels of reminding and customized "
-                 "per-partner policies."),
-        'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting',
-            help="This module will support the Anglo-Saxons accounting methodology by "
-                "changing the accounting logic with stock transactions."),
-        'account_asset': fields.boolean('Assets Management',
-            help="Helps you to manage your assets and their depreciation entries."),
-    }
-
-account_installer_modules()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/association/__init__.py b/addons/association/__init__.py
index 5b34f17fec9..4716d0d109b 100644
--- a/addons/association/__init__.py
+++ b/addons/association/__init__.py
@@ -18,6 +18,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import profile_association
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py
deleted file mode 100644
index 0e66af14a1d..00000000000
--- a/addons/association/profile_association.py
+++ /dev/null
@@ -1,53 +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 lxml import etree
-from osv import fields, osv
-
-class profile_association_config_install_modules_wizard(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        'hr_expense':fields.boolean('Resources Management: Expenses Tracking',  help="Tracks and manages employee expenses, and can "
-                 "automatically re-invoice clients if the expenses are "
-                 "project-related."),
-        'event_project':fields.boolean('Event Management: Events', help="Helps you to manage and organize your events."),
-        'project_gtd':fields.boolean('Getting Things Done',
-            help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
-        'wiki': fields.boolean('Wiki', help="Lets you create wiki pages and page groups in order "
-                 "to keep track of business knowledge and share it with "
-                 "and  between your employees."),
-    }
-
-    # Will be removed when rd-v61-al-config-depends will be done
-    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(profile_association_config_install_modules_wizard, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
-        doc = etree.XML(res['arch'])
-        for module in ['project_gtd','hr_expense']:
-            count = 0
-            for node in doc.xpath("//field[@name='%s']" % (module)):
-                count = count + 1
-                if count > 1:
-                    node.set('invisible', '1')
-        res['arch'] = etree.tostring(doc)
-        return res
-   
-profile_association_config_install_modules_wizard()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 12222ecbd90..8ce97cb2e43 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -1,24 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_confirm_install_module_form" model="ir.ui.view">
-            <field name="name">Association Application Configuration</field>
-            <field name="model">base.setup.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-            <field name="arch" type="xml">
-              <data>
-                <xpath expr="//group[@name='association']" position="replace">
-                    <newline/>
-                    <separator  string="Associations Features" colspan="4" />
-                    <field name="project_gtd" />
-                    <field name="wiki" />
-                    <field name="event_project" />
-                    <field name="hr_expense" />
-                </xpath>
-              </data>
-            </field>
-        </record>
         <menuitem
             name="Association"
             id="base.menu_association"
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 340c2f93044..5e0b5c7f13b 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -24,6 +24,9 @@ import pooler
 import tools
 from osv import fields, osv
 from tools.translate import _
+from lxml import etree
+from osv import fields, osv
+
 
 #Application and feature chooser, this could be done by introspecting ir.modules
 
@@ -89,7 +92,190 @@ class base_setup_installer(osv.osv_memory):
             help="Installs a preselected set of OpenERP "
                  "applications selected to help you manage your auctions "
                  "as well as the business processes around them."),
-        }
+        'account_analytic_plans': fields.boolean('Multiple Analytic Plans',
+            help="Allows invoice lines to impact multiple analytic accounts "
+                 "simultaneously."),
+        'account_payment': fields.boolean('Suppliers Payment Management',
+            help="Streamlines invoice payment and creates hooks to plug "
+                 "automated payment systems in."),
+        'account_followup': fields.boolean('Followups Management',
+            help="Helps you generate reminder letters for unpaid invoices, "
+                 "including multiple levels of reminding and customized "
+                 "per-partner policies."),
+        'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting',
+            help="This module will support the Anglo-Saxons accounting methodology by "
+                "changing the accounting logic with stock transactions."),
+        'account_asset': fields.boolean('Assets Management',
+            help="Helps you to manage your assets and their depreciation entries."),
+        # Manufacturing Resource Planning
+        'stock_location': fields.boolean('Advanced Routes',
+            help="Manages product routes and paths within and between "
+                 "locations (e.g. warehouses)."),
+        'mrp_jit': fields.boolean('Just In Time Scheduling',
+            help="Enables Just In Time computation of procurement orders."
+                 "\n\nWhile it's more resource intensive than the default "
+                 "setup, the JIT computer avoids having to wait for the "
+                 "procurement scheduler to run or having to run the "
+                 "procurement scheduler manually."),
+        'mrp_operations': fields.boolean('Manufacturing Operations',
+            help="Enhances production orders with readiness states as well "
+                 "as the start date and end date of execution of the order."),
+        'mrp_subproduct': fields.boolean('MRP Subproducts',
+            help="Enables multiple product output from a single production "
+                 "order: without this, a production order can have only one "
+                 "output product."),
+        'mrp_repair': fields.boolean('Repairs',
+            help="Enables warranty and repair management (and their impact "
+                 "on stocks and invoicing)."),
+        # Knowledge Management
+        'document_ftp':fields.boolean('Shared Repositories (FTP)',
+            help="Provides an FTP access to your OpenERP's "
+                "Document Management System. It lets you access attachments "
+                "and virtual documents through a standard FTP client."),
+        'document_webdav':fields.boolean('Shared Repositories (WebDAV)',
+            help="Provides a WebDAV access to your OpenERP's Document "
+                 "Management System. Lets you access attachments and "
+                 "virtual documents through your standard file browser."),
+        'wiki':fields.boolean('Collaborative Content (Wiki)',
+            help="Lets you create wiki pages and page groups in order "
+                 "to keep track of business knowledge and share it with "
+                 "and  between your employees."),
+        # Content templates
+        'wiki_faq':fields.boolean('Template: Internal FAQ',
+            help="Creates a skeleton internal FAQ pre-filled with "
+                 "documentation about OpenERP's Document Management "
+                 "System."),
+        'wiki_quality_manual':fields.boolean('Template: Quality Manual',
+            help="Creates an example skeleton for a standard quality manual."),
+        # Reporting
+        'base_report_designer':fields.boolean('OpenOffice Report Designer',help="Adds wizards to Import/Export .SXW report which "
+                                "you can modify in OpenOffice.Once you have modified it you can "
+                                "upload the report using the same wizard."),
+        'base_report_creator':fields.boolean('Query Builder',help="Allows you to create any statistic "
+                                "reports  on several objects. It's a SQL query builder and browser for end users."),
+        'lunch':fields.boolean('Lunch',help='A simple module to help you to manage Lunch orders.'),
+        'subscription':fields.boolean('Recurring Documents',help='Helps to generate automatically recurring documents.'),
+        'survey':fields.boolean('Survey',help='Allows you to organize surveys.'),
+        'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
+        'share':fields.boolean('Web Share',help='Allows you to give restricted access to your OpenERP documents to external users, ' \
+            'such as customers, suppliers, or accountants. You can share any OpenERP Menu such as your project tasks, support requests, invoices, etc.'),
+        'pad': fields.boolean('Collaborative Note Pads',
+            help="This module creates a tighter integration between a Pad "
+                 "instance of your choosing and your OpenERP Web Client by "
+                 "letting you easily link pads to OpenERP objects via "
+                 "OpenERP attachments."),
+        'email_template':fields.boolean('Automated E-Mails',
+            help="Helps you to design templates of emails and integrate them in your different processes."),
+        'marketing_campaign':fields.boolean('Marketing Campaigns',
+            help="Helps you to manage marketing campaigns and automate actions and communication steps."),
+        'crm_profiling':fields.boolean('Profiling Tools',
+            help="Helps you to perform segmentation of partners and design segmentation questionnaires"),
+        # Human Resources Management
+        'hr_holidays': fields.boolean('Leaves Management',
+            help="Tracks employee leaves, allocation requests and planning."),
+        'hr_expense': fields.boolean('Expenses',
+            help="Tracks and manages employee expenses, and can "
+                 "automatically re-invoice clients if the expenses are "
+                 "project-related."),
+        'hr_recruitment': fields.boolean('Recruitment Process',
+            help="Helps you manage and streamline your recruitment process."),
+        'hr_timesheet_sheet':fields.boolean('Timesheets',
+            help="Tracks and helps employees encode and validate timesheets "
+                 "and attendances."),
+        'hr_contract': fields.boolean("Employee's Contracts",
+            help="Extends employee profiles to help manage their contracts."),
+        'hr_evaluation': fields.boolean('Periodic Evaluations',
+            help="Lets you create and manage the periodic evaluation and "
+                 "performance review of employees."),
+        'hr_attendance': fields.boolean('Attendances',
+            help="Simplifies the management of employee's attendances."),
+        'hr_payroll': fields.boolean('Payroll',
+            help="Generic Payroll system."),
+        'hr_payroll_account': fields.boolean('Payroll Accounting',
+            help="Generic Payroll system Integrated with Accountings."),
+        # Project Management
+        'project_long_term': fields.boolean(
+        'Long Term Planning',
+            help="Enables long-term projects tracking, including "
+                 "multiple-phase projects and resource allocation handling."),
+        'hr_timesheet_sheet': fields.boolean('Timesheets',
+            help="Tracks and helps employees encode and validate timesheets "
+                 "and attendances."),
+        'project_timesheet': fields.boolean('Bill Time on Tasks',
+            help="Helps generate invoices based on time spent on tasks, if activated on the project."),
+        'account_budget': fields.boolean('Budgets',
+            help="Helps accountants manage analytic and crossover budgets."),
+        'project_issue': fields.boolean('Issues Tracker',
+            help="Automatically synchronizes project tasks and crm cases."),
+        # Methodologies
+        'project_scrum': fields.boolean('Methodology: SCRUM',
+            help="Implements and tracks the concepts and task types defined "
+                 "in the SCRUM methodology."),
+        'project_gtd': fields.boolean('Methodology: Getting Things Done',
+            help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
+        'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allows you to easily keep track and manage all your purchase orders."),
+        'purchase_analytic_plans': fields.boolean('Purchase Analytic Plans',help="Manages analytic distribution and purchase orders."),
+        'delivery': fields.boolean('Delivery Costs', 
+            help="Allows you to compute delivery costs on your quotations."),
+        'sale_journal': fields.boolean('Invoicing journals',
+            help="Allows you to group and invoice your delivery orders according to different invoicing types: daily, weekly, etc."),
+        'sale_layout': fields.boolean('Sales Orders Print Layout',
+            help="Provides some features to improve the layout of the Sales Order reports."),
+        'sale_margin': fields.boolean('Margins in Sales Orders',
+            help="Gives the margin of profitability by calculating "
+                 "the difference between Unit Price and Cost Price."),
+        'sale_order_dates': fields.boolean('Full Dates on Sales Orders',
+            help="Adds commitment, requested and effective dates on Sales Orders."),
+        'hr_expense':fields.boolean('Resources Management: Expenses Tracking',  help="Tracks and manages employee expenses, and can "
+                 "automatically re-invoice clients if the expenses are "
+                 "project-related."),
+        'event_project':fields.boolean('Event Management: Events', help="Helps you to manage and organize your events."),
+        'project_gtd':fields.boolean('Getting Things Done',
+            help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
+        'wiki': fields.boolean('Wiki', help="Lets you create wiki pages and page groups in order "
+                 "to keep track of business knowledge and share it with "
+                 "and  between your employees."),
+        'name': fields.char('Name', size=64),
+        'crm_helpdesk': fields.boolean('Helpdesk', help="Manages a Helpdesk service."),
+        'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
+        'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
+        'import_sugarcrm': fields.boolean('Import Data from SugarCRM', help="Help you to import and update data from SugarCRM to OpenERP"),
+        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
+        'sale_crm': fields.boolean('Opportunity to Quotation', help="Create a Quotation from an Opportunity."),
+        'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
+        'thunderbird': fields.boolean('Thunderbird Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
+        'outlook': fields.boolean('MS-Outlook Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
+        'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
+        'import_google': fields.boolean('Google Import', help="Imports contacts and events from your google account."),
+    }
+
+    _defaults = {
+        'mrp_jit': lambda self,cr,uid,*a: self.pool.get('res.users').browse(cr, uid, uid).view == 'simple',
+        'document_ftp':True,
+        'marketing_campaign': lambda *a: 1,
+    }
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        res = super(base_setup_installer, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+        doc = etree.XML(res['arch'])
+        for module in ['project_gtd','hr_expense']:
+            count = 0
+            for node in doc.xpath("//field[@name='%s']" % (module)):
+                count = count + 1
+                if count > 1:
+                    node.set('invisible', '1')
+        res['arch'] = etree.tostring(doc)
+        #Checking sale module is installed or not
+        cr.execute("SELECT * from ir_module_module where state='installed' and name = 'sale'")
+        count = cr.fetchall()
+        if count:
+            doc = etree.XML(res['arch'])
+            nodes = doc.xpath("//field[@name='sale_crm']")
+            for node in nodes:
+                node.set('invisible', '0')
+                node.set('modifiers', '{}')
+            res['arch'] = etree.tostring(doc)
+        return res
 
     def _if_knowledge(self, cr, uid, ids, context=None):
         if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
@@ -138,6 +324,8 @@ class base_setup_installer(osv.osv_memory):
             self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
         return
 
+
+
 #Migrate data from another application Conf wiz
 
 class migrade_application_installer_modules(osv.osv_memory):
@@ -158,11 +346,11 @@ class product_installer(osv.osv_memory):
     _name = 'product.installer'
     _inherit = 'res.config'
     _columns = {
-                'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
+        'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
 
     }
     _defaults = {
-                 'customers': 'create',
+        'customers': 'create',
     }
 
     def execute(self, cr, uid, ids, context=None):
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index a6059148b51..023ebd7d2c1 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -39,22 +39,113 @@
             <field name="marketing" groups="base.group_extended" />
             <field name="point_of_sale"/>
             <field name="report_designer" groups="base.group_extended" />
-            <separator string="Install Specific Industry Applications" colspan="4"/>
-            <field name="association" />
-            <field name="auction" />
-            <field name="product_expiry" />
-            <group name="crm"/>
-            <group name="sale"/>
-            <group name="project"/>
-            <group name="knowledge"/>
-            <group name="mrp"/>
-            <group name="account_accountant"/>
-            <group name="purchase"/>
-            <group name="hr"/>
-            <group name="profile_tools"/>
-            <group name="marketing"/>
-            <group name="report_designer"/>
-            <group name="association"/>
+
+            <group name="crm" colspan="4">
+                <separator string="Customer Relationship Management Features" colspan="4"/>
+                <field name="crm_claim" groups="base.group_extended"/>
+                <field name="crm_helpdesk" groups="base.group_extended"/>
+                <field name="crm_fundraising" groups="base.group_extended"/>
+                <field name="wiki_sale_faq" groups="base.group_extended"/>
+                <field name="sale_crm" invisible="1" groups="base.group_extended"/>
+                <field name="crm_caldav"/>
+                <field name="import_sugarcrm"/>
+                <field name="fetchmail"/>
+                <field name="thunderbird"/>
+                <field name="outlook"/>
+            </group>
+            <group name="sale" colspan="4">
+                <separator string="Sales Management Features" colspan="4" />
+                <field name="delivery" />
+                <field name="sale_journal" />
+                <field name="sale_layout" />
+                <field name="sale_margin" />
+                <field name="sale_order_dates" />
+            </group>
+            <group name="project" colspan="4">
+                <separator string="Project Management Features" colspan="4" />
+                <field name="project_issue" />
+                <field name="project_long_term" />
+                <field name="hr_timesheet_sheet" />
+                <field name="project_timesheet" />
+                <field name="account_budget" />
+                <field name="project_scrum" />
+                <field name="project_gtd" />
+            </group>
+            <group name="knowledge" colspan="4">
+                <separator  string="Knowledge Management Features" colspan="4" />
+                <field name="document_ftp" />
+                <field name="document_webdav" />
+                <field name="wiki" />
+                <field name="wiki_faq" />
+                <field name="wiki_quality_manual" />
+                <field name="stock" />
+            </group>
+            <group name="mrp" colspan="4">
+                <separator  string="Manufacturing Features" colspan="4" />
+                <field name="stock_location" />
+                <field name="mrp_jit" />
+                <field name="mrp_operations" />
+                <field name="mrp_subproduct" />
+                <field name="mrp_repair" />
+                <field name="account_voucher" />
+            </group>
+            <group name="account_accountant" colspan="4">
+                <separator string="Accounting &amp; Finance Features" colspan="4"/>
+                <field name="account_followup"/>
+                <field name="account_payment"/>
+                <field name="account_analytic_plans"/>
+                <field name="account_anglo_saxon"/>
+                <field name="account_asset"/>
+                <field name="purchase" />
+            </group>
+
+            <group name="hr" colspan="4">
+                <separator string="Human Resources Features" colspan="4"/>
+                <field name="hr_holidays"/>
+                <field name="hr_expense"/>
+                <field name="hr_recruitment"/>
+                <field name="hr_timesheet_sheet"/>
+                <field name="hr_contract"/>
+                <field name="hr_attendance"/>
+                <field name="hr_evaluation"/>
+                <field name="hr_payroll"/>
+                <field name="hr_payroll_account" groups="base.group_extended"/>
+            </group>
+            <group name="profile_tools" colspan="4">
+                <separator  string="Extra Tools Features" colspan="4" />
+                <field name="share" />
+                <field name="lunch" />
+                <field name="idea" />
+                <field name="survey" />
+                <field name="subscription" />
+                <field name="pad" />
+            </group>
+            <group name="marketing" colspan="4">
+                <separator  string="Marketing Features" colspan="4" />
+                <field name="marketing_campaign" />
+                <field name="email_template" />
+                <field name="crm_profiling" />
+                <field name="point_of_sale"/>
+            </group>
+            <group name="report_designer" colspan="4">
+                <separator  string="Advanced Reporting Features" colspan="4" />
+                <field name="base_report_designer" />
+                <field name="base_report_creator" />
+            </group>
+            <group name="association" colspan="4">
+                <separator  string="Associations Features" colspan="4" />
+                <field name="project_gtd" />
+                <field name="wiki" />
+                <field name="event_project" />
+                <field name="hr_expense" />
+                <field name="auction" />
+                <field name="product_expiry" />
+            </group>
+            <group name="purchase" colspan="4">
+                <separator  string="Purchase Management Features" colspan="4" />
+                <field name="purchase_requisition" />
+                <field name="purchase_analytic_plans" />
+            </group>
           </group>
         </data>
       </field>
diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index 6e57fa5e8c3..214c5c3d450 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -25,7 +25,6 @@ import crm_segmentation
 import crm_meeting
 import crm_lead
 import crm_phonecall
-import crm_installer
 import report
 import wizard
 import res_partner
diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
deleted file mode 100644
index fc3816c80fa..00000000000
--- a/addons/crm/crm_installer.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from lxml import etree
-from osv import fields, osv
-
-class crm_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        'name': fields.char('Name', size=64),
-        'crm_helpdesk': fields.boolean('Helpdesk', help="Manages a Helpdesk service."),
-        'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
-        'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
-        'import_sugarcrm': fields.boolean('Import Data from SugarCRM', help="Help you to import and update data from SugarCRM to OpenERP"),
-        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
-        'sale_crm': fields.boolean('Opportunity to Quotation', help="Create a Quotation from an Opportunity."),
-        'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
-        'thunderbird': fields.boolean('Thunderbird Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
-        'outlook': fields.boolean('MS-Outlook Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
-        'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
-        'import_google': fields.boolean('Google Import', help="Imports contacts and events from your google account."),
-    }
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(crm_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        #Checking sale module is installed or not
-        cr.execute("SELECT * from ir_module_module where state='installed' and name = 'sale'")
-        count = cr.fetchall()
-        if count:
-            doc = etree.XML(res['arch'])
-            nodes = doc.xpath("//field[@name='sale_crm']")
-            for node in nodes:
-                node.set('invisible', '0')
-                node.set('modifiers', '{}')
-            res['arch'] = etree.tostring(doc)
-        return res
-
-crm_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 782083e4669..0eab523e947 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -1,29 +1,5 @@
 <openerp>
   <data>
-    <record id="view_crm_installer" model="ir.ui.view">
-      <field name="name">crm.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='crm']" position="replace">
-            <newline/>
-            <separator string="Customer Relationship Management Features" colspan="4"/>
-            <field name="crm_claim" groups="base.group_extended"/>
-            <field name="crm_helpdesk" groups="base.group_extended"/>
-            <field name="crm_fundraising" groups="base.group_extended"/>
-            <field name="wiki_sale_faq" groups="base.group_extended"/>
-            <field name="sale_crm" invisible="1" groups="base.group_extended"/>
-            <field name="crm_caldav"/>
-            <field name="import_sugarcrm"/>
-            <field name="fetchmail"/>
-            <field name="thunderbird"/>
-            <field name="outlook"/>
-          </xpath>
-        </data>
-      </field>
-    </record>
     
     <record model="ir.actions.act_window" id="crm_case_section_view_form_installer">
         <field name="name">Define Sales Team</field>
diff --git a/addons/hr/__init__.py b/addons/hr/__init__.py
index 769e894f1bb..e2ff754ad35 100644
--- a/addons/hr/__init__.py
+++ b/addons/hr/__init__.py
@@ -21,9 +21,8 @@
 
 import hr_department
 import hr
-import installer
 
 import report
 import wizard
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index bd6e7ed3f6b..0b7880a032e 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -1,29 +1,6 @@
 <openerp>
     <data>
 
-        <record id="view_hr_installer" model="ir.ui.view">
-            <field name="name">hr.installer.view</field>
-            <field name="model">base.setup.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//group[@name='hr']" position="replace">
-                        <newline/>
-                        <separator string="Human Resources Features" colspan="4"/>
-                        <field name="hr_holidays"/>
-                        <field name="hr_expense"/>
-                        <field name="hr_recruitment"/>
-                        <field name="hr_timesheet_sheet"/>
-                        <field name="hr_contract"/>
-                        <field name="hr_attendance"/>
-                        <field name="hr_evaluation"/>
-                        <field name="hr_payroll"/>
-                        <field name="hr_payroll_account" groups="base.group_extended"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
 
         <record id="category_hr_management_config" model="ir.actions.todo.category">
             <field name="name">HR Management</field>
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
deleted file mode 100644
index 3916acaeb1e..00000000000
--- a/addons/hr/installer.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields, osv
-
-class hr_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-    _columns = {
-        # Human Resources Management
-        'hr_holidays': fields.boolean('Leaves Management',
-            help="Tracks employee leaves, allocation requests and planning."),
-        'hr_expense': fields.boolean('Expenses',
-            help="Tracks and manages employee expenses, and can "
-                 "automatically re-invoice clients if the expenses are "
-                 "project-related."),
-        'hr_recruitment': fields.boolean('Recruitment Process',
-            help="Helps you manage and streamline your recruitment process."),
-        'hr_timesheet_sheet':fields.boolean('Timesheets',
-            help="Tracks and helps employees encode and validate timesheets "
-                 "and attendances."),
-        'hr_contract': fields.boolean("Employee's Contracts",
-            help="Extends employee profiles to help manage their contracts."),
-        'hr_evaluation': fields.boolean('Periodic Evaluations',
-            help="Lets you create and manage the periodic evaluation and "
-                 "performance review of employees."),
-        'hr_attendance': fields.boolean('Attendances',
-            help="Simplifies the management of employee's attendances."),
-        'hr_payroll': fields.boolean('Payroll',
-            help="Generic Payroll system."),
-        'hr_payroll_account': fields.boolean('Payroll Accounting',
-            help="Generic Payroll system Integrated with Accountings."),
-        }
-hr_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/knowledge/__init__.py b/addons/knowledge/__init__.py
index 3511d091ecb..9a3d6d2fbb6 100644
--- a/addons/knowledge/__init__.py
+++ b/addons/knowledge/__init__.py
@@ -19,6 +19,5 @@
 #
 ##############################################################################
 
-import installer
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index c2f1b2c7a88..f0f64160286 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -39,7 +39,6 @@ document and Wiki based tools.
     'update_xml': [
         'security/knowledge_security.xml',
         'security/ir.model.access.csv',
-        'knowledge_installer.xml',
         'knowledge_view.xml',
     ],
     'demo_xml': ['knowledge_demo.xml'],
diff --git a/addons/knowledge/installer.py b/addons/knowledge/installer.py
deleted file mode 100644
index 0f6b29597de..00000000000
--- a/addons/knowledge/installer.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields, osv
-
-class knowledge_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        # Knowledge Management
-        'document_ftp':fields.boolean('Shared Repositories (FTP)',
-            help="Provides an FTP access to your OpenERP's "
-                "Document Management System. It lets you access attachments "
-                "and virtual documents through a standard FTP client."),
-        'document_webdav':fields.boolean('Shared Repositories (WebDAV)',
-            help="Provides a WebDAV access to your OpenERP's Document "
-                 "Management System. Lets you access attachments and "
-                 "virtual documents through your standard file browser."),
-        'wiki':fields.boolean('Collaborative Content (Wiki)',
-            help="Lets you create wiki pages and page groups in order "
-                 "to keep track of business knowledge and share it with "
-                 "and  between your employees."),
-        # Content templates
-        'wiki_faq':fields.boolean('Template: Internal FAQ',
-            help="Creates a skeleton internal FAQ pre-filled with "
-                 "documentation about OpenERP's Document Management "
-                 "System."),
-        'wiki_quality_manual':fields.boolean('Template: Quality Manual',
-            help="Creates an example skeleton for a standard quality manual."),
-        }
-    _defaults = {
-        'document_ftp':True,
-        }
-
-knowledge_installer()
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
deleted file mode 100644
index d9a4a45df66..00000000000
--- a/addons/knowledge/knowledge_installer.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_knowledge_installer" model="ir.ui.view">
-      <field name="name">knowledge.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='knowledge']" position="replace">
-            <newline/>
-            <separator  string="Knowledge Management Features" colspan="4" />
-            <field name="document_ftp" />
-            <field name="document_webdav" />
-            <field name="wiki" />
-            <field name="wiki_faq" />
-            <field name="wiki_quality_manual" />
-          </xpath>
-        </data>
-      </field>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/marketing/__init__.py b/addons/marketing/__init__.py
index c83787a6ef7..e68279cad8d 100644
--- a/addons/marketing/__init__.py
+++ b/addons/marketing/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import marketing_wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 9f70651e5ab..a697d586cd4 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -11,23 +11,5 @@
             web_icon="images/marketing.png"
             web_icon_hover="images/marketing-hover.png"/>
 
-
-        <record id="view_marketing_installer" model="ir.ui.view">
-            <field name="name">marketing.installer.view</field>
-            <field name="model">base.setup.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//group[@name='marketing']" position="replace">
-                        <newline/>
-                        <separator  string="Marketing Features" colspan="4" />
-                        <field name="marketing_campaign" />
-                        <field name="email_template" />
-                        <field name="crm_profiling" />
-                    </xpath>
-                </data>
-            </field>
-        </record>
     </data>
 </openerp>
diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py
deleted file mode 100644
index cedba8151c9..00000000000
--- a/addons/marketing/marketing_wizard.py
+++ /dev/null
@@ -1,40 +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 fields, osv
-
-class marketing_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-    _columns = {
-        'email_template':fields.boolean('Automated E-Mails',
-            help="Helps you to design templates of emails and integrate them in your different processes."),
-        'marketing_campaign':fields.boolean('Marketing Campaigns',
-            help="Helps you to manage marketing campaigns and automate actions and communication steps."),
-        'crm_profiling':fields.boolean('Profiling Tools',
-            help="Helps you to perform segmentation of partners and design segmentation questionnaires")
-    }
-    _defaults = {
-        'marketing_campaign': lambda *a: 1,
-    }
-
-marketing_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index 30367ec35f8..52a5bdda77b 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -22,7 +22,6 @@
 import mrp
 import stock
 import product
-import installer
 import wizard
 import report
 import company
diff --git a/addons/mrp/installer.py b/addons/mrp/installer.py
deleted file mode 100644
index 7fc7fea9c1e..00000000000
--- a/addons/mrp/installer.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields, osv
-
-class mrp_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        # Manufacturing Resource Planning
-        'stock_location': fields.boolean('Advanced Routes',
-            help="Manages product routes and paths within and between "
-                 "locations (e.g. warehouses)."),
-        'mrp_jit': fields.boolean('Just In Time Scheduling',
-            help="Enables Just In Time computation of procurement orders."
-                 "\n\nWhile it's more resource intensive than the default "
-                 "setup, the JIT computer avoids having to wait for the "
-                 "procurement scheduler to run or having to run the "
-                 "procurement scheduler manually."),
-        'mrp_operations': fields.boolean('Manufacturing Operations',
-            help="Enhances production orders with readiness states as well "
-                 "as the start date and end date of execution of the order."),
-        'mrp_subproduct': fields.boolean('MRP Subproducts',
-            help="Enables multiple product output from a single production "
-                 "order: without this, a production order can have only one "
-                 "output product."),
-        'mrp_repair': fields.boolean('Repairs',
-            help="Enables warranty and repair management (and their impact "
-                 "on stocks and invoicing)."),
-        }
-
-    _defaults = {
-        'mrp_jit': lambda self,cr,uid,*a: self.pool.get('res.users').browse(cr, uid, uid).view == 'simple',
-    }
-mrp_installer()
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index af2a35b3ce7..5b6268e001b 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -1,26 +1,5 @@
 <openerp>
   <data>
-    <record id="view_mrp_installer" model="ir.ui.view">
-      <field name="name">mrp.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='mrp']" position="replace">
-            <newline/>
-            <separator  string="Manufacturing Features" colspan="4" />
-            <field name="stock_location" />
-            <field name="mrp_jit" />
-            <field name="mrp_operations" />
-            <field name="mrp_subproduct" />
-            <field name="mrp_repair" />
-          </xpath>
-        </data>
-      </field>
-    </record>
-
-
     <record id="category_mrp_config" model="ir.actions.todo.category">
         <field name="name">MRP Management</field>
         <field name="sequence">6</field>
diff --git a/addons/profile_tools/__init__.py b/addons/profile_tools/__init__.py
index 3511d091ecb..9a3d6d2fbb6 100644
--- a/addons/profile_tools/__init__.py
+++ b/addons/profile_tools/__init__.py
@@ -19,6 +19,5 @@
 #
 ##############################################################################
 
-import installer
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py
index 46528337f98..a381594bb0d 100644
--- a/addons/profile_tools/__openerp__.py
+++ b/addons/profile_tools/__openerp__.py
@@ -37,7 +37,6 @@ modules like share, lunch, pad, idea, survey and subscription.
     'website': 'http://www.openerp.com',
     'init_xml': [],
     'update_xml': [
-        'misc_tools_installer.xml',
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
deleted file mode 100644
index 44258234d11..00000000000
--- a/addons/profile_tools/installer.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields, osv
-
-class misc_tools_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        'lunch':fields.boolean('Lunch',help='A simple module to help you to manage Lunch orders.'),
-        'subscription':fields.boolean('Recurring Documents',help='Helps to generate automatically recurring documents.'),
-        'survey':fields.boolean('Survey',help='Allows you to organize surveys.'),
-        'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
-        'share':fields.boolean('Web Share',help='Allows you to give restricted access to your OpenERP documents to external users, ' \
-            'such as customers, suppliers, or accountants. You can share any OpenERP Menu such as your project tasks, support requests, invoices, etc.'),
-        'pad': fields.boolean('Collaborative Note Pads',
-            help="This module creates a tighter integration between a Pad "
-                 "instance of your choosing and your OpenERP Web Client by "
-                 "letting you easily link pads to OpenERP objects via "
-                 "OpenERP attachments."),
-    }
-misc_tools_installer()
-
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
deleted file mode 100644
index 703a8aed9c7..00000000000
--- a/addons/profile_tools/misc_tools_installer.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_misc_tools_installer" model="ir.ui.view">
-      <field name="name">misc_tools.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='profile_tools']" position="replace">
-            <newline/>
-            <separator  string="Extra Tools Features" colspan="4" />
-            <field name="share" />
-            <field name="lunch" />
-            <field name="idea" />
-            <field name="survey" />
-            <field name="subscription" />
-            <field name="pad" />
-          </xpath>
-        </data>
-      </field>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/project/__init__.py b/addons/project/__init__.py
index 142cd98e485..01bef264e02 100644
--- a/addons/project/__init__.py
+++ b/addons/project/__init__.py
@@ -21,7 +21,6 @@
 
 import project
 import company
-import installer
 import report
 import wizard
 import res_partner
diff --git a/addons/project/installer.py b/addons/project/installer.py
deleted file mode 100644
index 36b458da296..00000000000
--- a/addons/project/installer.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-class project_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        # Project Management
-        'project_long_term': fields.boolean(
-        'Long Term Planning',
-            help="Enables long-term projects tracking, including "
-                 "multiple-phase projects and resource allocation handling."),
-        'hr_timesheet_sheet': fields.boolean('Timesheets',
-            help="Tracks and helps employees encode and validate timesheets "
-                 "and attendances."),
-        'project_timesheet': fields.boolean('Bill Time on Tasks',
-            help="Helps generate invoices based on time spent on tasks, if activated on the project."),
-        'account_budget': fields.boolean('Budgets',
-            help="Helps accountants manage analytic and crossover budgets."),
-        'project_issue': fields.boolean('Issues Tracker',
-            help="Automatically synchronizes project tasks and crm cases."),
-        # Methodologies
-        'project_scrum': fields.boolean('Methodology: SCRUM',
-            help="Implements and tracks the concepts and task types defined "
-                 "in the SCRUM methodology."),
-        'project_gtd': fields.boolean('Methodology: Getting Things Done',
-            help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
-    }
-project_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 3e04b919edd..d25635b8248 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -2,27 +2,6 @@
 <openerp>
     <data>
 
-        <record id="view_project_installer" model="ir.ui.view">
-            <field name="name">project.installer.view</field>
-            <field name="model">base.setup.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//group[@name='project']" position="replace">
-                        <newline/>
-                        <separator  string="Project Management Features" colspan="4" />
-                        <field name="project_issue" />
-                        <field name="project_long_term" />
-                        <field name="hr_timesheet_sheet" />
-                        <field name="project_timesheet" />
-                        <field name="account_budget" />
-                        <field name="project_scrum" />
-                        <field name="project_gtd" />
-                    </xpath>
-                </data>
-            </field>
-        </record>
 
         <record id="category_project_config" model="ir.actions.todo.category">
             <field name="name">Project Management</field>
diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py
index c6d70947893..1fe462ce191 100644
--- a/addons/purchase/wizard/purchase_installer.py
+++ b/addons/purchase/wizard/purchase_installer.py
@@ -20,15 +20,6 @@
 ##############################################################################
 from osv import fields, osv
 
-class purchase_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allows you to easily keep track and manage all your purchase orders."),
-        'purchase_analytic_plans': fields.boolean('Purchase Analytic Plans',help="Manages analytic distribution and purchase orders.")
-    }
-purchase_installer()
-
 class purchase_config_wizard(osv.osv_memory):
     _name = 'purchase.config.wizard'
 
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index cf9b6a985db..31c6a7ad6bc 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_purchase_install_module_form" model="ir.ui.view">
-            <field name="name">Purchases Application Configuration</field>
-            <field name="model">base.setup.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-            <field name="arch" type="xml">
-              <data>
-                  <xpath expr="//group[@name='purchase']" position="replace">
-                    <newline/>
-                    <separator  string="Purchase Management Features" colspan="4" />
-                    <field name="purchase_requisition" />
-                    <field name="purchase_analytic_plans" />
-                  </xpath>
-              </data>
-            </field>
-        </record>
 
         <record id="action_import_create_supplier_installer" model="ir.actions.act_window">
             <field name="name">Create or Import Suppliers</field>
diff --git a/addons/report_designer/__init__.py b/addons/report_designer/__init__.py
index 3511d091ecb..9a3d6d2fbb6 100644
--- a/addons/report_designer/__init__.py
+++ b/addons/report_designer/__init__.py
@@ -19,6 +19,5 @@
 #
 ##############################################################################
 
-import installer
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py
index 73982086c8f..00296a1d83f 100644
--- a/addons/report_designer/__openerp__.py
+++ b/addons/report_designer/__openerp__.py
@@ -37,7 +37,6 @@ modules like base_report_designer and base_report_creator.
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
-        'report_designer_installer.xml',
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/report_designer/installer.py b/addons/report_designer/installer.py
deleted file mode 100644
index e4bbc4ffa93..00000000000
--- a/addons/report_designer/installer.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields, osv
-
-class report_designer_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        # Reporting
-        'base_report_designer':fields.boolean('OpenOffice Report Designer',help="Adds wizards to Import/Export .SXW report which "
-                                "you can modify in OpenOffice.Once you have modified it you can "
-                                "upload the report using the same wizard."),
-        'base_report_creator':fields.boolean('Query Builder',help="Allows you to create any statistic "
-                                "reports  on several objects. It's a SQL query builder and browser for end users."),
-    }
-report_designer_installer()
-
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
deleted file mode 100644
index d8d1798578e..00000000000
--- a/addons/report_designer/report_designer_installer.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_report_designer_installer" model="ir.ui.view">
-      <field name="name">report_designer.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='report_designer']" position="replace">
-            <newline/>
-            <separator  string="Advanced Reporting Features" colspan="4" />
-            <field name="base_report_designer" />
-            <field name="base_report_creator" />
-          </xpath>
-        </data>
-      </field>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index 3c7af56e808..c7be8e7e14b 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -25,7 +25,6 @@
 
 import sale
 import stock
-import sale_installer
 import wizard
 import report
 import company
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index c983edc881e..529489101ef 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -79,7 +79,6 @@ Dashboard for Sales Manager that includes:
         'sale_sequence.xml',
         'sale_data.xml',
         'sale_view.xml',
-        'sale_installer.xml',
         'report/sale_report_view.xml',
         'sale_report.xml',
         'stock_view.xml',
diff --git a/addons/sale/sale_installer.py b/addons/sale/sale_installer.py
deleted file mode 100644
index dcac79270b2..00000000000
--- a/addons/sale/sale_installer.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-class sale_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        'delivery': fields.boolean('Delivery Costs', 
-            help="Allows you to compute delivery costs on your quotations."),
-        'sale_journal': fields.boolean('Invoicing journals',
-            help="Allows you to group and invoice your delivery orders according to different invoicing types: daily, weekly, etc."),
-        'sale_layout': fields.boolean('Sales Orders Print Layout',
-            help="Provides some features to improve the layout of the Sales Order reports."),
-        'sale_margin': fields.boolean('Margins in Sales Orders',
-            help="Gives the margin of profitability by calculating "
-                 "the difference between Unit Price and Cost Price."),
-        'sale_order_dates': fields.boolean('Full Dates on Sales Orders',
-            help="Adds commitment, requested and effective dates on Sales Orders."),
-    }
-    
-sale_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml
deleted file mode 100644
index ae48e9f14b2..00000000000
--- a/addons/sale/sale_installer.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_sale_installer" model="ir.ui.view">
-      <field name="name">sale.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='sale']" position="replace">
-            <newline/>
-            <separator  string="Sales Management Features" colspan="4" />
-            <field name="delivery" />
-            <field name="sale_journal" />
-            <field name="sale_layout" />
-            <field name="sale_margin" />
-            <field name="sale_order_dates" />
-          </xpath>
-        </data>
-      </field>
-    </record>
-  </data>
-</openerp>

From 7101204a2255e2686cf35dd40d190ff8fcfcfc92 Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Tue, 27 Sep 2011 16:28:21 +0530
Subject: [PATCH 073/304] [FIX/IMP]:stored function override were not removed

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

bzr revid: nch@tinyerp.com-20110927105821-3rmydltdyv4gv830
---
 openerp/osv/orm.py | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 251e736e0e7..fd0b68a3f1d 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -3306,17 +3306,20 @@ class orm(orm_template):
 
         self._columns = self._columns.copy()
         for store_field in self._columns:
-            f = self._columns[store_field]
-            if hasattr(f, 'digits_change'):
-                f.digits_change(cr)
-            if not isinstance(f, fields.function):
+            store_field_obj = self._columns[store_field]
+            if hasattr(store_field_obj, 'digits_change'):
+                store_field_obj.digits_change(cr)
+            fncts = self.pool._store_function.get(self._name, [])
+            for x, y, z, e, f, l in copy.copy(fncts):
+                 if ((x == self._name) and (y == store_field)):
+                     fncts.remove((x, y, z, e, f, l))
+            if not isinstance(store_field_obj, fields.function):
                 continue
-            if not f.store:
+            if not store_field_obj.store:
                 continue
-            if self._columns[store_field].store is True:
+            sm = store_field_obj.store
+            if store_field_obj.store is True:
                 sm = {self._name: (lambda self, cr, uid, ids, c={}: ids, None, 10, None)}
-            else:
-                sm = self._columns[store_field].store
             for object, aa in sm.items():
                 if len(aa) == 4:
                     (fnct, fields2, order, length) = aa
@@ -3327,14 +3330,8 @@ class orm(orm_template):
                     raise except_orm('Error',
                         ('Invalid function definition %s in object %s !\nYou must use the definition: store={object:(fnct, fields, priority, time length)}.' % (store_field, self._name)))
                 self.pool._store_function.setdefault(object, [])
-                ok = True
-                for x, y, z, e, f, l in self.pool._store_function[object]:
-                    if (x==self._name) and (y==store_field) and (e==fields2):
-                        if f == order:
-                            ok = False
-                if ok:
-                    self.pool._store_function[object].append((self._name, store_field, fnct, tuple(fields2) if fields2 else None, order, length))
-                    self.pool._store_function[object].sort(lambda x, y: cmp(x[4], y[4]))
+                self.pool._store_function[object].append((self._name, store_field, fnct, tuple(fields2) if fields2 else None, order, length))
+                self.pool._store_function[object].sort(lambda x, y: cmp(x[4], y[4]))
 
         for (key, _, msg) in self._sql_constraints:
             self.pool._sql_error[self._table+'_'+key] = msg

From 14528b600e2a48f8b056d9999a1e9d989bc3b56b Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 27 Sep 2011 17:47:25 +0200
Subject: [PATCH 074/304] [IMP] base_setup: add a new wizard

bzr revid: stw@openerp.com-20110927154725-l2tazrlqbjhslm1j
---
 addons/base_setup/base_setup.py        | 153 ++++++++++++++++++++++++-
 addons/base_setup/base_setup_views.xml |  12 ++
 2 files changed, 164 insertions(+), 1 deletion(-)

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 5e0b5c7f13b..f5b07d83d53 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -20,15 +20,166 @@
 ##############################################################################
 import pytz
 
+import simplejson
+import cgi
 import pooler
 import tools
 from osv import fields, osv
 from tools.translate import _
 from lxml import etree
-from osv import fields, osv
+
+class ir_module_category(osv.osv):
+    _inherit = 'ir.module.category'
+
+    _columns = {
+        'module_ids' : fields.one2many('ir.module.module', 'category_id', 'Modules'),
+    }
+ir_module_category()
 
 
 #Application and feature chooser, this could be done by introspecting ir.modules
+class base_setup_installer2(osv.osv_memory):
+    _name = 'base.setup.installer2'
+
+    _inherit = 'res.config.installer'
+
+    _columns = {
+        'modules' : fields.text('Modules'),
+    }
+
+    def fields_get(self, cr, uid, fields=None, context=None):
+        if context is None:
+            context = {}
+        if fields is None:
+            fields = {}
+
+        fields = {} #super(base_setup_installer2, self).fields_get(cr, uid, fields, context=context)
+        category_proxy = self.pool.get('ir.module.category')
+        category_ids = category_proxy.search(cr, uid, [], context=context)
+        for category in category_proxy.browse(cr, uid, category_ids, context=context):
+            category_name = 'category_%d' % (category.id,)
+            fields[category_name] = {
+                'type' : 'boolean',
+                'string' : category.name,
+                'name' : category_name,
+            }
+
+        module_proxy = self.pool.get('ir.module.module')
+        module_ids = module_proxy.search(cr, uid, [], context=context)
+        for module in module_proxy.browse(cr, uid, module_ids, context=context):
+            module_name = 'module_%s' % (module.name,)
+            module_is_installed = module.state == 'installed'
+            fields[module_name] = {
+                'type' : 'boolean',
+                'string' : module.shortdesc,
+                'name' : module_name,
+                'help' : module.description,
+            }
+
+        return fields
+
+    def default_get(self, cr, uid, fields=None, context=None):
+        if context is None:
+            context = {}
+        if fields is None:
+            fields = {}
+
+        result = {}
+
+        if 'dont_compute_virtual_attributes' not in context:
+            module_proxy = self.pool.get('ir.module.module')
+            module_ids = module_proxy.search(cr, uid, [], context=context)
+            for module in module_proxy.browse(cr, uid, module_ids, context=context):
+                result['module_%s' % (module.name,)] = module.state == 'installed'
+                category_name = 'category_%d' % (module.category_id.id,)
+                if not result.get('category_name'):
+                    result[category_name] = module.state == 'installed'
+
+        return result
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='from', context=None, toolbar=False, submenu=False):
+        result = super(base_setup_installer2, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+
+        module_category_proxy = self.pool.get('ir.module.category')
+        module_category_ids = module_category_proxy.search(cr, uid, [('name', '!=', 'Base')], context=context, order='name asc')
+        arch = ['<form string="Automatic Base Setup">']
+        arch.append('<separator string="Categories" colspan="4" />')
+        for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
+            readonly = False
+            for module in module_category.module_ids:
+                if module.state == 'installed':
+                    readonly=True
+
+            if readonly:
+                arch.append("""<field name="category_%d" modifiers='%s'/>""" % (module_category.id, simplejson.dumps({'readonly' : True}),))
+            else:
+                arch.append('<field name="category_%d" />' % (module_category.id,))
+
+
+        for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
+            if not module_category.module_ids:
+                continue
+
+            modifiers = {
+                'invisible' : [('category_%d' % (module_category.id), '=', False)],
+                'readonly' : module.state == 'installed',
+            }
+            modifiers = simplejson.dumps(modifiers)
+            arch.append("""<separator string="%s" colspan="4" modifiers='%s'/>""" % (cgi.escape(module_category.name), modifiers))
+            for module in module_category.module_ids: 
+                arch.append("""<field name="module_%s" modifiers='%s' />""" % (module.name, modifiers))
+
+        arch.append(
+            '<separator colspan="4" />'
+            '<group colspan="4" col="2">'
+            '<button special="cancel" string="Cancel" icon="gtk-cancel" />'
+            '<button string="Install Modules" type="object" name="apply_cb" icon="gtk-apply" />'
+            '</group>'
+        )
+
+        arch.append('</form>')
+
+        result['arch'] = ''.join(arch)
+
+        from pprint import pprint as pp
+        pp(result['arch'])
+
+        return result
+
+    def write(self, cr, uid, ids, values, context=None):
+        return True
+
+    def create(self, cr, uid, values, context=None):
+        modules_to_install = [ key[len('module_'):] for key, value in values.iteritems() if value == 1 and key.startswith('module_')]
+        values = {
+            'modules' : simplejson.dumps(modules_to_install),
+        }
+        print "values: %r" % (values,)
+        context.update(dont_compute_virtual_attributes=True)
+        return super(base_setup_installer2, self).create(cr, uid, values, context=context)
+
+    def apply_cb(self, cr, uid, ids, context=None): 
+        for installer in self.browse(cr, uid, ids, context=context):
+            modules_to_install = simplejson.loads(installer.modules)
+            proxy = self.pool.get('ir.module.module')
+
+            module_ids = proxy.search(cr, uid, [('name', 'in', modules_to_install)], context=context)
+
+            need_update = False
+            for module in proxy.browse(cr, uid, module_ids, context=context):
+                module.state_update('to install', ['uninstalled'], context=context)
+                need_update = True
+                cr.commit()
+
+            if need_update:
+                self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
+
+        if 'html' in context:
+            return {'type' : 'ir.actions.reload'}
+        else:
+            return {'type' : 'ir.actions.act_window_close'}
+
+base_setup_installer2()
 
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 023ebd7d2c1..4fc0a075664 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,6 +1,18 @@
 <openerp>
   <data>
 
+      <record model="ir.actions.act_window" id="action_base_setup_installer2">
+          <field name="name">base.setup.installer2</field>
+          <field name="res_model">base.setup.installer2</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+      </record>
+
+      <record id="todo_base_setup_installer2" model="ir.actions.todo">
+        <field name="action_id" ref="action_base_setup_installer2" />
+      </record>
+
     <record id="view_base_setup_installer" model="ir.ui.view">
       <field name="name">base.setup.installer.view</field>
       <field name="model">base.setup.installer</field>

From b00f4e7e1f722c26fe8f50ba2af2cd99e61033f0 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 28 Sep 2011 12:44:58 +0200
Subject: [PATCH 075/304] [IMP] Always instantiate search view in
 ViewManagerAction

bzr revid: fme@openerp.com-20110928104458-1a6768411suiky6c
---
 addons/web/static/src/js/search.js |  6 ++--
 addons/web/static/src/js/views.js  | 48 +++++++++++-------------------
 2 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index db91d6bfd27..c2a472b3ea6 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -30,6 +30,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
     },
     start: function() {
         this._super();
+        this.$element.hide();
         this.rpc("/web/searchview/load", {"model": this.model, "view_id":this.view_id}, this.on_loaded);
         return this.ready.promise();
     },
@@ -137,10 +138,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
             'defaults': this.defaults
         });
 
-        // We don't understand why the following commented line does not work in Chrome but
-        // the non-commented line does. As far as we investigated, only God knows.
-        //this.$element.html(render);
-        jQuery(render).appendTo(this.$element);
+        this.$element.html(render);
         this.$element.find(".oe_search-view-custom-filter-btn").click(ext.on_activate);
 
         var f = this.$element.find('form');
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 93265fdc5f1..eb8dfe7a2a0 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -166,6 +166,7 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
         this.model = dataset.model;
         this.dataset = dataset;
         this.searchview = null;
+        this.searchview_visible = false;
         this.active_view = null;
         this.views_src = _.map(views, function(x) {return x instanceof Array? {view_id: x[0], view_type: x[1]} : x;});
         this.views = {};
@@ -225,20 +226,6 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
                 controller.set_embedded_view(view.embedded_view);
             }
             controller.do_switch_view.add_last(this.on_mode_switch);
-            if (view_type === 'list' && this.flags.search_view === false && this.action && this.action['auto_search']) {
-                // In case the search view is not instantiated: manually call ListView#search
-                var domains = !_(self.action.domain).isEmpty()
-                                ? [self.action.domain] : [],
-                   contexts = !_(self.action.context).isEmpty()
-                                ? [self.action.context] : [];
-                controller.on_loaded.add({
-                    callback: function () {
-                        controller.do_search(domains, contexts, []);
-                    },
-                    position: 'last',
-                    unique: true
-                });
-            }
             var container = $("#" + this.element_id + '_view_' + view_type);
             view_promise = controller.appendTo(container);
             $.when(view_promise).then(function() {
@@ -249,7 +236,7 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
 
 
         if (this.searchview) {
-            if (view.controller.searchable === false) {
+            if (this.searchview_visible === false || view.controller.searchable === false) {
                 this.searchview.hide();
             } else {
                 this.searchview.show();
@@ -346,6 +333,7 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
             // buttons, sidebar, ...) displaying
             this.flags.search_view = this.flags.pager = this.flags.sidebar = this.flags.action_buttons = false;
         }
+        this.searchview_visible = !!this.flags.search_view;
 
         // setup storage for session-wise menu hiding
         if (this.session.hidden_menutips) {
@@ -360,23 +348,19 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
      * launches an initial search after both views are done rendering.
      */
     start: function() {
-        var self = this;
+        var self = this,
+            searchview_loaded,
+            search_defaults = {};
+        _.each(this.action.context, function (value, key) {
+            var match = /^search_default_(.*)$/.exec(key);
+            if (match) {
+                search_defaults[match[1]] = value;
+            }
+        });
+        // init search view
+        var searchview_id = this.action['search_view_id'] && this.action['search_view_id'][0];
 
-        var searchview_loaded;
-        if (this.flags.search_view !== false) {
-            var search_defaults = {};
-            _.each(this.action.context, function (value, key) {
-                var match = /^search_default_(.*)$/.exec(key);
-                if (match) {
-                    search_defaults[match[1]] = value;
-                }
-            });
-            // init search view
-            var searchview_id = this.action['search_view_id'] && this.action['search_view_id'][0];
-
-            searchview_loaded = this.setup_search_view(
-                    searchview_id || false, search_defaults);
-        }
+        searchview_loaded = this.setup_search_view(searchview_id || false, search_defaults);
 
         var main_view_loaded = this._super();
 
@@ -816,6 +800,8 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
     },
     do_switch_view: function(view) {
     },
+    do_search: function(view) {
+    },
     set_common_sidebar_sections: function(sidebar) {
         sidebar.add_section('customize', "Customize", [
             {

From 1ba826a4eae63af75260f30745ce8b944e1d6012 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 28 Sep 2011 16:12:58 +0200
Subject: [PATCH 076/304] [REF] Rename the categories

bzr revid: stw@openerp.com-20110928141258-9hfn5rfhboar2e5z
---
 addons/account/__openerp__.py                     | 2 +-
 addons/account_accountant/__openerp__.py          | 2 +-
 addons/account_analytic_analysis/__openerp__.py   | 2 +-
 addons/account_analytic_default/__openerp__.py    | 2 +-
 addons/account_analytic_plans/__openerp__.py      | 2 +-
 addons/account_anglo_saxon/__openerp__.py         | 2 +-
 addons/account_asset/__openerp__.py               | 2 +-
 addons/account_budget/__openerp__.py              | 2 +-
 addons/account_cancel/__openerp__.py              | 2 +-
 addons/account_chart/__openerp__.py               | 2 +-
 addons/account_coda/__openerp__.py                | 2 +-
 addons/account_followup/__openerp__.py            | 2 +-
 addons/account_invoice_layout/__openerp__.py      | 2 +-
 addons/account_payment/__openerp__.py             | 2 +-
 addons/account_sequence/__openerp__.py            | 2 +-
 addons/account_voucher/__openerp__.py             | 2 +-
 addons/analytic/__openerp__.py                    | 2 +-
 addons/analytic_user_function/__openerp__.py      | 2 +-
 addons/base_action_rule/__openerp__.py            | 3 +--
 addons/base_iban/__openerp__.py                   | 2 +-
 addons/base_vat/__openerp__.py                    | 2 +-
 addons/claim_from_delivery/__openerp__.py         | 2 +-
 addons/crm/__openerp__.py                         | 2 +-
 addons/crm_caldav/__openerp__.py                  | 3 +--
 addons/crm_claim/__openerp__.py                   | 2 +-
 addons/crm_fundraising/__openerp__.py             | 2 +-
 addons/crm_helpdesk/__openerp__.py                | 2 +-
 addons/crm_partner_assign/__openerp__.py          | 2 +-
 addons/crm_profiling/__openerp__.py               | 2 +-
 addons/delivery/__openerp__.py                    | 2 +-
 addons/document/__openerp__.py                    | 3 +--
 addons/document_ftp/__openerp__.py                | 2 +-
 addons/document_ics/__openerp__.py                | 2 +-
 addons/document_webdav/__openerp__.py             | 2 +-
 addons/google_base_account/__openerp__.py         | 2 +-
 addons/google_map/__openerp__.py                  | 3 +--
 addons/import_base/__openerp__.py                 | 2 +-
 addons/import_google/__openerp__.py               | 2 +-
 addons/import_sugarcrm/__openerp__.py             | 2 +-
 addons/l10n_at/__openerp__.py                     | 2 +-
 addons/l10n_be/__openerp__.py                     | 2 +-
 addons/l10n_be_hr_payroll/__openerp__.py          | 2 +-
 addons/l10n_br/__openerp__.py                     | 2 +-
 addons/l10n_ca/__openerp__.py                     | 2 +-
 addons/l10n_ch/__openerp__.py                     | 2 +-
 addons/l10n_cn/__openerp__.py                     | 2 +-
 addons/l10n_cr/__openerp__.py                     | 2 +-
 addons/l10n_de/__openerp__.py                     | 2 +-
 addons/l10n_ec/__openerp__.py                     | 2 +-
 addons/l10n_es/__openerp__.py                     | 2 +-
 addons/l10n_fr/__openerp__.py                     | 2 +-
 addons/l10n_gr/__openerp__.py                     | 2 +-
 addons/l10n_gt/__openerp__.py                     | 2 +-
 addons/l10n_in/__openerp__.py                     | 2 +-
 addons/l10n_it/__openerp__.py                     | 2 +-
 addons/l10n_lu/__openerp__.py                     | 2 +-
 addons/l10n_ma/__openerp__.py                     | 2 +-
 addons/l10n_mx/__openerp__.py                     | 2 +-
 addons/l10n_nl/__openerp__.py                     | 2 +-
 addons/l10n_pl/__openerp__.py                     | 2 +-
 addons/l10n_ro/__openerp__.py                     | 2 +-
 addons/l10n_syscohada/__openerp__.py              | 4 ++--
 addons/l10n_th/__openerp__.py                     | 2 +-
 addons/l10n_uk/__openerp__.py                     | 2 +-
 addons/l10n_ve/__openerp__.py                     | 2 +-
 addons/marketing/__openerp__.py                   | 2 +-
 addons/marketing_campaign/__openerp__.py          | 2 +-
 addons/marketing_campaign_crm_demo/__openerp__.py | 2 +-
 addons/mrp_repair/__openerp__.py                  | 2 +-
 addons/point_of_sale/__openerp__.py               | 2 +-
 addons/procurement/__openerp__.py                 | 2 +-
 addons/product/__openerp__.py                     | 2 +-
 addons/product_expiry/__openerp__.py              | 2 +-
 addons/product_margin/__openerp__.py              | 2 +-
 addons/product_visible_discount/__openerp__.py    | 2 +-
 addons/purchase/__openerp__.py                    | 2 +-
 addons/purchase_analytic_plans/__openerp__.py     | 2 +-
 addons/purchase_double_validation/__openerp__.py  | 2 +-
 addons/purchase_requisition/__openerp__.py        | 2 +-
 addons/report_intrastat/__openerp__.py            | 2 +-
 addons/sale/__openerp__.py                        | 3 +--
 addons/sale_analytic_plans/__openerp__.py         | 2 +-
 addons/sale_crm/__openerp__.py                    | 2 +-
 addons/sale_journal/__openerp__.py                | 2 +-
 addons/sale_layout/__openerp__.py                 | 2 +-
 addons/sale_margin/__openerp__.py                 | 2 +-
 addons/sale_mrp/__openerp__.py                    | 2 +-
 addons/sale_order_dates/__openerp__.py            | 2 +-
 addons/stock/__openerp__.py                       | 2 +-
 addons/stock_invoice_directly/__openerp__.py      | 2 +-
 addons/stock_location/__openerp__.py              | 2 +-
 addons/stock_no_autopicking/__openerp__.py        | 2 +-
 addons/stock_planning/__openerp__.py              | 2 +-
 addons/wiki_faq/__openerp__.py                    | 2 +-
 addons/wiki_quality_manual/__openerp__.py         | 2 +-
 95 files changed, 96 insertions(+), 101 deletions(-)

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index d1726d164b6..e37a39b4351 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -22,7 +22,7 @@
     "name" : "Accounting and Financial Management",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Finance',
+    "category": 'Accounting & Finance',
     'complexity': "normal",
     "description": """
 Accounting and Financial Management.
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index c018d277d46..112eca2a42f 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -22,7 +22,7 @@
     "name" : "Accountant Access",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Finance',
+    "category": 'Accounting & Finance',
     'complexity': "normal",
     "description": """
 Accounting Access Rights.
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index 5e93307865c..fb1ed78ab9a 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name'      : 'Analytic Account View',
     'version'   : '1.1',
-    'category'  : 'Finance',
+    'category'  : 'Accounting & Finance',
     '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 07cde53d003..f1c6e7c0847 100644
--- a/addons/account_analytic_default/__openerp__.py
+++ b/addons/account_analytic_default/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name'      : 'Account Analytic Defaults',
     'version'   : '1.0',
-    'category'  : 'Finance',
+    '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 d6a5834517e..b7bfa1a21ab 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name'      : 'Manage multiple plans in Analytic Accounting',
     'version'   : '1.0',
-    'category'  : 'Finance',
+    '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 79afb26ab26..d431ef053a0 100644
--- a/addons/account_anglo_saxon/__openerp__.py
+++ b/addons/account_anglo_saxon/__openerp__.py
@@ -36,7 +36,7 @@ when the invoice is created to transfer this amount to the debtor or creditor ac
 Secondly, price differences between actual purchase price and fixed product standard price are booked on a separate account""",
     "images"   : ["images/account_anglo_saxon.jpeg"],
     "depends"   : ["product", "purchase"],
-    "category"  : "Warehouse",
+    "category"  : "Accounting & Finance",
     "init_xml"  : [],
     "demo_xml"  : [],
     "update_xml" : ["product_view.xml",],
diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
index 4cad6f74af3..584a1622411 100644
--- a/addons/account_asset/__openerp__.py
+++ b/addons/account_asset/__openerp__.py
@@ -29,7 +29,7 @@
     those assets. And it allows to create Move's of the depreciation lines.
     """,
     "website" : "http://www.openerp.com",
-    "category" : "Generic Modules/Accounting",
+    "category" : "Accounting & Finance",
     "init_xml" : [
     ],
     "demo_xml" : [ 'account_asset_demo.xml'
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index 9ff5964637a..889935e7528 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Budget Management',
     'version': '1.0',
-    'category': 'Finance',
+    '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 469033ac56e..647146f98fb 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Cancel Entries",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Finance',
+    "category": 'Accounting & Finance',
     'complexity': "normal",
     "description": """
 Allows cancelling accounting entries.
diff --git a/addons/account_chart/__openerp__.py b/addons/account_chart/__openerp__.py
index 2b958c4a943..39bcd1e082f 100644
--- a/addons/account_chart/__openerp__.py
+++ b/addons/account_chart/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Charts of Accounts',
     'version': '1.1',
-    'category': 'Finance',
+    'category': 'Accounting & Finance',
     'description': """
 Remove minimal account chart.
 =============================
diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py
index fb39bc4c5ba..17b8cc27e96 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/account_coda/__openerp__.py
@@ -23,7 +23,7 @@
     "name"      : "Account CODA - import bank statements from coda file",
     "version"   : "1.0",
     "author"    : "OpenERP SA",
-    "category"  : "Finance",
+    "category"  : "Accounting & Finance",
     'complexity': "normal",
     "description": """
 Module provides functionality to import bank statements from coda files.
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 8de7468e43a..e69434b2a3c 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Reminders',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Accounting & Finance',
     'complexity': "normal",
     'description': """
 Modules 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 b045b7b0b5d..dd065fdc4fb 100644
--- a/addons/account_invoice_layout/__openerp__.py
+++ b/addons/account_invoice_layout/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Improve Invoice Layout',
     'version': '1.0',
-    'category': 'Finance',
+    '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 8a90a140558..24c0a37450d 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -23,7 +23,7 @@
     "name": "Payment Management",
     "version": "1.1",
     "author": "OpenERP SA",
-    "category": "Finance",
+    "category": "Accounting & Finance",
     'complexity': "easy",
     "description": """
 Module to manage invoice payment.
diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py
index f7ab18f3e7e..57eade4ee28 100644
--- a/addons/account_sequence/__openerp__.py
+++ b/addons/account_sequence/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Entries Sequence Numbering',
     'version': '1.1',
-    'category': 'Finance',
+    '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 7da2b2da99c..53fde3da8dc 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -32,7 +32,7 @@ Account Voucher module includes all the basic requirements of Voucher Entries fo
     * Voucher Receipt
     * Cheque Register
     """,
-    "category" : "Finance",
+    "category" : "Accounting & Finance",
     "website" : "http://tinyerp.com",
     "images" : ["images/customer_payment.jpeg","images/journal_voucher.jpeg","images/sales_receipt.jpeg","images/supplier_voucher.jpeg"],
     "depends" : ["account"],
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 30712a78167..ac461d8b596 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -24,7 +24,7 @@
     "version": "1.1",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Finance",
+    "category" : "Accounting & Finance",
     "depends" : ["base", "decimal_precision"],
     "description": """
 Module for defining analytic accounting object.
diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py
index 9716495aabc..12b6bfe76cf 100644
--- a/addons/analytic_user_function/__openerp__.py
+++ b/addons/analytic_user_function/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Human Resources',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Others',
     'description': """
 This module allows you to define what is the default function of a specific user on a given account.
 ====================================================================================================
diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index 1170557efad..c60ebda5d26 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -22,9 +22,8 @@
 {
     'name': 'Action Rule',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Base',
     'complexity': "expert",
-    'category': 'Generic Modules/Others',
     'description': """
 This module allows to implement action rules for any object.
 ============================================================
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index 370ca6c93f2..da6738dab5d 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -21,7 +21,7 @@
 {
     'name': 'Create IBAN bank accounts',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Accounting & Finance',
     '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_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index 29f402aa286..baf02424ec8 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'VAT Number Validation',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Accounting & Finance',
     'complexity': "easy",
     'description': """
 VAT validation for Partners' VAT numbers
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index 2e694008226..e032921c13c 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Claim from Delivery",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Warehouse",
+    "category" : "Warehouse Management",
     "depends" : ["base", "crm_claim", "stock"],
     "init_xml" : [],
     "demo_xml" : [],
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index c3f28c6a66f..a6f5f1630f7 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Customer & Supplier Relationship Management',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Customer Relationship Management',
     'complexity': "easy",
     'description': """
 The generic OpenERP Customer Relationship Management.
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index fdbde1c8d2d..9df5b59f542 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -24,8 +24,7 @@
 {
     'name': 'Extended Module to Add CalDav feature on Meeting',
     'version': '1.1',
-    'category': 'Sales',
-    'category': 'Generic Modules/CRM & SRM',
+    '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 696298d275b..795f683905b 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Customer & Supplier Claims Management',
     'version': '1.0',
-    'category': 'Sales',
+    '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 7a37bd13d16..b3a1c146398 100644
--- a/addons/crm_fundraising/__openerp__.py
+++ b/addons/crm_fundraising/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'category': 'Sales', 
+    'category': 'Customer Relationship Management', 
     'name': 'CRM Fundraising',
     'version': '1.0',
     'complexity': "easy",
diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
index b69f1de1b08..31719cc4e03 100644
--- a/addons/crm_helpdesk/__openerp__.py
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'category': 'Sales', 
+    'category': 'Customer Relationship Management', 
     'name': 'CRM Helpdesk',
     'version': '1.0',
     'complexity': "easy",
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index eca5307df91..b0954fa42a2 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Partner Geo-Localization',
     'version': '1.0',
-    'category': 'Sales',
+    '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 98d69aca7b5..70d30ae3cae 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'CRM Profiling Management - To Perform Segmentation within Partners',
     'version': '1.3',
-    'category': 'Sales',
+    'category': 'Customer Relationship Management',
     'complexity': "easy",
     'description': """
 This module allows users to perform segmentation within partners.
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index e9fa8240e21..fd03eb81c60 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Carriers and Deliveries',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Warehouse 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 c98daa4eaaf..6b9cbd21f48 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -23,8 +23,7 @@
 {
     'name': 'Integrated Document Management System',
     'version': '2.1',
-    'category': 'Tools',
-    'category': 'Generic Modules/Others',
+    '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 2683ba5ef0a..2ea9ddb7a82 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Integrated FTP Server with Document Management System',
     'version': '1.99',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "normal",
     'description': """
 This is a support FTP Interface with document management system.
diff --git a/addons/document_ics/__openerp__.py b/addons/document_ics/__openerp__.py
index 56bb8f11fee..d1278978f52 100644
--- a/addons/document_ics/__openerp__.py
+++ b/addons/document_ics/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Support for iCal based on Document Management System',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "normal",
     'description': """
 Allows to synchronise calendars with others applications.
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index dc74085ab6f..9b52d51dc32 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -32,7 +32,7 @@
         "name" : "WebDAV server for Document Management",
         "version" : "2.3",
         "author" : "OpenERP SA",
-        "category" : "Tools",
+        "category" : "Knowledge Management",
         'complexity': "normal",
         "website": "http://www.openerp.com",
         "description": """
diff --git a/addons/google_base_account/__openerp__.py b/addons/google_base_account/__openerp__.py
index 409ca205c74..8a8c9925900 100644
--- a/addons/google_base_account/__openerp__.py
+++ b/addons/google_base_account/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Google user',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Others',
     'description': """The module adds google user  in res user""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index 5c48a9370d7..4a778b0daff 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -23,9 +23,8 @@
 {
     'name': 'Google Map',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Others',
     'complexity': "easy",
-    'category': 'Generic Modules/Others',
     'description': """
 The module adds Google Map field in partner address.
 ====================================================
diff --git a/addons/import_base/__openerp__.py b/addons/import_base/__openerp__.py
index f244338a7e3..3d437510292 100644
--- a/addons/import_base/__openerp__.py
+++ b/addons/import_base/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Base framework for module that need to import complex data',
     'version': '0.9',
-    'category': 'Generic Modules',
+    'category': 'Tools/Importation',
     'description': """
         This module provide a class import_framework to help importing 
         complex data from other software
diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
index f1ab89a041d..81563d4fa23 100644
--- a/addons/import_google/__openerp__.py
+++ b/addons/import_google/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Google Import',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Tools/Importation',
     'description': """The module adds google contact in partner address and add google calendar events details in Meeting""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py
index 071f58099b3..2c36ec77bfa 100644
--- a/addons/import_sugarcrm/__openerp__.py
+++ b/addons/import_sugarcrm/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Import SugarCRM Data into OpenERP Module.',
     'version': '1.0',
-    'category': 'Generic Modules',
+    'category': 'Tools/Importation',
     'description': """This Module Import SugarCRM "Leads", "Opportunities", "Users", "Accounts", 
             "Contacts", "Employees", Meetings, Phonecalls, Emails, and Project, Project Tasks Data into OpenERP Module.""",
     'author': 'OpenERP SA',
diff --git a/addons/l10n_at/__openerp__.py b/addons/l10n_at/__openerp__.py
index 6c8e8b5eda3..d28598c1ed2 100644
--- a/addons/l10n_at/__openerp__.py
+++ b/addons/l10n_at/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "author" : "conexus.at",
 	"website" : "http://www.conexus.at",
-    "category" : "Localisation/Account Charts",
+    "category" : "Localization/Account Charts",
     "depends" : ["account_chart", 'base_vat'],
     "description": "This module provides the standard Accounting Chart for Austria which is based on the Template from BMF.gv.at. Please keep in mind that you should review and adapt it with your Accountant, before using it in a live Environment.",
     "demo_xml" : [],
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index 6fd486f06fb..26c9837a8bf 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 {   'name': 'Belgium - Plan Comptable Minimum Normalise',
     'version': '1.1',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Belgium in OpenERP.
 ==============================================================================
diff --git a/addons/l10n_be_hr_payroll/__openerp__.py b/addons/l10n_be_hr_payroll/__openerp__.py
index ca0851ed9eb..b6a36a7528c 100644
--- a/addons/l10n_be_hr_payroll/__openerp__.py
+++ b/addons/l10n_be_hr_payroll/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 {
     'name': 'Belgian Payroll Rules',
-    'category': 'payroll',
+    'category': 'Localization/Payroll',
     'author': 'OpenERP SA',
     'depends': ['hr_payroll','hr_contract'],
     'version': '1.0',
diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py
index 578978599a0..ecd6c9d6fa6 100644
--- a/addons/l10n_br/__openerp__.py
+++ b/addons/l10n_br/__openerp__.py
@@ -21,7 +21,7 @@
 {
     'name': 'Brazilian Localization',
     'description': 'Brazilian Localization',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Brazil in OpenERP.
 =============================================================================
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index b73f4fbbb05..fbfadbf9755 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -23,7 +23,7 @@
     "version" : "1.0",
     "author" : "Savoir-faire Linux",
     "website" : "http://www.savoirfairelinux.com",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the English and French - Canadian accounting chart in OpenERP.
 ===========================================================================================
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index d3398ccf23a..66a32c80437 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -62,7 +62,7 @@ TODO :
 """,
     "version" : "6.0",
     "author" : "Camptocamp SA",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "website": "http://www.camptocamp.com",
 
     "depends" : [
diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py
index 5674c95cd43..6a063505275 100644
--- a/addons/l10n_cn/__openerp__.py
+++ b/addons/l10n_cn/__openerp__.py
@@ -20,7 +20,7 @@
 {
     "name" : "中国会计科目表",
     "version" : "1.0",
-    "category": "Finance",
+    "category": "Localization/Account Charts",
     "author" : "openerp-china.org",
     "maintainer":"openerp-china.org",
     "website":"http://openerp-china.org",
diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py
index a2656e8dc59..5fc4d80d7f7 100644
--- a/addons/l10n_cr/__openerp__.py
+++ b/addons/l10n_cr/__openerp__.py
@@ -38,7 +38,7 @@
     'url': 'http://launchpad.net/openerp-costa-rica',
     'author': 'ClearCorp S.A.',
     'website': 'http://clearcorp.co.cr',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 Chart of accounts for Costa Rica.
 =================================
diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py
index 9582ce185fa..8cbdaa3b6ee 100644
--- a/addons/l10n_de/__openerp__.py
+++ b/addons/l10n_de/__openerp__.py
@@ -125,7 +125,7 @@
     "version" : "1.0",
     "author" : "openbig.org",
     "website" : "http://www.openbig.org",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03.
 ==============================================================================
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index 27c72e4b2e6..0e93a3ac57b 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -20,7 +20,7 @@
 {
     'name': 'Ecuador - Accounting Chart',
     'version': '1.1',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Ecuador in OpenERP.
 ==============================================================================
diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py
index aa27dc73f6f..3cdc521ad60 100644
--- a/addons/l10n_es/__openerp__.py
+++ b/addons/l10n_es/__openerp__.py
@@ -26,7 +26,7 @@
     "version" : "3.0",
     "author" : "Spanish Localization Team",
     'website' : 'https://launchpad.net/openerp-spain',
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 Spanish Charts of Accounts (PGCE 2008).
 =======================================
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index d0e8f481766..1bcb659c322 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -30,7 +30,7 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "website": "http://www.openerp.com",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart for France in OpenERP.
 ========================================================================
diff --git a/addons/l10n_gr/__openerp__.py b/addons/l10n_gr/__openerp__.py
index b1bae1a1bfb..72b1d2c7cc4 100644
--- a/addons/l10n_gr/__openerp__.py
+++ b/addons/l10n_gr/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "0.2",
     "author" : "P. Christeas, OpenERP SA.",
     "website": "http://openerp.hellug.gr/",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the base module to manage the accounting chart for Greece.
 ==================================================================
diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py
index 8806479b69d..d80c1fa80a7 100644
--- a/addons/l10n_gt/__openerp__.py
+++ b/addons/l10n_gt/__openerp__.py
@@ -35,7 +35,7 @@
 {
     'name': 'Guatemala - Plan contable general',
     'version': '3.0',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Guatemala.
 =====================================================================
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index ab99941c379..9aaec061319 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -29,7 +29,7 @@ Indian Accounting : Chart of Account.
 Indian accounting chart and localization.
     """,
     "author": ['OpenERP SA', 'Axelor'],
-    "category": "Finance",
+    "category": "Localization/Account Charts",
     "depends": [
         "account",
         "account_chart"
diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index 41161f67a70..d6138608aa2 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -36,7 +36,7 @@ Piano dei conti italiano di un'impresa generica.
 Italian accounting chart and localization.
     """,
     "license": "AGPL-3",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     'website': 'http://www.openerp-italia.org/',
     'init_xml': [
         'report.xml',
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index 09d8dbfabe3..7a4436e31c1 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Luxembourg - Plan Comptable Minimum Normalise',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Luxembourg.
 ======================================================================
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
index 3a26f6992dc..a9bd7ce557e 100644
--- a/addons/l10n_ma/__openerp__.py
+++ b/addons/l10n_ma/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Maroc - Plan Comptable Général",
     "version" : "1.0",
     "author" : "kazacube",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the base module to manage the accounting chart for Maroc.
 =================================================================
diff --git a/addons/l10n_mx/__openerp__.py b/addons/l10n_mx/__openerp__.py
index 17aea022d48..d56d5f570b1 100644
--- a/addons/l10n_mx/__openerp__.py
+++ b/addons/l10n_mx/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Mexico - Chart of Account",
     "version" : "1.0",
     "author" : "RelTek Mexico",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart for Mexico in OpenERP.
 ========================================================================
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 849053fb0ad..5635e16d6c3 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -88,7 +88,7 @@
 {
     "name" : "Netherlands - Grootboek en BTW rekeningen",
     "version" : "1.5",
-    "category": "Finance",
+    "category": "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart for Netherlands in OpenERP.
 =============================================================================
diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py
index 584a7d27832..0ec97ab7cb6 100644
--- a/addons/l10n_pl/__openerp__.py
+++ b/addons/l10n_pl/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "author" : "Grzegorz Grzelak (Cirrus)",
     "website": "http://www.cirrus.pl",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart and taxes for Poland in OpenERP.
 ==================================================================================
diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py
index 134a4aea679..647b4b35449 100644
--- a/addons/l10n_ro/__openerp__.py
+++ b/addons/l10n_ro/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.1",
     "author" : "filsys",
     "website": "http://www.filsystem.ro",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "depends" : ["account_chart", 'base_vat'],
     "description": """
 This is the module to manage the accounting chart, VAT structure and Registration Number for Romania in OpenERP.
diff --git a/addons/l10n_syscohada/__openerp__.py b/addons/l10n_syscohada/__openerp__.py
index 6cf85ed5f19..0fa4631b1f1 100644
--- a/addons/l10n_syscohada/__openerp__.py
+++ b/addons/l10n_syscohada/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "OHADA - The accounting chart ",
     "version" : "1.0",
     "author" : "Baamtu Senegal",
-    "category" : "Localisation/Account Charts",
+    "category" : "Localization/Account Charts",
     "description": """This module implements the accounting chart for OHADA area.
     It allows any company or association to manage its financial accounting.
     Countries that use OHADA are the following:
@@ -39,4 +39,4 @@
     "active": False,
     "installable": True
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index 714fc959c4a..1b2c4771aee 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Thailand - Thai Chart of Accounts',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 Chart of Accounts for Thailand.
 ===============================
diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py
index cf97b79d323..f6e253fffc2 100644
--- a/addons/l10n_uk/__openerp__.py
+++ b/addons/l10n_uk/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'UK Chart of Accounts - latest (Smartode/CT600)',
     'version': '1.0',
-    'category': 'Localisation/Account Charts',
+    'category': 'Localization/Account Charts',
     'description': """This is the latest UK OpenERP localisation necesary to run OpenERP accounting for UK SME's with:
     - a CT600-ready chart of accounts
     - VAT100-ready tax structure
diff --git a/addons/l10n_ve/__openerp__.py b/addons/l10n_ve/__openerp__.py
index b48c208dd17..45ac68fc105 100644
--- a/addons/l10n_ve/__openerp__.py
+++ b/addons/l10n_ve/__openerp__.py
@@ -26,7 +26,7 @@
     "name" : "Venezuela -Chart of Account",
     "version" : "1.0",
     "author" : ['OpenERP SA', "Netquatro"],
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description":
 '''
 This is the module to manage the accounting chart for Venezuela in OpenERP.
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index d9845cd957d..edb2ac087ed 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.1",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category": 'Sales',
+    "category": 'Sales Management',
     'complexity': "expert",
     "description": """
 Menu for Marketing.
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 78060b1e571..86431fbd3ba 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -29,7 +29,7 @@
                  "decimal_precision"
                 ],
     "author" : "OpenERP SA",
-    "category": 'Sales',
+    "category": 'Customer Relationship Management',
     '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/marketing_campaign_crm_demo/__openerp__.py b/addons/marketing_campaign_crm_demo/__openerp__.py
index 7fd9155bf9b..d1b0dc79516 100644
--- a/addons/marketing_campaign_crm_demo/__openerp__.py
+++ b/addons/marketing_campaign_crm_demo/__openerp__.py
@@ -27,7 +27,7 @@
                  "crm",
                 ],
     "author" : "OpenERP SA",
-    "category": 'Sales',
+    "category": 'Sales Management',
     "description": """
 Demo data for the module marketing_campaign.
 ============================================
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index 134b16542a5..1fa1ef5cb04 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Products Repairs Module - Manage All products Repairs',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Manufacturing',
     'description': """
 The aim is to have a complete module to manage all products repairs. The following topics should be covered by this module:
 ===========================================================================================================================
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 125449cfc6f..a03b673893a 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Point Of Sale',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales Management',
     'description': """
 This module provides a quick and easy sale process.
 ===================================================
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index e590163f8a7..87a766a009f 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Warehouse",
+    "category" : "Warehouse Management",
     "depends" : ["base","process", "product", "stock"],
     "description": """
 This is the module for computing Procurements.
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index bcddcc93bdf..7f2d4e48f3a 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "Products & Pricelists",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Warehouse",
+    "category" : "Sales Management",
     "depends" : ["base", "process", "decimal_precision"],
     "init_xml" : [],
     "demo_xml" : ["product_demo.xml"],
diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py
index 434f5605baa..68d928708e6 100644
--- a/addons/product_expiry/__openerp__.py
+++ b/addons/product_expiry/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Products Expiry Date",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Warehouse",
+    "category" : "Warehouse Management",
     'complexity': "easy",
     "depends" : ["stock"],
     "init_xml" : [],
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index 9ef858fa9ec..d96ff00c44d 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Margins in Product',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales Management',
     'description': """
 Adds a reporting menu in products that computes sales, purchases, margins and other interesting indicators based on invoices.
 =============================================================================================================================
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index 903bc6c7523..29ad173b602 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -21,7 +21,7 @@
     "name": "Visible Discount",
     "version": "1.0",
     "author": "OpenERP SA",
-    "category": "Sales",
+    "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/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 975754dd5fe..faf9850d14a 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Purchase Management',
     'version': '1.1',
-    'category': 'Purchases',
+    'category': 'Purchase Management',
     'complexity': "easy",
     'description': """
 Purchase module is for generating a purchase order for purchase of goods from a supplier.
diff --git a/addons/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py
index 56d9bd59051..2ad0f4607aa 100644
--- a/addons/purchase_analytic_plans/__openerp__.py
+++ b/addons/purchase_analytic_plans/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Purchase Analytic Distribution Management',
     'version': '1.0',
-    'category': 'Purchases',
+    'category': 'Purchase Management',
     'description': """
 The base module to manage analytic distribution and purchase orders.
 ====================================================================
diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py
index c111d0679c1..f58907622b7 100644
--- a/addons/purchase_double_validation/__openerp__.py
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Double Validation for Purchase",
     "version" : "1.1",
-    "category": 'Purchases',
+    "category": 'Purchase Management',
     'complexity': "easy",
     "images" : ["images/purchase_validation.jpeg"],
     "depends" : ["base","purchase"],
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index a3658414e0f..bef6ac7aec5 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Purchase - Purchase Requisition",
     "version" : "0.1",
     "author" : "OpenERP SA",
-    "category" : "Purchases",
+    "category" : "Purchase Management",
     'complexity': "easy",
     "images" : ['images/purchase_requisitions.jpeg'],
     "website" : "http://www.openerp.com",
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index b3101317ece..c7f70a5dddb 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Intrastat Reporting',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Warehouse Management',
     'description': """
 A module that adds intrastat reports.
 =====================================
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index c983edc881e..8995070dba0 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -22,8 +22,7 @@
 {
     'name': 'Sales Management',
     'version': '1.0',
-    'category': 'Sales',
-    'category': 'Generic Modules/Sales & Purchases',
+    'category': 'Sales Management',
     'complexity': "easy",
     'description': """
 The base module to manage quotations and sales orders.
diff --git a/addons/sale_analytic_plans/__openerp__.py b/addons/sale_analytic_plans/__openerp__.py
index 91f04c1b977..3204ae02dcc 100644
--- a/addons/sale_analytic_plans/__openerp__.py
+++ b/addons/sale_analytic_plans/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Sales Analytic Distribution Management',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales Management',
     'description': """
 The base module to manage analytic distribution and sales orders.
 =================================================================
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 7fe2bd135c7..56831f05cbe 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Creates Sales order from Opportunity',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales Management',
     '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 c95b94da3ee..f25730f8a72 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Managing sales and deliveries by journal',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales Management',
     'complexity': "easy",
     '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 8f9005e50a0..29c0f0ec98f 100644
--- a/addons/sale_layout/__openerp__.py
+++ b/addons/sale_layout/__openerp__.py
@@ -36,7 +36,7 @@ It gives you the possibility to
 
     """,
     "website" : "http://www.openerp.com",
-    "category" : "Sales",
+    "category" : "Sales Management",
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py
index 1170c72485c..0c7b342f9fe 100644
--- a/addons/sale_margin/__openerp__.py
+++ b/addons/sale_margin/__openerp__.py
@@ -21,7 +21,7 @@
 {
     "name":"Margins in Sales Order",
     "version":"1.0",
-    "category" : "Sales",
+    "category" : "Sales Management",
     "description": """
 This module adds the 'Margin' on sales order.
 =============================================
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index 1fd1fab9d2f..889b885532e 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Sales and MRP Management',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales Management',
     '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 eb7e3a516fa..7ae34335588 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Sales Order Dates',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales Management',
     'complexity': "easy",
     'description': """
 Add additional date information to the sales order.
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index c6ea30db330..5b1d392a592 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -47,7 +47,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
     "website" : "http://www.openerp.com",
     "images" : ["images/stock_forecast_report.png", "images/delivery_orders.jpeg", "images/inventory_analysis.jpeg","images/location.jpeg","images/moves_analysis.jpeg","images/physical_inventories.jpeg","images/warehouse_dashboard.jpeg"],
     "depends" : ["product", "account"],
-    "category" : "Warehouse",
+    "category" : "Warehouse Management",
     "init_xml" : [],
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [
diff --git a/addons/stock_invoice_directly/__openerp__.py b/addons/stock_invoice_directly/__openerp__.py
index 98c63dca506..d6930d1f43a 100644
--- a/addons/stock_invoice_directly/__openerp__.py
+++ b/addons/stock_invoice_directly/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Invoice Picking Directly',
     'version': '1.0',
-    'category': 'Warehouse',
+    '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 d50bcc0cac4..025b3b3e881 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Warehouse Locations Paths',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Warehouse Management',
     'description': """
 This module supplements the Warehouse application by effectively implementing Push and Pull inventory flows.
 ============================================================================================================
diff --git a/addons/stock_no_autopicking/__openerp__.py b/addons/stock_no_autopicking/__openerp__.py
index 9b12ac49c34..1f7b16b704b 100644
--- a/addons/stock_no_autopicking/__openerp__.py
+++ b/addons/stock_no_autopicking/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Stock No Auto-Picking',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Warehouse Management',
     'description': """
 This module allows an intermediate picking process to provide raw materials to production orders.
 =================================================================================================
diff --git a/addons/stock_planning/__openerp__.py b/addons/stock_planning/__openerp__.py
index eb3cb385078..bded9da3692 100644
--- a/addons/stock_planning/__openerp__.py
+++ b/addons/stock_planning/__openerp__.py
@@ -23,7 +23,7 @@
     "name": "Master Procurement Schedule",
     "version": "1.2",
     "author": "OpenERP SA and Grzegorz Grzelak (OpenGLOBE)",
-    "category": "Warehouse",
+    "category": "Warehouse Management",
     "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",
diff --git a/addons/wiki_faq/__openerp__.py b/addons/wiki_faq/__openerp__.py
index 873b4fea9d0..6199f3a4cce 100644
--- a/addons/wiki_faq/__openerp__.py
+++ b/addons/wiki_faq/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Document Management - Wiki - FAQ',
     'version': '1.0',
-    'category': 'Tools',
+    '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 e962265cea8..caeaeb28b35 100644
--- a/addons/wiki_quality_manual/__openerp__.py
+++ b/addons/wiki_quality_manual/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Document Management - Wiki - Quality Manual',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "easy",
     'description': """
 Quality Manual Template.

From 8b55e42884c4fd75bedc1f4f051f52ec61a699cd Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 28 Sep 2011 17:13:06 +0200
Subject: [PATCH 077/304] [IMP] trigger do_search on_mode_switch. Use headless
 searchview when hidden and when no default specified

bzr revid: fme@openerp.com-20110928151306-d7aphegy2gedjsqk
---
 addons/web/static/src/js/search.js | 21 +++++++++--
 addons/web/static/src/js/views.js  | 60 +++++++++++++++---------------
 2 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index c2a472b3ea6..cf253c3d54b 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -13,25 +13,35 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
      * @param view_id
      * @param defaults
      */
-    init: function(parent, dataset, view_id, defaults) {
+    init: function(parent, dataset, view_id, defaults, hidden) {
         this._super(parent);
         this.dataset = dataset;
         this.model = dataset.model;
         this.view_id = view_id;
 
         this.defaults = defaults || {};
+        this.has_defaults = !_.isEmpty(this.defaults);
 
         this.inputs = [];
         this.enabled_filters = [];
 
         this.has_focus = false;
 
+        this.hidden = !!hidden;
+        this.headless = this.hidden && !this.has_defaults;
+
         this.ready = $.Deferred();
     },
     start: function() {
         this._super();
-        this.$element.hide();
-        this.rpc("/web/searchview/load", {"model": this.model, "view_id":this.view_id}, this.on_loaded);
+        if (this.hidden) {
+            this.$element.hide();
+        }
+        if (this.headless) {
+            this.ready.resolve();
+        } else {
+            this.rpc("/web/searchview/load", {"model": this.model, "view_id":this.view_id}, this.on_loaded);
+        }
         return this.ready.promise();
     },
     show: function () {
@@ -244,10 +254,13 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
      * @param e jQuery event object coming from the "Search" button
      */
     do_search: function (e) {
+        if (this.headless && !this.has_defaults) {
+            return this.on_search([], [], []);
+        }
         // reset filters management
         var select = this.$element.find(".oe_search-view-filters-management");
         select.val("_filters");
-        
+
         if (e && e.preventDefault) { e.preventDefault(); }
 
         var data = this.build_search_data();
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index eb8dfe7a2a0..6049989c568 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -166,7 +166,6 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
         this.model = dataset.model;
         this.dataset = dataset;
         this.searchview = null;
-        this.searchview_visible = false;
         this.active_view = null;
         this.views_src = _.map(views, function(x) {return x instanceof Array? {view_id: x[0], view_type: x[1]} : x;});
         this.views = {};
@@ -235,12 +234,8 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
         }
 
 
-        if (this.searchview) {
-            if (this.searchview_visible === false || view.controller.searchable === false) {
-                this.searchview.hide();
-            } else {
-                this.searchview.show();
-            }
+        if (this.searchview && !this.searchview.hidden) {
+            this.searchview[view.controller.searchable === false ? 'hide' : 'show']();
         }
 
         this.$element
@@ -268,27 +263,6 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
      */
     on_controller_inited: function(view_type, view) {
     },
-    /**
-     * Sets up the current viewmanager's search view.
-     *
-     * @param {Number|false} view_id the view to use or false for a default one
-     * @returns {jQuery.Deferred} search view startup deferred
-     */
-    setup_search_view: function(view_id, search_defaults) {
-        var self = this;
-        if (this.searchview) {
-            this.searchview.stop();
-        }
-        this.searchview = new db.web.SearchView(
-                this, this.dataset,
-                view_id, search_defaults);
-
-        this.searchview.on_search.add(function(domains, contexts, groupbys) {
-            var controller = self.views[self.active_view].controller;
-            controller.do_search.call(controller, domains, contexts, groupbys);
-        });
-        return this.searchview.appendTo($("#" + this.element_id + "_search"));
-    },
     /**
      * Called when one of the view want to execute an action
      */
@@ -333,7 +307,7 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
             // buttons, sidebar, ...) displaying
             this.flags.search_view = this.flags.pager = this.flags.sidebar = this.flags.action_buttons = false;
         }
-        this.searchview_visible = !!this.flags.search_view;
+        this.last_search = false;
 
         // setup storage for session-wise menu hiding
         if (this.session.hidden_menutips) {
@@ -408,10 +382,38 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
         return $.when(
             this._super(view_type),
             this.shortcut_check(this.views[view_type])).then(function () {
+                self.do_searchview_search();
                 var view_id = self.views[self.active_view].controller.fields_view.view_id;
                 self.$element.find('.oe_get_xml_view span').text(view_id);
         });
     },
+    /**
+     * Sets up the current viewmanager's search view.
+     *
+     * @param {Number|false} view_id the view to use or false for a default one
+     * @returns {jQuery.Deferred} search view startup deferred
+     */
+    setup_search_view: function(view_id, search_defaults) {
+        var self = this;
+        if (this.searchview) {
+            this.searchview.stop();
+        }
+        this.searchview = new db.web.SearchView(
+                this, this.dataset,
+                view_id, search_defaults, this.flags.search_view === false);
+
+        this.searchview.on_search.add(this.do_searchview_search);
+        return this.searchview.appendTo($("#" + this.element_id + "_search"));
+    },
+    do_searchview_search: function(domains, contexts, groupbys) {
+        if (domains) {
+            this.last_search = [domains, contexts, groupbys];
+        }
+        if (this.last_search) {
+            var controller = this.views[this.active_view].controller;
+            controller.do_search.apply(controller, this.last_search);
+        }
+    },
     shortcut_check : function(view) {
         var self = this;
         var grandparent = this.widget_parent && this.widget_parent.widget_parent;

From 3909843bf8507c55c426957339497209f38e502e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 28 Sep 2011 17:32:54 +0200
Subject: [PATCH 078/304] [IMP] Search view can be initialized in ViewManager
 before start()

bzr revid: fme@openerp.com-20110928153254-e0rid4atpho0zf6k
---
 addons/web/static/src/js/views.js | 63 +++++++++++++++----------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 6049989c568..ac811b989d3 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -166,6 +166,7 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
         this.model = dataset.model;
         this.dataset = dataset;
         this.searchview = null;
+        this.last_search = false;
         this.active_view = null;
         this.views_src = _.map(views, function(x) {return x instanceof Array? {view_id: x[0], view_type: x[1]} : x;});
         this.views = {};
@@ -233,9 +234,9 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
             this.views[view_type].controller = controller;
         }
 
-
-        if (this.searchview && !this.searchview.hidden) {
-            this.searchview[view.controller.searchable === false ? 'hide' : 'show']();
+        if (this.searchview) {
+            this.do_searchview_search();
+            this.searchview[view.controller.searchable === false || this.searchview.hidden ? 'hide' : 'show']();
         }
 
         this.$element
@@ -255,6 +256,33 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
         }
         return view_promise;
     },
+    /**
+     * Sets up the current viewmanager's search view.
+     *
+     * @param {Number|false} view_id the view to use or false for a default one
+     * @returns {jQuery.Deferred} search view startup deferred
+     */
+    setup_search_view: function(view_id, search_defaults) {
+        var self = this;
+        if (this.searchview) {
+            this.searchview.stop();
+        }
+        this.searchview = new db.web.SearchView(
+                this, this.dataset,
+                view_id, search_defaults, this.flags.search_view === false);
+
+        this.searchview.on_search.add(this.do_searchview_search);
+        return this.searchview.appendTo($("#" + this.element_id + "_search"));
+    },
+    do_searchview_search: function(domains, contexts, groupbys) {
+        if (domains) {
+            this.last_search = [domains, contexts, groupbys];
+        }
+        if (this.last_search) {
+            var controller = this.views[this.active_view].controller;
+            controller.do_search.apply(controller, this.last_search);
+        }
+    },
     /**
      * Event launched when a controller has been inited.
      *
@@ -307,7 +335,6 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
             // buttons, sidebar, ...) displaying
             this.flags.search_view = this.flags.pager = this.flags.sidebar = this.flags.action_buttons = false;
         }
-        this.last_search = false;
 
         // setup storage for session-wise menu hiding
         if (this.session.hidden_menutips) {
@@ -382,38 +409,10 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
         return $.when(
             this._super(view_type),
             this.shortcut_check(this.views[view_type])).then(function () {
-                self.do_searchview_search();
                 var view_id = self.views[self.active_view].controller.fields_view.view_id;
                 self.$element.find('.oe_get_xml_view span').text(view_id);
         });
     },
-    /**
-     * Sets up the current viewmanager's search view.
-     *
-     * @param {Number|false} view_id the view to use or false for a default one
-     * @returns {jQuery.Deferred} search view startup deferred
-     */
-    setup_search_view: function(view_id, search_defaults) {
-        var self = this;
-        if (this.searchview) {
-            this.searchview.stop();
-        }
-        this.searchview = new db.web.SearchView(
-                this, this.dataset,
-                view_id, search_defaults, this.flags.search_view === false);
-
-        this.searchview.on_search.add(this.do_searchview_search);
-        return this.searchview.appendTo($("#" + this.element_id + "_search"));
-    },
-    do_searchview_search: function(domains, contexts, groupbys) {
-        if (domains) {
-            this.last_search = [domains, contexts, groupbys];
-        }
-        if (this.last_search) {
-            var controller = this.views[this.active_view].controller;
-            controller.do_search.apply(controller, this.last_search);
-        }
-    },
     shortcut_check : function(view) {
         var self = this;
         var grandparent = this.widget_parent && this.widget_parent.widget_parent;

From d80641da955bd9555f18ab026cccedb70d75755b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 28 Sep 2011 17:45:49 +0200
Subject: [PATCH 079/304] [FIX] Only trigger do_search when controller is ready

bzr revid: fme@openerp.com-20110928154549-xurjdf6qh7x73ck5
---
 addons/web/static/src/js/views.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index ac811b989d3..b0fe6940f58 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -230,12 +230,16 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
             view_promise = controller.appendTo(container);
             $.when(view_promise).then(function() {
                 self.on_controller_inited(view_type, controller);
+                if (self.searchview) {
+                    self.do_searchview_search();
+                }
             });
             this.views[view_type].controller = controller;
+        } else if (this.searchview) {
+            self.do_searchview_search();
         }
 
         if (this.searchview) {
-            this.do_searchview_search();
             this.searchview[view.controller.searchable === false || this.searchview.hidden ? 'hide' : 'show']();
         }
 

From 03156f88ff2a5080d0a8804736396e6c74ce85b6 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 28 Sep 2011 17:46:08 +0200
Subject: [PATCH 080/304] [IMP] The views do not have to search manually on
 do_show anymore

bzr revid: fme@openerp.com-20110928154608-mlehfgprg03byksr
---
 addons/web/static/src/js/view_form.js     | 3 ---
 addons/web/static/src/js/view_list.js     | 3 ---
 addons/web_graph/static/src/js/graph.js   | 1 -
 addons/web_kanban/static/src/js/kanban.js | 3 ---
 4 files changed, 10 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c7ffb896186..3acbcb70ab0 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -443,9 +443,6 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             return $.Deferred().then(success).resolve(_.extend(r, {created: true}));
         }
     },
-    do_search: function (domains, contexts, groupbys) {
-        console.debug("Searching form");
-    },
     on_action: function (action) {
         console.debug('Executing action', action);
     },
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index eeda44c4c99..49fdf326253 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -353,9 +353,6 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
         if (this.sidebar) {
             this.sidebar.$element.show();
         }
-        if (!_(this.dataset.ids).isEmpty()) {
-            this.reload_content();
-        }
     },
     do_hide: function () {
         this.$element.hide();
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index 59bc2c29dcf..6632791af31 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -26,7 +26,6 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
         this.view_id = view_id;
     },
     do_show: function () {
-        // TODO: re-trigger search
         this.$element.show();
     },
     do_hide: function () {
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 46173341361..52ad7982018 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -33,9 +33,6 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
         var self = this;
         this.fields_view = data;
         this.add_qweb_template();
-        if (this.qweb.has_template('kanban-box')) {
-            this.do_actual_search();
-        }
     },
     add_qweb_template: function() {
         var group_operator = ["avg", "max", "min", "sum", "count"]

From 96a350194acccc4471a95c5e6347e104b3a9e65b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Sep 2011 10:09:17 +0200
Subject: [PATCH 081/304] [FIX] Only trigger do_search on searchable
 controllers

bzr revid: fme@openerp.com-20110929080917-4ogqufkoyrwm5jej
---
 addons/web/static/src/js/views.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index b0fe6940f58..2bbb81198fe 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -230,12 +230,12 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
             view_promise = controller.appendTo(container);
             $.when(view_promise).then(function() {
                 self.on_controller_inited(view_type, controller);
-                if (self.searchview) {
+                if (self.searchview && view.controller.searchable !== false) {
                     self.do_searchview_search();
                 }
             });
             this.views[view_type].controller = controller;
-        } else if (this.searchview) {
+        } else if (this.searchview && view.controller.searchable !== false) {
             self.do_searchview_search();
         }
 

From 63223b30aba72a79133e75a439c1d5f9898e334b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Sep 2011 11:53:05 +0200
Subject: [PATCH 082/304] [IMP] Evaluate domain and context in viewmanager

bzr revid: fme@openerp.com-20110929095305-kol38i614124nvv7
---
 addons/web/static/src/js/views.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 2bbb81198fe..8dd1a797579 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -230,9 +230,6 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
             view_promise = controller.appendTo(container);
             $.when(view_promise).then(function() {
                 self.on_controller_inited(view_type, controller);
-                if (self.searchview && view.controller.searchable !== false) {
-                    self.do_searchview_search();
-                }
             });
             this.views[view_type].controller = controller;
         } else if (this.searchview && view.controller.searchable !== false) {
@@ -279,11 +276,19 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
         return this.searchview.appendTo($("#" + this.element_id + "_search"));
     },
     do_searchview_search: function(domains, contexts, groupbys) {
-        if (domains) {
-            this.last_search = [domains, contexts, groupbys];
-        }
-        if (this.last_search) {
-            var controller = this.views[this.active_view].controller;
+        var self = this,
+            controller = this.views[this.active_view].controller;
+        if (domains || contexts) {
+            //if ((!domains || !domains.length) && (!contexts || !contexts.length) && (!groupbys || !groupbys.length) { }
+            this.rpc('/web/session/eval_domain_and_context', {
+                domains: domains || [],
+                contexts: contexts || [],
+                group_by_seq: groupbys || []
+            }, function (results) {
+                controller.do_search(results.domain, results.context, results.group_by);
+                self.last_search = [results.domain, results.context, results.group_by];
+            });
+        } else if (this.last_search) {
             controller.do_search.apply(controller, this.last_search);
         }
     },

From 4d5d3302917f4e72fc901502a74f9d9f7d86fa7c Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 29 Sep 2011 15:32:49 +0530
Subject: [PATCH 083/304] [FIX] fix problem of select button on binary field
 type.

bzr revid: ysa@tinyerp.com-20110929100249-s0sk3pvogwvfud43
---
 addons/web/static/src/css/base.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c75fe786543..2a3dfb1fd5a 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -943,7 +943,7 @@ label.error {
     position: relative;
 }
 .openerp input.oe-binary-file {
-    z-index: 2;
+    z-index: 0;
     line-height: 0;
     font-size: 50px;
     position: absolute;

From a4336966fea1e78fb0f149bf900dbdaab96637f8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Sep 2011 12:26:37 +0200
Subject: [PATCH 084/304] [FIX] Forgot to merge dataset domain and contexts

bzr revid: fme@openerp.com-20110929102637-it9gxczwo40o1qqr
---
 addons/web/static/src/js/views.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 8dd1a797579..9d57d2c9728 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -281,8 +281,8 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
         if (domains || contexts) {
             //if ((!domains || !domains.length) && (!contexts || !contexts.length) && (!groupbys || !groupbys.length) { }
             this.rpc('/web/session/eval_domain_and_context', {
-                domains: domains || [],
-                contexts: contexts || [],
+                domains: [this.dataset.get_domain()].concat(domains || []),
+                contexts: [this.dataset.get_context()].concat(contexts || []),
                 group_by_seq: groupbys || []
             }, function (results) {
                 controller.do_search(results.domain, results.context, results.group_by);

From e34b07e1e3a52be4915d16c868442a26a278b736 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Sep 2011 12:32:29 +0200
Subject: [PATCH 085/304] [IMP] Fixed list view in order to support new
 do_search

bzr revid: fme@openerp.com-20110929103229-l9pfjqbezj28ihd9
---
 addons/web/static/src/js/view_list.js         | 29 ++++---------------
 .../web/static/src/js/view_list_editable.js   |  6 ++--
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 49fdf326253..d637802c08a 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -401,41 +401,22 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
                 self.compute_aggregates();
             }));
     },
-    /**
-     * Event handler for a search, asks for the computation/folding of domains
-     * and contexts (and group-by), then reloads the view's content.
-     *
-     * @param {Array} domains a sequence of literal and non-literal domains
-     * @param {Array} contexts a sequence of literal and non-literal contexts
-     * @param {Array} groupbys a sequence of literal and non-literal group-by contexts
-     * @returns {$.Deferred} fold request evaluation promise
-     */
-    do_search: function (domains, contexts, groupbys) {
-        return this.rpc('/web/session/eval_domain_and_context', {
-            domains: _([this.dataset.get_domain()].concat(domains)).compact(),
-            contexts: _([this.dataset.get_context()].concat(contexts)).compact(),
-            group_by_seq: groupbys
-        }, $.proxy(this, 'do_actual_search'));
-    },
     /**
      * Handler for the result of eval_domain_and_context, actually perform the
      * searching
      *
      * @param {Object} results results of evaluating domain and process for a search
      */
-    do_actual_search: function (results) {
+    do_search: function (domain, context, group_by) {
         this.groups.datagroup = new openerp.web.DataGroup(
-            this, this.model,
-            results.domain,
-            results.context,
-            results.group_by);
+            this, this.model, domain, context, group_by);
         this.groups.datagroup.sort = this.dataset._sort;
 
-        if (_.isEmpty(results.group_by) && !results.context['group_by_no_leaf']) {
-            results.group_by = null;
+        if (_.isEmpty(group_by) && !context['group_by_no_leaf']) {
+            group_by = null;
         }
 
-        this.reload_view(!!results.group_by, results.context).then(
+        this.reload_view(!!group_by, context).then(
             $.proxy(this, 'reload_content'));
     },
     /**
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index beb2c3ac0a9..0b361ae3a9c 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -56,11 +56,11 @@ openerp.web.list_editable = function (openerp) {
                     || this.defaults.editable);
         },
         /**
-         * Replace do_actual_search to handle editability process
+         * Replace do_search to handle editability process
          */
-        do_actual_search: function (results) {
+        do_search: function() {
             this.set_editable(results.context['set_editable']);
-            this._super(results);
+            this._super.apply(this, arguments);
         },
         /**
          * Replace do_add_record to handle editability (and adding new record

From 38ef100ec8e769617664ffbdba5980355c65a2c6 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Sep 2011 12:40:00 +0200
Subject: [PATCH 086/304] [FIX] Introduced a bug in last commit

bzr revid: fme@openerp.com-20110929104000-vnahwe0w09p03cqx
---
 addons/web/static/src/js/view_list_editable.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 0b361ae3a9c..6f476f4717d 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -58,8 +58,8 @@ openerp.web.list_editable = function (openerp) {
         /**
          * Replace do_search to handle editability process
          */
-        do_search: function() {
-            this.set_editable(results.context['set_editable']);
+        do_search: function(domain, context, group_by) {
+            this.set_editable(context['set_editable']);
             this._super.apply(this, arguments);
         },
         /**

From c0736631ca4bbe7e73773d90f160ad771720d8fb Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Sep 2011 13:47:20 +0200
Subject: [PATCH 087/304] [IMP] Search also when controller is not yet
 instanciate

bzr revid: fme@openerp.com-20110929114720-cjpkgjr7rm03w5rn
---
 addons/web/static/src/js/views.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 0c9ea1b894e..389b8bfc5a1 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -227,10 +227,13 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
             controller.do_switch_view.add_last(this.on_mode_switch);
             var container = $("#" + this.element_id + '_view_' + view_type);
             view_promise = controller.appendTo(container);
+            this.views[view_type].controller = controller;
             $.when(view_promise).then(function() {
                 self.on_controller_inited(view_type, controller);
+                if (self.searchview && view.controller.searchable !== false) {
+                    self.do_searchview_search();
+                }
             });
-            this.views[view_type].controller = controller;
         } else if (this.searchview && view.controller.searchable !== false) {
             self.do_searchview_search();
         }

From f2cd835296caf3a1fbc0f037c03977c26522cee2 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Sep 2011 13:48:15 +0200
Subject: [PATCH 088/304] [IMP] Fixed gantt in order to support new do_search

bzr revid: fme@openerp.com-20110929114815-4nql5xzwztb77vdm
---
 addons/web_graph/static/src/js/graph.js | 32 +++++++++----------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index c691ef35975..5a72bf2a816 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -78,9 +78,6 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
             }
         }, this);
         this.ordinate = this.columns[0].name;
-
-        this.dataset.read_slice(
-            this.list_fields(), {}, $.proxy(this, 'schedule_chart'));
     },
     schedule_chart: function(results) {
         var self = this;
@@ -365,24 +362,17 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
         });
     },
 
-    do_search: function(domains, contexts, groupbys) {
-        var self = this;
-        this.rpc('/web/session/eval_domain_and_context', {
-            domains: domains,
-            contexts: contexts,
-            group_by_seq: groupbys
-        }, function (results) {
-            // TODO: handle non-empty results.group_by with read_group?
-            if(!_(results.group_by).isEmpty()){
-                self.abscissa = results.group_by[0];
-            } else {
-                self.abscissa = self.first_field;
-            }
-            self.dataset.read_slice(self.list_fields(), {
-                context: results.context,
-                domain: results.domain
-            }, $.proxy(self, 'schedule_chart'));
-        });
+    do_search: function(domain, context, group_by) {
+        // TODO: handle non-empty group_by with read_group?
+        if (!_(group_by).isEmpty()) {
+            this.abscissa = group_by[0];
+        } else {
+            this.abscissa = this.first_field;
+        }
+        this.dataset.read_slice(this.list_fields(), {
+            context: context,
+            domain: domain
+        }, $.proxy(this, 'schedule_chart'));
     }
 });
 };

From ccfcb47149feebb74d5cb98d454d0c0528acfc36 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 29 Sep 2011 13:55:15 +0200
Subject: [PATCH 089/304] [IMP] base: each ir.module.category will be assigned
 with an autogenerated xml-id during the creation of the database [IMP] base:
 Create the records for the categories of OpenERP

bzr revid: stw@openerp.com-20110929115515-rqlwqfzndxblxqtz
---
 openerp/addons/base/module/module.py       | 30 ++++++---
 openerp/addons/base/module/module_data.xml | 78 ++++++++++++++++++++++
 openerp/modules/db.py                      |  5 ++
 3 files changed, 105 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index a35e4b5d1ce..419f0c8b4b9 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -42,13 +42,13 @@ from osv import fields, osv, orm
 
 
 ACTION_DICT = {
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'base.module.upgrade',
-            'target': 'new',
-            'type': 'ir.actions.act_window',
-            'nodestroy':True,
-        }
+    'view_type': 'form',
+    'view_mode': 'form',
+    'res_model': 'base.module.upgrade',
+    'target': 'new',
+    'type': 'ir.actions.act_window',
+    'nodestroy':True,
+}
 
 class module_category(osv.osv):
     _name = "ir.module.category"
@@ -70,11 +70,25 @@ class module_category(osv.osv):
                              result.get(id, 0))
         return result
 
+    def name_get(self, cr, uid, ids, context=None):
+        result = []
+
+        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context=context)
+        for record in reads:
+            name = record['name']
+            if record['parent_id']:
+                name = record['parent_id'][1] + ' / ' + name
+            result.append((record['id'], name,))
+
+        return result
+
     _columns = {
         'name': fields.char("Name", size=128, required=True, select=True),
         'parent_id': fields.many2one('ir.module.category', 'Parent Category', select=True),
         'child_ids': fields.one2many('ir.module.category', 'parent_id', 'Child Categories'),
-        'module_nr': fields.function(_module_nbr, method=True, string='Number of Modules', type='integer')
+        'module_nr': fields.function(_module_nbr, method=True, string='Number of Modules', type='integer'),
+        'module_ids' : fields.one2many('ir.module.module', 'category_id', 'Modules'),
+        'description' : fields.text("Description"),
     }
     _order = 'name'
 module_category()
diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml
index 5ae06fca897..b05a8796363 100644
--- a/openerp/addons/base/module/module_data.xml
+++ b/openerp/addons/base/module/module_data.xml
@@ -1,6 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>        
+        <record model="ir.module.category" id="module_category_customer_relationship_management">
+            <field name="name">Customer Relationship Management</field>
+            <field name="description">Helps you track and manage relations with customers such as leads, requests or issues. Can automatically send reminders, escalate requests or trigger business-specific actions based on standard events.</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_sales_management">
+            <field name="name">Sales Management</field>
+            <field name="description">Helps you handle your quotations, sale orders and invoicing.</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_project_management">
+            <field name="name">Project Management</field>
+            <field name="description">Helps you manage your projects and tasks by tracking them, generating plannings, etc...</field>
+        </record>
+
+
+        <record model="ir.module.category" id="module_category_knowledge_management">
+            <field name="name">Knowledge Management</field>
+            <field name="description">Lets you install addons geared towards sharing knowledge with and between your employees.</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_warehouse_management">
+            <field name="name">Warehouse Management</field>
+            <field name="description">Helps you manage your inventory and main stock operations: delivery orders, receptions, etc.</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_manufacturing">
+            <field name="name">Manufacturing</field>
+            <field name="description">Helps you manage your manufacturing processes and generate reports on those processes.</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_account_voucher">
+            <field name="name">Invoicing &amp; Payments</field>
+            <field name="description">Allows you to create your invoices and track the payments. It is an easier version of the accounting module for managers who are not accountants.</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_accounting_and_finance">
+            <field name="name">Accounting &amp; Finance</field>
+            <field name="description">Helps you handle your accounting needs, if you are not an accountant, we suggest you to install only the Invoicing.</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_purchase_management">
+            <field name="name">Purchase Management</field>
+            <field name="description">Helps you manage your purchase-related processes such as requests for quotations, supplier invoices, etc...</field>
+        </record>
+        <record model="ir.module.category" id="module_category_human_resources">
+            <field name="name">Human Resources</field>
+            <field name="description">Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more.</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_point_of_sale">
+            <field name="name">Point of Sales</field>
+            <field name="description">Helps you get the most out of your points of sales with fast sale encoding, simplified payment mode encoding, automatic picking lists generation and more.</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_marketing">
+            <field name="name">Marketing</field>
+            <field name="description">Helps you manage your marketing campaigns step by step.</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_tools">
+            <field name="name">Extra Tools</field>
+            <field name="description">Lets you install various interesting but non-essential tools like Survey, Lunch and Ideas box.</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_report_designer">
+            <field name="name">Advanced Reporting</field>
+            <field name="description">Lets you install various tools to simplify and enhance OpenERP's report creation.</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_localization">
+            <field name="name">Localization</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_localization_account_charts">
+            <field name="name">Account Charts</field>
+        </record>
+
 <!--        <record id="ir_ui_view_sc_modules0" model="ir.ui.view_sc">-->
 <!--            <field name="name">Modules</field>-->
 <!--            <field name="resource">ir.ui.menu</field>-->
diff --git a/openerp/modules/db.py b/openerp/modules/db.py
index 6e6dd64b13c..e621564076f 100644
--- a/openerp/modules/db.py
+++ b/openerp/modules/db.py
@@ -102,7 +102,9 @@ def create_categories(cr, categories):
 
     """
     p_id = None
+    category = []
     while categories:
+        category.append(categories[0])
         if p_id is not None:
             cr.execute('SELECT id \
                        FROM ir_module_category \
@@ -117,6 +119,9 @@ def create_categories(cr, categories):
                     (name, parent_id) \
                     VALUES (%s, %s) RETURNING id', (categories[0], p_id))
             c_id = cr.fetchone()[0]
+            xml_id = 'module_category_' + ('_'.join(map(lambda x: x.lower(), category))).replace('&', 'and').replace(' ', '_')
+            cr.execute('INSERT INTO ir_model_data (module, name, res_id, model) \
+                       VALUES (%s, %s, %s, %s)', ('base', xml_id, c_id, 'ir.module.category'))
         else:
             c_id = c_id[0]
         p_id = c_id

From 7e6bc0e062e0a14f1bda89c8239605032baaeb29 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Sep 2011 13:58:30 +0200
Subject: [PATCH 090/304] [FIX] Fixed kanban view for new do_search

bzr revid: fme@openerp.com-20110929115830-ww0xxxxxaso5rqs7
---
 addons/web_kanban/static/src/js/kanban.js | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 52ad7982018..f0ec245f52f 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -424,20 +424,11 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
         });
         return new_record;
     },
-    do_search: function (domains, contexts, group_by) {
+    do_search: function (domain, context, group_by) {
         var self = this;
-        this.rpc('/web/session/eval_domain_and_context', {
-            domains: [this.dataset.get_domain()].concat(domains),
-            contexts: [this.dataset.get_context()].concat(contexts),
-            group_by_seq: group_by
-        }, function (results) {
-            self.domain = results.domain;
-            self.context = results.context;
-            self.group_by = results.group_by;
-            self.do_actual_search();
-        });
-    },
-    do_actual_search : function () {
+        self.domain = domain;
+        self.context = context;
+        self.group_by = group_by;
         var self = this,
             group_by = self.group_by;
         if (!group_by.length && this.fields_view.arch.attrs.default_group_by) {

From 50300b74a76d5feceebc65e9a7d57dda71a2c1b4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Sep 2011 14:19:02 +0200
Subject: [PATCH 091/304] [FIX] Fixed the calendar view for new do_search

bzr revid: fme@openerp.com-20110929121902-np8driu2jukwh9b0
---
 addons/web_calendar/static/src/js/calendar.js | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index 5de601e0921..f80e57ebf5d 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -13,6 +13,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         this.set_default_options(options);
         this.dataset = dataset;
         this.model = dataset.model;
+        this.fields_view = {};
         this.view_id = view_id;
         this.domain = this.dataset.domain || [];
         this.context = this.dataset.context || {};
@@ -92,9 +93,6 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
 
         this.init_scheduler();
         this.has_been_loaded.resolve();
-        if (this.dataset.ids.length) {
-            this.dataset.read_ids(this.dataset.ids, _.keys(this.fields), this.on_events_loaded);
-        }
     },
     init_scheduler: function() {
         var self = this;
@@ -293,26 +291,21 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         }
         return data;
     },
-    do_search: function(domains, contexts, groupbys) {
+    do_search: function(domain, context, group_by) {
         var self = this;
         scheduler.clearAll();
         $.when(this.has_been_loaded).then(function() {
-            self.rpc('/web/session/eval_domain_and_context', {
-                domains: domains,
-                contexts: contexts,
-                group_by_seq: groupbys
-            }, function (results) {
-                // TODO: handle non-empty results.group_by with read_group
-                self.dataset.context = self.context = results.context;
-                self.dataset.domain = self.domain = results.domain;
-                self.dataset.read_slice(_.keys(self.fields), {
-                        offset:0,
-                        limit: self.limit
-                    }, function(events) {
-                        self.dataset_events = events;
-                        self.on_events_loaded(events);
-                    }
-                );
+            // TODO: handle non-empty results.group_by with read_group
+            self.context = context;
+            self.domain = domain;
+            self.dataset.read_slice(_.keys(self.fields), {
+                offset: 0,
+                context: context,
+                domain: domain,
+                limit: self.limit
+            }, function(events) {
+                self.dataset_events = events;
+                self.on_events_loaded(events);
             });
         });
     },

From 4171f852ce418f6d09e819e6616c99a14b61548f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Sep 2011 14:24:41 +0200
Subject: [PATCH 092/304] [IMP] Kanban:  Only reload current record when button
 is clicked

bzr revid: fme@openerp.com-20110929122441-x0o94teq3zbftyai
---
 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 f0ec245f52f..c961433a37b 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -291,7 +291,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
         this.do_execute_action(
             button_attrs, dataset,
             record_id, function () {
-                self.do_actual_search();
+                self.on_reload_record(record_id);
             }
         );
     },

From 45ed96d15e171a40ca5816f7483ba2d145aa1fca Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Sep 2011 14:32:25 +0200
Subject: [PATCH 093/304] [IMP] Kanban, removed local references to domain and
 context

bzr revid: fme@openerp.com-20110929123225-nkx9zx5kj8vc2pjm
---
 addons/web_kanban/static/src/js/kanban.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index c961433a37b..2e06482d375 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -9,8 +9,6 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
         this.set_default_options(options);
         this.dataset = dataset;
         this.model = dataset.model;
-        this.domain = dataset.domain;
-        this.context = dataset.context;
         this.view_id = view_id;
         this.fields_view = {};
         this.group_by = [];
@@ -426,8 +424,6 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
     },
     do_search: function (domain, context, group_by) {
         var self = this;
-        self.domain = domain;
-        self.context = context;
         self.group_by = group_by;
         var self = this,
             group_by = self.group_by;
@@ -435,8 +431,9 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
             group_by = [this.fields_view.arch.attrs.default_group_by];
             self.group_by = group_by;
         }
-        self.datagroup = new openerp.web.DataGroup(self, self.model, self.domain, self.context, group_by);
-        self.datagroup.list(_.keys(self.fields_view.fields),
+        self.datagroup = new openerp.web.DataGroup(self, self.model, domain, context, group_by);
+        self.datagroup.list(
+            _.keys(self.fields_view.fields),
             function (groups) {
                 self.groups = groups;
                 if (groups.length) {
@@ -449,9 +446,15 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
             },
             function (dataset) {
                 self.groups = [];
-                self.dataset.read_slice([], {'domain': self.domain, 'context': self.context}, function(records) {
-                    if (records.length) self.all_display_data = [{'records': records, 'value':false, 'header' : false, 'ids': self.dataset.ids}];
-                    else self.all_display_data = [];
+                self.dataset.read_slice([], {
+                    domain: domain,
+                    context: context
+                }, function(records) {
+                    if (records.length) {
+                        self.all_display_data = [{'records': records, 'value':false, 'header' : false, 'ids': self.dataset.ids}];
+                    } else {
+                        self.all_display_data = [];
+                    }
                     self.$element.find(".oe_kanban_view").remove();
                     self.on_show_data();
                 });
@@ -475,7 +478,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
             _.each(self.aggregates, function(value, key) {
                 group_aggregates[value] = group.aggregates[key];
             });
-            self.dataset.read_slice([], {'domain': group.domain, 'context': group.context}, function(records) {
+            self.dataset.read_slice([], {'domain': group.domain, 'conext': group.context}, function(records) {
                 self.all_display_data.push({"value" : group_value, "records": records, 'header':group_name, 'ids': self.dataset.ids, 'aggregates': group_aggregates});
                 if (datagroups.length == self.all_display_data.length) {
                     self.$element.find(".oe_kanban_view").remove();

From 4380b2044a5b635bbdbbecc8c01705d71a35af36 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 29 Sep 2011 14:35:24 +0200
Subject: [PATCH 094/304] [REF] base_setup: Specify the right domain for the
 ir.module.category, needed by the fields_get and fields_view_get methods of
 the super base.setup.installer2

bzr revid: stw@openerp.com-20110929123524-lsw8o8diyj4ljpku
---
 addons/base_setup/base_setup.py | 45 ++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 031e004e804..38edf7accbf 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -53,9 +53,11 @@ class base_setup_installer2(osv.osv_memory):
         if fields is None:
             fields = {}
 
-        fields = {} #super(base_setup_installer2, self).fields_get(cr, uid, fields, context=context)
+        fields = {} 
         category_proxy = self.pool.get('ir.module.category')
-        category_ids = category_proxy.search(cr, uid, [], context=context)
+        domain = [('parent_id', '=', False),
+                  ('name', '!=', 'Localization')]
+        category_ids = category_proxy.search(cr, uid, domain, context=context)
         for category in category_proxy.browse(cr, uid, category_ids, context=context):
             category_name = 'category_%d' % (category.id,)
             fields[category_name] = {
@@ -102,9 +104,12 @@ class base_setup_installer2(osv.osv_memory):
         result = super(base_setup_installer2, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
 
         module_category_proxy = self.pool.get('ir.module.category')
-        module_category_ids = module_category_proxy.search(cr, uid, [], context=context, order='name asc')
-        arch = ['<form string="Automatic Base Setup">']
-        arch.append('<separator string="Categories" colspan="4" />')
+        domain = [('parent_id', '=', False),
+                  ('name', '!=', 'Localization')]
+        module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='name asc')
+
+        arch = ['<form string="%s">' % _('Automatic Base Setup')]
+        arch.append('<separator string="%s" colspan="4" />' % _('Categories'))
         for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
             readonly = False
             for module in module_category.module_ids:
@@ -116,19 +121,19 @@ class base_setup_installer2(osv.osv_memory):
             else:
                 arch.append('<field name="category_%d" />' % (module_category.id,))
 
+        # Compute the module to show
+        for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
+            if not module_category.module_ids:
+                continue
 
-        #for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
-        #    if not module_category.module_ids:
-        #        continue
-
-        #    modifiers = {
-        #        'invisible' : [('category_%d' % (module_category.id), '=', False)],
-        #        'readonly' : module.state == 'installed',
-        #    }
-        #    modifiers = simplejson.dumps(modifiers)
-        #    arch.append("""<separator string="%s" colspan="4" modifiers='%s'/>""" % (cgi.escape(module_category.name), modifiers))
-        #    for module in module_category.module_ids: 
-        #        arch.append("""<field name="module_%s" modifiers='%s' />""" % (module.name, modifiers))
+            modifiers = {
+                'invisible' : [('category_%d' % (module_category.id), '=', False)],
+                'readonly' : module.state == 'installed',
+            }
+            modifiers = simplejson.dumps(modifiers)
+            arch.append("""<separator string="%s" colspan="4" modifiers='%s'/>""" % (cgi.escape(module_category.name), modifiers))
+            for module in module_category.module_ids: 
+                arch.append("""<field name="module_%s" modifiers='%s' />""" % (module.name, modifiers))
 
         arch.append(
             '<separator colspan="4" />'
@@ -142,14 +147,8 @@ class base_setup_installer2(osv.osv_memory):
 
         result['arch'] = ''.join(arch)
 
-        from pprint import pprint as pp
-        pp(result['arch'])
-
         return result
 
-    def write(self, cr, uid, ids, values, context=None):
-        return True
-
     def create(self, cr, uid, values, context=None):
         modules_to_install = [ key[len('module_'):] for key, value in values.iteritems() if value == 1 and key.startswith('module_')]
         values = {

From 593f997a43ff7285c7481f9f211b59d3aeefab50 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 29 Sep 2011 14:37:05 +0200
Subject: [PATCH 095/304] [FIX] base: assign a parent_id for the account charts
 subcategory

bzr revid: stw@openerp.com-20110929123705-zm5518i1odwv06fb
---
 openerp/addons/base/module/module_data.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml
index b05a8796363..dc955b8f9f5 100644
--- a/openerp/addons/base/module/module_data.xml
+++ b/openerp/addons/base/module/module_data.xml
@@ -76,6 +76,7 @@
         </record>
 
         <record model="ir.module.category" id="module_category_localization_account_charts">
+            <field name="parent_id" ref="module_category_localization" />
             <field name="name">Account Charts</field>
         </record>
 

From 3cee85eaba9ce9fe8706b14482324a765e817c74 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 29 Sep 2011 15:28:22 +0200
Subject: [PATCH 096/304] [FIX] typo syntax error

bzr revid: xmo@openerp.com-20110929132822-3qbbl1qttnvfhl40
---
 openerp/osv/orm.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 4740e8e37e5..3426dfd99d5 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1848,7 +1848,7 @@ class BaseModel(object):
 
         field_group = etree.SubElement(search_view, "group")
         for field_name in fields_to_search:
-            etree.SubElement(field_group, "field", name=field_name))
+            etree.SubElement(field_group, "field", name=field_name)
 
         return search_view
 
@@ -2092,8 +2092,10 @@ class BaseModel(object):
             resrelate = ir_values_obj.get(cr, user, 'action',
                     'client_action_relate', [(self._name, False)], False,
                     context)
-            resaction = [clean(action) for action in resaction if view_type == 'tree' or not action.get('multi')]
-            resprint = [clean(print_) for print_ in resprint if view_type == 'tree' or not print_.get('multi')]
+            resaction = [clean(action) for action in resaction
+                         if view_type == 'tree' or not action[2].get('multi')]
+            resprint = [clean(print_) for print_ in resprint
+                        if view_type == 'tree' or not print_[2].get('multi')]
             resrelate = map(lambda x: x[2], resrelate)
 
             for x in itertools.chain(resprint, resaction, resrelate):

From 59e70f45440521345d82ed649e237187c2bbfae1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Sep 2011 16:49:15 +0200
Subject: [PATCH 097/304] [FIX] si la vue est pas searchable on va appeler
 'this.searchview[true]()'

bzr revid: fme@openerp.com-20110929144915-mgh3eaztp14cbbfp
---
 addons/web/static/src/js/views.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 389b8bfc5a1..cfeb70a7e22 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -239,7 +239,7 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
         }
 
         if (this.searchview) {
-            this.searchview[view.controller.searchable === false || this.searchview.hidden ? 'hide' : 'show']();
+            this.searchview[(view.controller.searchable === false || this.searchview.hidden) ? 'hide' : 'show']();
         }
 
         this.$element

From c536edf45fb9dcbf4a122c1bf64b6cd3006794e9 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 29 Sep 2011 18:08:17 +0200
Subject: [PATCH 098/304] [REF] base_setup: Rewrite the code of fields_view_get
 [IMP] base_setup: Compute the modules to install with the selection from the
 user

bzr revid: stw@openerp.com-20110929160817-8cjtaznqgyl6110h
---
 addons/base_setup/base_setup.py | 97 +++++++++++++++++++++++++++++----
 1 file changed, 86 insertions(+), 11 deletions(-)

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 38edf7accbf..1bafa7b6b9a 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -70,7 +70,7 @@ class base_setup_installer2(osv.osv_memory):
         module_proxy = self.pool.get('ir.module.module')
         module_ids = module_proxy.search(cr, uid, [], context=context)
         for module in module_proxy.browse(cr, uid, module_ids, context=context):
-            module_name = 'module_%s' % (module.name,)
+            module_name = 'module_%d' % (module.id,)
             module_is_installed = module.state == 'installed'
             fields[module_name] = {
                 'type' : 'boolean',
@@ -93,7 +93,7 @@ class base_setup_installer2(osv.osv_memory):
             module_proxy = self.pool.get('ir.module.module')
             module_ids = module_proxy.search(cr, uid, [], context=context)
             for module in module_proxy.browse(cr, uid, module_ids, context=context):
-                result['module_%s' % (module.name,)] = module.state == 'installed'
+                result['module_%d' % (module.id,)] = module.state == 'installed'
                 category_name = 'category_%d' % (module.category_id.id,)
                 if not result.get('category_name'):
                     result[category_name] = module.state == 'installed'
@@ -116,10 +116,16 @@ class base_setup_installer2(osv.osv_memory):
                 if module.state == 'installed':
                     readonly=True
 
+
+            attributes = {
+                'name' : 'category_%d' % (module_category.id,),
+                'on_change' : 'on_change_selection("category_%d")' % (module_category.id,),
+            }
             if readonly:
-                arch.append("""<field name="category_%d" modifiers='%s'/>""" % (module_category.id, simplejson.dumps({'readonly' : True}),))
-            else:
-                arch.append('<field name="category_%d" />' % (module_category.id,))
+                attributes['modifiers'] = simplejson.dumps({'readonly' : True})
+
+            arch.append("""<field %s />""" % (" ".join(["%s='%s'" % (key, value,)
+                                                        for key, value in attributes.iteritems()]),))
 
         # Compute the module to show
         for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
@@ -132,8 +138,8 @@ class base_setup_installer2(osv.osv_memory):
             }
             modifiers = simplejson.dumps(modifiers)
             arch.append("""<separator string="%s" colspan="4" modifiers='%s'/>""" % (cgi.escape(module_category.name), modifiers))
-            for module in module_category.module_ids: 
-                arch.append("""<field name="module_%s" modifiers='%s' />""" % (module.name, modifiers))
+            for module in module_category.module_ids:
+                arch.append("""<field name="module_%d" modifiers='%s' />""" % (module.id, modifiers))
 
         arch.append(
             '<separator colspan="4" />'
@@ -146,24 +152,93 @@ class base_setup_installer2(osv.osv_memory):
         arch.append('</form>')
 
         result['arch'] = ''.join(arch)
+        from pprint import pprint as pp
+        pp(result['arch'])
 
         return result
 
+    def on_change_selection(self, cr, uid, ids, item, context=None):
+        if not isinstance(item, basestring):
+            return {}
+
+        if item.startswith('category_') or item.startswith('module_'):
+            object_name, identifier = item.split('_')
+        else:
+            return {}
+
+        values = {
+        }
+
+        #if object_name == 'category':
+        #    module_ids = self.pool.get('ir.module.module').search(cr, uid, [('category_id', '=', int(identifier))], context=context)
+        #    for module_id in module_ids:
+        #        values['module_%d' % module_id] = 1
+
+        return {'value': values}
+
     def create(self, cr, uid, values, context=None):
-        modules_to_install = [ key[len('module_'):] for key, value in values.iteritems() if value == 1 and key.startswith('module_')]
+        module_ids_to_install = [
+            key.split('_')[1]
+            for key, value in values.iteritems()
+            if value == 1 and key.startswith('module_')
+        ]
+
         values = {
             'modules' : simplejson.dumps(modules_to_install),
         }
-        print "values: %r" % (values,)
         context.update(dont_compute_virtual_attributes=True)
         return super(base_setup_installer2, self).create(cr, uid, values, context=context)
 
-    def apply_cb(self, cr, uid, ids, context=None): 
+    def _get_modules_to_install(self, cr, uid, selected_modules, context=None):
+        STATES = ('installed',)
+
+        module_proxy = self.pool.get('ir.module.module')
+        module_ids = module_proxy.search(cr, uid, [], context=context)
+
+        modules = {}
+        for module in module_proxy.browse(cr, uid, module_ids, context=context):
+            modules[module.name] = {
+                'state' : module.state,
+                'depends' : module.depends,
+            }
+
+        installed_modules = []
+        for module, info in modules.iteritems():
+            info.setdefault('depends', [] if module == 'base' else ['base',])
+
+            if info['state'] in STATES:
+                installed_modules.append(module)
+                info['counter'] = 0
+            else:
+                info['counter'] = - len(set(info['depends']))
+
+        selected_modules = set(selected_modules + installed_modules) - set(['base'])
+
+        for selected_module in selected_modules:
+            for module, info in modules.iteritems():
+                if info['state'] not in STATES and \
+                   (selected_module in info['depends'] or selected_module == module):
+                    info['counter'] += 1
+
+        to_install_modules = set(module
+                                 for module, info in modules.iteritems()
+                                 if info['counter'] == 0 and
+                                    info['state'] not in STATES)
+
+        return to_install_modules
+
+    def apply_cb(self, cr, uid, ids, context=None):
         for installer in self.browse(cr, uid, ids, context=context):
             modules_to_install = simplejson.loads(installer.modules)
             proxy = self.pool.get('ir.module.module')
 
-            module_ids = proxy.search(cr, uid, [('name', 'in', modules_to_install)], context=context)
+            module_ids = proxy.search(cr, uid, [('id', 'in', modules_to_install)], context=context)
+            modules = set(record['name']
+                          for record in proxy.read(cr, uid, module_ids, ['name'], context=context))
+
+            modules = self._get_modules_to_install(cr, uid, modules, context=context)
+
+            module_ids = proxy.search(cr, uid, [('name', 'in', modules)], context=context)
 
             need_update = False
             for module in proxy.browse(cr, uid, module_ids, context=context):

From 4705ae93522982f4805bfaf49e253e6c7ffbe906 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 30 Sep 2011 11:09:29 +0200
Subject: [PATCH 099/304] [REF] base_setup: Remove the definition of
 ir_module_category because defined in the server [FIX] base_setup: Set the
 rights variables and containers for the algo. [REF] base_setup: Use some code
 for the development of this wizard (sorry)

bzr revid: stw@openerp.com-20110930090929-lqj8lbmivsrkjmbb
---
 addons/base_setup/base_setup.py | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 1bafa7b6b9a..fc5fa1f2603 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -28,15 +28,6 @@ from osv import fields, osv
 from tools.translate import _
 from lxml import etree
 
-class ir_module_category(osv.osv):
-    _inherit = 'ir.module.category'
-
-    _columns = {
-        'module_ids' : fields.one2many('ir.module.module', 'category_id', 'Modules'),
-    }
-ir_module_category()
-
-
 #Application and feature chooser, this could be done by introspecting ir.modules
 class base_setup_installer2(osv.osv_memory):
     _name = 'base.setup.installer2'
@@ -72,9 +63,12 @@ class base_setup_installer2(osv.osv_memory):
         for module in module_proxy.browse(cr, uid, module_ids, context=context):
             module_name = 'module_%d' % (module.id,)
             module_is_installed = module.state == 'installed'
+            title = "%s (%s)" % (module.shortdesc, module.complexity,)
+            title = "%s (%s)" % (module.name, module.complexity,)
+
             fields[module_name] = {
                 'type' : 'boolean',
-                'string' : module.shortdesc,
+                'string' : title,
                 'name' : module_name,
                 'help' : module.description,
             }
@@ -152,8 +146,8 @@ class base_setup_installer2(osv.osv_memory):
         arch.append('</form>')
 
         result['arch'] = ''.join(arch)
-        from pprint import pprint as pp
-        pp(result['arch'])
+        #from pprint import pprint as pp
+        #pp(result['arch'])
 
         return result
 
@@ -184,7 +178,7 @@ class base_setup_installer2(osv.osv_memory):
         ]
 
         values = {
-            'modules' : simplejson.dumps(modules_to_install),
+            'modules' : simplejson.dumps(module_ids_to_install),
         }
         context.update(dont_compute_virtual_attributes=True)
         return super(base_setup_installer2, self).create(cr, uid, values, context=context)
@@ -197,9 +191,10 @@ class base_setup_installer2(osv.osv_memory):
 
         modules = {}
         for module in module_proxy.browse(cr, uid, module_ids, context=context):
+            depends = [ depend.name for depend in module.dependencies_id ]
             modules[module.name] = {
                 'state' : module.state,
-                'depends' : module.depends,
+                'depends' : depends,
             }
 
         installed_modules = []
@@ -236,9 +231,13 @@ class base_setup_installer2(osv.osv_memory):
             modules = set(record['name']
                           for record in proxy.read(cr, uid, module_ids, ['name'], context=context))
 
-            modules = self._get_modules_to_install(cr, uid, modules, context=context)
+            modules = self._get_modules_to_install(cr, uid, list(modules), context=context)
 
-            module_ids = proxy.search(cr, uid, [('name', 'in', modules)], context=context)
+            module_ids = proxy.search(cr, uid, [('name', 'in', list(modules))], context=context)
+
+            print "modules: %r" % (modules,)
+
+            break
 
             need_update = False
             for module in proxy.browse(cr, uid, module_ids, context=context):

From cb13a76208ed763e1ada4cb868ba8fee7fea147d Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 30 Sep 2011 13:51:44 +0200
Subject: [PATCH 100/304] [FIX] base_setup: the web client can't parse the
 literal value in the on_change event. We use a workaround to bypass this kind
 of problem.

bzr revid: stw@openerp.com-20110930115144-nwog9ac6a5dzv1xj
---
 addons/base_setup/base_setup.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index fc5fa1f2603..42fae345959 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -113,7 +113,7 @@ class base_setup_installer2(osv.osv_memory):
 
             attributes = {
                 'name' : 'category_%d' % (module_category.id,),
-                'on_change' : 'on_change_selection("category_%d")' % (module_category.id,),
+                'on_change' : 'on_change_%s_%d(category_%d)' % ('category', module_category.id, module_category.id,),
             }
             if readonly:
                 attributes['modifiers'] = simplejson.dumps({'readonly' : True})
@@ -151,8 +151,17 @@ class base_setup_installer2(osv.osv_memory):
 
         return result
 
-    def on_change_selection(self, cr, uid, ids, item, context=None):
-        if not isinstance(item, basestring):
+    def __getattr__(self, name):
+        if name.startswith('on_change_category_'):
+            def proxy(cr, uid, ids, value, context=None):
+                item = 'category_%s' % name[len('on_change_category_'):]
+                return self._on_change_selection(cr, uid, ids, item, value, context=context)
+            return proxy
+        return getattr(super(base_setup_installer2, self), name)
+
+    def _on_change_selection(self, cr, uid, ids, item, value, context=None):
+        print "on_change_selection: %r" % (item,) 
+        if not isinstance(item, basestring) or not value:
             return {}
 
         if item.startswith('category_') or item.startswith('module_'):
@@ -208,6 +217,7 @@ class base_setup_installer2(osv.osv_memory):
                 info['counter'] = - len(set(info['depends']))
 
         selected_modules = set(selected_modules + installed_modules) - set(['base'])
+        print "selected_modules: %r" % (selected_modules,)
 
         for selected_module in selected_modules:
             for module, info in modules.iteritems():
@@ -220,6 +230,8 @@ class base_setup_installer2(osv.osv_memory):
                                  if info['counter'] == 0 and
                                     info['state'] not in STATES)
 
+        print "to_install_modules: %r" % (to_install_modules,)
+
         return to_install_modules
 
     def apply_cb(self, cr, uid, ids, context=None):

From 2e02eaf46fb3a0fa520ca52951c78bd6cb91beae Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 30 Sep 2011 14:19:00 +0200
Subject: [PATCH 101/304] [IMP] edi: review/cleanup (wip)

bzr revid: odo@openerp.com-20110930121900-1fzq6b0gbhxxki0j
---
 openerp/addons/base/ir/ir_edi.py             | 236 +++++++++----------
 openerp/addons/base/res/res_partner_demo.xml |   9 +
 openerp/service/web_services.py              |   1 -
 3 files changed, 124 insertions(+), 122 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index e830e18428f..6efdd64d5a0 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -44,108 +44,107 @@ def safe_unique_id(database_id, model, record_id):
     digest = ''.join(chr(ord(x) ^ ord(y)) for (x,y) in zip(digest[:9], digest[9:-2]))
     # finally, use the b64-encoded folded digest as ID part of the unique ID:
     digest = base64.urlsafe_b64encode(digest)
-        
     return '%s-%s' % (model.replace('.','_'), digest)
 
 class ir_edi_document(osv.osv):
     _name = 'ir.edi.document'
-    _description = 'To represent the EDI Document of any OpenERP record.'
+    _description = 'EDI Document'
     _columns = {
-                'name': fields.char("EDI token", size = 128, help="EDI Token is a unique identifier for the EDI document."),
-                'document': fields.text("Document", help="hold the serialization of the EDI document.")
-                
+                'name': fields.char("EDI token", size = 128, help="Unique identifier for retrieving an EDI document."),
+                'document': fields.text("Document", help="EDI document content")
     }
     _sql_constraints = [
-        ('name_uniq', 'unique (name)', 'The EDI Token must be unique!')
+        ('name_uniq', 'unique (name)', 'EDI Tokens must be unique!')
     ]
-    
-    
+
     def new_edi_token(self, cr, uid, record):
-        """
-        Return a new, random unique token to identify an edi.document
-        :param record: It's a object of browse_record of any model
+        """Return a new, random unique token to identify this model record,
+        and to be used as token when exporting it as an EDI document.
+
+        :param browse_record record: model record for which a token is needed
         """
         db_uuid = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
-
         edi_token = hashlib.sha256('%s-%s-%s-%s' % (time.time(), db_uuid, record._name, record.id)).hexdigest()
         return edi_token
-    
+
     def serialize(self, edi_documents):
-        """Serialize the list of dictionaries using json dumps method
-        perform a JSON serialization of a list of dicts prepared by generate_edi() and return a UTF-8 encoded string that could be passed to deserialize()
-        :param edi_dicts: it's list of edi_dict
+        """Serialize the given EDI document structures (Python dicts holding EDI data),
+        using JSON serialization.
+
+        :param [dict] edi_documents: list of EDI document structures to serialize
+        :return: UTF-8 encoded string containing the serialized document
         """
         serialized_list = json.dumps(edi_documents)
         return serialized_list
-    
+
     def generate_edi(self, cr, uid, records, context=None):
+        """Generates a final EDI document containing the EDI serialization
+        of the given records, which should all be instances of a Model
+        that has the :meth:`~.edi` mixin. The document is not saved in the
+        database, this is done by :meth:`~.export_edi`.
+
+        :param list(browse_record) records: records to export as EDI
+        :return: UTF-8 encoded string containing the serialized records
         """
-        Generate the list of dictionaries using edi_export method of edi class 
-        :param records: it's a object of browse_record_list of any model
-        """
-        
         edi_list = []
         for record in records:
             record_model_obj = self.pool.get(record._name)
             edi_list += record_model_obj.edi_export(cr, uid, [record], context=context)
         return self.serialize(edi_list)
-    
-    def get_document(self, cr, uid, edi_token, context=None):
-        """
-        Get the edi document from database using given edi token 
-        returns the string serialization that is in the database (column: document) for the given edi_token or raise.
-        """
-        
-        records = self.name_search(cr, uid, edi_token, operator='=', context=context)
-        if records:
-            record = records[0][0]
-            edi = self.browse(cr, uid, record, context=context)
-            return edi.document
-        else:  
-            pass
-    
-    def load_edi(self, cr, uid, edi_documents, context=None):
-        """
-        loads the values from list of dictionaries to the corresponding OpenERP records
-        using the edi_import method of edi class
-        For each edi record (dict) in the list, call the corresponding osv.edi_import() method, based on the __model attribute (see section 2.4 of  for spec of 
-        osv.edi_import)
 
-        :param edi_dicts: list of edi_dict
+    def get_document(self, cr, uid, edi_token, context=None):
+        """Retrieve the EDI document corresponding to the given edi_token.
+
+        :return: EDI document string
+        :raise: ValueError if requested EDI token does not match any know document
         """
-        module_obj =self.pool.get('ir.module.module')
+        edi_ids = self.search(cr, uid, [('name','=', edi_token)], context=context)
+        if not edi_ids:
+            raise ValueError('Invalid EDI token: %s' % edi_token)
+        edi = self.browse(cr, uid, edi_ids[0], context=context)
+        return edi.document
+
+    def load_edi(self, cr, uid, edi_documents, context=None):
+        """Import the given EDI document structures into the system, using
+        :meth:`~.import_edi`.
+
+        :param edi_documents: list of Python dicts containing the deserialized
+                              version of EDI documents
+        :return: list of (model, id) pairs containing the model and database ID
+                 of all records that were imported in the system
+        """
+        ir_module = self.pool.get('ir.module.module')
         res = []
         for edi_document in edi_documents:
             module = edi_document.get('__module')
-            module_ids = module_obj.search(cr, uid, [('name','=',module),('state','not in',['uninstalled', 'uninstallable', 'to remove'])])
-            if not module_ids:
-                raise osv.except_osv(_('Invalid action !'),
-                            _('The document you are trying to import requires the OpenERP "%s" application. The OpenERP configuration assistant will help with this if you are connected as an administrator.')%(module))
+            if not ir_module.search(cr, uid, [('name','=',module),('state','=','installed')]):
+                raise osv.except_osv(_('Missing Application'),
+                            _("The document you are trying to import requires the OpenERP `%s` application. "
+                              "The OpenERP configuration assistant will help with this if you are connected as an administrator.")%(module,))
             model = edi_document.get('__model')
-            assert model, _('model should be provided in EDI Dict')
+            assert model, '__model attribute is required in each EDI document'
             model_obj = self.pool.get(model)
             record_id = model_obj.edi_import(cr, uid, edi_document, context=context)
-            res.append((model,record_id))
+            res.append((model, record_id))
         return res
-    
-    def deserialize(self, edi_document_string):
-        """ Deserialized the edi document string
-        perform JSON deserialization from an edi document string, and returns a list of dicts
-        """
-        edi_document = json.loads(edi_document_string)
-        
-        return edi_document
-    
-    def export_edi(self, cr, uid, records, context=None):
-        """
-        The method handles the flow of the edi document generation and store it in 
-            the database and return the edi_token of the particular document
-        Steps: 
-        * call generate_edi() to get a serialization and new_edi_token() to get a unique ID
-        * serialize the list returned by generate_edi() using serialize(), and save it in database with unique ID.
-        * return the unique ID
 
-        : param records: list of browse_record of any model
+    def deserialize(self, edi_documents_string):
+        """Return deserialized version of the given EDI Document string.
+
+        :param str|unicode edi_documents_string: UTF-8 string (or unicode) containing
+                                                 JSON-serialized EDI document(s)
+        :return: Python object representing the EDI document(s) (usually a list of dicts) 
+        """
+        return json.loads(edi_documents_string)
+
+    def export_edi(self, cr, uid, records, context=None):
+        """Export the given database records as EDI documents, stores them
+        permanently with a new unique EDI token, for later retrieval via :meth:`~.get_document`,
+        and returns the list of the new corresponding ``ir.edi.document`` records.
+
+        :param records: list of browse_record of any model
+        :return: list of IDs of the new ``ir.edi.document`` entries, in the same 
+                 order as the provided ``records``.
         """
         exported_ids = []
         for record in records:
@@ -155,40 +154,35 @@ class ir_edi_document(osv.osv):
                          'name': token,
                          'document': document
                         }, context=context)
-        
             exported_ids.append(token)
         return exported_ids
-    
+
     def import_edi(self, cr, uid, edi_document=None, edi_url=None, context=None):
+        """Import a JSON serialized EDI Document string into the system, first retrieving it
+        from the given ``edi_url`` if provided.
+
+        :param str|unicode edi_document: UTF-8 string or unicode containing JSON-serialized
+                                         EDI Document to import. Must not be provided if 
+                                         ``edi_url`` is given.
+        :param str|unicode edi_url: URL where the EDI document (same format as ``edi_document``)
+                                    may be retrieved, without authentication.
         """
-        The method handles the flow of importing particular edi document and 
-        updates the database values on the basis of the edi document using 
-        edi_loads method
-        
-        * N: a serialized edi.document or the URL to download a serialized document
-        * If a URL is provided, download it first to get the document
-        * Calls deserialize() to get the resulting list of dicts from the document
-        * Call load_edi() with the list of dicts, to create or update the corresponding OpenERP records based on the edi.document.
-        """
-        
-        if edi_url and not edi_document:
+        if edi_url:
+            assert not edi_document, 'edi_document must not be provided if edi_url is given'
             edi_document = urllib2.urlopen(edi_url).read()
-        assert edi_document, _('EDI Document should be provided')
+        assert edi_document, 'EDI Document is empty!'
         edi_documents = self.deserialize(edi_document)
         return self.load_edi(cr, uid, edi_documents, context=context)
-    
-ir_edi_document()
+
 
 class edi(object):
-    _name = 'edi'
-    _description = 'edi document handler'
-    
-    """Mixin class for OSV objects that want be exposed as EDI documents.
-       Classes that inherit from this mixin class should override the 
+    """Mixin class for Model objects that want be exposed as EDI documents.
+       Classes that inherit from this mixin class should override the
        ``edi_import()`` and ``edi_export()`` methods to implement their
-       specific behavior, based on the primitives provided by this superclass."""
+       specific behavior, based on the primitives provided by this mixin."""
 
     def record_xml_id(self, cr, uid, record, context=None):
+        #TODO: remove this -> use ir.model.data directly
         model_data_pool = self.pool.get('ir.model.data')
         data_ids = model_data_pool.search(cr, uid, [('res_id','=',record.id),('model','=',record._name)])
         if not data_ids:
@@ -233,12 +227,12 @@ class edi(object):
                 'module': module,
                 'res_id': record.id}, context=context)
         return xml_id
-    
+
     def edi_metadata(self, cr, uid, records, context=None):
         """Return a list representing the boilerplate EDI structure for
            exporting the record in the given browse_rec_list, including
            the metadata fields
-        
+
         The metadata fields MUST always include:
         - __model': the OpenERP model name
         - __module': the OpenERP module containing the model
@@ -270,8 +264,8 @@ class edi(object):
                         'content': base64.encodestring(attachment.datas),
                         'file_name': attachment.datas_fname,
                 })
-            
-            
+
+
             uuid = self.edi_xml_id(cr, uid, record, context=context)
             edi_dict = {
                 '__id': uuid,
@@ -285,7 +279,7 @@ class edi(object):
                     '__attachments': attachment_dict_list
                 })
             edi_dict_list.append(edi_dict)
-            
+
         return edi_dict_list
 
     def edi_m2o(self, cr, uid, record, context=None):
@@ -296,11 +290,11 @@ class edi(object):
         """
         # generic implementation!
         db_uuid = self.edi_xml_id(cr, uid, record, context=context)
-        relation_model_pool = self.pool.get(record._name)  
+        relation_model_pool = self.pool.get(record._name)
         name = relation_model_pool.name_get(cr, uid, [record.id], context=context)
         name = name and name[0][1] or False
         return [db_uuid, name]
-        
+
     def edi_o2m(self, cr, uid, records, edi_struct=None, context=None):
         """Return a list representing a O2M EDI value for
            the browse_records from the given browse_record_list.
@@ -320,17 +314,17 @@ class edi(object):
         ctx = context.copy()
         ctx.update({'o2m_export':True})
         for record in records:
-            
+
             model_obj = self.pool.get(record._name)
             dict_list += model_obj.edi_export(cr, uid, [record], edi_struct=edi_struct, context=ctx)
-        
+
         return dict_list
-        
+
     def edi_m2m(self, cr, uid, records, context=None):
         """Return a list representing a M2M EDI value for
            the browse_records from the given browse_record_list.
 
-        Example: 
+        Example:
         'related_tasks': [                 # M2M fields would exported as a list of pairs,
                   ['db-uuid:xml-id1',      # similar to a list of M2O values.
                    'Task 01: bla bla'],
@@ -340,10 +334,10 @@ class edi(object):
         """
         # generic implementation!
         dict_list = []
-        
+
         for record in records:
             dict_list.append(self.edi_m2o(cr, uid, record, context=None))
-      
+
         return dict_list
 
     def edi_export(self, cr, uid, records, edi_struct=None, context=None):
@@ -366,7 +360,7 @@ class edi(object):
                               be included in the exported data.
         """
         # generic implementation!
-        
+
         if context is None:
             context = {}
         if edi_struct is None:
@@ -380,7 +374,7 @@ class edi(object):
             edi_dict.update(self.edi_metadata(cr, uid, [row], context=context)[0])
             for field in fields_to_export:
                 _column = _columns[field].column
-                _column_dict = fields.field_to_dict(self, cr, uid, context, _column)
+                _column_dict = fields.field_to_dict(self, cr, uid, _column, context=context)
                 record = getattr(row, field)
                 if not record:
                     continue
@@ -423,7 +417,7 @@ class edi(object):
     def edi_create_relation(self, cr, uid, relation_model, relation_value, context=None):
         relation_model = self.pool.get(relation_model)
         values = {} #relation_model.default_get(cr, uid, fields, context=context)
-        values[relation_model._rec_name] = relation_value            
+        values[relation_model._rec_name] = relation_value
         return relation_model.create(cr, uid, values, context=context)
 
     def edi_import_relation(self, cr, uid, relation_model, relation_value, xml_id=None, context=None):
@@ -442,13 +436,13 @@ class edi(object):
             xml_id = '%s.%s' % (module, xml_id)
         if not xml_id:
             xml_id = self.edi_xml_id(cr, uid, relation, context=context)
-        
+
         #TODO: update record from values ?
         #relation_id = model_data._update(cr, uid, relation_model, module, values, xml_id=xml_id, context=context)
         return relation and relation.id or False
-        
+
     def edi_import(self, cr, uid, edi_document, context=None):
-    
+
         """Imports a list of dicts representing an edi.document, using the
            generic algorithm.
 
@@ -492,7 +486,7 @@ class edi(object):
              For each pair in the M2M:
                  a. Perform the same steps as for a Many2One (see 1.2.1.1)
                  b. After finding the database ID of the final record in the database,
-                    connect it to the parent record via a write value like (4, db_id).        
+                    connect it to the parent record via a write value like (4, db_id).
         """
         # generic implementation!
         model_data = self.pool.get('ir.model.data')
@@ -508,8 +502,8 @@ class edi(object):
                     continue
                 if not field.startswith('__'):
                     _column = _columns[field].column
-                    _column_dict = fields.field_to_dict(self, cr, uid, context, _column)
-                
+                    _column_dict = fields.field_to_dict(self, cr, uid, _column, context=context)
+
                     edi_field_value = datas[field]
                     field_type = _column_dict['type']
                     relation_model = _column_dict.get('relation')
@@ -544,21 +538,21 @@ class edi(object):
                         for edi_parent_document in edi_parent_documents:
                             relation_id = self.edi_import_relation(cr, uid, relation_model, edi_parent_document[1], edi_parent_document[0], context=context)
                             parent_lines.append(relation_id)
-                            
-                        if len(parent_lines):   
+
+                        if len(parent_lines):
                             if field_type == 'many2one':
                                 values[field] = parent_lines[0]
-                                
+
                             else:
                                 many2many_ids = []
                                 for m2m_id in parent_lines:
                                     many2many_ids.append((4, m2m_id))
                                 values[field] = many2many_ids
-                    
+
                     else:
                         values[field] = edi_field_value
             return module, xml_id2, values
-        
+
         module, xml_id, data_values = process(edi_document, self._name)
         return model_data._update(cr, uid, self._name, module, data_values, xml_id=xml_id, context=context)
 # vim: ts=4 sts=4 sw=4 si et
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index c6616cd20bb..f106702cd61 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -277,6 +277,7 @@
             <field model="res.users" name="user_id" search="[('name', '=', u'Thomas Lebrun')]"/>
             <field name="name">Dubois sprl</field>
             <field name="address" eval="[]"/>
+            <field name="opt_out" eval="True"/>
             <field name="website">http://www.dubois.be/</field>
         </record>
 
@@ -284,17 +285,20 @@
             <field name="name">Eric Dubois</field>
             <field name="address" eval="[]"/>
             <field name="user_id" ref="user_demo"/>
+            <field name="opt_out" eval="True"/>
         </record>
 
         <record id="res_partner_fabiendupont0" model="res.partner">
             <field name="name">Fabien Dupont</field>
             <field name="address" eval="[]"/>
+            <field name="opt_out" eval="True"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
 
         <record id="res_partner_lucievonck0" model="res.partner">
             <field name="name">Lucie Vonck</field>
             <field name="address" eval="[]"/>
+            <field name="opt_out" eval="True"/>
         </record>
 
         <record id="res_partner_notsotinysarl0" model="res.partner">
@@ -302,6 +306,7 @@
             <field name="address" eval="[]"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="website">notsotiny.be</field>
+            <field name="opt_out" eval="True"/>
         </record>
 
         <record id="res_partner_theshelvehouse0" model="res.partner">
@@ -309,6 +314,7 @@
             <field eval="[(6,0,[ref('res_partner_category_retailers0')])]" name="category_id"/>
             <field name="address" eval="[]"/>
             <field name="user_id" ref="base.user_root"/>
+            <field name="opt_out" eval="True"/>
         </record>
 
         <record id="res_partner_vickingdirect0" model="res.partner">
@@ -317,6 +323,7 @@
             <field name="supplier">1</field>
             <field name="customer">0</field>
             <field name="address" eval="[]"/>
+            <field name="opt_out" eval="True"/>
             <field name="website">vicking-direct.be</field>
         </record>
 
@@ -326,6 +333,7 @@
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
             <field name="address" eval="[]"/>
+            <field name="opt_out" eval="True"/>
             <field name="website">woodywoodpecker.com</field>
         </record>
 
@@ -334,6 +342,7 @@
             <field eval="[(6,0,[ref('res_partner_category_consumers0')])]" name="category_id"/>
             <field name="address" eval="[]"/>
             <field name="user_id" ref="base.user_root"/>
+            <field name="opt_out" eval="True"/>
             <field name="website">http://www.zerooneinc.com/</field>
         </record>
 
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 7b14768fc9e..09112f884fd 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -87,7 +87,6 @@ class edi(netsvc.ExportService):
 
     def __init__(self, name="edi"):
         netsvc.ExportService.__init__(self, name)
-        self.joinGroup("web-services")
 
     def dispatch(self, method, auth, params):
         if method in ['import_edi_document',  'import_edi_url']:

From 4e0efdbb3034e39f6c98cc72c58323d149452ce8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 30 Sep 2011 17:31:10 +0200
Subject: [PATCH 102/304] [FIX] standalone client default threading

bzr revid: xmo@openerp.com-20110930153110-u9s2yle90ygoozf3
---
 openerp-web.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp-web.py b/openerp-web.py
index 1a349fa601c..c4e6012fb1f 100755
--- a/openerp-web.py
+++ b/openerp-web.py
@@ -40,7 +40,7 @@ server_options.add_option('--no-serve-static', dest='serve_static',
                           default=True, action='store_false',
                           help="Do not serve static files via this server")
 server_options.add_option('--multi-threaded', dest='threaded',
-                          default=True, action='store_true',
+                          default=False, action='store_true',
                           help="Spawn one thread per HTTP request")
 server_options.add_option('--proxy-mode', dest='proxy_mode',
                           default=False, action='store_true',

From 5ad882f880da21726e23a0f5296d388290a98bd7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 30 Sep 2011 17:31:10 +0200
Subject: [PATCH 103/304] [FIX] standalone client default threading

bzr revid: xmo@openerp.com-20110930153110-k0pps1wl9d2o12c1
---
 openerp-web.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp-web.py b/openerp-web.py
index 1a349fa601c..c4e6012fb1f 100755
--- a/openerp-web.py
+++ b/openerp-web.py
@@ -40,7 +40,7 @@ server_options.add_option('--no-serve-static', dest='serve_static',
                           default=True, action='store_false',
                           help="Do not serve static files via this server")
 server_options.add_option('--multi-threaded', dest='threaded',
-                          default=True, action='store_true',
+                          default=False, action='store_true',
                           help="Spawn one thread per HTTP request")
 server_options.add_option('--proxy-mode', dest='proxy_mode',
                           default=False, action='store_true',

From 7c93366eab218bdc21029808a024c87c21ff491b Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 30 Sep 2011 17:46:46 +0200
Subject: [PATCH 104/304] [FIX] Update the categories of some modules

bzr revid: stw@openerp.com-20110930154646-9tr60seb389nw3yd
---
 addons/account_budget/__openerp__.py       | 2 +-
 addons/account_voucher/__openerp__.py      | 2 +-
 addons/association/__openerp__.py          | 3 +--
 addons/auction/__openerp__.py              | 2 +-
 addons/base_report_creator/__openerp__.py  | 2 +-
 addons/base_report_designer/__openerp__.py | 2 +-
 addons/crm_profiling/__openerp__.py        | 2 +-
 addons/delivery/__openerp__.py             | 2 +-
 addons/email_template/__openerp__.py       | 2 +-
 addons/event_project/__openerp__.py        | 2 +-
 addons/fetchmail/__openerp__.py            | 2 +-
 addons/idea/__openerp__.py                 | 2 +-
 addons/import_sugarcrm/__openerp__.py      | 2 +-
 addons/lunch/__openerp__.py                | 2 +-
 addons/marketing/__openerp__.py            | 2 +-
 addons/marketing_campaign/__openerp__.py   | 2 +-
 addons/outlook/__openerp__.py              | 2 +-
 addons/pad/__openerp__.py                  | 2 +-
 addons/point_of_sale/__openerp__.py        | 2 +-
 addons/product_expiry/__openerp__.py       | 2 +-
 addons/sale_crm/__openerp__.py             | 2 +-
 addons/share/__openerp__.py                | 2 +-
 addons/stock/__openerp__.py                | 2 +-
 addons/stock_location/__openerp__.py       | 2 +-
 addons/subscription/__openerp__.py         | 2 +-
 addons/survey/__openerp__.py               | 2 +-
 addons/thunderbird/__openerp__.py          | 2 +-
 addons/wiki/__openerp__.py                 | 2 +-
 addons/wiki_sale_faq/__openerp__.py        | 2 +-
 29 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index 889935e7528..3e4318b7da9 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Budget Management',
     'version': '1.0',
-    'category': 'Accounting & Finance',
+    'category': 'Project Management',
     'complexity': "normal",
     'description': """
 This module allows accountants to manage analytic and crossovered budgets.
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 53fde3da8dc..87d009d2e14 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -32,7 +32,7 @@ Account Voucher module includes all the basic requirements of Voucher Entries fo
     * Voucher Receipt
     * Cheque Register
     """,
-    "category" : "Accounting & Finance",
+    "category" : "Manufacturing",
     "website" : "http://tinyerp.com",
     "images" : ["images/customer_payment.jpeg","images/journal_voucher.jpeg","images/sales_receipt.jpeg","images/supplier_voucher.jpeg"],
     "depends" : ["account"],
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index 51d44bf681d..ba70167fd24 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -23,8 +23,7 @@
 {
     'name': 'Association profile',
     'version': '0.1',
-    'category': 'General',
-    'category': 'Profile',
+    'category': 'Associations',
     '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 e1ceaf9921c..b1deafca157 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Auction Management',
     'version': '1.0',
-    'category': 'General',
+    'category': 'Associations',
     'complexity': "normal",
     'description': """
 This module manages the records of artists, auction articles, buyers and sellers.
diff --git a/addons/base_report_creator/__openerp__.py b/addons/base_report_creator/__openerp__.py
index 6c0a01f78fd..57aa22b95f4 100644
--- a/addons/base_report_creator/__openerp__.py
+++ b/addons/base_report_creator/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Statistical Report Creator',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Advanced Reporting',
     'complexity': "expert",
     'description': """
 This module allows you to create any statistic report on several objects.
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index c5bbbbd34ec..24a7d093b78 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'OpenOffice Report Designer Interface',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Advanced Reporting',
     'complexity': "normal",
     'description': """
 This module is used along with OpenERP OpenOffice Plugin.
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 70d30ae3cae..2ca6b5ec7c3 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'CRM Profiling Management - To Perform Segmentation within Partners',
     'version': '1.3',
-    'category': 'Customer Relationship Management',
+    'category': 'Marketing',
     'complexity': "easy",
     'description': """
 This module allows users to perform segmentation within partners.
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index fd03eb81c60..b110b8e6172 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Carriers and Deliveries',
     'version': '1.0',
-    'category': 'Warehouse Management',
+    'category': 'Sales Management',
     'complexity': "normal",
     'description': """
 Allows you to add delivery methods in sale orders and picking.
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index e5f83f9ac0c..f3ada96563f 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.1",
     "author" : "Openlabs",
     "website" : "http://openerp.com",
-    "category" : "Tools",
+    "category" : "Marketing",
     'complexity': "expert",
     "depends" : ['mail'],
     "description": """
diff --git a/addons/event_project/__openerp__.py b/addons/event_project/__openerp__.py
index ddd32c37631..2fbb280083f 100644
--- a/addons/event_project/__openerp__.py
+++ b/addons/event_project/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Event Project - Create Retro-Planning to manage your Events',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Associations',
     'complexity': "easy",
     'description': """
 Organization and management of events.
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 986c3bc12a1..d27199b1b30 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "depends" : ["base", 'mail'],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Customer Relationship Management',
     "description": """
 Retrieve incoming email on POP / IMAP servers
 =============================================
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 2a561a93b81..2e40992f2cf 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Idea Manager',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'complexity': "easy",
     'description': """
 This module allows your user to easily and efficiently participate in enterprise innovation.
diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py
index 2c36ec77bfa..ff083e94bb4 100644
--- a/addons/import_sugarcrm/__openerp__.py
+++ b/addons/import_sugarcrm/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Import SugarCRM Data into OpenERP Module.',
     'version': '1.0',
-    'category': 'Tools/Importation',
+    'category': 'Customer Relationship Management',
     'description': """This Module Import SugarCRM "Leads", "Opportunities", "Users", "Accounts", 
             "Contacts", "Employees", Meetings, Phonecalls, Emails, and Project, Project Tasks Data into OpenERP Module.""",
     'author': 'OpenERP SA',
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index d2f91c6f040..16d3129f3b7 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -33,7 +33,7 @@
     """,
     "version": "0.1",
     "depends": ["base_tools"],
-    "category" : "Tools",
+    "category" : "Extra Tools",
     'description': """
     The base module to manage lunch
 
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index edb2ac087ed..1f1995c52da 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.1",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category": 'Sales Management',
+    "category": 'Marketing',
     'complexity': "expert",
     "description": """
 Menu for Marketing.
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 86431fbd3ba..c94eaf76356 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -29,7 +29,7 @@
                  "decimal_precision"
                 ],
     "author" : "OpenERP SA",
-    "category": 'Customer Relationship Management',
+    "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/outlook/__openerp__.py b/addons/outlook/__openerp__.py
index e376bcfa34a..08e33734317 100644
--- a/addons/outlook/__openerp__.py
+++ b/addons/outlook/__openerp__.py
@@ -26,7 +26,7 @@
     'author' : 'OpenERP SA',
     'website' : 'http://www.openerp.com/',
     'depends' : ['base', 'mail'],
-    'category' : 'Tools',
+    'category' : 'Customer Relationship Management',
     'description': '''
 This module provides the Outlook Plug-in.
 =========================================
diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index b3429dde329..6d2fcf63fb4 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -2,7 +2,7 @@
 {
     'name': 'Enhanced support for (Ether)Pad attachments',
     'version': '1.0.3',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'complexity': "easy",
     'description': """
 Adds enhanced support for (Ether)Pad attachments in the web client.
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index a03b673893a..cc73364716c 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Point Of Sale',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Marketing',
     'description': """
 This module provides a quick and easy sale process.
 ===================================================
diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py
index 68d928708e6..65a9585f684 100644
--- a/addons/product_expiry/__openerp__.py
+++ b/addons/product_expiry/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Products Expiry Date",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Warehouse Management",
+    "category" : "Associations",
     'complexity': "easy",
     "depends" : ["stock"],
     "init_xml" : [],
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 56831f05cbe..60463a20b02 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Creates Sales order from Opportunity',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Customer Relationship Management',
     'complexity': "easy",
     'description': """
 This module adds a shortcut on one or several opportunity cases in the CRM.
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 52ffa165c14..4eb48f69e77 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.5",
     "depends" : ["base", "mail"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Extra 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 5b1d392a592..94b9e10fe73 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -47,7 +47,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
     "website" : "http://www.openerp.com",
     "images" : ["images/stock_forecast_report.png", "images/delivery_orders.jpeg", "images/inventory_analysis.jpeg","images/location.jpeg","images/moves_analysis.jpeg","images/physical_inventories.jpeg","images/warehouse_dashboard.jpeg"],
     "depends" : ["product", "account"],
-    "category" : "Warehouse Management",
+    "category" : "Knowledge Management",
     "init_xml" : [],
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index 025b3b3e881..d70bf098682 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Warehouse Locations Paths',
     'version': '1.0',
-    'category': 'Warehouse Management',
+    'category': 'Manufacturing',
     'description': """
 This module supplements the Warehouse application by effectively implementing Push and Pull inventory flows.
 ============================================================================================================
diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index d2010c47987..478c451b6ff 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Subscription and recurring operations',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'description': """
 Create recurring documents.
 ===========================
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 5a551c28a3d..f9caebd3575 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Survey Module',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'description': """
 This module is used for surveying.
 ==================================
diff --git a/addons/thunderbird/__openerp__.py b/addons/thunderbird/__openerp__.py
index 51e4153e897..e7418cc9265 100644
--- a/addons/thunderbird/__openerp__.py
+++ b/addons/thunderbird/__openerp__.py
@@ -25,7 +25,7 @@
     "author" : ['OpenERP SA', 'Axelor'],
     "website" : "http://www.openerp.com/",
     "depends" : ["base","mail"],
-    "category" : "Tools",
+    "category" : "Customer Relationship Management",
     "description": """
 This module is required for the Thuderbird Plug-in to work properly.
 ====================================================================
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index cf2234b4386..40583faf9a0 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Document Management - Wiki',
     'version': '1.0.1',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "easy",
     'description': """
 The base module to manage documents(wiki).
diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py
index 7d06dc73712..1df773a8c97 100644
--- a/addons/wiki_sale_faq/__openerp__.py
+++ b/addons/wiki_sale_faq/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Wiki - Sale-FAQ',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Customer Relationship Management',
     'complexity': "easy",
     'description': """
 This module provides a Wiki Sales FAQ Template.

From 80caa96c0c5e9bed7012a9fe1d9ecfc5949c704c Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 30 Sep 2011 17:48:44 +0200
Subject: [PATCH 105/304] [FIX] base: add a sequence field in
 ir.module.category

bzr revid: stw@openerp.com-20110930154844-9wgiysywpxwyr3z0
---
 openerp/addons/base/module/module.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 419f0c8b4b9..08e11bcd6a5 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -89,6 +89,7 @@ class module_category(osv.osv):
         'module_nr': fields.function(_module_nbr, method=True, string='Number of Modules', type='integer'),
         'module_ids' : fields.one2many('ir.module.module', 'category_id', 'Modules'),
         'description' : fields.text("Description"),
+        'sequence' : fields.integer('Sequence'),
     }
     _order = 'name'
 module_category()

From 3befd0be34bb8e84bcd190a5b9fa1f893d818209 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 30 Sep 2011 17:49:11 +0200
Subject: [PATCH 106/304] [FIX] base: Add the sequence in the
 ir.module.category records

bzr revid: stw@openerp.com-20110930154911-r3cyw94au06b4xse
---
 openerp/addons/base/module/module_data.xml | 39 ++++++++++++++++------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml
index dc955b8f9f5..c3117caec64 100644
--- a/openerp/addons/base/module/module_data.xml
+++ b/openerp/addons/base/module/module_data.xml
@@ -4,71 +4,85 @@
         <record model="ir.module.category" id="module_category_customer_relationship_management">
             <field name="name">Customer Relationship Management</field>
             <field name="description">Helps you track and manage relations with customers such as leads, requests or issues. Can automatically send reminders, escalate requests or trigger business-specific actions based on standard events.</field>
+            <field name="sequence">1</field>
         </record>
 
         <record model="ir.module.category" id="module_category_sales_management">
             <field name="name">Sales Management</field>
             <field name="description">Helps you handle your quotations, sale orders and invoicing.</field>
+            <field name="sequence">2</field>
         </record>
 
         <record model="ir.module.category" id="module_category_project_management">
             <field name="name">Project Management</field>
             <field name="description">Helps you manage your projects and tasks by tracking them, generating plannings, etc...</field>
+            <field name="sequence">3</field>
         </record>
 
 
         <record model="ir.module.category" id="module_category_knowledge_management">
             <field name="name">Knowledge Management</field>
             <field name="description">Lets you install addons geared towards sharing knowledge with and between your employees.</field>
+            <field name="sequence">4</field>
         </record>
 
         <record model="ir.module.category" id="module_category_warehouse_management">
             <field name="name">Warehouse Management</field>
             <field name="description">Helps you manage your inventory and main stock operations: delivery orders, receptions, etc.</field>
+            <field name="sequence">5</field>
         </record>
 
         <record model="ir.module.category" id="module_category_manufacturing">
             <field name="name">Manufacturing</field>
             <field name="description">Helps you manage your manufacturing processes and generate reports on those processes.</field>
+            <field name="sequence">6</field>
         </record>
 
         <record model="ir.module.category" id="module_category_account_voucher">
             <field name="name">Invoicing &amp; Payments</field>
             <field name="description">Allows you to create your invoices and track the payments. It is an easier version of the accounting module for managers who are not accountants.</field>
+            <field name="sequence">7</field>
         </record>
 
         <record model="ir.module.category" id="module_category_accounting_and_finance">
             <field name="name">Accounting &amp; Finance</field>
             <field name="description">Helps you handle your accounting needs, if you are not an accountant, we suggest you to install only the Invoicing.</field>
+            <field name="sequence">8</field>
         </record>
 
         <record model="ir.module.category" id="module_category_purchase_management">
             <field name="name">Purchase Management</field>
             <field name="description">Helps you manage your purchase-related processes such as requests for quotations, supplier invoices, etc...</field>
+            <field name="sequence">9</field>
         </record>
         <record model="ir.module.category" id="module_category_human_resources">
             <field name="name">Human Resources</field>
             <field name="description">Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more.</field>
-        </record>
-
-        <record model="ir.module.category" id="module_category_point_of_sale">
-            <field name="name">Point of Sales</field>
-            <field name="description">Helps you get the most out of your points of sales with fast sale encoding, simplified payment mode encoding, automatic picking lists generation and more.</field>
-        </record>
-
-        <record model="ir.module.category" id="module_category_marketing">
-            <field name="name">Marketing</field>
-            <field name="description">Helps you manage your marketing campaigns step by step.</field>
+            <field name="sequence">10</field>
         </record>
 
         <record model="ir.module.category" id="module_category_tools">
             <field name="name">Extra Tools</field>
             <field name="description">Lets you install various interesting but non-essential tools like Survey, Lunch and Ideas box.</field>
+            <field name="sequence">11</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_marketing">
+            <field name="name">Marketing</field>
+            <field name="description">Helps you manage your marketing campaigns step by step.</field>
+            <field name="sequence">12</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_point_of_sale">
+            <field name="name">Point of Sales</field>
+            <field name="description">Helps you get the most out of your points of sales with fast sale encoding, simplified payment mode encoding, automatic picking lists generation and more.</field>
+            <field name="sequence">13</field>
         </record>
 
         <record model="ir.module.category" id="module_category_report_designer">
             <field name="name">Advanced Reporting</field>
             <field name="description">Lets you install various tools to simplify and enhance OpenERP's report creation.</field>
+            <field name="sequence">14</field>
         </record>
 
         <record model="ir.module.category" id="module_category_localization">
@@ -80,6 +94,11 @@
             <field name="name">Account Charts</field>
         </record>
 
+        <record model="ir.module.category" id="module_category_associations">
+            <field name="name">Associations</field>
+            <field name="description">Installs a preselected set of OpenERP applications which will help you manage your association more efficiently.</field>
+        </record>
+
 <!--        <record id="ir_ui_view_sc_modules0" model="ir.ui.view_sc">-->
 <!--            <field name="name">Modules</field>-->
 <!--            <field name="resource">ir.ui.menu</field>-->

From c4d51e5acba9af43aee437e24b510a05df3137cc Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 30 Sep 2011 17:49:56 +0200
Subject: [PATCH 107/304] [IMP] base_setup: Set the default modules to load
 when the user selects a category [IMP] base_setup: Show the expert modules
 only if the user is in the extended group

bzr revid: stw@openerp.com-20110930154956-si1rkeiifhh90tqd
---
 addons/base_setup/base_setup.py        | 144 ++++++++++++++++++++-----
 addons/base_setup/base_setup_views.xml |   4 +-
 2 files changed, 119 insertions(+), 29 deletions(-)

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 42fae345959..cc94e946b0c 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -29,13 +29,27 @@ from tools.translate import _
 from lxml import etree
 
 #Application and feature chooser, this could be done by introspecting ir.modules
+DEFAULT_MODULES = {
+    'Customer Relationship Management' : ['crm',],
+    'Sales Management' : ['sale',],
+    'Project Management' : ['project',],
+    'Knowledge Management' : ['document',],
+    'Warehouse Management' : ['stock',],
+    'Manufacturing' : ['mrp',],
+    'Accounting & Finance' : ['account,'],
+    'Purchase Management' : ['purchase,'],
+    'Human Resources' : ['hr',],
+    'Point of Sales' : ['pos',],
+    'Marketing' : ['marketing',],
+}
+
 class base_setup_installer2(osv.osv_memory):
     _name = 'base.setup.installer2'
 
     _inherit = 'res.config.installer'
 
     _columns = {
-        'modules' : fields.text('Modules'),
+        'selection' : fields.text('Selection'),
     }
 
     def fields_get(self, cr, uid, fields=None, context=None):
@@ -47,7 +61,7 @@ class base_setup_installer2(osv.osv_memory):
         fields = {} 
         category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', '!=', 'Localization')]
+                  ('name', 'not in', ('Localization', 'Others', 'Tools'))]
         category_ids = category_proxy.search(cr, uid, domain, context=context)
         for category in category_proxy.browse(cr, uid, category_ids, context=context):
             category_name = 'category_%d' % (category.id,)
@@ -64,7 +78,7 @@ class base_setup_installer2(osv.osv_memory):
             module_name = 'module_%d' % (module.id,)
             module_is_installed = module.state == 'installed'
             title = "%s (%s)" % (module.shortdesc, module.complexity,)
-            title = "%s (%s)" % (module.name, module.complexity,)
+            title = "%s %s (%s)" % (module.shortdesc, module.name, module.complexity,)
 
             fields[module_name] = {
                 'type' : 'boolean',
@@ -94,22 +108,47 @@ class base_setup_installer2(osv.osv_memory):
 
         return result
 
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='from', context=None, toolbar=False, submenu=False):
+
+        def in_extended_view_group(cr, uid, context=None):
+            try:
+                model, group_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_extended')
+            except ValueError:
+                return False
+            return group_id in self.pool.get('res.users').read(cr, uid, uid, ['groups_id'], context=context)['groups_id']
+
         result = super(base_setup_installer2, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
 
         module_category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', '!=', 'Localization')]
-        module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='name asc')
+                  ('name', 'not in', ('Localization', 'Others', 'Tools', 'Base'))]
+        module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='sequence asc')
 
         arch = ['<form string="%s">' % _('Automatic Base Setup')]
-        arch.append('<separator string="%s" colspan="4" />' % _('Categories'))
-        for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
-            readonly = False
-            for module in module_category.module_ids:
-                if module.state == 'installed':
-                    readonly=True
+        arch.append('<separator string="%s" colspan="4" />' % _('Install Applications'))
+        module_proxy = self.pool.get('ir.module.module')
 
+        extended_view = in_extended_view_group(cr, uid, context=context)
+
+        print "extended_view: %r" % (extended_view,)
+        for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
+            domain = [('installable', '=', True),
+                      ('category_id', '=', module_category.id)]
+            if not extended_view:
+                domain.append(('complexity', '!=', 'expert'))
+
+            default_modules = DEFAULT_MODULES.get(module_category.name, False)
+            if default_modules:
+                domain.append(('name', 'not in', default_modules))
+
+            print "domain: %r" % (domain,)
+
+            modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
+            if not modules:
+                continue
+
+            readonly = any(module.state == 'installed' for module in modules)
 
             attributes = {
                 'name' : 'category_%d' % (module_category.id,),
@@ -122,18 +161,43 @@ class base_setup_installer2(osv.osv_memory):
                                                         for key, value in attributes.iteritems()]),))
 
         # Compute the module to show
+
         for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
-            if not module_category.module_ids:
+            domain = [('installable', '=', True),
+                      ('category_id', '=', module_category.id)]
+
+            if not extended_view:
+                domain.append(('complexity', '!=', 'expert'))
+
+            default_modules = DEFAULT_MODULES.get(module_category.name, False)
+            if default_modules:
+                domain.append(('name', 'not in', default_modules))
+
+            print "domain2: %r" % (domain,)
+
+            modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
+
+            if not modules:
                 continue
 
             modifiers = {
                 'invisible' : [('category_%d' % (module_category.id), '=', False)],
-                'readonly' : module.state == 'installed',
             }
-            modifiers = simplejson.dumps(modifiers)
-            arch.append("""<separator string="%s" colspan="4" modifiers='%s'/>""" % (cgi.escape(module_category.name), modifiers))
-            for module in module_category.module_ids:
-                arch.append("""<field name="module_%d" modifiers='%s' />""" % (module.id, modifiers))
+            module_modifiers = dict(modifiers)
+
+            arch.append("""<separator string="%s Features" colspan="4" modifiers='%s'/>""" % (
+                cgi.escape(module_category.name),
+                simplejson.dumps(modifiers))
+            )
+
+            for module in modules:
+                #module_modifiers['readonly'] = module.state == 'installed'
+                #print "module_modifiers: %r %r" % (module.name, module_modifiers,)
+
+                arch.append("""<field name="module_%d" modifiers='%s' />""" % (
+                    module.id,
+                    simplejson.dumps(module_modifiers))
+                )
 
         arch.append(
             '<separator colspan="4" />'
@@ -160,7 +224,7 @@ class base_setup_installer2(osv.osv_memory):
         return getattr(super(base_setup_installer2, self), name)
 
     def _on_change_selection(self, cr, uid, ids, item, value, context=None):
-        print "on_change_selection: %r" % (item,) 
+        #print "on_change_selection: %r" % (item,) 
         if not isinstance(item, basestring) or not value:
             return {}
 
@@ -180,14 +244,18 @@ class base_setup_installer2(osv.osv_memory):
         return {'value': values}
 
     def create(self, cr, uid, values, context=None):
-        module_ids_to_install = [
-            key.split('_')[1]
-            for key, value in values.iteritems()
-            if value == 1 and key.startswith('module_')
-        ]
+        to_install = {'categories' : [], 'modules' : []}
+
+        for key, value in values.iteritems():
+            if value == 1 and (key.startswith('module_') or key.startswith('category_')):
+                kind, identifier = key.split('_')
+                if kind == 'category':
+                    to_install['categories'].append(long(identifier))
+                if kind == 'module':
+                    to_install['modules'].append(long(identifier))
 
         values = {
-            'modules' : simplejson.dumps(module_ids_to_install),
+            'selection' : simplejson.dumps(to_install),
         }
         context.update(dont_compute_virtual_attributes=True)
         return super(base_setup_installer2, self).create(cr, uid, values, context=context)
@@ -196,7 +264,7 @@ class base_setup_installer2(osv.osv_memory):
         STATES = ('installed',)
 
         module_proxy = self.pool.get('ir.module.module')
-        module_ids = module_proxy.search(cr, uid, [], context=context)
+        module_ids = module_proxy.search(cr, uid, [('installable', '=', False)], context=context)
 
         modules = {}
         for module in module_proxy.browse(cr, uid, module_ids, context=context):
@@ -235,15 +303,35 @@ class base_setup_installer2(osv.osv_memory):
         return to_install_modules
 
     def apply_cb(self, cr, uid, ids, context=None):
+        category_proxy = self.pool.get('ir.module.category')
         for installer in self.browse(cr, uid, ids, context=context):
-            modules_to_install = simplejson.loads(installer.modules)
+            to_install = simplejson.loads(installer.selection)
+
             proxy = self.pool.get('ir.module.module')
 
-            module_ids = proxy.search(cr, uid, [('id', 'in', modules_to_install)], context=context)
+            module_ids = proxy.search(cr, uid, [('id', 'in', to_install['modules'])], context=context)
             modules = set(record['name']
                           for record in proxy.read(cr, uid, module_ids, ['name'], context=context))
 
-            modules = self._get_modules_to_install(cr, uid, list(modules), context=context)
+            category_ids = category_proxy.search(cr, uid, [('id', 'in', to_install['categories'])], context=context)
+            selected_categories = set(record['name']
+                                      for record in category_proxy.read(cr, uid, category_ids, ['name'], context=context))
+
+            # Workaround :(
+            # FIXME: Use a workaround, but can do better
+            #import pdb
+            #pdb.set_trace()
+            for category_name, default_modules in DEFAULT_MODULES.iteritems():
+                if category_name in selected_categories:
+                    modules.update(default_modules)
+
+            if 'sale' in modules and 'crm' in modules:
+                modules.add('sale_crm')
+            if 'sale' in modules and 'project' in modules:
+                modules.add('project_mrp')
+
+            # The current code has a bug
+            # modules = self._get_modules_to_install(cr, uid, list(modules), context=context)
 
             module_ids = proxy.search(cr, uid, [('name', 'in', list(modules))], context=context)
 
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 4fc0a075664..ee2fb121a5d 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -2,7 +2,7 @@
   <data>
 
       <record model="ir.actions.act_window" id="action_base_setup_installer2">
-          <field name="name">base.setup.installer2</field>
+          <field name="name">Install Applications (beta)</field>
           <field name="res_model">base.setup.installer2</field>
           <field name="view_type">form</field>
           <field name="view_mode">form</field>
@@ -11,6 +11,8 @@
 
       <record id="todo_base_setup_installer2" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_installer2" />
+        <field name="category_id" ref="base.category_administration_config"/>
+        <field name="sequence">2</field>
       </record>
 
     <record id="view_base_setup_installer" model="ir.ui.view">

From 98c24848e5e855c175185881a00d272556bd1e4e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 30 Sep 2011 23:05:49 +0200
Subject: [PATCH 108/304] [IMP] edi: missing access rights

bzr revid: odo@openerp.com-20110930210549-wzct536me8wxvjyg
---
 openerp/addons/base/security/ir.model.access.csv | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index 659938a73a3..56e6c1b2408 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -127,3 +127,5 @@
 "access_ir_mail_server_all","ir_mail_server","model_ir_mail_server",,1,0,0,0
 "access_ir_actions_todo_category","ir_actions_todo_category","model_ir_actions_todo_category","group_system",1,1,1,1
 "access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0
+"access_ir_edi_all_read","access_ir_edi_all_read","model_ir_edi_document",,1,0,0,0
+"access_ir_edi_employee_create","access_ir_edi_employee_create","model_ir_edi_document","group_user",1,0,1,0

From 0453878cf3663a9f59346fca53f4f13dee156b50 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 30 Sep 2011 23:06:51 +0200
Subject: [PATCH 109/304] [IMP] ir.mail_server: build_email support for
 alternative body content

bzr revid: odo@openerp.com-20110930210651-jkkskerjt1fb4s9p
---
 openerp/addons/base/ir/ir_mail_server.py | 25 ++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index 96fa9f52a88..8da0f34f0f9 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -236,15 +236,18 @@ class ir_mail_server(osv.osv):
         return connection
 
     def build_email(self, email_from, email_to, subject, body, email_cc=None, email_bcc=None, reply_to=False,
-               attachments=None, message_id=None, references=None, object_id=False, subtype='plain', headers=None):
+               attachments=None, message_id=None, references=None, object_id=False, subtype='plain', headers=None,
+               body_alternative=None, subtype_alternative='plain'):
         """Constructs an RFC2822 email.message.Message object based on the keyword arguments passed, and returns it.
 
            :param string email_from: sender email address
            :param list email_to: list of recipient addresses (to be joined with commas) 
            :param string subject: email subject (no pre-encoding/quoting necessary)
-           :param string body: email body, according to the ``subtype`` (by default, plaintext).
+           :param string body: email body, of the type ``subtype`` (by default, plaintext).
                                If html subtype is used, the message will be automatically converted
-                               to plaintext and wrapped in multipart/alternative.
+                               to plaintext and wrapped in multipart/alternative, unless an explicit
+                               ``body_alternative`` version is passed.
+           :param string body_alternative: optional alternative body, of the type specified in ``subtype_alternative``
            :param string reply_to: optional value of Reply-To header
            :param string object_id: optional tracking identifier, to be included in the message-id for
                                     recognizing replies. Suggested format for object-id is "res_id-model",
@@ -252,6 +255,8 @@ class ir_mail_server(osv.osv):
            :param string subtype: optional mime subtype for the text body (usually 'plain' or 'html'),
                                   must match the format of the ``body`` parameter. Default is 'plain',
                                   making the content part of the mail "text/plain".
+           :param string subtype_alternative: optional mime subtype of ``body_alternative`` (usually 'plain'
+                                              or 'html'). Default is 'plain'.
            :param list attachments: list of (filename, filecontents) pairs, where filecontents is a string
                                     containing the bytes of the attachment
            :param list email_cc: optional list of string values for CC header (to be joined with commas)
@@ -276,7 +281,7 @@ class ir_mail_server(osv.osv):
         if not body: body = u''
 
         email_body_utf8 = ustr(body).encode('utf-8')
-        email_text_part = MIMEText(email_body_utf8 or '', _subtype=subtype, _charset='utf-8')
+        email_text_part = MIMEText(email_body_utf8, _subtype=subtype, _charset='utf-8')
         msg = MIMEMultipart()
 
         if not message_id:
@@ -304,13 +309,21 @@ class ir_mail_server(osv.osv):
         for key, value in headers.iteritems():
             msg[ustr(key).encode('utf-8')] = encode_header(value)
 
-        if html2text and subtype == 'html':
-            # Always provide alternative text body if possible.
+        if subtype == 'html' and not body_alternative and html2text:
+            # Always provide alternative text body ourselves if possible.
             text_utf8 = tools.html2text(email_body_utf8.decode('utf-8')).encode('utf-8')
             alternative_part = MIMEMultipart(_subtype="alternative")
             alternative_part.attach(MIMEText(text_utf8, _charset='utf-8', _subtype='plain'))
             alternative_part.attach(email_text_part)
             msg.attach(alternative_part)
+        elif body_alternative:
+            # Include both alternatives, as specified, within a multipart/alternative part
+            alternative_part = MIMEMultipart(_subtype="alternative")
+            body_alternative_utf8 = ustr(body_alternative).encode('utf-8')
+            alternative_body_part = MIMEText(body_alternative_utf8, _subtype=subtype_alternative, _charset='utf-8')
+            alternative_part.attach(alternative_body_part)
+            alternative_part.attach(email_text_part)
+            msg.attach(alternative_part)
         else:
             msg.attach(email_text_part)
 

From bdf846b53539167de26456a185a2c0bda42a7585 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 30 Sep 2011 23:07:44 +0200
Subject: [PATCH 110/304] [FIX] edi: ir.model.data creation should be done as
 super-user

bzr revid: odo@openerp.com-20110930210744-7eb3ebwk5czfxbm5
---
 openerp/addons/base/ir/ir_edi.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 6efdd64d5a0..6bc28f69778 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -19,15 +19,16 @@
 #
 ##############################################################################
 
-from osv import osv,fields
+import base64
 import hashlib
 import json
 import time
-import base64
 import urllib2
+
+import openerp
 import openerp.release as release
+from osv import osv,fields
 from tools.translate import _
-import netsvc
 
 def split_xml_id(xml_id):
     assert len(xml_id.split('.'))==2, \
@@ -117,7 +118,7 @@ class ir_edi_document(osv.osv):
         res = []
         for edi_document in edi_documents:
             module = edi_document.get('__module')
-            if not ir_module.search(cr, uid, [('name','=',module),('state','=','installed')]):
+            if module != 'base' and not ir_module.search(cr, uid, [('name','=',module),('state','=','installed')]):
                 raise osv.except_osv(_('Missing Application'),
                             _("The document you are trying to import requires the OpenERP `%s` application. "
                               "The OpenERP configuration assistant will help with this if you are connected as an administrator.")%(module,))
@@ -221,7 +222,7 @@ class edi(object):
                 uuid = safe_unique_id(db_uuid, record._name, record.id)
                 xml_id = '%s:%s.%s' % (db_uuid, record._module, uuid)
             module, xml_id2 = split_xml_id(xml_id)
-            xml_record_id = model_data_pool.create(cr, uid, {
+            xml_record_id = model_data_pool.create(cr, openerp.SUPERUSER_ID, {
                 'name': xml_id2,
                 'model': record._name,
                 'module': module,

From 0489f83a445f5c50aa9f2901d88b9b5f8499607d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 1 Oct 2011 00:23:55 +0200
Subject: [PATCH 111/304] [IMP] orm: rename/cleanup: get_xml_id* ->
 get_external_id*

bzr revid: odo@openerp.com-20110930222355-jtuo4z9dz995emxk
---
 openerp/osv/orm.py | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 2a8553e122b..246187a5424 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -4591,17 +4591,21 @@ class BaseModel(object):
                     return False
         return True
 
-    def _get_xml_ids(self, cr, uid, ids, *args, **kwargs):
-        """Find out the XML ID(s) of any database record.
+    def _get_external_ids(self, cr, uid, ids, *args, **kwargs):
+        """Retrieve the External ID(s) of any database record.
 
         **Synopsis**: ``_get_xml_ids(cr, uid, ids) -> { 'id': ['module.xml_id'] }``
 
-        :return: map of ids to the list of their fully qualified XML IDs
-                 (empty list when there's none).
+        :return: map of ids to the list of their fully qualified External IDs
+                 in the form ``module.key``, or an empty list when there's no External
+                 ID for a record, e.g.::
+
+                     { 'id': ['module.ext_id', 'module.ext_id_bis'],
+                       'id2': [] }
         """
-        model_data_obj = self.pool.get('ir.model.data')
-        data_ids = model_data_obj.search(cr, uid, [('model', '=', self._name), ('res_id', 'in', ids)])
-        data_results = model_data_obj.read(cr, uid, data_ids, ['module', 'name', 'res_id'])
+        ir_model_data = self.pool.get('ir.model.data')
+        data_ids = ir_model_data.search(cr, uid, [('model', '=', self._name), ('res_id', 'in', ids)])
+        data_results = ir_model_data.read(cr, uid, data_ids, ['module', 'name', 'res_id'])
         result = {}
         for id in ids:
             # can't use dict.fromkeys() as the list would be shared!
@@ -4610,29 +4614,35 @@ class BaseModel(object):
             result[record['res_id']].append('%(module)s.%(name)s' % record)
         return result
 
-    def get_xml_id(self, cr, uid, ids, *args, **kwargs):
-        """Find out the XML ID of any database record, if there
+    def get_external_id(self, cr, uid, ids, *args, **kwargs):
+        """Retrieve the External ID of any database record, if there
         is one. This method works as a possible implementation
         for a function field, to be able to add it to any
-        model object easily, referencing it as ``osv.osv.get_xml_id``.
+        model object easily, referencing it as ``Model.get_external_id``.
 
-        When multiple XML IDs exist for a record, only one
+        When multiple External IDs exist for a record, only one
         of them is returned (randomly).
 
-        **Synopsis**: ``get_xml_id(cr, uid, ids) -> { 'id': 'module.xml_id' }``
-
         :return: map of ids to their fully qualified XML ID,
                  defaulting to an empty string when there's none
-                 (to be usable as a function field).
+                 (to be usable as a function field), 
+                 e.g.::
+
+                     { 'id': 'module.ext_id',
+                       'id2': '' }
         """
         results = self._get_xml_ids(cr, uid, ids)
-        for k, v in results.items():
+        for k, v in results.iteritems():
             if results[k]:
                 results[k] = v[0]
             else:
                 results[k] = ''
         return results
 
+    # backwards compatibility
+    get_xml_id = get_external_id
+    _get_xml_ids = _get_external_ids
+
     # Transience
     def is_transient(self):
         """ Return whether the model is transient.

From 7690714df3dcab3b73415375a598c60d129ab177 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 1 Oct 2011 20:26:30 +0200
Subject: [PATCH 112/304] [FIX] missing deps babel and openid

bzr revid: al@openerp.com-20111001182630-g0p3l1bjrl7js9bg
---
 debian/control | 2 +-
 setup.py       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 2fdc8cf90f0..e226f1e8d49 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Package: openerp
 Section: net
 Architecture: all
 Depends:
- ${misc:Depends}, adduser, python, postgresql-client, python-dateutil, python-libxslt1, python-lxml, python-mako, python-psycopg2, python-pychart, python-pydot, python-pyparsing, python-reportlab, python-simplejson python-tz, python-webdav, python-werkzeug, python-yaml
+ ${misc:Depends}, adduser, python, postgresql-client, python-dateutil, python-libxslt1, python-lxml, python-mako, python-openid, python-psycopg2, python-pybabel, python-pychart, python-pydot, python-pyparsing, python-reportlab, python-simplejson python-tz, python-webdav, python-werkzeug, python-yaml
 Conflicts: tinyerp-server, openerp-server
 Replaces: tinyerp-server, openerp-server
 Recommends:
diff --git a/setup.py b/setup.py
index b42c99795b6..df062502785 100755
--- a/setup.py
+++ b/setup.py
@@ -87,9 +87,11 @@ setuptools.setup(
         # (Let setup.py choose the latest one, and we should check we can remove pychart from
         # our tree.) http://download.gna.org/pychart/
         # TODO  'pychart',
+          'babel',
           'feedparser',
           'lxml',
           'mako',
+          'openid',
           'psycopg2',
           'pydot',
           'python-dateutil',

From a0822d02cbc2e16ad4569d78cc15a2416312dd72 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 1 Oct 2011 20:29:37 +0200
Subject: [PATCH 113/304] [FIX] missing deps typo openid

bzr revid: al@openerp.com-20111001182937-szfqkjaki3qf2y6g
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index df062502785..f4e6ddec987 100755
--- a/setup.py
+++ b/setup.py
@@ -91,10 +91,10 @@ setuptools.setup(
           'feedparser',
           'lxml',
           'mako',
-          'openid',
           'psycopg2',
           'pydot',
           'python-dateutil',
+          'python-openid',
           'pytz',
           'pywebdav',
           'pyyaml',

From 372943bd1b0b8b1ad0a8b6324c16a482e5f15120 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 1 Oct 2011 20:34:24 +0200
Subject: [PATCH 114/304] [FIX] missing deps python-ldap

bzr revid: al@openerp.com-20111001183424-ogc61cztbpqyn1b4
---
 debian/control | 2 +-
 setup.py       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index e226f1e8d49..17ff862e0a7 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Package: openerp
 Section: net
 Architecture: all
 Depends:
- ${misc:Depends}, adduser, python, postgresql-client, python-dateutil, python-libxslt1, python-lxml, python-mako, python-openid, python-psycopg2, python-pybabel, python-pychart, python-pydot, python-pyparsing, python-reportlab, python-simplejson python-tz, python-webdav, python-werkzeug, python-yaml
+ ${misc:Depends}, adduser, python, postgresql-client, python-dateutil, python-ldap, python-libxslt1, python-lxml, python-mako, python-openid, python-psycopg2, python-pybabel, python-pychart, python-pydot, python-pyparsing, python-reportlab, python-simplejson python-tz, python-webdav, python-werkzeug, python-yaml
 Conflicts: tinyerp-server, openerp-server
 Replaces: tinyerp-server, openerp-server
 Recommends:
diff --git a/setup.py b/setup.py
index f4e6ddec987..b4039e0bdbd 100755
--- a/setup.py
+++ b/setup.py
@@ -94,6 +94,7 @@ setuptools.setup(
           'psycopg2',
           'pydot',
           'python-dateutil',
+          'python-ldap'
           'python-openid',
           'pytz',
           'pywebdav',

From ddc61228052d52338b1e9fbc5b0d67cdca46e2b5 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 1 Oct 2011 20:37:21 +0200
Subject: [PATCH 115/304] [FIX] missing deps typo

bzr revid: al@openerp.com-20111001183721-3l3c5h1ybbzg2urq
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index b4039e0bdbd..caca2f09889 100755
--- a/setup.py
+++ b/setup.py
@@ -94,7 +94,7 @@ setuptools.setup(
           'psycopg2',
           'pydot',
           'python-dateutil',
-          'python-ldap'
+          'python-ldap',
           'python-openid',
           'pytz',
           'pywebdav',

From f80f45c0beb6a1f748cfca8c35e54df76da34bfa Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 1 Oct 2011 20:44:21 +0200
Subject: [PATCH 116/304] missing deps gdata

bzr revid: al@openerp.com-20111001184421-q1lpdwn8jph9705h
---
 debian/control | 2 +-
 setup.py       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 17ff862e0a7..bdb8490548f 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Package: openerp
 Section: net
 Architecture: all
 Depends:
- ${misc:Depends}, adduser, python, postgresql-client, python-dateutil, python-ldap, python-libxslt1, python-lxml, python-mako, python-openid, python-psycopg2, python-pybabel, python-pychart, python-pydot, python-pyparsing, python-reportlab, python-simplejson python-tz, python-webdav, python-werkzeug, python-yaml
+ ${misc:Depends}, adduser, python, postgresql-client, python-dateutil, python-gdata, python-ldap, python-libxslt1, python-lxml, python-mako, python-openid, python-psycopg2, python-pybabel, python-pychart, python-pydot, python-pyparsing, python-reportlab, python-simplejson python-tz, python-webdav, python-werkzeug, python-yaml
 Conflicts: tinyerp-server, openerp-server
 Replaces: tinyerp-server, openerp-server
 Recommends:
diff --git a/setup.py b/setup.py
index caca2f09889..72625af9811 100755
--- a/setup.py
+++ b/setup.py
@@ -89,6 +89,7 @@ setuptools.setup(
         # TODO  'pychart',
           'babel',
           'feedparser',
+          'gdata',
           'lxml',
           'mako',
           'psycopg2',

From af3097d652afe08db60da3eb055367c0ba8caf44 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 20:46:12 +0200
Subject: [PATCH 117/304] [IMP] config wizards

bzr revid: fp@tinyerp.com-20111001184612-zf8qq67k2zujve27
---
 openerp/addons/base/res/res_config.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml
index 56432f51f7b..007770396f6 100644
--- a/openerp/addons/base/res/res_config.xml
+++ b/openerp/addons/base/res/res_config.xml
@@ -75,10 +75,9 @@
           <group colspan="8" col="8">
             <separator string="" colspan="8"/>
             <group colspan="4" width="220">
-              <field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
             </group>
             <button name="action_skip" icon="gtk-jump-to" special="cancel"
-                    type="object" string="Skip" colspan="1"/>
+                    type="object" string="Cancel" colspan="1"/>
             <button name="action_next" icon="gtk-go-forward"
                     type="object" string="Install Modules" colspan="1"/>
           </group>

From ac214af8d058902d443792ee41cc2e4f9721bb5d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 20:46:25 +0200
Subject: [PATCH 118/304] [IMP] config wizards

bzr revid: fp@tinyerp.com-20111001184625-57er05vgdir4lgwd
---
 addons/account/account.py                          |  3 +--
 addons/account/account_installer.xml               |  2 +-
 addons/account/account_view.xml                    |  6 +++---
 .../base_report_designer_installer.xml             |  4 ++--
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py    |  3 ++-
 addons/thunderbird/thunderbird_installer.xml       | 14 +++++++-------
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 34306b703aa..2f835ddacb3 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2730,7 +2730,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=True),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
-        'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts', required=True),
+        'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Cash and Banks', required=True),
         'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
         'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
         "sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"),
@@ -2778,7 +2778,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
     def _get_default_accounts(self, cr, uid, context=None):
         return [
-            {'acc_name': _('Bank Account'),'account_type':'bank'},
             {'acc_name': _('Cash'),'account_type':'cash'}
         ]
 
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 361a371fb97..a79fddee595 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -26,7 +26,7 @@
                 <group colspan="8" position="inside">
                     <group colspan="4" width="600">
                         <field name="charts"/>
-                            <group colspan="4" groups="base.group_extended">
+                            <group colspan="4" groups="account.group_account_user">
                                 <separator col="4" colspan="4" string="Configure Fiscal Year"/>
                                 <field name="company_id" colspan="4" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                                 <field name="date_start" on_change="on_change_start_date(date_start)"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e5dbbedb9de..ff0fa6447b9 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2388,13 +2388,13 @@
                   </xpath>
                 <group string="res_config_contents" position="replace">
                     <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
-                    <field name ="code_digits" groups="base.group_extended"/>
+                    <field name ="code_digits" groups="account.group_account_user"/>
                     <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
-                    <field name ="seq_journal" groups="base.group_extended"/>
+                    <field name ="seq_journal" groups="account.group_account_user"/>
                     <field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
                     <field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
                     <newline/> <!-- extended view because the web UI is not good for one2many -->
-                    <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="base.group_extended">
+                    <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="account.group_account_user">
                         <form string="Bank Information">
                             <field name="acc_name"/>
                             <field name="account_type"/>
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index b943c35c2ef..2774767af26 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -22,8 +22,8 @@
                 <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
                 <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
               </xpath>
-              <xpath expr="//button[@string='Skip']" position="replace">
-                <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
+              <xpath expr="//button[@string='Cancel']" position="replace">
+                <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
               </xpath>
               <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
                   <attribute name="string"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 1983b75d3f6..5e0fc9a5b36 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -774,7 +774,8 @@ class res_company(osv.osv):
     _inherit = 'res.company'
     _columns = {
         'timesheet_range': fields.selection(
-            [('day','Day'),('week','Week'),('month','Month'),('year','Year')], 'Timesheet range'),
+            [('day','Day'),('week','Week'),('month','Month')], 'Timesheet range',
+            help="Periodicity on which you validate your timesheets."),
         'timesheet_max_difference': fields.float('Timesheet allowed difference(Hours)',
             help="Allowed difference in hours between the sign in/out and the timesheet " \
                  "computation for one sheet. Set this to 0 if you do not want any control."),
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index cf23cdf45c1..2cee4eebaa0 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -17,18 +17,18 @@
               <xpath expr="//label[@string='description']" position="attributes">
                   <attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
               </xpath>
-	          <xpath expr="//button[@string='Install Modules']" position="replace">
+              <xpath expr="//button[@string='Install Modules']" position="replace">
                 <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
                 <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
               </xpath>
-              <xpath expr="//button[@string='Skip']" position="replace">
-                <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
+              <xpath expr="//button[@string='Cancel']" position="replace">
+                <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
               </xpath>
               <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-		  		<attribute name="string"/>
-		  		<attribute name="rowspan">15</attribute>
-		  	  </xpath>
-		  	  <group colspan="8" position="replace">
+                  <attribute name="string"/>
+                  <attribute name="rowspan">15</attribute>
+              </xpath>
+              <group colspan="8" position="replace">
               <group colspan="8" height="450" width="750">
                   <field name="thunderbird" invisible="1"/>
                   <field name="name" invisible="1"/>

From 8a28b0828c27bcefe20170f5a732cb564ca229aa Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 1 Oct 2011 20:57:36 +0200
Subject: [PATCH 119/304] missing deps zsi

bzr revid: al@openerp.com-20111001185736-ttwjp6fmoxcm1syd
---
 debian/control | 24 +++++++++++++++++++++++-
 setup.py       |  1 +
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index bdb8490548f..f8f4e08e7ad 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,29 @@ Package: openerp
 Section: net
 Architecture: all
 Depends:
- ${misc:Depends}, adduser, python, postgresql-client, python-dateutil, python-gdata, python-ldap, python-libxslt1, python-lxml, python-mako, python-openid, python-psycopg2, python-pybabel, python-pychart, python-pydot, python-pyparsing, python-reportlab, python-simplejson python-tz, python-webdav, python-werkzeug, python-yaml
+ ${misc:Depends},
+ adduser,
+ python,
+ postgresql-client,
+ python-dateutil,
+ python-gdata,
+ python-ldap,
+ python-libxslt1,
+ python-lxml,
+ python-mako,
+ python-openid,
+ python-psycopg2,
+ python-pybabel,
+ python-pychart,
+ python-pydot,
+ python-pyparsing,
+ python-reportlab,
+ python-simplejson,
+ python-tz,
+ python-webdav,
+ python-werkzeug,
+ python-yaml,
+ python-zsi
 Conflicts: tinyerp-server, openerp-server
 Replaces: tinyerp-server, openerp-server
 Recommends:
diff --git a/setup.py b/setup.py
index 72625af9811..d52bf951820 100755
--- a/setup.py
+++ b/setup.py
@@ -104,6 +104,7 @@ setuptools.setup(
           'simplejson',
           'vatnumber', # recommended by base_vat
           'werkzeug',
+          'zsi',
       ],
       extras_require = {
           'SSL' : ['pyopenssl'],

From 7c151653f9dde20274013d21f28d9d5412fdfcf7 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 1 Oct 2011 21:05:08 +0200
Subject: [PATCH 120/304] missing deps vobject

bzr revid: al@openerp.com-20111001190508-d276u05j4o1ye0h3
---
 debian/control | 1 +
 setup.py       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index f8f4e08e7ad..7c1da67d3cf 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,7 @@ Depends:
  python-reportlab,
  python-simplejson,
  python-tz,
+ python-vobject,
  python-webdav,
  python-werkzeug,
  python-yaml,
diff --git a/setup.py b/setup.py
index d52bf951820..08c30faf737 100755
--- a/setup.py
+++ b/setup.py
@@ -103,6 +103,7 @@ setuptools.setup(
           'reportlab',
           'simplejson',
           'vatnumber', # recommended by base_vat
+          'vobject',
           'werkzeug',
           'zsi',
       ],

From 8cf0d19c513b83179504daa1c8c249c38e8f426f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 21:21:15 +0200
Subject: [PATCH 121/304] [IMP] useability config wizards

bzr revid: fp@tinyerp.com-20111001192115-mgkx8mbmx34ps5xo
---
 addons/account/account_view.xml               |  3 +-
 addons/base_setup/base_setup_views.xml        |  2 +-
 .../document/wizard/document_configuration.py | 18 +++-------
 .../wizard/document_configuration_view.xml    | 33 ++++++++-----------
 addons/lunch/lunch_installer_view.xml         |  2 +-
 addons/lunch/lunch_view.xml                   |  4 +--
 addons/outlook/outlook_installer.xml          | 16 ++++-----
 addons/thunderbird/thunderbird_installer.xml  | 16 ++++-----
 8 files changed, 37 insertions(+), 57 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ff0fa6447b9..c9a2ef0058b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2375,8 +2375,7 @@
                   <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <separator string="title" position="attributes">
-                <attribute name="string"
-                       >Generate Your Accounting Chart from a Chart Template</attribute>
+                <attribute name="string">Generate Your Chart of Accounts from a Chart Template</attribute>
                   </separator>
                   <xpath expr="//label[@string='description']" position="attributes">
                     <attribute name="string">This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template</attribute>
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index a6059148b51..a27b3f36f99 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -119,7 +119,7 @@
                   <attribute name="string">Define default users preferences</attribute>
             </xpath>
             <xpath expr="//label[@string='description']" position="attributes">
-              <attribute name="string">Specify default values. This will set the default values for each new user, each user is free to change his own preferences.</attribute>
+              <attribute name="string">This will set the default values for all users. After this, user will be free to update his own preferences.</attribute>
             </xpath>
             <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
                   <attribute name="string"/>
diff --git a/addons/document/wizard/document_configuration.py b/addons/document/wizard/document_configuration.py
index 3485e7412c7..97eda4e2d62 100644
--- a/addons/document/wizard/document_configuration.py
+++ b/addons/document/wizard/document_configuration.py
@@ -22,26 +22,16 @@
 from osv import osv, fields
 
 class document_configuration(osv.osv_memory):
-
     _name='document.configuration'
-    _description = 'Auto Directory Configuration'
+    _description = 'Directory Configuration'
     _inherit = 'res.config'
 
-    _columns = {
-        'sale_order' : fields.boolean('Sale Orders', help="Create virtual folders for Sale Orders and Quotations. One virtual folder will appear for each, in which the latest printed PDF document can be downloaded at any time, and where you can manage (view, add, delete) other attachments."),
-        'product' : fields.boolean('Products', help="Create virtual folders for Products. One virtual folder will appear for each product, where you can manage (view, add, delete) the files attached to the product"),
-        'project': fields.boolean('Projects', help="Create virtual folders for Projects. One virtual folder will appear for each project, where you can manage (view, add, delete) the files attached to the project"),
-    }
-
-
     def execute(self, cr, uid, ids, context=None):
-        conf_id = ids and ids[0] or False
-        conf = self.browse(cr, uid, conf_id, context=context)
         dir_pool = self.pool.get('document.directory')
         data_pool = self.pool.get('ir.model.data')
         model_pool = self.pool.get('ir.model')
         content_pool = self.pool.get('document.directory.content')
-        if conf.sale_order and self.pool.get('sale.order'):
+        if self.pool.get('sale.order'):
             # Sale order
             dir_data_id = data_pool._get_id(cr, uid, 'document', 'dir_sale_order_all')
             if dir_data_id:
@@ -90,7 +80,7 @@ class document_configuration(osv.osv_memory):
                 })
 
 
-        if conf.product and self.pool.get('product.product'):
+        if self.pool.get('product.product'):
             # Product
             dir_data_id = data_pool._get_id(cr, uid, 'document', 'dir_product')
             if dir_data_id:
@@ -104,7 +94,7 @@ class document_configuration(osv.osv_memory):
                 'ressource_type_id': mid[0],
             })
 
-        if conf.project and self.pool.get('account.analytic.account'):
+        if self.pool.get('account.analytic.account'):
             # Project
             dir_data_id = data_pool._get_id(cr, uid, 'document', 'dir_project')
             if dir_data_id:
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index eaba3b7115e..a51a7877e60 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -1,31 +1,27 @@
 <openerp>
   <data>
     <record id="view_auto_config_form" model="ir.ui.view">
-        <field name="name">Auto Configure Directory</field>
+        <field name="name">Auto Configure Directories</field>
         <field name="model">document.configuration</field>
         <field name="type">form</field>
         <field name="inherit_id" ref="base.res_config_view_base"/>
         <field name="arch" type="xml">
           <data>
             <form position="attributes">
-              <attribute name="string">Knowledge Application Configuration</attribute>
+                <attribute name="string">Knowledge Application Configuration</attribute>
             </form>
-             <separator string="title" position="attributes">
-            	<attribute name="string">Virtual Document Folders</attribute>
-          	</separator>
-          	<xpath expr="//label[@string='description']" position="attributes">
-            <attribute name="string">OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any document report. A few common virtual folders can be created for you automatically from this screen.</attribute>
-          </xpath>
-          <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-  				<attribute name="rowspan">12</attribute>
-      			<attribute name="string"/>
-	      	</xpath>
+            <separator string="title" position="attributes">
+            <attribute name="string">Configure Direcories</attribute>
+            </separator>
+            <xpath expr="//label[@string='description']" position="attributes">
+            <attribute name="string">OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed.</attribute>
+            </xpath>
+            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                    <attribute name="rowspan">12</attribute>
+                    <attribute name="string"/>
+            </xpath>
             <group string="res_config_contents" position="replace">
-                <group col="6" colspan="4">
-                    <field name="sale_order"/>
-                    <field name="product"/>
-                    <field name="project"/>
-                </group>
+                  <label align="0.0" string="When executing this wizard, it will configure your directories automatically according to modules installed."/>
             </group>
             <xpath expr="//button[@name='action_skip']" position="replace"/>
           </data>
@@ -33,7 +29,7 @@
     </record>
 
     <record id="action_config_auto_directory" model="ir.actions.act_window">
-        <field name="name">Document Management System: Configure Virtual Folders</field>
+        <field name="name">Configure Directories</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">document.configuration</field>
         <field name="view_id" ref="view_auto_config_form"/>
@@ -50,7 +46,6 @@
     <record model="ir.actions.todo" id="config_auto_directory">
         <field name="action_id" ref="action_config_auto_directory"/>
         <field name="category_id" ref="category_knowledge_mgmt_config"/>
-        <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
         <field name="type">automatic</field>
     </record>
   </data>
diff --git a/addons/lunch/lunch_installer_view.xml b/addons/lunch/lunch_installer_view.xml
index 693ac9aa27f..bdb2a9d8163 100644
--- a/addons/lunch/lunch_installer_view.xml
+++ b/addons/lunch/lunch_installer_view.xml
@@ -20,7 +20,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">lunch.cashbox</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
 
         <record id="action_create_cashbox_todo" model="ir.actions.todo">
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 0b2cdf04e89..50932a03437 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -262,7 +262,7 @@
                 <form string="Products">
                      <group col="6">
                           <field name="name" select="1"/>
-                          <field name="category_id" widget="selection"/>
+                          <field name="category_id"/>
                           <field name="price" />
                      </group>
                      <notebook colspan="4">
@@ -300,7 +300,7 @@
             <field name="arch" type="xml">
                 <search string="Products">
                     <field name="name" />
-                    <field name="category_id" widget="selection"/>
+                    <field name="category_id"/>
                     <field name="price"/>
                 </search>
             </field>
diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
index a85a16c245b..80bd2867809 100644
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/outlook/outlook_installer.xml
@@ -8,20 +8,18 @@
             <field name="arch" type="xml">
                 <data>
                     <form position="attributes">
-                        <attribute name="string">Load Outlook Plug-In</attribute>
+                        <attribute name="string">Install Outlook Plug-In</attribute>
                     </form>
                     <separator string="title" position="attributes">
-                        <attribute name="string">Load Outlook Plug-In</attribute>
+                        <attribute name="string">Install Outlook Plug-In</attribute>
                     </separator>
                     <xpath expr="//label[@string='description']" position="attributes">
                         <attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
                     </xpath>
                     <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
-                        <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
                     </xpath>
                     <xpath expr="//button[@string='Skip']" position="replace">
-                        <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
                     </xpath>
                     <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
                         <attribute name="string"/>
@@ -46,7 +44,7 @@
         </record>
 
         <record id="action_outlook_installer" model="ir.actions.act_window">
-            <field name="name">Load Outlook Plug-In</field>
+            <field name="name">Install Outlook Plug-In</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">outlook.installer</field>
             <field name="view_id" ref="view_outlook_installer"/>
@@ -62,7 +60,7 @@
         </record>
 
         <record id="action_outlook_wizard" model="ir.actions.act_window">
-            <field name="name">Load Outlook Plug-In</field>
+            <field name="name">Install Outlook Plug-In</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">outlook.installer</field>
             <field name="view_id" ref="view_outlook_installer"/>
@@ -74,9 +72,9 @@
 
         <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>
 
-        <menuitem id="menu_base_config_plugins_outlook" action="action_outlook_wizard" name="Load Outlook Plug-In" parent="base.menu_base_config_plugins" sequence="10"/>
+        <menuitem id="menu_base_config_plugins_outlook" action="action_outlook_wizard" parent="base.menu_base_config_plugins" sequence="10"/>
 
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1" />
-        <menuitem id="menu_base_config_plugins_outlook_sales" action="action_outlook_wizard" name="Load Outlook Plug-In" parent="base.menu_sales" />
+        <menuitem id="menu_base_config_plugins_outlook_sales" action="action_outlook_wizard" parent="base.menu_sales" />
     </data>
 </openerp>
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 2cee4eebaa0..826906cb6ee 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -9,20 +9,18 @@
       <field name="arch" type="xml">
           <data>
               <form position="attributes">
-                  <attribute name="string">Load Thunderbird Plug-In</attribute>
+                  <attribute name="string">Install Thunderbird Plug-In</attribute>
               </form>
               <separator string="title" position="attributes">
-                   <attribute name="string">Load Thunderbird Plug-In</attribute>
+                   <attribute name="string">Install Thunderbird Plug-In</attribute>
               </separator>
               <xpath expr="//label[@string='description']" position="attributes">
                   <attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
               </xpath>
               <xpath expr="//button[@string='Install Modules']" position="replace">
-                <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
-                <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+                <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
               </xpath>
               <xpath expr="//button[@string='Cancel']" position="replace">
-                <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
               </xpath>
               <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
                   <attribute name="string"/>
@@ -48,7 +46,7 @@
     </record>
 
     <record id="action_thunderbird_installer" model="ir.actions.act_window">
-      <field name="name">Load Thunderbird Plug-In</field>
+      <field name="name">Install Thunderbird Plug-In</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">thunderbird.installer</field>
       <field name="view_id" ref="view_thunderbird_installer"/>
@@ -65,7 +63,7 @@
 
 
     <record id="action_thunderbird_wizard" model="ir.actions.act_window">
-      <field name="name">Load Thunderbird Plug-In</field>
+      <field name="name">Install Thunderbird Plug-In</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">thunderbird.installer</field>
       <field name="view_id" ref="view_thunderbird_installer"/>
@@ -76,9 +74,9 @@
     </record>
 
     <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>
-    <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Load Thunderbird Plug-In" parent="base.menu_base_config_plugins" sequence="10"/>
+    <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" parent="base.menu_base_config_plugins" sequence="10"/>
     <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1" />
-    <menuitem id="menu_base_config_plugins_thunderbird_sales" action="action_thunderbird_wizard" name="Load Thunderbird Plug-In" parent="base.menu_sales" />
+    <menuitem id="menu_base_config_plugins_thunderbird_sales" action="action_thunderbird_wizard" parent="base.menu_sales" />
 
   </data>
 </openerp>

From 49ab1f660cfcad019a199b8edf2605b4d54bd288 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 21:26:12 +0200
Subject: [PATCH 122/304] [IMP] fetchmail useability

bzr revid: fp@tinyerp.com-20111001192612-bgyiugp815evia5r
---
 addons/fetchmail/fetchmail_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 05f62f4b9fb..b322fc40d5c 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -54,7 +54,7 @@
                         <page string="Advanced">
                             <group colspan="2" col="2">
                                 <separator string="Advanced options" colspan="2"/>
-                                <field name="priority"/>
+                                <field name="priority" groups="base.group_extended"/>
                                 <field name="attach"/>
                                 <field name="original"/>
                                 <field name="active" select="1"/>

From 501b02d2b241a0b13607e1f8cce6a0a20c82ab15 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 21:43:03 +0200
Subject: [PATCH 123/304] [IMP] useability views

bzr revid: fp@tinyerp.com-20111001194303-kt62bd25odvl30i6
---
 addons/mail/mail_installer.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_installer.xml b/addons/mail/mail_installer.xml
index 3faf5fad630..022bff6e53b 100644
--- a/addons/mail/mail_installer.xml
+++ b/addons/mail/mail_installer.xml
@@ -2,11 +2,11 @@
 <openerp>
     <data>
         <record model="ir.actions.act_window" id="action_configure_email_server">
-            <field name="name">Configure Email Server</field>
+            <field name="name">Configure Email Servers</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.mail_server</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
 
         <record model="ir.actions.todo" id="config_wizard_action_configure_email_server">

From 26c6e4440b554a06e78eac5bafcc11c3ea5a905a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 21:47:26 +0200
Subject: [PATCH 124/304] [IMP] useability views

bzr revid: fp@tinyerp.com-20111001194726-liqdsa2ga5f48cqn
---
 addons/account/account_bank_view.xml |  4 ++--
 addons/account/account_installer.xml | 13 -------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml
index d91739817ac..57882b3d487 100644
--- a/addons/account/account_bank_view.xml
+++ b/addons/account/account_bank_view.xml
@@ -23,7 +23,7 @@
 
 
     <record id="action_bank_tree" model="ir.actions.act_window">
-        <field name="name">Bank Accounts</field>
+        <field name="name">Setup your Bank Accounts</field>
         <field name="res_model">res.partner.bank</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
@@ -32,7 +32,7 @@
     </record>
     <menuitem
         sequence="0"
-    	parent="account.account_account_menu"
+        parent="account.account_account_menu"
         id="menu_action_bank_tree"
         action="action_bank_tree"/>
 
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index a79fddee595..3fa5ce4061b 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -85,19 +85,6 @@
             <field name="type">automatic</field>
         </record>
 
-        <record id="action_bank_account_configuration_installer" model="ir.actions.act_window">
-            <field name="name">Define your Bank Account</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.partner.bank</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-        </record>
-
-        <record id="bank_account_configuration_todo" model="ir.actions.todo">
-            <field name="action_id" ref="action_bank_account_configuration_installer" />
-            <field name="category_id" ref="category_accounting_configuration" />
-        </record>
-
         <record id="action_view_financial_accounts_installer" model="ir.actions.act_window">
             <field name="name">Review your Financial Accounts</field>
             <field name="type">ir.actions.act_window</field>

From c8a29501e41c3d0d43d2d6c9aad2b8b951a87fe0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 21:51:03 +0200
Subject: [PATCH 125/304] [FIX] remove warnings, better view for mails

bzr revid: fp@tinyerp.com-20111001195103-sd8y0n4t8snzju9o
---
 openerp/addons/base/ir/ir.xml          | 30 +++++++++++---------------
 openerp/addons/base/res/res_partner.py |  2 +-
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 79490542b1c..444a6ffcbbc 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -2010,23 +2010,19 @@
                         <field name="name"/>
                         <field name="sequence"/>
                     </group>
-                    <notebook colspan="4">
-                        <page string="Configuration">
-                            <group col="2" colspan="4">
-                                <separator string="Connection Information" colspan="4"/>
-                                <field name="smtp_host"/>
-                                <field name="smtp_port"/>
-                                <field name="smtp_debug"/>
-                             </group>
-                             <group col="2" colspan="4">
-                                <separator string="Security and Authentication" colspan="2"/>
-                                <field name="smtp_encryption" on_change="on_change_encryption(smtp_encryption)"/>
-                                <field name="smtp_user"/>
-                                <field name="smtp_pass" password="True"/>
-                                <button name="test_smtp_connection" type="object" string="Test Connection" icon="gtk-network" colspan="2"/>
-                            </group>
-                        </page>
-                    </notebook>
+                    <group col="2" colspan="4">
+                        <separator string="Connection Information" colspan="4"/>
+                        <field name="smtp_host"/>
+                        <field name="smtp_port"/>
+                        <field name="smtp_debug" groups="base.group_extended"/>
+                     </group>
+                     <group col="2" colspan="4">
+                        <separator string="Security and Authentication" colspan="2"/>
+                        <field name="smtp_encryption" on_change="on_change_encryption(smtp_encryption)"/>
+                        <field name="smtp_user"/>
+                        <field name="smtp_pass" password="True"/>
+                        <button name="test_smtp_connection" type="object" string="Test Connection" icon="gtk-network" colspan="2"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 4ef582c97f2..9746db40cc1 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -229,7 +229,7 @@ class res_partner(osv.osv):
 
     def address_get(self, cr, uid, ids, adr_pref=['default']):
         address_obj = self.pool.get('res.partner.address')
-        address_ids = address_obj.search(cr, uid, [('partner_id', '=', ids)])
+        address_ids = address_obj.search(cr, uid, [('partner_id', 'in', ids)])
         address_rec = address_obj.read(cr, uid, address_ids, ['type'])
         res = list(tuple(addr.values()) for addr in address_rec)
         adr = dict(res)

From e70a409af1febb0005b2d3348e4996c19781e29c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 22:02:47 +0200
Subject: [PATCH 126/304] [IMP] useability views

bzr revid: fp@tinyerp.com-20111001200247-tqyw0w8zomrq0jil
---
 addons/account/account_bank_view.xml          |  4 +--
 addons/account/account_installer.xml          |  4 +--
 addons/fetchmail/fetchmail.py                 |  4 +--
 addons/fetchmail/fetchmail_installer_view.xml | 25 ++++++++++---------
 addons/fetchmail/fetchmail_view.xml           | 12 ++++-----
 5 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml
index 57882b3d487..81e1ee7c47a 100644
--- a/addons/account/account_bank_view.xml
+++ b/addons/account/account_bank_view.xml
@@ -13,7 +13,7 @@
         <field name="inherit_id" ref="base.view_partner_bank_form"/>
         <field name="arch" type="xml">
             <group name="bank" position="after">
-                <group name="accounting" col="2" colspan="2" attrs="{'invisible': [('company_id','=', False)]}">
+                <group name="accounting" col="2" colspan="2" attrs="{'invisible': [('company_id','=', False)]}" groups="account.group_account_user">
                     <separator string="Accounting Information" colspan="2"/>
                     <field name="journal_id"/>
                 </group>
@@ -28,7 +28,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="context" eval="{'default_partner_id':ref('base.main_partner'), 'company_hide':False, 'default_company_id':ref('base.main_company'), 'search_default_my_bank':1}"/>
-        <field name="help">Configure your company's bank account and select those that must appear on the report footer. You can drag &amp; drop bank in the list view to reorder bank accounts. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
+        <field name="help">Configure your company's bank account and select those that must appear on the report footer. You can reorder banks in the list view. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
     </record>
     <menuitem
         sequence="0"
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 3fa5ce4061b..c7a9f6b4d0a 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -11,7 +11,7 @@
                     <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <separator string="title" position="attributes">
-                    <attribute name="string">Configure Your Accounting Chart</attribute>
+                    <attribute name="string">Configure Your Chart of Accounts</attribute>
                 </separator>
                 <xpath expr="//label[@string='description']" position="attributes">
                     <attribute name="string">The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default.</attribute>
@@ -64,7 +64,7 @@
         </record>
 
         <record id="action_account_configuration_installer" model="ir.actions.act_window">
-            <field name="name">Accounting Chart Configuration</field>
+            <field name="name">Install your Chart of Accounts</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.installer</field>
             <field name="view_id" ref="view_account_configuration_installer"/>
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index f45b5e955a0..e7f7250458b 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -60,10 +60,9 @@ class fetchmail_server(osv.osv):
         'date': fields.datetime('Last Fetch Date', readonly=True),
         'user' : fields.char('Username', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}),
         'password' : fields.char('Password', size=1024, required=True, readonly=True, states={'draft':[('readonly', False)]}),
-        'note': fields.text('Description'),
         'action_id':fields.many2one('ir.actions.server', 'Server Action', help="Optional custom server action to trigger for each incoming mail, "
                                                                                "on the record that was created or updated by this mail"),
-        'object_id': fields.many2one('ir.model', "Target document type", required=True, help="Process each incoming mail as part of a conversation "
+        'object_id': fields.many2one('ir.model', "Create a New Record", required=True, help="Process each incoming mail as part of a conversation "
                                                                                              "corresponding to this document type. This will create "
                                                                                              "new documents for new conversations, or attach follow-up "
                                                                                              "emails to the existing conversations (documents)."),
@@ -73,6 +72,7 @@ class fetchmail_server(osv.osv):
     }
     _defaults = {
         'state': "draft",
+        'type': "pop",
         'active': True,
         'priority': 5,
         'attach': True,
diff --git a/addons/fetchmail/fetchmail_installer_view.xml b/addons/fetchmail/fetchmail_installer_view.xml
index 911ad8101da..b5bd7df80ca 100644
--- a/addons/fetchmail/fetchmail_installer_view.xml
+++ b/addons/fetchmail/fetchmail_installer_view.xml
@@ -1,18 +1,19 @@
 <openerp>
     <data>
-	 <record model="ir.actions.act_window" id="view_email_server_form_installer">
-	        <field name="name">Setup Incoming Mail Server (fetchmail)</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="res_model">fetchmail.server</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,form</field>
-	        <field name="view_id" ref="fetchmail.view_email_server_form"/>
-	    </record>
+     <record model="ir.actions.act_window" id="view_email_server_form_installer">
+            <field name="name">Setup Incoming Mail Servers</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">fetchmail.server</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="False"/>
+            <field name="help">You can connect OpenERP to your incoming mail server so that documents (leads, tasks, issues, etc) are synchronized automatically with your incoming emails.</field>
+        </record>
 
-	    <record id="view_email_server_form_installer_todo" model="ir.actions.todo">
-	        <field name="action_id" ref="view_email_server_form_installer"/>
-	        <field name="category_id" ref="base.category_sales_management_config"/>
-	        <field name="sequence">4</field>
+        <record id="view_email_server_form_installer_todo" model="ir.actions.todo">
+            <field name="action_id" ref="view_email_server_form_installer"/>
+            <field name="category_id" ref="base.category_sales_management_config"/>
+            <field name="sequence">4</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index b322fc40d5c..84bcb5778c4 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -26,7 +26,7 @@
             <field name="arch" type="xml">
                 <form string="Incoming Mail Server">
                     <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="4"/>
+                        <field name="name" select="1"/>
                         <field name="type" select="1" on_change="onchange_server_type(type, is_ssl)"/>
                         <field name="date" select="1"/>
                     </group>
@@ -44,14 +44,12 @@
                                 <field name="password" password="True" />
                             </group>
                             <group col="2" colspan="2">
-                                <separator string="Automated Processing" colspan="2"/>
+                                <separator string="Actions to Perform on Incoming Mails" colspan="2"/>
                                 <field name="object_id"/>
-                                <field name="action_id"/>
+                                <field name="action_id" groups="base.group_extended"/>
                             </group>
-                            <separator string="Description" colspan="4"/>
-                            <field name="note" colspan="4" nolabel="1"/>
                         </page>
-                        <page string="Advanced">
+                        <page string="Advanced" groups="base.group_extended">
                             <group colspan="2" col="2">
                                 <separator string="Advanced options" colspan="2"/>
                                 <field name="priority" groups="base.group_extended"/>
@@ -62,7 +60,7 @@
                         </page>
                     </notebook>
                     <group col="6" colspan="4">
-                        <field name="state" select="1"/>
+                        <field name="state"/>
                         <button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
                         <button string="Test &amp; Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
                         <button string="Fetch Now" type="object" name="fetch_mail" states="done" icon="gtk-network"/>

From d9dc20068892a75ce272d40a7c338805467402c1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 22:10:44 +0200
Subject: [PATCH 127/304] [IMP] useability views

bzr revid: fp@tinyerp.com-20111001201044-pmttdc810josm8a9
---
 addons/account/account_installer.xml              |  2 +-
 addons/base_setup/base_setup.py                   |  2 +-
 addons/base_setup/base_setup_views.xml            | 15 ---------------
 .../document_ics/document_ics_config_wizard.xml   |  3 ---
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index c7a9f6b4d0a..4d0193781ad 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -100,7 +100,7 @@
         </record>
 
         <record id="action_review_financial_journals_installer" model="ir.actions.act_window">
-            <field name="name">Review your Financial Journal</field>
+            <field name="name">Review your Financial Journals</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.journal</field>
             <field name="view_type">form</field>
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 5717df8681f..efa2f9e023c 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -259,7 +259,7 @@ class specify_partner_terminology(osv.osv_memory):
                                  'Choose how to call a Customer', required=True ),
     }
     _defaults={
-               'partner' :'Partner',
+        'partner' :'Customer',
     }
 
     def make_translations(self, cr, uid, ids, name, type, src, value, res_id=0, context=None):
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index a27b3f36f99..97192b67339 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -225,21 +225,6 @@
         <field name="category_id" ref="base.category_administration_config"/>
         <field name="sequence">1</field>
     </record>
-    <!--   register Upload Logo configuration wizard  -->
-    <record id="base_setup_company_logo_action" model="ir.actions.act_window">
-      <field name="name">Upload Your Company Logo</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">res.company</field>
-      <field name="view_id" ref="base.view_company_form"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="context">{'res_id': user.company_id.id}</field>
-    </record>
-    <record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
-        <field name="action_id" ref="base_setup_company_logo_action"/>
-        <field name="category_id" ref="base.category_administration_config"/>
-        <field name="state">done</field>
-    </record>
 
   </data>
 </openerp>
diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml
index a751fb2ca6f..0b31eb85d73 100644
--- a/addons/document_ics/document_ics_config_wizard.xml
+++ b/addons/document_ics/document_ics_config_wizard.xml
@@ -21,9 +21,6 @@
                           <attribute name="rowspan">15</attribute>
                           <attribute name="string"/>
                   </xpath>
-                  <xpath expr="//button[@name='action_next']" position="attributes">
-                    <attribute name="string">Configure</attribute>
-                   </xpath>
                   <group string="res_config_contents" position="replace">
                   <field name="meeting"/>
                   <field name="opportunity"/>

From c1f8ecd7b900b72e1ce21e8fa90e3bed1a3776fd Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 1 Oct 2011 22:13:05 +0200
Subject: [PATCH 128/304] [FIX] avoid hyphen in version

bzr revid: al@openerp.com-20111001201305-50db3aumb3f3fv33
---
 openerp/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/release.py b/openerp/release.py
index dd338902757..23a764bc94c 100644
--- a/openerp/release.py
+++ b/openerp/release.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-version = '6.1-dev'
+version = '6.1dev'
 major_version = '6.1'
 description = 'OpenERP Server'
 long_desc = '''OpenERP is a complete ERP and CRM. The main features are accounting (analytic

From 017d40fc5e4df9abcc71cd9a9e2d9076d344bcf7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 22:17:53 +0200
Subject: [PATCH 129/304] [IMP] useability views

bzr revid: fp@tinyerp.com-20111001201753-cce36q1u5jdbl92z
---
 addons/account/account_installer.xml | 1 +
 addons/account/account_view.xml      | 4 ++--
 addons/hr/hr_installer.xml           | 6 +++---
 addons/hr/hr_view.xml                | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 4d0193781ad..81ec29d4df4 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -105,6 +105,7 @@
             <field name="res_model">account.journal</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">Setup your accounting journals. For bank accounts, it's better to use the 'Setup Your Bank Accounts' tool that will automatically create the accounts and journals for you.</field>
         </record>
 
         <record id="review_financial_journals_todo" model="ir.actions.todo">
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c9a2ef0058b..a158feabbd2 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -438,9 +438,9 @@
                                 <field name="user_id" groups="base.group_extended"/>
                                 <field name="currency"/>
                             </group>
-                            <group colspan="2" col="2">
+                            <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Validations" colspan="4"/>
-                                <field name="allow_date" groups="base.group_extended"/>
+                                <field name="allow_date"/>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Other Configuration" colspan="4"/>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index bd6e7ed3f6b..7e2a36ae8b2 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -32,12 +32,12 @@
 
         <!-- employee configure  action -->
         <record id="action_create_hr_employee_installer" model="ir.actions.act_window">
-            <field name="name">Create your employees</field>
+            <field name="name">Create your Employees</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.employee</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_employee_form"/>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="False"/>
         </record>
 
         <record id="config_wizard_action_create_hr_employee_installer" model="ir.actions.todo">
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 7afa379bf8b..f0399a4f5a3 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -33,7 +33,7 @@
                         <field name="parent_id" />
                         </group>
                         <group colspan="2" col="1">
-                        <field name="photo" widget='image' nolabel="1"/>
+                          <field name="photo" widget='image' nolabel="1"/>
                         </group>
                     </group>
                     <notebook colspan="6">

From e70ce4df3d022b22c76716c24cbb98ed659dc9ac Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 22:28:18 +0200
Subject: [PATCH 130/304] [IMP] useability of some views/default values

bzr revid: fp@tinyerp.com-20111001202818-96m3m5h2o3zktkji
---
 addons/crm/crm_view.xml              |  9 ++++-----
 addons/project/project_installer.xml |  5 +++--
 addons/project/project_view.xml      | 17 ++++++++++++++++-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index c7038958126..61c638d5660 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -64,11 +64,11 @@
                 <form string="Sales Team">
                     <group col="6" colspan="4">
                         <field name="name" select="1" colspan="2"/>
-                        <field name="parent_id" select="2" widget="selection"/>
+                        <field name="parent_id" select="2"/>
                         <field name="code" select="1"/>
                         <newline/>
                         <field name="user_id" select="2"/>
-                        <field name="resource_calendar_id" select="2" widget="selection"/>
+                        <field name="resource_calendar_id" select="2"/>
                         <field name="active" select="2"/>
                     </group>
                     <notebook colspan="4">
@@ -230,7 +230,7 @@
             <field name="arch" type="xml">
                 <form string="Campaign">
                     <field name="name" select="1"/>
-                    <field name="section_id" select="1" widget="selection"/>
+                    <field name="section_id"/>
                 </form>
             </field>
         </record>
@@ -382,7 +382,6 @@
             <field name="arch" type="xml">
                 <group name="default_filters" position="inside">
                     <field name="context_section_id" completion="1"
-                        widget="selection"
                         readonly="0"/>
                 </group>
             </field>
@@ -396,7 +395,7 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <group name="default_filters" position="inside">
-                        <field name="context_section_id" completion="1" widget="selection"/>
+                        <field name="context_section_id" completion="1"/>
                     </group>
                 </field>
         </record>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 3e04b919edd..3150d250562 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -43,7 +43,7 @@
         </record>
 
         <record id="action_configure_default_time_unit" model="ir.actions.act_window">
-            <field name="name">Configure Default Time Unit for Project</field>
+            <field name="name">Setup your Project's Time Unit</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.company</field>
             <field name="view_id" ref="base.view_company_form" />
@@ -62,8 +62,9 @@
             <field name="res_model">project.task.type</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{}</field>
+            <field name="context">{'search_default_common': 1, 'default_project_default': 1}</field>
             <field name="domain">[]</field>
+            <field name="help">The stages can be common to all project or specific to one project. Each task will follow the different stages in order to be closed.</field>
         </record>
 
         <record id="config_wizard_action_review_task_stage" model="ir.actions.todo">
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b19bfaa9797..3a88c8ffb8a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -557,6 +557,21 @@
         </record>
 
         <!-- Task types -->
+        <record id="task_type_search" model="ir.ui.view">
+            <field name="name">project.task.type.search</field>
+            <field name="model">project.task.type</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Tasks Stages">
+                   <group>
+                       <filter icon="terp-check" string="Common" name="common" domain="[('project_default', '=', 1)]" help="Stages common to all projects"/>
+                       <separator orientation="vertical"/>
+                       <field name="name"/>
+                   </group>
+                </search>
+            </field>
+        </record>
+
         <record id="task_type_edit" model="ir.ui.view">
             <field name="name">project.task.type.form</field>
             <field name="model">project.task.type</field>
@@ -564,7 +579,7 @@
             <field name="arch" type="xml">
                 <form string="Task Stage">
                     <group colspan="4" col="6">
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                     <field name="project_default"/>
                     <field name="sequence"/>
                     </group>

From 7a9ba2babd57fa3c218383c51d62f00633d3a2ec Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 22:30:14 +0200
Subject: [PATCH 131/304] [IMP] create additional users is active by default

bzr revid: fp@tinyerp.com-20111001203014-8ivbfso0g177gncg
---
 openerp/addons/base/res/res_config.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml
index 007770396f6..2da5dc32e8e 100644
--- a/openerp/addons/base/res/res_config.xml
+++ b/openerp/addons/base/res/res_config.xml
@@ -21,12 +21,11 @@
          <group colspan="8" col="8">
            <separator string="" colspan="6"/>
            <group colspan="4" width="220">
-             <field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
            </group>
            <button name="action_skip" icon="gtk-jump-to" special="cancel"
-                   type="object" string="Skip" colspan="1"/>
+                   type="object" string="Cancel" colspan="1"/>
            <button name="action_next" icon="gtk-go-forward"
-                   type="object" string="Next" colspan="1"/>
+                   type="object" string="Apply" colspan="1"/>
          </group>
         </form>
       </field>

From f71ff614722f38c8304b1329f25660f12a9b1fa4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 23:12:47 +0200
Subject: [PATCH 132/304] [IMP] useability

bzr revid: fp@tinyerp.com-20111001211247-xbcvy6t5g8w3to13
---
 openerp/addons/base/base_update.xml | 2 +-
 openerp/addons/base/ir/ir.xml       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index c28b73cad0c..ba7ecfb2715 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -196,7 +196,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="context" eval="{'default_partner_id':ref('base.main_partner'), 'company_hide':False, 'default_company_id':ref('base.main_company'), 'search_default_my_bank':1}"/>
-        <field name="help">Configure your company's bank account and select those that must appear on the report footer. You can drag &amp; drop bank in the list view to reorder bank accounts. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
+            <field name="help">Configure your company's bank account and select those that must appear on the report footer. You can drag &amp; drop bank in the list view to reorder bank accounts. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
         </record>
 
 
diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 444a6ffcbbc..a273a04a5ec 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -573,6 +573,8 @@
                                         <field name="view_id"/>
                                     </tree>
                                 </field>
+                                <separator string="View Ordering" colspan="4"/>
+                                <field colspan="4" name="help" nolabel="1">
                             </group>
                         </page>
                         <page string="Security">

From eee9eac9bd3e2043576d112cc472165557055ab2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 23:14:25 +0200
Subject: [PATCH 133/304] [IMP] useability

bzr revid: fp@tinyerp.com-20111001211425-sz6o9eb01yuo1mar
---
 openerp/addons/base/base_update.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index ba7ecfb2715..26f971b8334 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -196,7 +196,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="context" eval="{'default_partner_id':ref('base.main_partner'), 'company_hide':False, 'default_company_id':ref('base.main_company'), 'search_default_my_bank':1}"/>
-            <field name="help">Configure your company's bank account and select those that must appear on the report footer. You can drag &amp; drop bank in the list view to reorder bank accounts. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
+            <field name="help">Configure your company's bank account and select those that must appear on the report footer. You can reorder bank accounts from the list view. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
         </record>
 
 

From ff615022729d20b64680f9ec9f15639d7893d114 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 23:15:29 +0200
Subject: [PATCH 134/304] [IMP] some view should not have group_by...

bzr revid: fp@tinyerp.com-20111001211529-0g2jccon81tbjrry
---
 addons/base_setup/base_setup_views.xml |  5 ++---
 addons/crm/crm.py                      |  5 +++++
 addons/crm/crm_installer_view.xml      |  2 +-
 addons/crm/crm_view.xml                | 10 +++++-----
 addons/fetchmail/fetchmail_view.xml    |  7 -------
 addons/hr/hr_installer.xml             |  7 +++----
 6 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 97192b67339..9c832f1b7cb 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -156,14 +156,13 @@
           <field name="type">ir.actions.act_window</field>
           <field name="res_model">res.users</field>
           <field name="view_type">form</field>
-          <field name="view_mode">form</field>
-          <field name="view_id" ref="base.view_users_form"/>
+          <field name="view_mode">tree,form</field>
+          <field name="view_id" eval="False"/>
       </record>
       <record id="config_wizard_action_config_user_form" model="ir.actions.todo">
           <field name="action_id" ref="action_config_access_other_user"/>
           <field name="category_id" ref="base.category_administration_config"/>
           <field name="sequence">1000</field>
-          <field name="state">done</field>
       </record>
 
 
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 4031f3d9868..bf30cac58fb 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -71,6 +71,7 @@ class crm_case_stage(osv.osv):
         'on_change': fields.boolean('Change Probability Automatically', help="Setting this stage will change the probability automatically on the opportunity."),
         'requirements': fields.text('Requirements'),
         'section_ids':fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', 'Sections'),
+        'case_default': fields.boolean('Common to All Teams', help="If you check this field, this stage will be proposed by default on each sales team. It will not assign this stage to existing teams."),
     }
 
     _defaults = {
@@ -106,10 +107,14 @@ class crm_case_section(osv.osv):
         'working_hours': fields.float('Working Hours', digits=(16,2 )),
         'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
     }
+    def _get_stage_common(self, cr, uid, context):
+        ids = self.pool.get('crm.case.stage').search(cr, uid, [('case_default','=',1)], context=context)
+        return ids
 
     _defaults = {
         'active': lambda *a: 1,
         'allow_unlink': lambda *a: 1,
+        'stage_ids': _get_stage_common
     }
 
     _sql_constraints = [
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 782083e4669..db217cde4a8 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -56,7 +56,7 @@
         <field name="action_id" ref="crm_case_stage_form_installer"/>
         <field name="category_id" ref="base.category_sales_management_config"/>
         <field name="groups_id" eval="[(6, 0, [ref('base.group_extended')])]" />
-        <field name="sequence">10</field>
+        <field name="sequence">9</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 61c638d5660..fc01cfd5a05 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -154,12 +154,12 @@
             <field name="priority" eval="1"/>
             <field name="arch" type="xml">
                 <form string="Stage">
-                    <separator string="Stage Definition" colspan="4"/>
-                    <field name="name" select="1"/>
-                    <field name="sequence"/>
-                    <field name="probability"/>
-                    <group colspan="4" col="2" >
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="probability"/>
                         <field name="on_change"/>
+                        <field name="case_default"/>
+                        <field name="sequence"/>
                     </group>
                     <separator string="Requirements" colspan="4"/>
                     <field name="requirements" nolabel="1" colspan="4"/>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 84bcb5778c4..61992629b2a 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -81,13 +81,6 @@
                     <filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/>
                     <separator orientation="vertical"/>
                     <field name="name"/>
-                    <field name="object_id"/>
-                    <newline/>
-                    <group expand="0" string="Group By..." groups="base.group_extended">
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 7e2a36ae8b2..d2c235313d0 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -43,17 +43,16 @@
         <record id="config_wizard_action_create_hr_employee_installer" model="ir.actions.todo">
             <field name="action_id" ref="action_create_hr_employee_installer"/>
             <field name="category_id" ref="category_hr_management_config"/>
-        </record>            
-
+        </record>
 
         <record model="ir.actions.act_window" id="view_department_form_installer">
-            <field name="name">Define Your Department Structure</field>
+            <field name="name">Create Your Departments</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.department</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="hr.view_department_tree"/>
-            <field name="help">Your Company's Department Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc.</field>
+            <field name="help">Your departments structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc.</field>
         </record>
 
         <record id="view_department_form_todo" model="ir.actions.todo">

From 2974459cb6da49fb477ee475a980743301c1f740 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 23:18:13 +0200
Subject: [PATCH 135/304] [IMP] improved views of config wizards

bzr revid: fp@tinyerp.com-20111001211813-qr5ova5jfecto9j7
---
 addons/base_setup/base_setup_views.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 9c832f1b7cb..6824de60bcb 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -113,13 +113,13 @@
           <field name="arch" type="xml">
             <data>
               <form position="attributes">
-                <attribute name="string">Define default users preferences</attribute>
+                <attribute name="string">Define Users's Preferences</attribute>
               </form>
             <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
-                  <attribute name="string">Define default users preferences</attribute>
+                  <attribute name="string">Define Users's Preferences</attribute>
             </xpath>
             <xpath expr="//label[@string='description']" position="attributes">
-              <attribute name="string">This will set the default values for all users. After this, user will be free to update his own preferences.</attribute>
+              <attribute name="string">This will set the default preferences for all users. After this, each user will be able to update his own preferences.</attribute>
             </xpath>
             <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
                   <attribute name="string"/>

From c271931682c7bb22e03619a14b778b1490dbe290 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 23:20:00 +0200
Subject: [PATCH 136/304] [IMP] improved views of config wizards

bzr revid: fp@tinyerp.com-20111001212000-koul7fq12hdxbwvw
---
 addons/base_setup/base_setup.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index efa2f9e023c..a87e4e24e39 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -247,16 +247,16 @@ class specify_partner_terminology(osv.osv_memory):
     _name = 'base.setup.terminology'
     _inherit = 'res.config'
     _columns = {
-        'partner': fields.selection([('Customer','Customer'),
-                                  ('Client','Client'),
-                                  ('Member','Member'),
-                                  ('Patient','Patient'),
-                                  ('Partner','Partner'),
-                                  ('Donor','Donor'),
-                                  ('Guest','Guest'),
-                                  ('Tenant','Tenant')
-                                  ],
-                                 'Choose how to call a Customer', required=True ),
+        'partner': fields.selection([
+            ('Customer','Customer'),
+            ('Client','Client'),
+            ('Member','Member'),
+            ('Patient','Patient'),
+            ('Partner','Partner'),
+            ('Donor','Donor'),
+            ('Guest','Guest'),
+            ('Tenant','Tenant')
+        ], 'How do you call a Customer', required=True ),
     }
     _defaults={
         'partner' :'Customer',

From 5034f761436f44b75e898523b6a9bfe020f79a91 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 23:23:18 +0200
Subject: [PATCH 137/304] [IMP] improved views of config wizards

bzr revid: fp@tinyerp.com-20111001212318-jmknm2qorrb39gin
---
 addons/account/account.py       | 2 +-
 addons/account/account_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index b5d52dc680f..c22c8c58413 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -372,7 +372,7 @@ class account_account(osv.osv):
         'balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Balance', multi='balance'),
         'credit': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Credit', multi='balance'),
         'debit': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'),
-        'reconcile': fields.boolean('Reconcile', help="Check this if the user is allowed to reconcile entries in this account."),
+        'reconcile': fields.boolean('Allow Reconciliation', help="Check this box if this account allows reconciliation of journal items."),
         'shortcut': fields.char('Shortcut', size=12),
         'tax_ids': fields.many2many('account.tax', 'account_account_tax_default_rel',
             'account_id', 'tax_id', 'Default Taxes'),
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a158feabbd2..6c901dd8a88 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -169,10 +169,10 @@
                     <field name="parent_id"/>
                     <field name="type" select="1"/>
                     <field name="user_type" select="1"/>
+                    <field name="active" groups="base.group_extended" />
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
-                            <field name="active" groups="base.group_extended" />
                             <newline/>
                             <group col="2" colspan="2">
                                 <separator string="Currency" colspan="2"/>

From 5284a4148c7885ad691e029b92f6f3ea440c2fbd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 23:24:41 +0200
Subject: [PATCH 138/304] [IMP] improved views of config wizards

bzr revid: fp@tinyerp.com-20111001212441-sxkwa82hgn5447fq
---
 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 6c901dd8a88..30b6b52c150 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -209,7 +209,6 @@
                         <field name="code"/>
                         <field name="name"/>
                         <field name="user_type"/>
-                        <field name="type"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">

From 4581faccf40366aea6f848521d78be9784eda4c2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 23:32:52 +0200
Subject: [PATCH 139/304] [IMP] config wizards useability

bzr revid: fp@tinyerp.com-20111001213252-po9zv1ib7m2pwp8f
---
 addons/account/account_installer.xml | 1 +
 addons/crm/crm_installer_view.xml    | 1 +
 addons/crm/crm_lead_data.xml         | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 81ec29d4df4..e2968b4d542 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -119,6 +119,7 @@
             <field name="res_model">account.payment.term</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">Payment terms define the conditions to pay a customer or supplier invoice in one or several payments. Customers periodic reminders will use the payment terms for each letter. Each customer or supplier can be assigned to one of these payment terms.</field>
         </record>
 
         <record id="review_payment_terms_todo" model="ir.actions.todo">
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index db217cde4a8..b840b609c61 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -48,6 +48,7 @@
         <field name="res_model">crm.case.stage</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
+        <field name="context">{'default_case_default': 1}</field>
         <field name="view_id" ref="crm.crm_case_stage_tree"/>
         <field name="help">Stages will allow salesmen to easily track how a specific opportunity is positioned in the sales cycle. In order to efficiently manage your sales pipeline, it's important to define conditions to go to the next step. Example: to set an opportunity as 'Qualified', you must set the "Expected Revenue" and the "Expected Closing Date." You should also have a look at the tooltip of the field "Change Probability Automatically".</field>
     </record>
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 0c7215c09eb..aaa00307bfe 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -5,31 +5,37 @@
         <!-- Crm stages -->
         <record model="crm.case.stage" id="stage_lead6">
             <field name="name">Lost</field>
+            <field eval="1" name="case_default"/>
             <field eval="'0'" name="probability"/>
             <field eval="'0'" name="sequence"/>
         </record>
         <record model="crm.case.stage" id="stage_lead1">
             <field name="name">New</field>
+            <field eval="1" name="case_default"/>
             <field eval="'10'" name="probability"/>
             <field eval="'11'" name="sequence"/>
         </record>
         <record model="crm.case.stage" id="stage_lead2">
             <field name="name">Qualification</field>
+            <field eval="1" name="case_default"/>
             <field eval="'20'" name="probability"/>
             <field eval="'12'" name="sequence"/>
         </record>
         <record model="crm.case.stage" id="stage_lead3">
             <field name="name">Proposition</field>
+            <field eval="1" name="case_default"/>
             <field eval="'40'" name="probability"/>
             <field eval="'13'" name="sequence"/>
         </record>
         <record model="crm.case.stage" id="stage_lead4">
             <field name="name">Negotiation</field>
+            <field eval="1" name="case_default"/>
             <field eval="'60'" name="probability"/>
             <field eval="'14'" name="sequence"/>
         </record>
         <record model="crm.case.stage" id="stage_lead5">
             <field name="name">Won</field>
+            <field eval="1" name="case_default"/>
             <field eval="'100'" name="probability"/>
             <field eval="'15'" name="sequence"/>
             <field eval="1" name="on_change"/>

From 431a33d0f9e257654b600b7e0f61f1de30c6c2e4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 23:44:27 +0200
Subject: [PATCH 140/304] [IMP] config wizards useability

bzr revid: fp@tinyerp.com-20111001214427-podsy51mdlure2yo
---
 addons/account_followup/__openerp__.py            |  5 +++--
 addons/account_followup/account_followup_demo.xml |  2 +-
 addons/account_followup/account_followup_view.xml | 11 ++++-------
 addons/hr_timesheet/hr_timesheet_installer.xml    |  1 +
 addons/project/project_installer.xml              |  4 ++--
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 8de7468e43a..9df99b720a2 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -52,10 +52,11 @@ Note that if you want to check the followup level for a given partner/account en
         'security/ir.model.access.csv',
         'wizard/account_followup_print_view.xml',
         'report/account_followup_report.xml',
+        'account_followup_demo.xml',   # Defined by default
         'account_followup_view.xml',
-        'account_followup_data.xml'
+        'account_followup_data.xml',
     ],
-    'demo_xml': ['account_followup_demo.xml'],
+    'demo_xml': [],
     'test': ['test/account_followup.yml'],
     'installable': True,
     'active': False,
diff --git a/addons/account_followup/account_followup_demo.xml b/addons/account_followup/account_followup_demo.xml
index 01b275de306..3799033b24a 100644
--- a/addons/account_followup/account_followup_demo.xml
+++ b/addons/account_followup/account_followup_demo.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
 
         <record id="demo_followup1" model="account_followup.followup">
-            <field name="name">Default follow-up</field>
+            <field name="name">Default Follow-Up</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="description">First letter after 15 net days, 30 net days and 45 days end of month levels.</field>
         </record>
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index f99a8b2c060..e6aee02ffdc 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -6,7 +6,7 @@
             <field name="model">account_followup.followup.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Follow-Up Lines">
+                <tree string="Follow-Up Steps">
                     <field name="name"/>
                     <field name="delay"/>
                     <field name="start" groups="base.group_extended"/>
@@ -19,7 +19,7 @@
             <field name="model">account_followup.followup.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Follow-Up Lines">
+                <form string="Follow-Up Steps">
                   <group col="6" colspan="4">
                      <field name="name"/>
                      <field name="delay"/>
@@ -45,7 +45,7 @@
                 <form string="Follow-Up">
                     <field name="name"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <separator colspan="4" string=""/>
+                    <newline/>
                     <field colspan="4" name="followup_line" nolabel="1"/>
                 </form>
             </field>
@@ -73,10 +73,6 @@
                         <field name="name"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
-                   <newline/>
-                   <group expand="0" string="Group By...">
-                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                   </group>
                </search>
             </field>
         </record>
@@ -169,6 +165,7 @@
             <field name="res_model">account_followup.followup</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
+            <field name="context" eval="'{\'res_id\': %s}' % (ref('demo_followup1'),)"/>
             <field name="view_id" ref="view_account_followup_followup_form"/>
         </record>
         
diff --git a/addons/hr_timesheet/hr_timesheet_installer.xml b/addons/hr_timesheet/hr_timesheet_installer.xml
index 66289ed0c0c..cfd2cc8ab88 100644
--- a/addons/hr_timesheet/hr_timesheet_installer.xml
+++ b/addons/hr_timesheet/hr_timesheet_installer.xml
@@ -7,6 +7,7 @@
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">You should create an analytic account structure depending on your needs to analyse costs and revenues. In OpenERP, analytic accounts are also used to track customer contracts.</field>
         </record>
 
         <record id="todo_define_analytic_structure" model="ir.actions.todo">
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 3150d250562..53b4cb0933a 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -30,11 +30,11 @@
         </record>
 
         <record id="action_create_initial_projects_installer" model="ir.actions.act_window">
-            <field name="name">Create your initial projects</field>
+            <field name="name">Create your Firsts Projects</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">project.project</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
 
         <record id="config_wizard_action_create_initial_projects_installer" model="ir.actions.todo">

From 142313d01297083935d02fd4a9d2b710190e162f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 00:18:03 +0200
Subject: [PATCH 141/304] [FIX] delivery methods

bzr revid: fp@tinyerp.com-20111001221803-d5dchaux0pzjozqo
---
 addons/delivery/delivery.py       | 35 ++++++++++++++++++-------------
 addons/delivery/delivery_view.xml | 15 ++++++-------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 94a21289925..0a0abc92259 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -61,16 +61,16 @@ class delivery_carrier(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Carrier', size=64, required=True),
-        'partner_id': fields.many2one('res.partner', 'Carrier Partner', required=True),
+        'name': fields.char('Delivery Method', size=64, required=True),
+        'partner_id': fields.many2one('res.partner', 'Transport Company', required=True, help="The partner that is doing the delivery service."),
         'product_id': fields.many2one('product.product', 'Delivery Product', required=True),
         'grids_id': fields.one2many('delivery.grid', 'carrier_id', 'Delivery Grids'),
         'price' : fields.function(get_price, string='Price'),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the delivery carrier without removing it."),
-        'normal_price': fields.float('Normal Price'),
-        'free_if_more_than': fields.boolean('Free If More Than'),
-        'amount': fields.float('Amount'),
-        'use_detailed_pricelist': fields.boolean('Use Detailed Pricelist'),
+        'normal_price': fields.float('Normal Price', help="Keep empty if the pricing depends on the advanced pricing per destination"),
+        'free_if_more_than': fields.boolean('Free If More Than', help="If the order is more expensive than a certain amount, the customer can benefit from a free shipping"),
+        'amount': fields.float('Amount', help="Amount of the order to benefit from a free shipping, expressed in the company currency"),
+        'use_detailed_pricelist': fields.boolean('Advanced Pricing per Destination', help="Check this box if you want to manage delivery prices that depends on the destination, the weight, the total of the order, etc."),
         'pricelist_ids': fields.one2many('delivery.grid', 'carrier_id', 'Advanced Pricing'),
     }
 
@@ -103,25 +103,32 @@ class delivery_carrier(osv.osv):
         grid_line_pool = self.pool.get('delivery.grid.line')
         grid_pool = self.pool.get('delivery.grid')
         for record in self.browse(cr, uid, ids, context=context):
-            grid_id = grid_pool.search(cr, uid, [('carrier_id', '=', record.id)], context=context)
+            grid_id = grid_pool.search(cr, uid, [('carrier_id', '=', record.id),('sequence','=',9999)], context=context)
+
+            if grid_id and not (record.normal_price or record.free_if_more_than):
+                grid_pool.unlink(cr, uid, grid_id, context=context)
+
+            if not (record.normal_price or record.free_if_more_than):
+                continue
+
             if not grid_id:
                 record_data = {
-                    'name': vals.get('name', False),
+                    'name': record.name,
                     'carrier_id': record.id,
-                    'seqeunce': 10,
+                    'sequence': 9999,
                 }
                 new_grid_id = grid_pool.create(cr, uid, record_data, context=context)
                 grid_id = [new_grid_id]
 
-            #delete all existing grid lines
-            grid_lines = [line.id for line in grid_pool.browse(cr, uid, grid_id[0]).line_ids if line.type == 'price']
-            grid_line_pool.unlink(cr, uid, grid_lines, context=context)
+            lines = grid_line_pool.search(cr, uid, [('grid_id','in',grid_id)], context=context)
+            if lines:
+                grid_line_pool.unlink(cr, uid, lines, context=context)
 
             #create the grid lines
             if record.free_if_more_than:
                 data = {
                     'grid_id': grid_id and grid_id[0],
-                    'name': _('Free if more than %d') % record.amount,
+                    'name': _('Free if more than %.2f') % record.amount,
                     'type': 'price',
                     'operator': '>=',
                     'max_value': record.amount,
@@ -217,7 +224,7 @@ class delivery_grid_line(osv.osv):
     _description = "Delivery Grid Line"
     _columns = {
         'name': fields.char('Name', size=32, required=True),
-        'grid_id': fields.many2one('delivery.grid', 'Grid',required=True),
+        'grid_id': fields.many2one('delivery.grid', 'Grid',required=True, ondelete='cascade'),
         'type': fields.selection([('weight','Weight'),('volume','Volume'),\
                                   ('wv','Weight * Volume'), ('price','Price')],\
                                   'Variable', required=True),
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 23147a2716f..4d92e6aa125 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -9,6 +9,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Carrier">
+                    <field name="name"/>
                     <field name="partner_id"/>
                     <field name="price" invisible="'order_id' not in context"/>
                 </tree>
@@ -21,15 +22,16 @@
             <field name="arch" type="xml">
                 <form string="Carrier">
                     <group colspan="4" col="4" name="general">
+                        <field name="name" select="1"/>
                         <field name="partner_id" select="1"/>
                         <field name="product_id" select="1"/>
                         <field name="active" select="1"/>
-                        <separator string="Pricing Information" colspan="6"/>
-                        <group colspan="2" col="4">
-                            <field name="normal_price" select="1" colspan="4"/>
+                        <separator string="Pricing Information" colspan="4"/>
+                        <group colspan="4" col="4">
+                            <field name="normal_price"/>
                             <newline/>
                             <field name="free_if_more_than"/>
-                            <field name="amount" attrs="{'invisible':[('free_if_more_than','=',False)]}"/>
+                            <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
                         </group>
                         <newline/>
                         <field name="use_detailed_pricelist"/>
@@ -37,7 +39,6 @@
                         <field name="pricelist_ids" nolabel="1" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
                          <tree string="Delivery grids">
                               <field name="sequence"/>
-                              <field name="carrier_id"/>
                               <field name="name"/>
                          </tree>
                         <form string="Delivery grids">
@@ -76,8 +77,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">delivery.carrier</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-            <field name="help">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</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help">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.</field>
         </record>
 
         <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery"/>

From 4c7e390891c9fbff037169cae36e1120779d8ebd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 00:28:09 +0200
Subject: [PATCH 142/304] [FIX] delivery methods

bzr revid: fp@tinyerp.com-20111001222809-kv3za5932qfajrv0
---
 .../account_analytic_plans_installer_view.xml     | 15 ++++++++-------
 addons/delivery/delivery.py                       |  3 ---
 addons/delivery/delivery_view.xml                 |  4 ++--
 addons/mrp/mrp_installer.xml                      | 10 +---------
 4 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
index c9d21147458..c6879774078 100644
--- a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
@@ -7,14 +7,15 @@
         <field name="res_model">account.analytic.plan</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="account_analytic_plans.account_analytic_plan_form"/>
+        <field name="view_id" eval="False"/>
+        <field name="help">To setup a multiple analytic plans environment, you must define the root analytic accounts for each plan set. Then, you must attach a plan set to your account journals.</field>
+    </record>
+
+    <record id="account_analytic_plan_installer_todo" model="ir.actions.todo">
+        <field name="action_id" ref="account_analytic_plan_form_action_installer"/>
+        <field name="category_id" ref="account.category_accounting_configuration"/>
+        <field name="sequence">15</field>
     </record>
-        
-   <record id="account_analytic_plan_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="account_analytic_plan_form_action_installer"/>
-      <field name="category_id" ref="account.category_accounting_configuration"/>
-      <field name="sequence">15</field>
-  </record>
 
   </data>
 </openerp>
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 0a0abc92259..437e2ab6f80 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -255,11 +255,8 @@ class define_delivery_steps(osv.osv_memory):
 
     def apply_cb(self, cr, uid, ids, context=None):
         ir_values_obj = self.pool.get('ir.values')
-
         wizard = self.browse(cr, uid, ids, context=context)[0]
-
         ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], wizard.picking_policy)
-
         return {'type' : 'ir.actions.act_window_close'}
 
 define_delivery_steps()
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 4d92e6aa125..5daa6534c55 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -342,9 +342,9 @@
             <field name="model">delivery.define.delivery.steps.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Define Delivery Steps">
-                    <label string="" />
+                <form string="Setup Your Delivery Steps">
                     <field name="picking_policy" />
+                    <separator string="" colspan="4"/>
                     <group colspan="4">
                         <button string="Cancel" icon="gtk-cancel" special="cancel" />
                         <button string="Apply" icon="gtk-apply" name="apply_cb" type="object" />
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index af2a35b3ce7..33ef333d8ca 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -40,16 +40,8 @@
         <field name="groups_id" eval="[(6, 0, [ref('base.group_extended')])]" />
     </record>
 
-    <record id="action_create_bill_of_materials" model="ir.actions.act_window">
-        <field name="name">Create Bill of Materials</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">mrp.bom</field>
-        <field name="view_mode">form,tree</field>
-        <field name="view_type">form</field>
-    </record>
-
     <record id="todo_action_create_bill_of_materials" model="ir.actions.todo">
-        <field name="action_id" ref="action_create_bill_of_materials" />
+        <field name="action_id" ref="mrp_bom_form_action" />
         <field name="category_id" ref="category_mrp_config" />
     </record>
 

From c388982692cb924c1851042766ab98ab01173ee1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 00:32:01 +0200
Subject: [PATCH 143/304] fix

bzr revid: fp@tinyerp.com-20111001223201-u8sn9adka5j70hpy
---
 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 5daa6534c55..cef9f442cf9 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -326,7 +326,7 @@
             <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">
-                    <button name="%(report_shipping)d" string="Delivery Order" states="done,assigned" type="action" icon="gtk-print"/>
+                    <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
                 </xpath>
             </field>
         </record>

From 346d19862ab407c7aaf71cac405a62e288969e51 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 00:34:02 +0200
Subject: [PATCH 144/304] [IMP] mail server view

bzr revid: fp@tinyerp.com-20111001223402-zh4bmgmihliiic1c
---
 openerp/addons/base/ir/ir_mail_server.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index 96fa9f52a88..e8d97160068 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -145,14 +145,14 @@ class ir_mail_server(osv.osv):
 
     _columns = {
         'name': fields.char('Description', size=64, required=True, select=True),
-        'smtp_host': fields.char('Server Name', size=128, required=True, help="Hostname or IP of SMTP server"),
+        'smtp_host': fields.char('SMTP Server', size=128, required=True, help="Hostname or IP of SMTP server"),
         'smtp_port': fields.integer('SMTP Port', size=5, required=True, help="SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases."),
         'smtp_user': fields.char('Username', size=64, help="Optional username for SMTP authentication"),
         'smtp_pass': fields.char('Password', size=64, help="Optional password for SMTP authentication"),
         'smtp_encryption': fields.selection([('none','None'),
                                              ('starttls','TLS (STARTTLS)'),
                                              ('ssl','SSL/TLS')],
-                                            string='Connection Security',
+                                            string='Connection Security', required=True,
                                             help="Choose the connection encryption scheme:\n"
                                                  "- None: SMTP sessions are done in cleartext.\n"
                                                  "- TLS (STARTTLS): TLS encryption is requested at start of SMTP session (Recommended)\n"

From 1475aa0ea1388159cf86c08ad07d7eed5e33d466 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 00:38:26 +0200
Subject: [PATCH 145/304] [IMP] removing add more features from SC, as it's in
 config panel

bzr revid: fp@tinyerp.com-20111001223826-twjo397gb00bt9gi
---
 addons/base_setup/base_setup_views.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 6824de60bcb..bf40e511eaa 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -82,12 +82,6 @@
     </record>
 
     <menuitem name="Add More Features" action="action_start_configurator" id="menu_view_base_module_configuration" parent="base.menu_config" type="server" icon="STOCK_EXECUTE" sequence="100"/>
-    <record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc">
-      <field name="name">Add More Features</field>
-      <field name="resource">ir.ui.menu</field>
-      <field name="user_id" ref="base.user_root"/>
-      <field name="res_id" ref="menu_view_base_module_configuration"/>
-    </record>
 
      <!-- Import or create customers configartion view  -->
      <record id="action_import_create_installer" model="ir.actions.act_window">

From 5dc1bc2f44a983307d6d9897c6da73da0e66fba4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 00:59:58 +0200
Subject: [PATCH 146/304] [FIX] hr_holidays

bzr revid: fp@tinyerp.com-20111001225958-0d0wi1los2870utr
---
 addons/hr_holidays/hr_holidays.py       | 23 +++++++++++++++++------
 addons/hr_holidays/hr_holidays_view.xml | 10 ++++------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 2dcb448d3cf..864a3200bdf 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -358,12 +358,24 @@ class hr_employee(osv.osv):
             leave_id = holiday_obj.create(cr, uid, {'name': _('Leave Request for %s') % employee.name, 'employee_id': employee.id, 'holiday_status_id': status_id, 'type': 'remove', 'holiday_type': 'employee', 'number_of_days_temp': abs(diff)}, context=context)
         else:
             return False
-        holiday_obj.holidays_confirm(cr, uid, [leave_id])
-        holiday_obj.holidays_validate2(cr, uid, [leave_id])
+        wf_service = netsvc.LocalService("workflow")
+        wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr)
+        wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr)
+        wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr)
         return True
 
    def _get_remaining_days(self, cr, uid, ids, name, args, context=None):
-        cr.execute("SELECT sum(h.number_of_days_temp) as days, h.employee_id from hr_holidays h join hr_holidays_status s on (s.id=h.holiday_status_id) where h.type='add' and h.state='validate' and s.limit=False group by h.employee_id")
+        cr.execute("""SELECT
+                sum(h.number_of_days) as days,
+                h.employee_id 
+            from
+                hr_holidays h
+                join hr_holidays_status s on (s.id=h.holiday_status_id) 
+            where
+                h.state='validate' and
+                s.limit=False and
+                h.employee_id in (%s)
+            group by h.employee_id""", (','.join(map(str,ids)),) )
         res = cr.dictfetchall()
         remaining = {}
         for r in res:
@@ -373,11 +385,10 @@ class hr_employee(osv.osv):
                 remaining[employee_id] = 0.0
         return remaining
 
-
    _columns = {
-        'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Leaves', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave requests.', store=True),
+        'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Leaves', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave requests.'),
     }
 
 hr_employee()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 3c899cb5a26..5628171f443 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -10,7 +10,7 @@
                     <group>
                         <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
                         <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
-                        <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"/>
+                        <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/>
                         <separator orientation="vertical"/>
                         <filter string="This Month" icon="terp-go-month" name="This Month" domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
@@ -21,8 +21,6 @@
                             <filter icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                         </field>
                         <field name="holiday_status_id" widget="selection"/>
-                        <field name="date_from"/>
-                        <field name="date_to"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -314,7 +312,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_holiday_simple"/>
-            <field name="context">{'search_default_my_leaves': 1, 'search_default_group_type': 1}</field>
+            <field name="context">{'search_default_my_leaves': 1, 'search_default_group_type': 1, 'search_default_validated': 1}</field>
             <field name="domain">[('holiday_type','=','employee')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
@@ -437,7 +435,7 @@
             <field name="model">hr.employee</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Assign Leaves" editable="top">
+                <tree string="Assign Leaves" editable="bottom">
                     <field name="name" string="Employee"/>
                     <field name="remaining_leaves" string="Remaining Legal Leaves"/>
                 </tree>
@@ -467,7 +465,7 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="coach_id" position="after">
-                    <field name="remaining_leaves" string="Remaining Legal Leaves"/>
+                    <field name="remaining_leaves" string="Remaining Legal Leaves" readonly="1"/>
                 </field>
             </field>
         </record>

From c4463eb7c1ee4cabf30a2a8a8394aeca49720668 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 01:01:38 +0200
Subject: [PATCH 147/304] fix

bzr revid: fp@tinyerp.com-20111001230138-qrfjjkyh3ly1iz17
---
 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 864a3200bdf..77cd53551b8 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -375,7 +375,7 @@ class hr_employee(osv.osv):
                 h.state='validate' and
                 s.limit=False and
                 h.employee_id in (%s)
-            group by h.employee_id""", (','.join(map(str,ids)),) )
+            group by h.employee_id"""% (','.join(map(str,ids)),) )
         res = cr.dictfetchall()
         remaining = {}
         for r in res:

From 856d08e411c6bab969e8211704c53246c1b7df72 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 01:17:11 +0200
Subject: [PATCH 148/304] [IMP] hr evaluation

bzr revid: fp@tinyerp.com-20111001231711-it0w375uui2k3ssf
---
 addons/hr_evaluation/hr_evaluation.py         |   2 +
 addons/hr_evaluation/hr_evaluation_data.xml   | 631 +++++++++++++
 addons/hr_evaluation/hr_evaluation_demo.xml   | 854 ------------------
 .../hr_evaluation/hr_evaluation_installer.xml |   2 +-
 4 files changed, 634 insertions(+), 855 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index d79cf90b915..03ff1692009 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -39,6 +39,8 @@ class hr_evaluation_plan(osv.osv):
     }
     _defaults = {
         'active': True,
+        'month_first': 6,
+        'month_next': 12,
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
     }
 hr_evaluation_plan()
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index a83caa71173..b69671f2343 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -593,5 +593,636 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_42"/>
             <field eval="5" name="sequence"/>
         </record>
+
+        <record id="survey_3" model="survey">
+            <field name="title">Employee Opinion</field>
+            <field name="max_response_limit">20</field>
+            <field eval="[(6,0,[])]" name="users"/>
+            <field name="type" ref="survey.survey_type1"/>
+            <field name="responsible_id" ref="base.user_root"/>
+            <field name="response_user">5</field>
+        </record>
+        <record id="survey_page_2" model="survey.page">
+            <field name="title">Process</field>
+            <field name="survey_id" ref="survey_3"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_page_10" model="survey.page">
+            <field name="title">Survey</field>
+            <field name="survey_id" ref="survey_3"/>
+            <field eval="5" name="sequence"/>
+        </record>
+        <record id="survey_question_0" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="1" name="sequence"/>
+            <field name="question">Employee Details</field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">multiple_textboxes_diff_type</field>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_2"/>
+            <field name="comment_label">Other</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_3" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="1" name="sequence"/>
+            <field name="question">Engagement</field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_10"/>
+            <field name="comment_label">Other</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_6" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="2" name="sequence"/>
+            <field name="question">Leadership</field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_10"/>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_10" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="3" name="sequence"/>
+            <field name="question">Effectiveness</field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_10"/>
+            <field name="comment_label">Other</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_14" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="4" name="sequence"/>
+            <field name="question">Continuous Improvement</field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_10"/>
+            <field name="comment_label">Other</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_18" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="5" name="sequence"/>
+            <field name="question">Openness</field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_10"/>
+            <field name="comment_label">Other</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_40" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="6" name="sequence"/>
+            <field name="question">Miscellaneous</field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_10"/>
+            <field name="comment_label">Other</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_41" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="7" name="sequence"/>
+            <field name="question">Additional comments :</field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">comment</field>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_10"/>
+            <field name="comment_label">Other</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_21" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="2" name="sequence"/>
+            <field name="question">At the supervisor's appraisal date </field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">descriptive_text</field>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field name="descriptive_text">* His direct reports will be invited through OpenERP to express a feedback on their supervisor's leadership and to give their opinion about their own engagement and effectiveness, the continuous improvement and openness in action in the company, ...
+
+* The employees will send back their anonymous answers to OpenERP. The data will be handled by the HR manager and a  brief summary of the data will be sent to the concerned supervisor, to his team and to the supervisor's supervisor.
+* The appraiser should rate the employee’s major work accomplishments and     performance according to the metric provided below :
+
+    1 - Significantly exceeds standards and expectations required of the position
+    2 - Exceeds standards and expectations
+    3 - Meet standards and expectations
+    4 - Did not meet standards and expectations
+    5 - Significantly below standards and expectations</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_2"/>
+            <field name="comment_label">Other</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_column_heading_14" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">1</field>
+            <field name="question_id" ref="survey_question_3"/>
+        </record>
+        <record id="survey_question_column_heading_15" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">2</field>
+            <field name="question_id" ref="survey_question_3"/>
+        </record>
+        <record id="survey_question_column_heading_16" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">3</field>
+            <field name="question_id" ref="survey_question_3"/>
+        </record>
+        <record id="survey_question_column_heading_17" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">4</field>
+            <field name="question_id" ref="survey_question_3"/>
+        </record>
+        <record id="survey_question_column_heading_18" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">5</field>
+            <field name="question_id" ref="survey_question_3"/>
+        </record>
+        <record id="survey_question_column_heading_19" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">1</field>
+            <field name="question_id" ref="survey_question_6"/>
+        </record>
+        <record id="survey_question_column_heading_20" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">2</field>
+            <field name="question_id" ref="survey_question_6"/>
+        </record>
+        <record id="survey_question_column_heading_21" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">3</field>
+            <field name="question_id" ref="survey_question_6"/>
+        </record>
+        <record id="survey_question_column_heading_22" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">4</field>
+            <field name="question_id" ref="survey_question_6"/>
+        </record>
+        <record id="survey_question_column_heading_23" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">5</field>
+            <field name="question_id" ref="survey_question_6"/>
+        </record>
+        <record id="survey_question_column_heading_24" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">1</field>
+            <field name="question_id" ref="survey_question_10"/>
+        </record>
+        <record id="survey_question_column_heading_25" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">2</field>
+            <field name="question_id" ref="survey_question_10"/>
+        </record>
+        <record id="survey_question_column_heading_26" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">3</field>
+            <field name="question_id" ref="survey_question_10"/>
+        </record>
+        <record id="survey_question_column_heading_27" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">4</field>
+            <field name="question_id" ref="survey_question_10"/>
+        </record>
+        <record id="survey_question_column_heading_28" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">5</field>
+            <field name="question_id" ref="survey_question_10"/>
+        </record>
+        <record id="survey_question_column_heading_29" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">1</field>
+            <field name="question_id" ref="survey_question_14"/>
+        </record>
+        <record id="survey_question_column_heading_30" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">2</field>
+            <field name="question_id" ref="survey_question_14"/>
+        </record>
+        <record id="survey_question_column_heading_31" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">3</field>
+            <field name="question_id" ref="survey_question_14"/>
+        </record>
+        <record id="survey_question_column_heading_32" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">4</field>
+            <field name="question_id" ref="survey_question_14"/>
+        </record>
+        <record id="survey_question_column_heading_33" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">5</field>
+            <field name="question_id" ref="survey_question_14"/>
+        </record>
+        <record id="survey_question_column_heading_34" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">1</field>
+            <field name="question_id" ref="survey_question_18"/>
+        </record>
+        <record id="survey_question_column_heading_35" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">2</field>
+            <field name="question_id" ref="survey_question_18"/>
+        </record>
+        <record id="survey_question_column_heading_36" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">3</field>
+            <field name="question_id" ref="survey_question_18"/>
+        </record>
+        <record id="survey_question_column_heading_37" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">4</field>
+            <field name="question_id" ref="survey_question_18"/>
+        </record>
+        <record id="survey_question_column_heading_38" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">5</field>
+            <field name="question_id" ref="survey_question_18"/>
+        </record>
+        <record id="survey_question_column_heading_39" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">1</field>
+            <field name="question_id" ref="survey_question_40"/>
+        </record>
+        <record id="survey_question_column_heading_40" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">2</field>
+            <field name="question_id" ref="survey_question_40"/>
+        </record>
+        <record id="survey_question_column_heading_41" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">3</field>
+            <field name="question_id" ref="survey_question_40"/>
+        </record>
+        <record id="survey_question_column_heading_42" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">4</field>
+            <field name="question_id" ref="survey_question_40"/>
+        </record>
+        <record id="survey_question_column_heading_43" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">5</field>
+            <field name="question_id" ref="survey_question_40"/>
+        </record>
+        <record id="survey_answer_0" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Demonstrates genuine concern for me as a person. </field>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_answer_2" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I'm efficient at work and my achievements are successful.</field>
+            <field name="question_id" ref="survey_question_10"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_answer_3" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I am proud to tell others I work here. </field>
+            <field name="question_id" ref="survey_question_3"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_answer_4" model="survey.answer">
+            <field name="in_visible_answer_type">0</field>
+            <field name="answer">Name of your direct supervisor</field>
+            <field name="question_id" ref="survey_question_0"/>
+            <field name="type">char</field>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_answer_5" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Actions by Executive management show genuine interest in the well-being of employees.</field>
+            <field name="question_id" ref="survey_question_40"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_answer_6" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I know the company's values and live them.</field>
+            <field name="question_id" ref="survey_question_18"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_answer_7" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">My work contributes towards the continuous improvement of the company, our services or products. </field>
+            <field name="question_id" ref="survey_question_14"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_answer_8" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I have enough work.</field>
+            <field name="question_id" ref="survey_question_10"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_9" model="survey.answer">
+            <field name="in_visible_answer_type">0</field>
+            <field name="answer">Date</field>
+            <field name="question_id" ref="survey_question_0"/>
+            <field name="type">datetime</field>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_11" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I consistently acquire new knowledge, skills or understanding through contact with my supervisor. He helps me growing my compete</field>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_12" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">My job provides me with a sense of personal accomplishment.</field>
+            <field name="question_id" ref="survey_question_3"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_13" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">What I did several months ago is still of use to the company, the services or the products today. </field>
+            <field name="question_id" ref="survey_question_14"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_14" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">My best achievements have been communicated to the community, internally or to customers. </field>
+            <field name="question_id" ref="survey_question_18"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_15" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I have the same opportunity to succeed as others with similar experiences, performance and educational background. </field>
+            <field name="question_id" ref="survey_question_40"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_16" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Compared to similar jobs in other companies where I could work, my total compensation is:
+(Scale: Well below others, Below othe</field>
+            <field name="question_id" ref="survey_question_40"/>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_answer_17" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Overall, I believe the quality of products and/or services my workgroup delivers is improving.</field>
+            <field name="question_id" ref="survey_question_14"/>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_answer_18" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I would prefer to remain with this company even if a comparable job were available in another company. </field>
+            <field name="question_id" ref="survey_question_3"/>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_answer_19" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Listens and takes into account all ideas and do his best to put in place the best of these. </field>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_answer_21" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I mostly work on value-added tasks for the company, the products or the services. (Value-added task : significant improvement pe</field>
+            <field name="question_id" ref="survey_question_10"/>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_answer_22" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Our workgroup identifies and reduces waste of time in our activities and processes. </field>
+            <field name="question_id" ref="survey_question_14"/>
+            <field eval="4" name="sequence"/>
+        </record>
+        <record id="survey_answer_23" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Taking everything into account, how satisfied are you with your current job? </field>
+            <field name="question_id" ref="survey_question_3"/>
+            <field eval="4" name="sequence"/>
+        </record>
+        <record id="survey_answer_24" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I understand the company strategy and how my workgroup supports it. </field>
+            <field name="question_id" ref="survey_question_40"/>
+            <field eval="4" name="sequence"/>
+        </record>
+        <record id="survey_answer_51" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I am willing to put in a great deal of effort beyond what is expected to help my workgroup succeed.</field>
+            <field name="question_id" ref="survey_question_3"/>
+            <field eval="5" name="sequence"/>
+        </record>
+        <record id="survey_answer_52" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I believe the information that I get from the person I report to. </field>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="5" name="sequence"/>
+        </record>
     </data>
+
+    <data noupdate="1">
+        <record id="hr_evaluation_plan_managersevaluationplan0" model="hr_evaluation.plan">
+            <field eval="1" name="active"/>
+            <field eval="6" name="month_next"/>
+            <field name="name">Manager's Evaluation Plan</field>
+            <field eval="3" name="month_first"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+    </data>
+
+    <data noupdate="1">
+        <record id="hr_evaluation_plan_phase_sendtosubordinates0" model="hr_evaluation.plan.phase">
+            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+            <field name="name">Send to Subordinates</field>
+            <field eval="0" name="send_anonymous_manager"/>
+            <field eval="1" name="sequence"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="action">bottom-up</field>
+            <field eval="0" name="send_anonymous_employee"/>
+            <field eval="0" name="send_answer_employee"/>
+            <field name="survey_id" ref="hr_evaluation.survey_2"/>
+            <field eval="0" name="send_answer_manager"/>
+            <field eval="0" name="wait"/>
+        </record>
+        <record id="hr_evaluation_plan_phase_sendtomanagers0" model="hr_evaluation.plan.phase">
+            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+            <field name="name">Send to Managers</field>
+            <field eval="0" name="send_anonymous_manager"/>
+            <field eval="2" name="sequence"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="action">top-down</field>
+            <field eval="0" name="send_anonymous_employee"/>
+            <field eval="0" name="send_answer_employee"/>
+            <field name="survey_id" ref="hr_evaluation.survey_2"/>
+            <field eval="0" name="send_answer_manager"/>
+            <field eval="0" name="wait"/>
+        </record>
+        <record id="hr_evaluation_plan_phase_sendtoemployee0" model="hr_evaluation.plan.phase">
+            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+            <field name="name">Send to Employee</field>
+            <field eval="0" name="send_anonymous_manager"/>
+            <field eval="3" name="sequence"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="action">self</field>
+            <field eval="0" name="send_anonymous_employee"/>
+            <field eval="0" name="send_answer_employee"/>
+            <field name="survey_id" ref="hr_evaluation.survey_2"/>
+            <field eval="0" name="send_answer_manager"/>
+            <field eval="0" name="wait"/>
+        </record>
+        <record id="hr_evaluation_plan_phase_finalinterviewwithmanager0" model="hr_evaluation.plan.phase">
+            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+            <field name="name">Final Interview With Manager</field>
+            <field eval="0" name="send_anonymous_manager"/>
+            <field eval="4" name="sequence"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="action">final</field>
+            <field eval="0" name="send_anonymous_employee"/>
+            <field eval="0" name="send_answer_employee"/>
+            <field name="survey_id" ref="hr_recruitment.survey_job_0"/>
+            <field eval="0" name="send_answer_manager"/>
+            <field eval="1" name="wait"/>
+        </record>
+    </data>
+
+    <data>
+        <record forcecreate="True" id="ir_cron_scheduler_evaluation" model="ir.cron">
+           <field name="name">Run Employee Evaluation</field>
+           <field eval="True" name="active" />
+           <field name="user_id" ref="base.user_root" />
+           <field name="interval_number">1</field>
+           <field name="interval_type">days</field>
+           <field name="numbercall">-1</field>
+           <field eval="'hr.employee'" name="model" />
+           <field eval="'run_employee_evaluation'" name="function" />
+           <field eval="'(False,)'" name="args" />
+        </record>
+     </data>
+
 </openerp>
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index a7be585272f..f8220663291 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -1,857 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-
-    <data>
-        <record id="survey_3" model="survey">
-            <field name="title">Employee Opinion</field>
-            <field name="max_response_limit">20</field>
-            <field eval="[(6,0,[])]" name="users"/>
-            <field name="type" ref="survey.survey_type1"/>
-            <field name="responsible_id" ref="base.user_root"/>
-            <field name="response_user">5</field>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_page_2" model="survey.page">
-            <field name="title">Process</field>
-            <field name="survey_id" ref="survey_3"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_page_10" model="survey.page">
-            <field name="title">Survey</field>
-            <field name="survey_id" ref="survey_3"/>
-            <field eval="5" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_0" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="1" name="sequence"/>
-            <field name="question">Employee Details</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">multiple_textboxes_diff_type</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_2"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_3" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="1" name="sequence"/>
-            <field name="question">Engagement</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_6" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="2" name="sequence"/>
-            <field name="question">Leadership</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-    </data>
-
-    <data>
-        <record id="survey_question_10" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="3" name="sequence"/>
-            <field name="question">Effectiveness</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_14" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="4" name="sequence"/>
-            <field name="question">Continuous Improvement</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_18" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="5" name="sequence"/>
-            <field name="question">Openness</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_40" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="6" name="sequence"/>
-            <field name="question">Miscellaneous</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_41" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="7" name="sequence"/>
-            <field name="question">Additional comments :</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">comment</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_21" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="2" name="sequence"/>
-            <field name="question">At the supervisor's appraisal date </field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">descriptive_text</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field name="descriptive_text">* His direct reports will be invited through OpenERP to express a feedback on their supervisor's leadership and to give their opinion about their own engagement and effectiveness, the continuous improvement and openness in action in the company, ...
-
-* The employees will send back their anonymous answers to OpenERP. The data will be handled by the HR manager and a  brief summary of the data will be sent to the concerned supervisor, to his team and to the supervisor's supervisor.
-* The appraiser should rate the employee’s major work accomplishments and     performance according to the metric provided below :
-
-    1 - Significantly exceeds standards and expectations required of the position
-    2 - Exceeds standards and expectations
-    3 - Meet standards and expectations
-    4 - Did not meet standards and expectations
-    5 - Significantly below standards and expectations</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="1" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_2"/>
-            <field name="comment_label">Other</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_14" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_3"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_15" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_3"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_16" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_3"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_17" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_3"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_18" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_3"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_19" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_6"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_20" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_6"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_21" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_6"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_22" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_6"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_23" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_6"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_24" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_10"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_25" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_10"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_26" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_10"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_27" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_10"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_28" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_10"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_29" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_14"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_30" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_14"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_31" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_14"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_32" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_14"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_33" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_14"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_34" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_18"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_35" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_18"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_36" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_18"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_37" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_18"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_38" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_18"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_39" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_40"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_40" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_40"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_41" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_40"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_42" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_40"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_43" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_40"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_0" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Demonstrates genuine concern for me as a person. </field>
-            <field name="question_id" ref="survey_question_6"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_2" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I'm efficient at work and my achievements are successful.</field>
-            <field name="question_id" ref="survey_question_10"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_3" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I am proud to tell others I work here. </field>
-            <field name="question_id" ref="survey_question_3"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_4" model="survey.answer">
-            <field name="in_visible_answer_type">0</field>
-            <field name="answer">Name of your direct supervisor</field>
-            <field name="question_id" ref="survey_question_0"/>
-            <field name="type">char</field>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_5" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Actions by Executive management show genuine interest in the well-being of employees.</field>
-            <field name="question_id" ref="survey_question_40"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_6" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I know the company's values and live them.</field>
-            <field name="question_id" ref="survey_question_18"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_7" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">My work contributes towards the continuous improvement of the company, our services or products. </field>
-            <field name="question_id" ref="survey_question_14"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_8" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I have enough work.</field>
-            <field name="question_id" ref="survey_question_10"/>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_9" model="survey.answer">
-            <field name="in_visible_answer_type">0</field>
-            <field name="answer">Date</field>
-            <field name="question_id" ref="survey_question_0"/>
-            <field name="type">datetime</field>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_11" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I consistently acquire new knowledge, skills or understanding through contact with my supervisor. He helps me growing my compete</field>
-            <field name="question_id" ref="survey_question_6"/>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_12" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">My job provides me with a sense of personal accomplishment.</field>
-            <field name="question_id" ref="survey_question_3"/>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_13" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">What I did several months ago is still of use to the company, the services or the products today. </field>
-            <field name="question_id" ref="survey_question_14"/>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_14" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">My best achievements have been communicated to the community, internally or to customers. </field>
-            <field name="question_id" ref="survey_question_18"/>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_15" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I have the same opportunity to succeed as others with similar experiences, performance and educational background. </field>
-            <field name="question_id" ref="survey_question_40"/>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_16" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Compared to similar jobs in other companies where I could work, my total compensation is:
-(Scale: Well below others, Below othe</field>
-            <field name="question_id" ref="survey_question_40"/>
-            <field eval="3" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_17" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Overall, I believe the quality of products and/or services my workgroup delivers is improving.</field>
-            <field name="question_id" ref="survey_question_14"/>
-            <field eval="3" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_18" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I would prefer to remain with this company even if a comparable job were available in another company. </field>
-            <field name="question_id" ref="survey_question_3"/>
-            <field eval="3" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_19" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Listens and takes into account all ideas and do his best to put in place the best of these. </field>
-            <field name="question_id" ref="survey_question_6"/>
-            <field eval="3" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_21" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I mostly work on value-added tasks for the company, the products or the services. (Value-added task : significant improvement pe</field>
-            <field name="question_id" ref="survey_question_10"/>
-            <field eval="3" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_22" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Our workgroup identifies and reduces waste of time in our activities and processes. </field>
-            <field name="question_id" ref="survey_question_14"/>
-            <field eval="4" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_23" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Taking everything into account, how satisfied are you with your current job? </field>
-            <field name="question_id" ref="survey_question_3"/>
-            <field eval="4" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_24" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I understand the company strategy and how my workgroup supports it. </field>
-            <field name="question_id" ref="survey_question_40"/>
-            <field eval="4" name="sequence"/>
-        </record>
-    </data>
-
-
-    <data>
-        <record id="survey_answer_51" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I am willing to put in a great deal of effort beyond what is expected to help my workgroup succeed.</field>
-            <field name="question_id" ref="survey_question_3"/>
-            <field eval="5" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_52" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I believe the information that I get from the person I report to. </field>
-            <field name="question_id" ref="survey_question_6"/>
-            <field eval="5" name="sequence"/>
-        </record>
-    </data>
-
-    <data noupdate="1">
-        <record id="hr_evaluation_plan_managersevaluationplan0" model="hr_evaluation.plan">
-            <field eval="1" name="active"/>
-            <field eval="6" name="month_next"/>
-            <field name="name">Manager's Evaluation Plan</field>
-            <field eval="3" name="month_first"/>
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-    </data>
-
-    <data noupdate="1">
-        <record id="hr_evaluation_plan_phase_sendtosubordinates0" model="hr_evaluation.plan.phase">
-            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
-            <field name="name">Send to Subordinates</field>
-            <field eval="0" name="send_anonymous_manager"/>
-            <field eval="1" name="sequence"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="action">bottom-up</field>
-            <field eval="0" name="send_anonymous_employee"/>
-            <field eval="0" name="send_answer_employee"/>
-            <field name="survey_id" ref="hr_evaluation.survey_2"/>
-            <field eval="0" name="send_answer_manager"/>
-            <field eval="0" name="wait"/>
-        </record>
-    </data>
-
-    <data noupdate="1">
-        <record id="hr_evaluation_plan_phase_sendtomanagers0" model="hr_evaluation.plan.phase">
-            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
-            <field name="name">Send to Managers</field>
-            <field eval="0" name="send_anonymous_manager"/>
-            <field eval="2" name="sequence"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="action">top-down</field>
-            <field eval="0" name="send_anonymous_employee"/>
-            <field eval="0" name="send_answer_employee"/>
-            <field name="survey_id" ref="hr_evaluation.survey_2"/>
-            <field eval="0" name="send_answer_manager"/>
-            <field eval="0" name="wait"/>
-        </record>
-    </data>
-
-    <data noupdate="1">
-        <record id="hr_evaluation_plan_phase_sendtoemployee0" model="hr_evaluation.plan.phase">
-            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
-            <field name="name">Send to Employee</field>
-            <field eval="0" name="send_anonymous_manager"/>
-            <field eval="3" name="sequence"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="action">self</field>
-            <field eval="0" name="send_anonymous_employee"/>
-            <field eval="0" name="send_answer_employee"/>
-            <field name="survey_id" ref="hr_evaluation.survey_2"/>
-            <field eval="0" name="send_answer_manager"/>
-            <field eval="0" name="wait"/>
-        </record>
-    </data>
-
-    <data noupdate="1">
-        <record id="hr_evaluation_plan_phase_finalinterviewwithmanager0" model="hr_evaluation.plan.phase">
-            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
-            <field name="name">Final Interview With Manager</field>
-            <field eval="0" name="send_anonymous_manager"/>
-            <field eval="4" name="sequence"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="action">final</field>
-            <field eval="0" name="send_anonymous_employee"/>
-            <field eval="0" name="send_answer_employee"/>
-            <field name="survey_id" ref="hr_recruitment.survey_job_0"/>
-            <field eval="0" name="send_answer_manager"/>
-            <field eval="1" name="wait"/>
-        </record>
-    </data>
-
-        <data>
-          <record forcecreate="True" id="ir_cron_scheduler_evaluation" model="ir.cron">
-           <field name="name">Run Employee Evaluation</field>
-           <field eval="True" name="active" />
-           <field name="user_id" ref="base.user_root" />
-           <field name="interval_number">1</field>
-           <field name="interval_type">minutes</field>
-           <field name="numbercall">-1</field>
-           <field eval="'hr.employee'" name="model" />
-           <field eval="'run_employee_evaluation'" name="function" />
-           <field eval="'(False,)'" name="args" />
-          </record>
-
-        <record id="property_rule_evaluation" model="ir.rule">
-            <field name="name">Employee Evaluation</field>
-            <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
-            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
-        </record>
-        <record id="property_rule_evaluation_manager" model="ir.rule">
-            <field name="name">Manager Evaluation</field>
-            <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
-            <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-            <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
-        </record>
-         </data>
-
 </openerp>
diff --git a/addons/hr_evaluation/hr_evaluation_installer.xml b/addons/hr_evaluation/hr_evaluation_installer.xml
index 4ef0013a4c2..842363559a9 100644
--- a/addons/hr_evaluation/hr_evaluation_installer.xml
+++ b/addons/hr_evaluation/hr_evaluation_installer.xml
@@ -6,7 +6,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr_evaluation.plan</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
+            <field name="view_mode">tree,form</field>
         </record>
 
         <record id="todo_evaluation_plans_installer" model="ir.actions.todo">

From 61506518930f0059c936aed2ffd67954b317cca0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 01:19:45 +0200
Subject: [PATCH 149/304] [IMP] menutip config wizar

bzr revid: fp@tinyerp.com-20111001231945-3hh0xce63d8bj9oa
---
 addons/hr_expense/hr_expense_installer_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index a5c378238a6..bdb5fdedcb4 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -24,6 +24,7 @@
            <field name="context" eval="'{\'default_type\':\'service\',\'default_procure_method\':\'make_to_stock\',\'default_supply_method\':\'buy\',\'default_purchase_ok\':True, \'default_sale_ok\':False, \'default_hr_expense_ok\':True,\'default_categ_id\': ' + str(ref('cat_expense')) +'}'"/>
            <field name="domain">[('hr_expense_ok','=',True)]</field>
            <field name="view_id" ref="product_expense_installer_tree_view"/>
+           <field name="help">Define one product for each expense type allowed for an employee (travel by car, hostel, restaurant, etc). If you reimburse the employees at a fixed rate, set a cost and a unit of measure on the product. If you reimburse based on real costs, set the cost at 0.00. The user will set the real price when recording his expense sheet.</field>
        </record>
 
        <record id="product_normal_form_view_todo" model="ir.actions.todo">

From b24f2a190afa68cdfa678ebbd17d11bd31ce8255 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 01:25:01 +0200
Subject: [PATCH 150/304] [IMP] menutip config wizard

bzr revid: fp@tinyerp.com-20111001232501-8kv8ixcrqts3sq9u
---
 addons/hr_holidays/hr_holidays_view.xml | 5 +++--
 addons/lunch/lunch_installer_view.xml   | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 5628171f443..b6d6a64ed26 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -449,13 +449,14 @@
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
            <field name="view_id" ref="hr_holidays_leaves_assign_tree_view"/>
+           <field name="help">You can assign remaining Legal Leaves for each employee, OpenERP will automatically create and validate allocation requests.</field>
        </record>
 
        <record id="hr_holidays_leaves_assign_form_view_todo" model="ir.actions.todo">
            <field name="action_id" ref="hr_holidays_leaves_assign_legal"/>
            <field name="category_id" ref="hr.category_hr_management_config"/>
-       </record>        
-       
+       </record>
+
         <!-- Hr employee inherit Legal Leaves -->
     
         <record id="view_employee_form_leave_inherit" model="ir.ui.view">
diff --git a/addons/lunch/lunch_installer_view.xml b/addons/lunch/lunch_installer_view.xml
index bdb2a9d8163..c417a9e6383 100644
--- a/addons/lunch/lunch_installer_view.xml
+++ b/addons/lunch/lunch_installer_view.xml
@@ -6,7 +6,8 @@
             <field name="res_model">lunch.product</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="lunch.view_lunch_product_form"/>
+            <field name="view_id" eval="False"/>
+            <field name="help">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.</field>
         </record>
 
         <record id="view_lunch_product_form_todo" model="ir.actions.todo">
@@ -21,6 +22,7 @@
             <field name="res_model">lunch.cashbox</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">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.</field>
         </record>
 
         <record id="action_create_cashbox_todo" model="ir.actions.todo">

From 23b7cca69134db61d8cd0df56a70637127e58908 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 2 Oct 2011 04:51:42 +0000
Subject: [PATCH 151/304] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20111002045142-6keuvqyry9t3dnxq
---
 addons/account/i18n/ar.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index e3e9c9669a3..74fcc0ee06d 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-01 05:08+0000\n"
+"X-Launchpad-Export-Date: 2011-10-02 04:51+0000\n"
 "X-Generator: Launchpad (build 14071)\n"
 
 #. module: account

From 31803314ab50731e8bcc38ebbba3154b48411558 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 12:54:04 +0200
Subject: [PATCH 152/304] [IMP] allows to update credit/debit for initial
 balances of accounts, config wizard

bzr revid: fp@tinyerp.com-20111002105404-tkwzujn086qgjm6h
---
 addons/account/account.py            | 50 ++++++++++++++++++++++++++--
 addons/account/account_installer.xml |  1 +
 addons/account/account_view.xml      | 20 ++++++-----
 3 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index c22c8c58413..68af88754f5 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -346,6 +346,52 @@ class account_account(osv.osv):
             res[account.id] = level
         return res
 
+    def _set_credit_debit(self, cr, uid, account_id, name, value, arg, context=None):
+        if context.get('config_invisible', True):
+            return True
+
+        account = self.browse(cr, uid, account_id, context=context)
+        diff = value - getattr(account,name)
+        if not diff:
+            return True
+
+        journal_obj = self.pool.get('account.journal')
+        jids = journal_obj.search(cr, uid, [('type','=','situation'),('centralisation','=',1),('company_id','=',account.company_id.id)], context=context)
+        if not jids:
+            raise osv.except_osv(_('Error!'),_("You need an Opening journal with centralisation checked to set the initial balance!"))
+
+        period_obj = self.pool.get('account.period')
+        pids = period_obj.search(cr, uid, [('special','=',True),('company_id','=',account.company_id.id)], context=context)
+        if not pids:
+            raise osv.except_osv(_('Error!'),_("No opening/closing period defined, please create one to set the initial balance!"))
+
+        move_obj = self.pool.get('account.move.line')
+        move_id = move_obj.search(cr, uid, [
+            ('journal_id','=',jids[0]), 
+            ('period_id','=',pids[0]), 
+            ('account_id','=', account_id),
+            (name,'>', 0.0),
+            ('name','=', _('Opening Balance'))
+        ], context=context)
+        if move_id:
+            move = move_obj.browse(cr, uid, move_id[0], context=context)
+            move_obj.write(cr, uid, move_id[0], {
+                name: diff+getattr(move,name)
+            }, context=context)
+        else:
+            if diff<0.0:
+                raise osv.except_osv(_('Error!'),_("Unable to adapt the initial balance (negative value)!"))
+            nameinv = (name=='credit' and 'debit') or 'credit'
+            move_id = move_obj.create(cr, uid, {
+                'name': _('Opening Balance'),
+                'account_id': account_id,
+                'journal_id': jids[0],
+                'period_id': pids[0],
+                name: diff,
+                nameinv: 0.0
+            }, context=context)
+        return True
+
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
         'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
@@ -370,8 +416,8 @@ class account_account(osv.osv):
         'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'),
         'child_id': fields.function(_get_child_ids, type='many2many', relation="account.account", string="Child Accounts"),
         'balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Balance', multi='balance'),
-        'credit': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Credit', multi='balance'),
-        'debit': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'),
+        'credit': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Account'), string='Credit', multi='balance'),
+        'debit': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'),
         'reconcile': fields.boolean('Allow Reconciliation', help="Check this box if this account allows reconciliation of journal items."),
         'shortcut': fields.char('Shortcut', size=12),
         'tax_ids': fields.many2many('account.tax', 'account_account_tax_default_rel',
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index e2968b4d542..b7bf5d89fe2 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -91,6 +91,7 @@
             <field name="res_model">account.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{'config_invisible': False}</field>
         </record>
 
         <record id="view_financial_accounts_todo" model="ir.actions.todo">
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 30b6b52c150..888c2cd7f2b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -162,14 +162,18 @@
             <field name="arch" type="xml">
                 <form string="Account">
                     <group col="6" colspan="4">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="parent_id"/>
-                    <field name="type" select="1"/>
-                    <field name="user_type" select="1"/>
-                    <field name="active" groups="base.group_extended" />
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <newline/>
+                        <field name="parent_id"/>
+                        <field name="type" select="1"/>
+                        <field name="user_type" select="1"/>
+                        <field name="active" groups="base.group_extended" />
+                        <newline/>
+                        <field name="debit" invisible="context.get('config_invisible', True)"/>
+                        <field name="credit" invisible="context.get('config_invisible', True)"/>
+                        <field name="balance" invisible="context.get('config_invisible', True)"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">

From c999a6ed8a70b240465bfbd8e65f042d10d07ce2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 12:57:01 +0200
Subject: [PATCH 153/304] [FIX] bad XML

bzr revid: fp@tinyerp.com-20111002105701-lj0btbhunmf09ts6
---
 openerp/addons/base/ir/ir.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index a273a04a5ec..30d28ba18b0 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -574,7 +574,7 @@
                                     </tree>
                                 </field>
                                 <separator string="View Ordering" colspan="4"/>
-                                <field colspan="4" name="help" nolabel="1">
+                                <field colspan="4" name="help" nolabel="1"/>
                             </group>
                         </page>
                         <page string="Security">

From 7569906597c6ea783c4466e3c05b473c5ed818af Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 13:03:10 +0200
Subject: [PATCH 154/304] [IMP] useability bank account views

bzr revid: fp@tinyerp.com-20111002110310-8022cdp3qel4vyju
---
 addons/account/account_bank_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml
index 81e1ee7c47a..1a0e26e7c1f 100644
--- a/addons/account/account_bank_view.xml
+++ b/addons/account/account_bank_view.xml
@@ -13,7 +13,7 @@
         <field name="inherit_id" ref="base.view_partner_bank_form"/>
         <field name="arch" type="xml">
             <group name="bank" position="after">
-                <group name="accounting" col="2" colspan="2" attrs="{'invisible': [('company_id','=', False)]}" groups="account.group_account_user">
+                <group name="accounting" col="2" colspan="2" attrs="{'invisible': [('company_id','=', False)]}" groups="base.group_extended">
                     <separator string="Accounting Information" colspan="2"/>
                     <field name="journal_id"/>
                 </group>

From fc7675014fa53bd75c16015c7319e80dcdc5392c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 13:51:31 +0200
Subject: [PATCH 155/304] [IMP] config wizard, launch once

bzr revid: fp@tinyerp.com-20111002115131-cf5417apx9vfa9jc
---
 openerp/addons/base/ir/ir_actions.py  | 11 ++++++-----
 openerp/addons/base/res/res_config.py | 27 +--------------------------
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index a2e107e741e..7850006c31a 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -810,7 +810,7 @@ ir_actions_todo_category()
 # This model use to register action services.
 TODO_STATES = [('open', 'To Do'),
                ('done', 'Done')]
-TODO_TYPES = [('manual', 'Launch Manually'),
+TODO_TYPES = [('manual', 'Launch Manually'),('once', 'Launch Manually Once'),
               ('automatic', 'Launch Automatically')]
 class ir_actions_todo(osv.osv):
     """
@@ -827,7 +827,8 @@ class ir_actions_todo(osv.osv):
         'name': fields.char('Name', size=64),
         'type': fields.selection(TODO_TYPES, 'Type', required=True,
             help="""Manual: Launched manually.
-Automatic: Runs whenever the system is reconfigured."""),
+Automatic: Runs whenever the system is reconfigured.
+Launch Manually Once: after hacing been launched manually, it sets automatically to Done."""),
         'groups_id': fields.many2many('res.groups', 'res_groups_action_rel', 'uid', 'gid', 'Groups'),
         'note': fields.text('Text', translate=True),
         'category_id': fields.many2one('ir.actions.todo.category','Category'),
@@ -843,7 +844,7 @@ Automatic: Runs whenever the system is reconfigured."""),
         """ Launch Action of Wizard"""
         wizard_id = ids and ids[0] or False
         wizard = self.browse(cr, uid, wizard_id, context=context)
-        if wizard.type == 'automatic':
+        if wizard.type in ('automatic', 'once'):
             wizard.write({'state': 'done'})
 
         # Load action
@@ -890,13 +891,13 @@ Automatic: Runs whenever the system is reconfigured."""),
         done = filter(
             groups_match,
             self.browse(cr, uid,
-                self.search(cr, uid, ['&', ('state', '!=', 'open'), ('type', '=', 'manual')], context=context),
+                self.search(cr, uid, [('state', '!=', 'open')], context=context),
                         context=context))
 
         total = filter(
             groups_match,
             self.browse(cr, uid,
-                self.search(cr, uid, [('type', '=', 'manual')], context=context),
+                self.search(cr, uid, [], context=context),
                         context=context))
 
         return {
diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index df508bad5c9..3cec8b740ec 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -39,27 +39,6 @@ class res_config_configurable(osv.osv_memory):
     _inherit = 'ir.wizard.screen'
     __logger = logging.getLogger(_name)
 
-    def get_current_progress(self, cr, uid, context=None):
-        '''Return a description the current progress of configuration:
-        a tuple of (non_open_todos:int, total_todos: int)
-        '''
-        return itemgetter('done', 'total')(
-            self.pool.get('ir.actions.todo').progress(cr, uid, context=context))
-
-    def _progress(self, cr, uid, context=None):
-        closed, total = self.get_current_progress(cr, uid, context=context)
-        if total:
-            return round(closed*100./total)
-        return 100.
-
-    _columns = dict(
-        progress = fields.float('Configuration Progress', readonly=True),
-    )
-
-    _defaults = dict(
-        progress = _progress,
-    )
-
     def _next_action(self, cr, uid, context=None):
         Todos = self.pool['ir.actions.todo']
         self.__logger.info('getting next %s', Todos)
@@ -91,11 +70,7 @@ class res_config_configurable(osv.osv_memory):
             res = next.action_launch(context=context)
             res['nodestroy'] = False
             return res
-        self.__logger.info('all configuration actions have been executed')
-
-        current_user_menu = self.pool.get('res.users').browse(cr, uid, uid).menu_id
-        # return the action associated with the menu
-        return self.pool.get(current_user_menu.type).read(cr, uid, current_user_menu.id)
+        return {'type' : 'ir.actions.act_window_close'}
 
     def start(self, cr, uid, ids, context=None):
         return self.next(cr, uid, ids, context)

From 730230f7ac9fb4191e8b47acf106a88b423326ec Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 13:51:45 +0200
Subject: [PATCH 156/304] [IMP] config wizard launch policy

bzr revid: fp@tinyerp.com-20111002115145-fdqzn5eic83z9fd7
---
 addons/account/configurable_account_chart.xml | 576 +++++++++---------
 addons/base_setup/base_setup_views.xml        |   2 +
 addons/delivery/delivery_view.xml             |   1 +
 addons/outlook/outlook_installer.xml          |   1 +
 addons/project/project_installer.xml          |   1 +
 .../purchase_double_validation_installer.xml  |   1 +
 addons/sale/sale_view.xml                     |   3 +-
 addons/thunderbird/thunderbird_installer.xml  |   1 +
 8 files changed, 297 insertions(+), 289 deletions(-)

diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index 3ab6d3975a2..cc1e5b27380 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -21,26 +21,26 @@
           <field name="close_method">none</field>
         </record>
 
-	    <record model="account.account.type" id="account_type_income_view1">
-	        <field name="name">Income View</field>
-	        <field name="code">view</field>
-	        <field name="report_type">income</field>
-	    </record>
-	    <record model="account.account.type" id="account_type_expense_view1">
-	        <field name="name">Expense View</field>
-	        <field name="code">expense</field>
-	        <field name="report_type">expense</field>
-	    </record>
-	    <record model="account.account.type" id="account_type_asset_view1">
-	        <field name="name">Asset View</field>
-	        <field name="code">asset</field>
-	        <field name="report_type">asset</field>
-	    </record>
-	    <record model="account.account.type" id="account_type_liability_view1">
-	        <field name="name">Liability View</field>
-	        <field name="code">liability</field>
-	        <field name="report_type">liability</field>
-	    </record>
+        <record model="account.account.type" id="account_type_income_view1">
+            <field name="name">Income View</field>
+            <field name="code">view</field>
+            <field name="report_type">income</field>
+        </record>
+        <record model="account.account.type" id="account_type_expense_view1">
+            <field name="name">Expense View</field>
+            <field name="code">expense</field>
+            <field name="report_type">expense</field>
+        </record>
+        <record model="account.account.type" id="account_type_asset_view1">
+            <field name="name">Asset View</field>
+            <field name="code">asset</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record model="account.account.type" id="account_type_liability_view1">
+            <field name="name">Liability View</field>
+            <field name="code">liability</field>
+            <field name="report_type">liability</field>
+        </record>
 
         <record model="account.account.type" id="conf_account_type_income">
           <field name="name">Income</field>
@@ -106,16 +106,16 @@
 
 
 
-		<!-- Account Templates-->
-		<record id="conf_chart0" model="account.account.template">
-		    <field name="code">0</field>
-		    <field name="name">Configurable Account Chart</field>
-		    <field eval="0" name="parent_id"/>
-		    <field name="type">view</field>
-		    <field name="user_type" ref="conf_account_type_view"/>
-		</record>
+        <!-- Account Templates-->
+        <record id="conf_chart0" model="account.account.template">
+            <field name="code">0</field>
+            <field name="name">Configurable Account Chart</field>
+            <field eval="0" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="conf_account_type_view"/>
+        </record>
 
-       	<!-- Balance Sheet -->
+           <!-- Balance Sheet -->
 
         <record id="conf_bal" model="account.account.template">
             <field name="code">1</field>
@@ -125,120 +125,120 @@
             <field name="user_type" ref="conf_account_type_view"/>
         </record>
 
-	        <record id="conf_fas" model="account.account.template">
-	            <field name="code">10</field>
-	            <field name="name">Fixed Assets</field>
-	            <field ref="conf_bal" name="parent_id"/>
-	            <field name="type">view</field>
-	            <field name="user_type" ref="account_type_asset_view1"/>
-	        </record>
+            <record id="conf_fas" model="account.account.template">
+                <field name="code">10</field>
+                <field name="name">Fixed Assets</field>
+                <field ref="conf_bal" name="parent_id"/>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_asset_view1"/>
+            </record>
 
-		        <record id="conf_xfa" model="account.account.template">
-		            <field name="code">100</field>
-		            <field name="name">Fixed Asset Account</field>
-		            <field ref="conf_fas" name="parent_id"/>
-		            <field name="type">other</field>
-		            <field name="user_type" ref="account_type_asset_view1"/>
-		        </record>
+                <record id="conf_xfa" model="account.account.template">
+                    <field name="code">100</field>
+                    <field name="name">Fixed Asset Account</field>
+                    <field ref="conf_fas" name="parent_id"/>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="account_type_asset_view1"/>
+                </record>
 
-	        <record id="conf_nca" model="account.account.template">
-	            <field name="code">11</field>
-	            <field name="name">Net Current Assets</field>
-	            <field ref="conf_bal" name="parent_id"/>
-	            <field name="type">view</field>
-	            <field name="user_type" ref="account_type_asset_view1"/>
-	        </record>
+            <record id="conf_nca" model="account.account.template">
+                <field name="code">11</field>
+                <field name="name">Net Current Assets</field>
+                <field ref="conf_bal" name="parent_id"/>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_asset_view1"/>
+            </record>
 
-		        <record id="conf_cas" model="account.account.template">
-		            <field name="code">110</field>
-		            <field name="name">Current Assets</field>
-		            <field ref="conf_nca" name="parent_id"/>
-		            <field name="type">view</field>
-		            <field name="user_type" ref="account_type_asset_view1"/>
-		        </record>
+                <record id="conf_cas" model="account.account.template">
+                    <field name="code">110</field>
+                    <field name="name">Current Assets</field>
+                    <field ref="conf_nca" name="parent_id"/>
+                    <field name="type">view</field>
+                    <field name="user_type" ref="account_type_asset_view1"/>
+                </record>
 
-			        <record id="conf_stk" model="account.account.template">
-			            <field name="code">1101</field>
-			            <field name="name">Purchased Stocks</field>
-			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">other</field>
-			            <field name="user_type" ref="conf_account_type_asset"/>
-			        </record>
+                    <record id="conf_stk" model="account.account.template">
+                        <field name="code">1101</field>
+                        <field name="name">Purchased Stocks</field>
+                        <field ref="conf_cas" name="parent_id"/>
+                        <field name="type">other</field>
+                        <field name="user_type" ref="conf_account_type_asset"/>
+                    </record>
 
-			        <record id="conf_a_recv" model="account.account.template">
-			            <field name="code">1102</field>
-			            <field name="name">Debtors</field>
-			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">receivable</field>
-			            <field eval="True" name="reconcile"/>
-			            <field name="user_type" ref="conf_account_type_asset"/>
-			        </record>
+                    <record id="conf_a_recv" model="account.account.template">
+                        <field name="code">1102</field>
+                        <field name="name">Debtors</field>
+                        <field ref="conf_cas" name="parent_id"/>
+                        <field name="type">receivable</field>
+                        <field eval="True" name="reconcile"/>
+                        <field name="user_type" ref="conf_account_type_asset"/>
+                    </record>
 
-			        <record id="conf_ova" model="account.account.template">
-			            <field name="code">1103</field>
-			            <field name="name">Tax Paid</field>
-			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">other</field>
-			            <field name="user_type" ref="conf_account_type_asset"/>
-			        </record>
+                    <record id="conf_ova" model="account.account.template">
+                        <field name="code">1103</field>
+                        <field name="name">Tax Paid</field>
+                        <field ref="conf_cas" name="parent_id"/>
+                        <field name="type">other</field>
+                        <field name="user_type" ref="conf_account_type_asset"/>
+                    </record>
 
-			        <record id="conf_bnk" model="account.account.template">
-			            <field name="code">1104</field>
-			            <field name="name">Bank Current Account</field>
-			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">view</field>
-			            <field name="user_type" ref="account_type_asset_view1"/>
-			        </record>
+                    <record id="conf_bnk" model="account.account.template">
+                        <field name="code">1104</field>
+                        <field name="name">Bank Current Account</field>
+                        <field ref="conf_cas" name="parent_id"/>
+                        <field name="type">view</field>
+                        <field name="user_type" ref="account_type_asset_view1"/>
+                    </record>
 
-			        <record id="conf_o_income" model="account.account.template">
-			            <field name="code">1106</field>
-			            <field name="name">Opening Income Account</field>
-			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">other</field>
-			            <field name="user_type" ref="conf_account_type_income"/>
-			        </record>
+                    <record id="conf_o_income" model="account.account.template">
+                        <field name="code">1106</field>
+                        <field name="name">Opening Income Account</field>
+                        <field ref="conf_cas" name="parent_id"/>
+                        <field name="type">other</field>
+                        <field name="user_type" ref="conf_account_type_income"/>
+                    </record>
 
-		        <record id="conf_cli" model="account.account.template">
-		            <field name="code">111</field>
-		            <field name="name">Current Liabilities</field>
-		            <field ref="conf_nca" name="parent_id"/>
-		            <field name="type">view</field>
-		            <field name="user_type" ref="account_type_liability_view1"/>
-		        </record>
+                <record id="conf_cli" model="account.account.template">
+                    <field name="code">111</field>
+                    <field name="name">Current Liabilities</field>
+                    <field ref="conf_nca" name="parent_id"/>
+                    <field name="type">view</field>
+                    <field name="user_type" ref="account_type_liability_view1"/>
+                </record>
 
-			        <record id="conf_a_pay" model="account.account.template">
-			            <field name="code">1111</field>
-			            <field name="name">Creditors</field>
-			            <field ref="conf_cli" name="parent_id"/>
-			            <field name="type">payable</field>
-			            <field eval="True" name="reconcile"/>
-			            <field name="user_type" ref="conf_account_type_liability"/>
-			        </record>
+                    <record id="conf_a_pay" model="account.account.template">
+                        <field name="code">1111</field>
+                        <field name="name">Creditors</field>
+                        <field ref="conf_cli" name="parent_id"/>
+                        <field name="type">payable</field>
+                        <field eval="True" name="reconcile"/>
+                        <field name="user_type" ref="conf_account_type_liability"/>
+                    </record>
 
-			        <record id="conf_iva" model="account.account.template">
-			            <field name="code">1112</field>
-			            <field name="name">Tax Received</field>
-			            <field ref="conf_cli" name="parent_id"/>
-			            <field name="type">other</field>
-			            <field name="user_type" ref="conf_account_type_liability"/>
-			        </record>
+                    <record id="conf_iva" model="account.account.template">
+                        <field name="code">1112</field>
+                        <field name="name">Tax Received</field>
+                        <field ref="conf_cli" name="parent_id"/>
+                        <field name="type">other</field>
+                        <field name="user_type" ref="conf_account_type_liability"/>
+                    </record>
 
-			        <record id="conf_a_reserve_and_surplus" model="account.account.template">
-			            <field name="code">1113</field>
-			            <field name="name">Reserve and Profit/Loss Account</field>
-			            <field ref="conf_cli" name="parent_id"/>
-			            <field name="type">other</field>
-			            <field eval="True" name="reconcile"/>
-			            <field name="user_type" ref="conf_account_type_liability"/>
-			        </record>
+                    <record id="conf_a_reserve_and_surplus" model="account.account.template">
+                        <field name="code">1113</field>
+                        <field name="name">Reserve and Profit/Loss Account</field>
+                        <field ref="conf_cli" name="parent_id"/>
+                        <field name="type">other</field>
+                        <field eval="True" name="reconcile"/>
+                        <field name="user_type" ref="conf_account_type_liability"/>
+                    </record>
 
-			        <record id="conf_o_expense" model="account.account.template">
-			            <field name="code">1114</field>
-			            <field name="name">Opening Expense Account</field>
-			            <field ref="conf_cli" name="parent_id"/>
-			            <field name="type">other</field>
-			            <field name="user_type" ref="conf_account_type_expense"/>
-			        </record>
+                    <record id="conf_o_expense" model="account.account.template">
+                        <field name="code">1114</field>
+                        <field name="name">Opening Expense Account</field>
+                        <field ref="conf_cli" name="parent_id"/>
+                        <field name="type">other</field>
+                        <field name="user_type" ref="conf_account_type_expense"/>
+                    </record>
 
         <!-- Profit and Loss -->
 
@@ -250,53 +250,53 @@
             <field name="user_type" ref="conf_account_type_view"/>
         </record>
 
-	        <record id="conf_rev" model="account.account.template">
-	            <field name="code">20</field>
-	            <field name="name">Revenue</field>
-	            <field ref="conf_gpf" name="parent_id"/>
-	            <field name="type">view</field>
-	            <field name="user_type" ref="account_type_income_view1"/>
-	        </record>
+            <record id="conf_rev" model="account.account.template">
+                <field name="code">20</field>
+                <field name="name">Revenue</field>
+                <field ref="conf_gpf" name="parent_id"/>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_income_view1"/>
+            </record>
 
-		        <record id="conf_a_sale" model="account.account.template">
-		            <field name="code">200</field>
-		            <field name="name">Product Sales</field>
-		            <field ref="conf_rev" name="parent_id"/>
-		            <field name="type">other</field>
-		            <field name="user_type" ref="conf_account_type_income"/>
-		        </record>
+                <record id="conf_a_sale" model="account.account.template">
+                    <field name="code">200</field>
+                    <field name="name">Product Sales</field>
+                    <field ref="conf_rev" name="parent_id"/>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="conf_account_type_income"/>
+                </record>
 
-	        <record id="conf_cos" model="account.account.template">
-	            <field name="code">21</field>
-	            <field name="name">Cost of Sales</field>
-	            <field ref="conf_gpf" name="parent_id"/>
-	            <field name="type">view</field>
-	            <field name="user_type" ref="account_type_income_view1"/>
-	        </record>
+            <record id="conf_cos" model="account.account.template">
+                <field name="code">21</field>
+                <field name="name">Cost of Sales</field>
+                <field ref="conf_gpf" name="parent_id"/>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_income_view1"/>
+            </record>
 
-		        <record id="conf_cog" model="account.account.template">
-		            <field name="code">210</field>
-		            <field name="name">Cost of Goods Sold</field>
-		            <field ref="conf_cos" name="parent_id"/>
-		            <field name="type">other</field>
-		            <field name="user_type" ref="conf_account_type_expense"/>
-		        </record>
+                <record id="conf_cog" model="account.account.template">
+                    <field name="code">210</field>
+                    <field name="name">Cost of Goods Sold</field>
+                    <field ref="conf_cos" name="parent_id"/>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="conf_account_type_expense"/>
+                </record>
 
-	        <record id="conf_ovr" model="account.account.template">
-	            <field name="code">22</field>
-	            <field name="name">Overheads</field>
-	            <field ref="conf_gpf" name="parent_id"/>
-	            <field name="type">view</field>
-	            <field name="user_type" ref="account_type_expense_view1"/>
-	        </record>
+            <record id="conf_ovr" model="account.account.template">
+                <field name="code">22</field>
+                <field name="name">Overheads</field>
+                <field ref="conf_gpf" name="parent_id"/>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_expense_view1"/>
+            </record>
 
-		        <record id="conf_a_expense" model="account.account.template">
-		            <field name="code">220</field>
-		            <field name="name">Expenses</field>
-		            <field ref="conf_ovr" name="parent_id"/>
-		            <field name="type">other</field>
-		            <field name="user_type" ref="conf_account_type_expense"/>
-		        </record>
+                <record id="conf_a_expense" model="account.account.template">
+                    <field name="code">220</field>
+                    <field name="name">Expenses</field>
+                    <field ref="conf_ovr" name="parent_id"/>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="conf_account_type_expense"/>
+                </record>
 
                 <record id="conf_a_salary_expense" model="account.account.template">
                     <field name="code">221</field>
@@ -315,126 +315,126 @@
             <field name="name">Plan Fees </field>
         </record>
 
-	        <record id="tax_code_balance_net" model="account.tax.code.template">
-	            <field name="name">Tax Balance to Pay</field>
-	            <field name="parent_id" ref="tax_code_chart_root"/>
-	        </record>
+            <record id="tax_code_balance_net" model="account.tax.code.template">
+                <field name="name">Tax Balance to Pay</field>
+                <field name="parent_id" ref="tax_code_chart_root"/>
+            </record>
 
-			<!-- Input TAX -->
-	        <record id="tax_code_input" model="account.tax.code.template">
-	            <field name="name">Tax Received</field>
-	            <field name="parent_id" ref="tax_code_balance_net"/>
-	            <field eval="-1" name="sign"/>
-	        </record>
+            <!-- Input TAX -->
+            <record id="tax_code_input" model="account.tax.code.template">
+                <field name="name">Tax Received</field>
+                <field name="parent_id" ref="tax_code_balance_net"/>
+                <field eval="-1" name="sign"/>
+            </record>
 
-		        <record id="tax_code_input_S" model="account.tax.code.template">
-		            <field name="name">Tax Received Rate S (15%)</field>
-		            <field name="parent_id" ref="tax_code_input"/>
-		        </record>
+                <record id="tax_code_input_S" model="account.tax.code.template">
+                    <field name="name">Tax Received Rate S (15%)</field>
+                    <field name="parent_id" ref="tax_code_input"/>
+                </record>
 
-		        <record id="tax_code_input_R" model="account.tax.code.template">
-		            <field name="name">Tax Received Rate R (5%)</field>
-		            <field name="parent_id" ref="tax_code_input"/>
-		        </record>
+                <record id="tax_code_input_R" model="account.tax.code.template">
+                    <field name="name">Tax Received Rate R (5%)</field>
+                    <field name="parent_id" ref="tax_code_input"/>
+                </record>
 
-		        <record id="tax_code_input_X" model="account.tax.code.template">
-		            <field name="name">Tax Received Rate X (Exempt)</field>
-		            <field name="parent_id" ref="tax_code_input"/>
-		        </record>
+                <record id="tax_code_input_X" model="account.tax.code.template">
+                    <field name="name">Tax Received Rate X (Exempt)</field>
+                    <field name="parent_id" ref="tax_code_input"/>
+                </record>
 
-		        <record id="tax_code_input_O" model="account.tax.code.template">
-		            <field name="name">Tax Received Rate O (Out of scope)</field>
-		            <field name="parent_id" ref="tax_code_input"/>
-		        </record>
+                <record id="tax_code_input_O" model="account.tax.code.template">
+                    <field name="name">Tax Received Rate O (Out of scope)</field>
+                    <field name="parent_id" ref="tax_code_input"/>
+                </record>
 
-	        <!-- Output TAX -->
+            <!-- Output TAX -->
 
-	        <record id="tax_code_output" model="account.tax.code.template">
-	            <field name="name">Tax Paid</field>
-	            <field name="parent_id" ref="tax_code_balance_net"/>
-	        </record>
+            <record id="tax_code_output" model="account.tax.code.template">
+                <field name="name">Tax Paid</field>
+                <field name="parent_id" ref="tax_code_balance_net"/>
+            </record>
 
-		        <record id="tax_code_output_S" model="account.tax.code.template">
-		            <field name="name">Tax Paid Rate S (15%)</field>
-		            <field name="parent_id" ref="tax_code_output"/>
-		        </record>
+                <record id="tax_code_output_S" model="account.tax.code.template">
+                    <field name="name">Tax Paid Rate S (15%)</field>
+                    <field name="parent_id" ref="tax_code_output"/>
+                </record>
 
-		        <record id="tax_code_output_R" model="account.tax.code.template">
-		            <field name="name">Tax Paid Rate R (5%)</field>
-		            <field name="parent_id" ref="tax_code_output"/>
-		        </record>
+                <record id="tax_code_output_R" model="account.tax.code.template">
+                    <field name="name">Tax Paid Rate R (5%)</field>
+                    <field name="parent_id" ref="tax_code_output"/>
+                </record>
 
-		        <record id="tax_code_output_X" model="account.tax.code.template">
-		            <field name="name">Tax Paid Rate X (Exempt)</field>
-		            <field name="parent_id" ref="tax_code_output"/>
-		        </record>
+                <record id="tax_code_output_X" model="account.tax.code.template">
+                    <field name="name">Tax Paid Rate X (Exempt)</field>
+                    <field name="parent_id" ref="tax_code_output"/>
+                </record>
 
-		        <record id="tax_code_output_O" model="account.tax.code.template">
-		            <field name="name">Tax Paid Rate O (Out of scope)</field>
-		            <field name="parent_id" ref="tax_code_output"/>
-		        </record>
+                <record id="tax_code_output_O" model="account.tax.code.template">
+                    <field name="name">Tax Paid Rate O (Out of scope)</field>
+                    <field name="parent_id" ref="tax_code_output"/>
+                </record>
 
 
-	        <!-- Invoiced Base of TAX -->
+            <!-- Invoiced Base of TAX -->
 
-	        <!-- Purchases -->
+            <!-- Purchases -->
 
-	        <record id="tax_code_base_net" model="account.tax.code.template">
-	            <field name="name">Tax Bases</field>
-	            <field name="parent_id" ref="tax_code_chart_root"/>
-	        </record>
+            <record id="tax_code_base_net" model="account.tax.code.template">
+                <field name="name">Tax Bases</field>
+                <field name="parent_id" ref="tax_code_chart_root"/>
+            </record>
 
-		        <record id="tax_code_base_purchases" model="account.tax.code.template">
-		            <field name="name">Taxable Purchases Base</field>
-		            <field name="parent_id" ref="tax_code_base_net"/>
-		        </record>
+                <record id="tax_code_base_purchases" model="account.tax.code.template">
+                    <field name="name">Taxable Purchases Base</field>
+                    <field name="parent_id" ref="tax_code_base_net"/>
+                </record>
 
-			        <record id="tax_code_purch_S" model="account.tax.code.template">
-			            <field name="name">Taxable Purchases Rated S (15%)</field>
-			            <field name="parent_id" ref="tax_code_base_purchases"/>
-			        </record>
+                    <record id="tax_code_purch_S" model="account.tax.code.template">
+                        <field name="name">Taxable Purchases Rated S (15%)</field>
+                        <field name="parent_id" ref="tax_code_base_purchases"/>
+                    </record>
 
-			        <record id="tax_code_purch_R" model="account.tax.code.template">
-			            <field name="name">Taxable Purchases Rated R (5%)</field>
-			            <field name="parent_id" ref="tax_code_base_purchases"/>
-			        </record>
+                    <record id="tax_code_purch_R" model="account.tax.code.template">
+                        <field name="name">Taxable Purchases Rated R (5%)</field>
+                        <field name="parent_id" ref="tax_code_base_purchases"/>
+                    </record>
 
-			        <record id="tax_code_purch_X" model="account.tax.code.template">
-			            <field name="name">Taxable Purchases Type X (Exempt)</field>
-			            <field name="parent_id" ref="tax_code_base_purchases"/>
-			        </record>
+                    <record id="tax_code_purch_X" model="account.tax.code.template">
+                        <field name="name">Taxable Purchases Type X (Exempt)</field>
+                        <field name="parent_id" ref="tax_code_base_purchases"/>
+                    </record>
 
-			        <record id="tax_code_purch_O" model="account.tax.code.template">
-			            <field name="name">Taxable Purchases Type O (Out of scope)</field>
-			            <field name="parent_id" ref="tax_code_base_purchases"/>
-			        </record>
+                    <record id="tax_code_purch_O" model="account.tax.code.template">
+                        <field name="name">Taxable Purchases Type O (Out of scope)</field>
+                        <field name="parent_id" ref="tax_code_base_purchases"/>
+                    </record>
 
-		        <!-- Sales -->
+                <!-- Sales -->
 
-		        <record id="tax_code_base_sales" model="account.tax.code.template">
-		            <field name="name">Base of Taxable Sales</field>
-		            <field name="parent_id" ref="tax_code_base_net"/>
-		        </record>
+                <record id="tax_code_base_sales" model="account.tax.code.template">
+                    <field name="name">Base of Taxable Sales</field>
+                    <field name="parent_id" ref="tax_code_base_net"/>
+                </record>
 
-			        <record id="tax_code_sales_S" model="account.tax.code.template">
-			            <field name="name">Taxable Sales Rated S (15%)</field>
-			            <field name="parent_id" ref="tax_code_base_sales"/>
-			        </record>
+                    <record id="tax_code_sales_S" model="account.tax.code.template">
+                        <field name="name">Taxable Sales Rated S (15%)</field>
+                        <field name="parent_id" ref="tax_code_base_sales"/>
+                    </record>
 
-			        <record id="tax_code_sales_R" model="account.tax.code.template">
-			            <field name="name">Taxable Sales Rated R (5%)</field>
-			            <field name="parent_id" ref="tax_code_base_sales"/>
-			        </record>
+                    <record id="tax_code_sales_R" model="account.tax.code.template">
+                        <field name="name">Taxable Sales Rated R (5%)</field>
+                        <field name="parent_id" ref="tax_code_base_sales"/>
+                    </record>
 
-			        <record id="tax_code_sales_X" model="account.tax.code.template">
-			            <field name="name">Taxable Sales Type X (Exempt)</field>
-			            <field name="parent_id" ref="tax_code_base_sales"/>
-			        </record>
+                    <record id="tax_code_sales_X" model="account.tax.code.template">
+                        <field name="name">Taxable Sales Type X (Exempt)</field>
+                        <field name="parent_id" ref="tax_code_base_sales"/>
+                    </record>
 
-			        <record id="tax_code_sales_O" model="account.tax.code.template">
-			            <field name="name">Taxable Sales Type O (Out of scope)</field>
-			            <field name="parent_id" ref="tax_code_base_sales"/>
-			        </record>
+                    <record id="tax_code_sales_O" model="account.tax.code.template">
+                        <field name="name">Taxable Sales Type O (Out of scope)</field>
+                        <field name="parent_id" ref="tax_code_base_sales"/>
+                    </record>
 
         <record id="configurable_chart_template" model="account.chart.template">
             <field name="name">Configurable Account Chart Template</field>
@@ -450,7 +450,7 @@
             <field name="property_reserve_and_surplus_account" ref="conf_a_reserve_and_surplus"/>
         </record>
 
-     	<!-- VAT Codes -->
+         <!-- VAT Codes -->
         <!-- Purchases + Output VAT -->
 
         <record id="otaxs" model="account.tax.template">
@@ -569,9 +569,9 @@
 
 
 
-	    <!-- = = = = = = = = = = = = = = = -->
-	     <!-- Fiscal Mapping Templates     -->
-	    <!-- = = = = = = = = = = = = = = = -->
+        <!-- = = = = = = = = = = = = = = = -->
+         <!-- Fiscal Mapping Templates     -->
+        <!-- = = = = = = = = = = = = = = = -->
 
 
         <record id="fiscal_position_normal_taxes_template1" model="account.fiscal.position.template">
@@ -584,40 +584,40 @@
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
-	    <!-- = = = = = = = = = = = = = = = -->
-	    <!-- Fiscal Position Tax Templates -->
-	    <!-- = = = = = = = = = = = = = = = -->
+        <!-- = = = = = = = = = = = = = = = -->
+        <!-- Fiscal Position Tax Templates -->
+        <!-- = = = = = = = = = = = = = = = -->
 
 
-    	<record id="fiscal_position_normal_taxes" model="account.fiscal.position.tax.template">
+        <record id="fiscal_position_normal_taxes" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_normal_taxes_template1"/>
             <field name="tax_src_id" ref="itaxs"/>
             <field name="tax_dest_id" ref="otaxs"/>
         </record>
 
-    	<record id="fiscal_position_tax_exempt" model="account.fiscal.position.tax.template">
+        <record id="fiscal_position_tax_exempt" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_tax_exempt_template2"/>
             <field name="tax_src_id" ref="itaxx"/>
             <field name="tax_dest_id" ref="otaxx"/>
         </record>
 
 
-		<!--  Assigned Default Taxes For Different Account -->
+        <!--  Assigned Default Taxes For Different Account -->
 
-		<record id="conf_a_sale" model="account.account.template">
-			<field name="tax_ids" eval="[(6,0,[ref('itaxs')])]"/>
-		</record>
+        <record id="conf_a_sale" model="account.account.template">
+            <field name="tax_ids" eval="[(6,0,[ref('itaxs')])]"/>
+        </record>
 
-		<record id="conf_a_expense" model="account.account.template">
-			<field name="tax_ids" eval="[(6,0,[ref('otaxs')])]"/>
-		</record>
+        <record id="conf_a_expense" model="account.account.template">
+            <field name="tax_ids" eval="[(6,0,[ref('otaxs')])]"/>
+        </record>
 
-		<record id="action_wizard_multi_chart_todo" model="ir.actions.todo">
-			<field name="name">Generate Chart of Accounts from a Chart Template</field>
-			<field name="action_id" ref="account.action_wizard_multi_chart"/>
-			<field name="category_id" ref="account.category_accounting_configuration"/>
-			<field name="type">automatic</field>
-		</record>
+        <record id="action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="name">Generate Chart of Accounts from a Chart Template</field>
+            <field name="action_id" ref="account.action_wizard_multi_chart"/>
+            <field name="category_id" ref="account.category_accounting_configuration"/>
+            <field name="type">automatic</field>
+        </record>
 
 
     </data>
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index bf40e511eaa..2a1ff256d0e 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -142,6 +142,7 @@
       <record id="config_action_user_preferences_config_form" model="ir.actions.todo">
           <field name="action_id" ref="action_user_preferences_config_form"/>
           <field name="category_id" ref="base.category_administration_config"/>
+          <field name="type">once</field>
       </record>
 
       <!-- Create Additional Users  -->
@@ -201,6 +202,7 @@
       <record id="config_action_partner_terminology_config_form" model="ir.actions.todo">
           <field name="action_id" ref="action_partner_terminology_config_form"/>
           <field name="category_id" ref="base.category_administration_config"/>
+          <field name="type">once</field>
       </record>
 
     <!-- Company config -->
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index cef9f442cf9..bae2647ea11 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -363,6 +363,7 @@
 
         <record model="ir.actions.todo" id="todo_define_delivery_steps">
             <field name="action_id" ref="action_define_delivery_steps" />
+            <field name="type">once</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
index 80bd2867809..c54a69da57f 100644
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/outlook/outlook_installer.xml
@@ -57,6 +57,7 @@
             <field name="action_id" ref="action_outlook_installer"/>
             <field name="category_id" ref="base.category_sales_management_config"/>
             <field name="sequence">4</field>
+            <field name="type">automatic</field>
         </record>
 
         <record id="action_outlook_wizard" model="ir.actions.act_window">
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 53b4cb0933a..7974dd4af62 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -54,6 +54,7 @@
         <record id="config_wizard_action_configure_default_time_unit" model="ir.actions.todo">
             <field name="action_id" ref="action_configure_default_time_unit" />
             <field name="category_id" ref="category_project_config" />
+            <field name="type">once</field>
         </record>
 
         <record id="action_review_task_stage" model="ir.actions.act_window">
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index 9a06f66164a..490581e472b 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -44,6 +44,7 @@
         <record id="config_wizard_step_purchase_limit_amount" model="ir.actions.todo">
             <field name="action_id" ref="action_config_purchase_limit_amount"/>
             <field name="category_id" ref="purchase.category_purchase_config"/>
+            <field name="type">once</field>
         </record>
         
     </data>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b7f5d11e15f..68f83604e7d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -528,7 +528,7 @@
         </record>
 
         <record id="action_config_picking_policy" model="ir.actions.act_window">
-            <field name="name">Set up your Invoicing Method</field>
+            <field name="name">Setup your Invoicing Method</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.config.picking_policy</field>
             <field name="view_id" ref="view_config_picking_policy"/>
@@ -541,6 +541,7 @@
         <record id="config_wizard_step_sale_picking_policy" model="ir.actions.todo">
             <field name="action_id" ref="action_config_picking_policy"/>
             <field name="category_id" ref="base.category_sales_management_config"/>
+            <field name="type">once</field>
         </record>
 
     </data>
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 826906cb6ee..52954e330b6 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -59,6 +59,7 @@
         <field name="action_id" ref="action_thunderbird_installer"/>
         <field name="category_id" ref="base.category_sales_management_config"/>
         <field name="sequence">3</field>
+        <field name="type">automatic</field>
     </record>
 
 

From 81f4199fe636dfbca853860b8cdc0338ed8b6604 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 14:59:58 +0200
Subject: [PATCH 157/304] [IMP] config wizards useability

bzr revid: fp@tinyerp.com-20111002125958-uh8ubpli8izpxqyw
---
 addons/base_setup/base_setup_views.xml |  2 +-
 addons/purchase/purchase.py            |  8 ++--
 addons/sale/sale.py                    | 43 ++++++++---------
 addons/sale/sale_view.xml              | 64 ++++++++++++--------------
 4 files changed, 55 insertions(+), 62 deletions(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 2a1ff256d0e..2e2808d9ff4 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -176,7 +176,7 @@
                   <attribute name="string">Specify Your Terminology</attribute>
             </xpath>
             <xpath expr="//label[@string='description']" position="attributes">
-              <attribute name="string">Based on the industry needs you can use this wizard to change the terminologies for Partners. </attribute>
+              <attribute name="string">You can use this wizard to change the terminologies for customers in the whole application.</attribute>
             </xpath>
             <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
                   <attribute name="string"/>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index dcf29bfaceb..568be5953ca 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -188,11 +188,11 @@ 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','From PO/PO lines'),('order','Draft invoices pre-generated'),('picking','From receptions')], 'Invoicing Control', required=True,
-            help="From Order: a draft invoice will be generated based on the purchase order. The accountant " \
+        'invoice_method': fields.selection([('manual','Based on purchase order'),('order','Draft invoices pre-generated'),('picking','Based on receptions')], 'Invoicing Control', required=True,
+            help="Based on orders: a draft invoice will be generated based on the purchase order. The accountant " \
                 "will just have to validate this invoice for control.\n" \
-                "From Reception: a draft invoice will be generated based on validated receptions.\n" \
-                "Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders."
+                "Based on receptions: a draft invoice will be generated based on validated receptions.\n" \
+                "Pre-generate Invoice: allows you to generate draft suppliers invoices on validation of the PO."
         ),
         '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/sale/sale.py b/addons/sale/sale.py
index 16cb5faf065..6f1b3abf40e 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1216,7 +1216,7 @@ class sale_config_picking_policy(osv.osv_memory):
             ('manual', 'Invoice Based on Sales Orders'),
             ('picking', 'Invoice Based on Deliveries'),
         ], 'Main Method Based On', required=True, help="You can generate invoices based on sales orders or based on shippings."),
-        'charge_delivery': fields.boolean('Do you charge the delivery'),
+        'charge_delivery': fields.boolean('Do you charge the delivery?'),
         'time_unit': fields.many2one('product.uom','Main Working Time Unit')
     }
     _defaults = {
@@ -1225,10 +1225,10 @@ class sale_config_picking_policy(osv.osv_memory):
 
     def onchange_order(self, cr, uid, ids, sale, deli, context=None):
         res = {}
-        if sale or deli:
-            res.update({'order_policy': 'manual'})
-        elif not sale and not deli:
+        if sale:
             res.update({'order_policy': 'manual'})
+        elif deli:
+            res.update({'order_policy': 'picking'})
         else:
             return {}
         return {'value':res}
@@ -1240,26 +1240,18 @@ class sale_config_picking_policy(osv.osv_memory):
         module_obj = self.pool.get('ir.module.module')
         module_upgrade_obj = self.pool.get('base.module.upgrade')
         module_name = []
-        group_ids=[]
-        group_name = ['group_sale_salesman','group_sale_manager']
 
-        for name in group_name:
-            data_id = data_obj.name_search(cr, uid, name)
-            group_ids.append(data_obj.browse(cr,uid,data_id[0][0]).res_id)
+        group_id = data_obj.get_object(cr, uid, 'base', 'group_sale_salesman').id
 
         wizard = self.browse(cr, uid, ids)[0]
 
         if wizard.sale_orders:
-            menu_name = 'menu_invoicing_sales_order_lines'
-            data_id = data_obj.name_search(cr, uid, menu_name)
-            menu_id = data_obj.browse(cr,uid,data_id[0][0]).res_id
-            menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_ids[0]),(4,group_ids[1])]}) 
+            menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_invoicing_sales_order_lines').id
+            menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]}) 
 
         if wizard.deli_orders:
-            menu_name = 'menu_action_picking_list_to_invoice'
-            data_id = data_obj.name_search(cr, uid, menu_name)
-            menu_id = data_obj.browse(cr,uid,data_id[0][0]).res_id
-            menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_ids[0]),(4,group_ids[1])]})
+            menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_action_picking_list_to_invoice').id
+            menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]})
 
         if wizard.task_work:
             module_name.append('project_timesheet')
@@ -1269,12 +1261,7 @@ class sale_config_picking_policy(osv.osv_memory):
             module_name.append('account_analytic_analysis')
 
         if wizard.charge_delivery:
-            module_name.append('delivery')    
-
-        if wizard.time_unit:
-            product_obj = self.pool.get('product.product')
-            product_id = product_obj.name_search(cr, uid, 'Employee')
-            product_obj.write(cr, uid, product_id[0][0], {'uom_id':wizard.time_unit.id})
+            module_name.append('delivery')
 
         if len(module_name):
             module_ids = []
@@ -1292,7 +1279,17 @@ class sale_config_picking_policy(osv.osv_memory):
             if need_install:
                 pooler.restart_pool(cr.dbname, update_module=True)[1]
 
+        if wizard.time_unit:
+            prod_id = data_obj.get_object(cr, uid, 'hr_timesheet', 'product_consultant').id
+            product_obj = self.pool.get('product.product')
+            product_obj.write(cr, uid, prod_id, {'uom_id':wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id})
+
         ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], wizard.order_policy)  
+        if wizard.task_work and wizard.time_unit:
+            company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+            self.pool.get('res.company').write(cr, uid, [company_id], {
+                'project_time_mode_id': wizard.time_unit.id
+            }, context=context)
 
 sale_config_picking_policy()
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 68f83604e7d..4669a9d7d9c 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -481,48 +481,44 @@
         <!-- configartion view -->
 
         <record id="view_config_picking_policy" model="ir.ui.view">
-            <field name="name">Set Up Your Invoicing Method</field>
+            <field name="name">Setup Your Invoicing Method</field>
             <field name="model">sale.config.picking_policy</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
-                  <attribute name="string">Sales Application Configuration</attribute>
+                  <attribute name="string">Setup your Invoicing Method</attribute>
                 </form>
-                <group colspan="4" col="8" position="replace">
-                    <group colspan="8">
-                        <separator string="How do you generate your customer invoice ?"/>
+
+                <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
+                    <attribute name="string">Setup your Invoicing Method</attribute>
+                </xpath>
+                <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">This tool will help you to install the right module and configure the system according to the method you use to invoice your customers.</attribute>
+                </xpath>
+                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                    <attribute name="string"/>
+                    <attribute name="rowspan">12</attribute>
+                </xpath>
+                <group string="res_config_contents" position="replace">
+                    <group colspan="4" col="4">
+                       <field name="sale_orders" on_change="onchange_order(sale_orders,deli_orders)"/>
+                       <newline/>
+                       <field name="deli_orders" on_change="onchange_order(sale_orders,deli_orders)"/>
+                       <newline/>
+                       <field name="task_work"/>
+                       <newline/>
+                       <field name="timesheet"/>
+                       <newline/>
+                       <separator string="Options" colspan="4"/>
+                       <field name="order_policy" attrs="{'invisible':['|',('sale_orders','!=',True),('deli_orders','!=',True)]}"/>
+                       <newline/>
+                       <field name="charge_delivery" attrs="{'invisible':[('sale_orders','!=',True), ('deli_orders','!=',True)]}"/>
+                       <newline/>
+                       <field name="time_unit" widget="selection" domain="[('category_id','=',%(product.uom_categ_wtime)s)]" attrs="{'invisible':[('task_work','=',False),('timesheet','=',False)]}"/>
                     </group>
-                    <group colspan="8" col="2">
-                        <label align="0.0" string="Based on Sales Orders" width="200"/>
-                        <field name="sale_orders" on_change="onchange_order(sale_orders,deli_orders)" nolabel="1"/>
-                        <label align="0.0" string="Based on Delivery Orders" width="200"/>
-                        <field name="deli_orders" on_change="onchange_order(sale_orders,deli_orders)" nolabel="1"/>
-                        <label align="0.0" string="Based on Task's Work" width="200"/>
-                        <field name="task_work" nolabel="1"/>
-                        <label align="0.0" string="Based on Timesheet" width="200"/>
-                        <field name="timesheet" nolabel="1"/>
-                    </group>
-                    <group colspan="8">
-                        <separator string="Options"/>
-                    </group>
-                    <group colspan="8">
-                        <group colspan="4" col="2" attrs="{'invisible':['|',('sale_orders','!=',True),('deli_orders','!=',True)]}">
-                            <label align="0.0" string="Main Method Based On" width="200"/>
-                            <field name="order_policy" nolabel="1"/>
-                        </group>
-                        <group colspan="4" col="2" attrs="{'invisible':[('sale_orders','!=',True), ('deli_orders','!=',True)]}">
-                            <label align="0.0" string="Do you charge the delivery" width="200"/>
-                            <field name="charge_delivery" nolabel="1"/>
-                        </group>
-                        <group colspan="4" col="2" attrs="{'invisible':[('task_work','=',False),('timesheet','=',False)]}">
-                            <label align="0.0" string="Main Working Time Unit" width="200"/>
-                            <field name="time_unit" widget="selection" domain="[('category_id','=',3)]" nolabel="1"/>
-                        </group>
-                    </group>
-                </group>
-                <xpath expr="//button[@name=&quot;action_skip&quot;]" position="replace"/>
+                 </group>
               </data>
             </field>
         </record>

From 1dc046496ea0404947f11c54df2f626b7194effb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 15:33:24 +0200
Subject: [PATCH 158/304] [IMP] useability

bzr revid: fp@tinyerp.com-20111002133324-ij24c1a83ynr805f
---
 addons/hr_timesheet/hr_timesheet_data.xml | 2 +-
 addons/hr_timesheet/hr_timesheet_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet_data.xml b/addons/hr_timesheet/hr_timesheet_data.xml
index 74403343a03..e6130806b2e 100644
--- a/addons/hr_timesheet/hr_timesheet_data.xml
+++ b/addons/hr_timesheet/hr_timesheet_data.xml
@@ -16,7 +16,7 @@
         <record id="hr.employee" model="hr.employee">
             <field name="product_id" ref="product_consultant"/>
         </record>
-        
+
         <record id="analytic_journal" model="account.analytic.journal">
             <field name="code">TS</field>
             <field name="name">Timesheet Journal</field>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 710291c8f32..f2b8a6beb0f 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -104,8 +104,8 @@
                 <page string="Categories" position="after">
                     <page string="Timesheets" groups="base.group_hr_user">
                         <field name="product_id" domain="[('type','=','service')]"/>
-                        <field name="uom_id"/>
                         <field name="journal_id" widget="selection"/>
+                        <field name="uom_id" invisible="1"/>
                     </page>
                 </page>
             </field>

From dca927ac8b01f80c7de75117d4380ac7c9a15cce Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 15:57:59 +0200
Subject: [PATCH 159/304] [IMP] Useability sale order

bzr revid: fp@tinyerp.com-20111002135759-m6jinhcrog83aumi
---
 addons/sale/sale.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6f1b3abf40e..3d3bd8e0590 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1229,8 +1229,6 @@ class sale_config_picking_policy(osv.osv_memory):
             res.update({'order_policy': 'manual'})
         elif deli:
             res.update({'order_policy': 'picking'})
-        else:
-            return {}
         return {'value':res}
 
     def execute(self, cr, uid, ids, context=None):

From a15f532739815f62fe660da6056833e383ef29b4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 17:44:57 +0200
Subject: [PATCH 160/304] [IMP] config wizard list not editable

bzr revid: fp@tinyerp.com-20111002154457-5krl4kuwasihs16a
---
 openerp/addons/base/ir/ir.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 30d28ba18b0..4766134a70c 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -1880,7 +1880,7 @@
             <field name="name">Config Wizard Steps</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree editable="bottom" string="Config Wizard Steps">
+                <tree string="Config Wizard Steps">
                     <field name="sequence"/>
                     <field name="action_id"/>
                     <field name="category_id"/>

From f5a95f40fe4604e22c868b621369cdc8e5e11297 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 17:48:02 +0200
Subject: [PATCH 161/304] [IMP] purchase invoice control wizard improvemens

bzr revid: fp@tinyerp.com-20111002154802-pnl31a0ulf688jcp
---
 addons/purchase/purchase.py                   |  2 +-
 addons/purchase/purchase_view.xml             |  4 +-
 addons/purchase/wizard/purchase_installer.py  | 18 ++++-----
 addons/purchase/wizard/purchase_installer.xml | 37 ++++++++++++++-----
 4 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 568be5953ca..db494add04b 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -188,7 +188,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'),('order','Draft invoices pre-generated'),('picking','Based on receptions')], 'Invoicing Control', required=True,
+        'invoice_method': fields.selection([('manual','Based on purchase order lines'),('order','Draft invoices pre-generated'),('picking','Based on receptions')], 'Invoicing Control', required=True,
             help="Based on orders: a draft invoice will be generated based on the purchase order. The accountant " \
                 "will just have to validate this invoice for control.\n" \
                 "Based on receptions: a draft invoice will be generated based on validated receptions.\n" \
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index cb7224faaf0..60c6c39bf05 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -497,14 +497,14 @@
 
 
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
-            <field name="name">On Purchase Order Line</field>
+            <field name="name">On Purchase Order Lines</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order.line</field>
             <field name="domain">[('order_id.invoice_method','&lt;&gt;','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="purchase_order_line_search"/>
-            <field name="help">If you set the invoicing control on a purchase order as "Manual", you can track here all the purchase order lines for which you have not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu.</field>
+            <field name="help">If you set the invoicing control on a purchase order as "Based on Purchase Order Lines", you can track here all the purchase order lines for which you have not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu.</field>
         </record>
         <record id="purchase_line_form_action_tree2" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py
index c6d70947893..03327002953 100644
--- a/addons/purchase/wizard/purchase_installer.py
+++ b/addons/purchase/wizard/purchase_installer.py
@@ -31,24 +31,24 @@ purchase_installer()
 
 class purchase_config_wizard(osv.osv_memory):
     _name = 'purchase.config.wizard'
+    _inherit = 'res.config'
 
     _columns = {
         'default_method' : fields.selection(
-            [('manual', 'Based on Purchase Orders'),
+            [('manual', 'Based on Purchase Order Lines'),
              ('picking', 'Based on Receptions'),
-             ('order', 'Pre-Generate Draft Invoices on Purchase Orders'),
-            ],
-            'Default Invoicing Control Method',
-            required=True,
-        ),
+             ('order', 'Pre-Generate Draft Invoices on Based Purchase Orders'),
+            ], 'Default Invoicing Control Method', required=True,
+        )
+    }
+    _defaults = {
+        'default_method': lambda s,c,u,ctx: s.pool.get('purchase.order').default_get(c,u,['invoice_method'],context=ctx)['invoice_method']
     }
 
-    def validate_cb(self, cr, uid, ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         wizard = self.browse(cr, uid, ids, context=context)[0]
-
         proxy = self.pool.get('ir.values')
         proxy.set(cr, uid, 'default', False, 'invoice_method', ['purchase.order'], wizard.default_method),
-
         return {'type' : 'ir.actions.act_window_close'}
 
 purchase_config_wizard()
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index cf9b6a985db..0519ac3dd01 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -40,32 +40,49 @@
         </record>
 
         <record id="view_purchase_config" model="ir.ui.view">
-            <field name="name">purchase.view_purchase_config</field>
-            <field name="type">form</field>
+            <field name="name">Invoicing Control on Purchases</field>
             <field name="model">purchase.config.wizard</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Purchase Config">
-                    <label string="Set Your Default Invoicing Control Method" />
-                    <field name="default_method" nolabel="1"/>
-
-                    <group colspan="4">
-                        <button special="cancel" icon="gtk-cancel" string="Cancel" />
-                        <button name="validate_cb" string="Validate" icon="gtk-apply" type="object" />
-                    </group>
+              <data>
+                <form position="attributes">
+                  <attribute name="string">Invoicing Control on Purchases</attribute>
                 </form>
+
+                <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
+                    <attribute name="string">Invoicing Control on Purchases</attribute>
+                </xpath>
+                <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">This tool will help you to select the method you want to use to control supplier invoices.</attribute>
+                </xpath>
+                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                    <attribute name="string"/>
+                    <attribute name="rowspan">12</attribute>
+                </xpath>
+                <group string="res_config_contents" position="replace">
+                    <group colspan="4" col="4">
+                       <field name="default_method"/>
+                    </group>
+                 </group>
+              </data>
             </field>
         </record>
 
+
         <record id="action_purchase_config" model="ir.actions.act_window">
             <field name="name">Set the Default Invoicing Control Method</field>
             <field name="res_model">purchase.config.wizard</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+            <field name="view_id" ref="view_purchase_config"/>
         </record>
 
         <record id="todo_purchase_config" model="ir.actions.todo">
             <field name="action_id" ref="action_purchase_config" />
+            <field name="category_id" ref="category_purchase_config" />
+            <field name="type">once</field>
         </record>
     </data>
 </openerp>

From b8af9b3423c385f270f877eb864ea6a8bb6f514b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 17:57:44 +0200
Subject: [PATCH 162/304] [FIX] hr_evaluation

bzr revid: fp@tinyerp.com-20111002155744-cpc21ctqd4bpmrsq
---
 addons/hr_evaluation/__openerp__.py         | 2 +-
 addons/hr_evaluation/hr_evaluation_demo.xml | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 addons/hr_evaluation/hr_evaluation_demo.xml

diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 95ef4512d5c..6deba41c05f 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -39,7 +39,7 @@ level of employee hierarchy fills what and final review and evaluation
 is done by the manager.Every evaluation filled by the employees can be viewed
 in the form of pdf file. Implements a dashboard for My Current Evaluations
          """,
-    "demo": ["hr_evaluation_demo.xml", ],
+    "demo": [],
     "data": [
         "security/ir.model.access.csv",
         "security/hr_evaluation_security.xml",
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
deleted file mode 100644
index f8220663291..00000000000
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-</openerp>

From 709bdcf3e9a726155156278abee3e8d56127c453 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 18:04:10 +0200
Subject: [PATCH 163/304] [IMP] better useability

bzr revid: fp@tinyerp.com-20111002160410-l7db0cwv2j1173tt
---
 addons/delivery/delivery.py       | 7 ++++---
 addons/delivery/delivery_view.xml | 5 +++--
 addons/sale/sale.py               | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 437e2ab6f80..77ef0ae9220 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -249,8 +249,10 @@ class define_delivery_steps(osv.osv_memory):
     _name = 'delivery.define.delivery.steps.wizard'
 
     _columns = {
-        'picking_policy' : fields.selection([('direct', 'Partial Delivery'), ('one', 'Complete Delivery'),],
-                                            'Picking Policy', required=True),
+        'picking_policy' : fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once'),],
+    }
+    _defaults = {
+        'picking_policy': lambda s,c,u,ctx: s.pool.get('sale.order').default_get(c,u,['picking_policy'],context=ctx)['picking_policy']
     }
 
     def apply_cb(self, cr, uid, ids, context=None):
@@ -262,5 +264,4 @@ class define_delivery_steps(osv.osv_memory):
 define_delivery_steps()
 
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index bae2647ea11..6b312223308 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -342,7 +342,8 @@
             <field name="model">delivery.define.delivery.steps.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Setup Your Delivery Steps">
+                <form string="Setup Your Picking Policy">
+                    <separator string="Choose Your Default Picking Policy" colspan="4"/>
                     <field name="picking_policy" />
                     <separator string="" colspan="4"/>
                     <group colspan="4">
@@ -354,7 +355,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_define_delivery_steps">
-            <field name="name">Setup Your Delivery Steps</field>
+            <field name="name">Setup Your Picking Policy</field>
             <field name="res_model">delivery.define.delivery.steps.wizard</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 3d3bd8e0590..d9b8cfb88f9 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -216,7 +216,7 @@ class sale_order(osv.osv):
         'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."),
 
         'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."),
-        'picking_policy': fields.selection([('direct', 'Partial Delivery'), ('one', 'Complete Delivery')],
+        'picking_policy': fields.selection([('direct', 'Deliver each products when available'), ('one', 'Deliver all products at once')],
             'Picking Policy', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""),
         'order_policy': fields.selection([
             ('prepaid', 'Pay before delivery'),

From 751bb006c9826834c94aba089e93e1ef59522ad3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 18:08:04 +0200
Subject: [PATCH 164/304] [FIX] delivery

bzr revid: fp@tinyerp.com-20111002160804-wmr1usci1x7m9g2z
---
 addons/delivery/delivery.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 77ef0ae9220..cac4c20c288 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -249,7 +249,7 @@ class define_delivery_steps(osv.osv_memory):
     _name = 'delivery.define.delivery.steps.wizard'
 
     _columns = {
-        'picking_policy' : fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once'),],
+        'picking_policy' : fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')], 'Picking Policy'),
     }
     _defaults = {
         'picking_policy': lambda s,c,u,ctx: s.pool.get('sale.order').default_get(c,u,['picking_policy'],context=ctx)['picking_policy']

From ed8577be956d819fc24364687abcfac67e69fd28 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 18:12:38 +0200
Subject: [PATCH 165/304] [IMP] config wizards

bzr revid: fp@tinyerp.com-20111002161238-jo5g9hegmthht888
---
 addons/delivery/delivery_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 6b312223308..deb13679355 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -364,6 +364,7 @@
 
         <record model="ir.actions.todo" id="todo_define_delivery_steps">
             <field name="action_id" ref="action_define_delivery_steps" />
+            <field name="category_id" ref="base.category_sales_management_config"/>
             <field name="type">once</field>
         </record>
     </data>

From d63d532a526ff9142af7d4682fb418bef9da8293 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 18:13:28 +0200
Subject: [PATCH 166/304] [IMP] typo

bzr revid: fp@tinyerp.com-20111002161328-74c6szghjgyjtvnw
---
 addons/lunch/lunch_installer_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/lunch/lunch_installer_view.xml b/addons/lunch/lunch_installer_view.xml
index c417a9e6383..716ba36a49c 100644
--- a/addons/lunch/lunch_installer_view.xml
+++ b/addons/lunch/lunch_installer_view.xml
@@ -17,7 +17,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_create_cashbox">
-            <field name="name">Create CashBox</field>
+            <field name="name">Create Lunch Cash Boxes</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">lunch.cashbox</field>
             <field name="view_type">form</field>

From 875ba0630ccb243bdacc513128061906b4edee9f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 18:16:56 +0200
Subject: [PATCH 167/304] [IMP] Simplified Administration Dashboard

bzr revid: fp@tinyerp.com-20111002161656-d76mkhmlupcj4xiy
---
 addons/board/board_administration_view.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/board/board_administration_view.xml b/addons/board/board_administration_view.xml
index 29146ad53ad..9e22dbd3fb6 100644
--- a/addons/board/board_administration_view.xml
+++ b/addons/board/board_administration_view.xml
@@ -139,13 +139,11 @@
                 <form string="Administration Dashboard">
                     <hpaned position="100">
                         <child1>
-                            <action width="510" name="%(action_user_connection_tree)d" string="User Connections" />
-                            <action width="510" name="%(action_latest_activities_tree)d" string="Latest Activities" />
+                            <action name="%(board_config_overview)d" string="Configuration Overview"/>
+                            <action name="%(action_latest_activities_tree)d" string="Latest Activities" />
                         </child1>
                         <child2>
-                          <action name="%(board_config_overview)d" string="Configuration Overview"/>
-                            <action  name="%(board_monthly_res_log_report_action)d" string="Monthly Activity per Document"/>
-                            <action  name="%(board_weekly_res_log_report_action)d" string="Weekly Global Activity" />
+                            <action name="%(action_user_connection_tree)d" string="Users" />
                         </child2>
                     </hpaned>
                 </form>

From a4b1c832df4dc93c9714cf77eb7e6084ed3f21b5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 18:19:40 +0200
Subject: [PATCH 168/304] [FIX] subscription bad raise

bzr revid: fp@tinyerp.com-20111002161940-r2b0fj0uut75ay1e
---
 addons/subscription/subscription.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index 0f2630ffbb5..466defd1fa2 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -38,12 +38,6 @@ class subscription_document(osv.osv):
     _defaults = {
         'active' : lambda *a: True,
     }
-    
-    def write(self, cr, uid, ids, vals, context=None):
-        if 'model' in vals:
-            raise osv.except_osv(_('Error !'),_('You cannot modify the Object linked to the Document Type!\nCreate another Document instead !'))
-        return super(subscription_document, self).write(cr, uid, ids, vals, context=context)
-    
 subscription_document()
 
 class subscription_document_fields(osv.osv):

From c4b493f502e09fb1191657d01ef8061ed2f535be Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 18:44:53 +0200
Subject: [PATCH 169/304] [IMP] remove unused relate

bzr revid: fp@tinyerp.com-20111002164453-ezrjck2labtz4ni6
---
 addons/project/project_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 3a88c8ffb8a..b518cb31de2 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -663,7 +663,6 @@
             </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="[('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" 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>

From 56c5b496baee8455e349695fa0361d33bdc2ccfe Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 19:42:15 +0200
Subject: [PATCH 170/304] [IMP] useability remove plugins form main menu

bzr revid: fp@tinyerp.com-20111002174215-5ctqdm0ysa988evi
---
 addons/outlook/outlook_installer.xml         | 3 ---
 addons/thunderbird/thunderbird_installer.xml | 2 --
 2 files changed, 5 deletions(-)

diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
index c54a69da57f..bb2aeb31fd2 100644
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/outlook/outlook_installer.xml
@@ -72,10 +72,7 @@
         </record>
 
         <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>
-
         <menuitem id="menu_base_config_plugins_outlook" action="action_outlook_wizard" parent="base.menu_base_config_plugins" sequence="10"/>
 
-        <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1" />
-        <menuitem id="menu_base_config_plugins_outlook_sales" action="action_outlook_wizard" parent="base.menu_sales" />
     </data>
 </openerp>
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 52954e330b6..2fb5d3177c3 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -76,8 +76,6 @@
 
     <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>
     <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" parent="base.menu_base_config_plugins" sequence="10"/>
-    <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1" />
-    <menuitem id="menu_base_config_plugins_thunderbird_sales" action="action_thunderbird_wizard" parent="base.menu_sales" />
 
   </data>
 </openerp>

From 8d7a2aff58cfa3a8612c5ce4d9c658409f396dff Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 3 Oct 2011 03:17:35 +0200
Subject: [PATCH 171/304] [IMP] packaging debian

bzr revid: al@openerp.com-20111003011735-02q79s36os3wltm6
---
 debian/control                   |  7 ++-----
 debian/openerp.install           |  2 +-
 debian/openerp.lintian-overrides |  7 -------
 debian/openerp.postinst          |  2 --
 debian/rules                     | 13 +++++++++++--
 debian/source/format             |  1 -
 install/openerp-server.conf      | 27 ---------------------------
 7 files changed, 14 insertions(+), 45 deletions(-)
 delete mode 100644 debian/openerp.lintian-overrides
 delete mode 100644 debian/source/format

diff --git a/debian/control b/debian/control
index 7c1da67d3cf..ca7131c1508 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,10 @@ Source: openerp
 Section: net
 Priority: optional
 Maintainer: OpenERP SA <al@openerp.com>
-Build-Depends: debhelper (>= 7.0.50~), python
-Build-Depends-Indep:
- python-libxslt1, python-lxml, python-pychart, python-pydot, python-psycopg2,
- python-reportlab
+Build-Depends: debhelper (>= 7.0.50~), python, rsync
 Standards-Version: 3.9.1
 Homepage: http://www.openerp.com/
-Vcs-Bzr: https://code.launchpad.net/openobject
+Vcs-Bzr: https://launchpad.net/openobject
 
 Package: openerp
 Section: net
diff --git a/debian/openerp.install b/debian/openerp.install
index 78a4a648a06..511075fb7c9 100644
--- a/debian/openerp.install
+++ b/debian/openerp.install
@@ -1 +1 @@
-doc/openerp-server.conf		/etc
+install/openerp-server.conf /etc/openerp
diff --git a/debian/openerp.lintian-overrides b/debian/openerp.lintian-overrides
deleted file mode 100644
index 25b1165c4be..00000000000
--- a/debian/openerp.lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-# Add-on directories needs data directories, and sometimes they are
-# (intentionally) empty, hence overriting the lintian warning.
-openerp-server: package-contains-empty-directory
-# Add-on directoires contain images sometimes, but it's nothing that is
-# worthwile to be splittet out to /usr/share as it's all manual work for each
-# release.
-openerp-server: image-file-in-usr-lib
diff --git a/debian/openerp.postinst b/debian/openerp.postinst
index bbeee2a15f7..edb6c16450f 100644
--- a/debian/openerp.postinst
+++ b/debian/openerp.postinst
@@ -2,8 +2,6 @@
 
 set -e
 
-. /usr/share/debconf/confmodule
-
 CONFFILE="/etc/openerp.conf"
 FILESTORE="/var/lib/openerp/filestore"
 LOGFILE="/var/log/openerp.log"
diff --git a/debian/rules b/debian/rules
index 52d395fd86e..7d8b210d1ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,18 @@
 #!/usr/bin/make -f
 
-EXTRA_MODULES_PATH ?= ../addons
-
 %:
 	dh  ${@}
 
+override_dh_pysupport:
+	echo "rsync"
+	sh -c "[ -d debian/openerp/usr/lib/python2.6 ] && rsync -av openerp/ debian/openerp/usr/lib/python2.6/dist-packages/openerp/" || true
+	sh -c "[ -d debian/openerp/usr/lib/python2.7 ] && rsync -av openerp/ debian/openerp/usr/lib/python2.7/dist-packages/openerp/" || true
+	rm -Rf debian/openerp/usr/openerp debian/openerp/usr/lib/python2.6/dist-packages/tests debian/openerp/usr/lib/python2.7/dist-packages/tests
+	dh_pysupport
+	rm -Rf debian/openerp/usr/lib
+
+
+
 override_dh_installinit:
 	dh_installinit --update-rcd-params='defaults 21'
+
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index d3827e75a5c..00000000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-1.0
diff --git a/install/openerp-server.conf b/install/openerp-server.conf
index 4f13c8a45c2..ead261e5218 100644
--- a/install/openerp-server.conf
+++ b/install/openerp-server.conf
@@ -1,34 +1,7 @@
 [options]
-without_demo = True
 ; This is the password that allows database operations:
 ; admin_passwd = admin
-upgrade = False
-verbose = False
-netrpc = True
-; netrpc_interface = 
-; netrpc_port = 
-xmlrpc = True
-; xmlrpc_interface = 
-xmlrpc_port = 8069
 db_host = False
 db_port = False
-; Please uncomment the following line *after* you have created the
-; database. It activates the auto module check on startup.
-; db_name = terp
 db_user = openerp
 db_password = False
-; Uncomment these for xml-rpc over SSL
-; secure = True
-; secure_cert_file = /etc/openerp/server.cert
-; secure_pkey_file = /etc/openerp/server.key
-root_path = None
-soap = False
-translate_modules = ['all']
-demo = {}
-addons_path = None
-reportgz = False
-
-; Static http parameters
-static_http_enable = False
-static_http_document_root = /var/www/html
-static_http_url_prefix = /
\ No newline at end of file

From 28a5c5840ba41c413f582a0159bcf45ca997c401 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 3 Oct 2011 03:39:56 +0200
Subject: [PATCH 172/304] [IMP] packaging debian

bzr revid: al@openerp.com-20111003013956-kekmedzn8qm3u3s7
---
 debian/control          |  4 ++--
 debian/openerp.postinst | 46 ++++++++++++++++-------------------------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/debian/control b/debian/control
index ca7131c1508..3165879fa3f 100644
--- a/debian/control
+++ b/debian/control
@@ -35,8 +35,8 @@ Depends:
  python-werkzeug,
  python-yaml,
  python-zsi
-Conflicts: tinyerp-server, openerp-server
-Replaces: tinyerp-server, openerp-server
+Conflicts: tinyerp-server, openerp-server, openerp-web
+Replaces: tinyerp-server, openerp-server, openerp-web
 Recommends:
  graphviz, ghostscript, postgresql, python-imaging, python-matplotlib
 Description: OpenERP Enterprise Resource Management
diff --git a/debian/openerp.postinst b/debian/openerp.postinst
index edb6c16450f..362741bb7e9 100644
--- a/debian/openerp.postinst
+++ b/debian/openerp.postinst
@@ -2,35 +2,25 @@
 
 set -e
 
-CONFFILE="/etc/openerp.conf"
-FILESTORE="/var/lib/openerp/filestore"
-LOGFILE="/var/log/openerp.log"
-USERNAME="openerp"
-
 case "${1}" in
-	configure)
-		if ! getent passwd | grep -q "^${USERNAME}" then
-			adduser --system --no-create-home --quiet --gecos 'OpenERP' --group ${USERNAME}
-		fi
-		# Creating log file
-		touch ${LOGFILE}
-		chown ${USERNAME}:${USERNAME} ${LOGFILE}
-		chmod 0640 ${LOGFILE}
-		# Creating local storage directory
-		mkdir -p ${FILESTORE}
-		# Setting ownership and permissions
-		chmod 0640 ${CONFFILE}
-		chown ${_USERNAME}:${_USERNAME} ${CONFFILE}
-		chown ${_USERNAME}:${_USERNAME} /var/lib/openerp -R
-		;;
-
-	abort-upgrade|abort-remove|abort-deconfigure)
-		;;
-
-	*)
-		echo "postinst called with unknown argument \`{$1}'" >&2
-		exit 1
-		;;
+    configure)
+        if ! getent passwd | grep -q "^openerp"; then
+            adduser --system --no-create-home --quiet --gecos 'OpenERP' --group openerp
+        fi
+        # Register "openerp" as a postgres superuser 
+        su - postgres -c "createuser -s openerp" 2> /dev/null || true
+        chown openerp:openerp /etc/openerp/openerp-server.conf
+        chmod 0640 /etc/openerp/openerp-server.conf
+        # Creating log file
+        touch /var/log/openerp.log
+        chown openerp:openerp /var/log/openerp.log
+        chmod 0640 /var/log/openerp.log
+        # Creating local storage directory
+        mkdir -p /var/lib/openerp/filestore
+        chown openerp:openerp -R /var/lib/openerp
+        ;;
+    *)
+        ;;
 esac
 
 #DEBHELPER#

From 94b28a9f9ba6666a5d01ceaa2011ebc53957e8af Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 3 Oct 2011 03:44:44 +0200
Subject: [PATCH 173/304] [IMP] packaging debian

bzr revid: al@openerp.com-20111003014444-uifqmb372f09c5qs
---
 debian/openerp.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/openerp.init b/debian/openerp.init
index ad8cbecb07c..6abb6f10ed6 100644
--- a/debian/openerp.init
+++ b/debian/openerp.init
@@ -16,7 +16,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/openerp-server
 NAME=openerp-server
 DESC=openerp-server
-CONFIG=/etc/openerp-server.conf
+CONFIG=/etc/openerp/openerp-server.conf
 LOGFILE=/var/log/openerp-server.log
 USER=openerp
 

From fdfe102cc416c1fe70dd30de0aa61c947c1101d1 Mon Sep 17 00:00:00 2001
From: kbh <kbh@bde-desktop>
Date: Mon, 3 Oct 2011 11:32:39 +0530
Subject: [PATCH 174/304] [FIX] change in listview for sidebar.

bzr revid: kbh@bde-desktop-20111003060239-l7bwy55n8t9fkz66
---
 addons/web/static/src/js/view_list.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 8a9deaab228..2a3170953c3 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -505,7 +505,11 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
     do_select: function (ids, records) {
         this.$element.find('.oe-list-delete')
             .attr('disabled', !ids.length);
-
+        if(ids.length > 0) {
+            this.sidebar.do_unfold();
+        } else {
+            this.sidebar.do_fold();
+        }
         if (!records.length) {
             this.compute_aggregates();
             return;

From de41cf72348123feb8e93c481e52d505bfbf8660 Mon Sep 17 00:00:00 2001
From: kbh <kbh@bde-desktop>
Date: Mon, 3 Oct 2011 11:32:39 +0530
Subject: [PATCH 175/304] [FIX] change in listview for sidebar.

bzr revid: kbh@bde-desktop-20111003060239-v92vo8vc0iiq649k
---
 addons/web/static/src/js/view_list.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 8a9deaab228..2a3170953c3 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -505,7 +505,11 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
     do_select: function (ids, records) {
         this.$element.find('.oe-list-delete')
             .attr('disabled', !ids.length);
-
+        if(ids.length > 0) {
+            this.sidebar.do_unfold();
+        } else {
+            this.sidebar.do_fold();
+        }
         if (!records.length) {
             this.compute_aggregates();
             return;

From 335c99fda4ee0bfda3ccfb74a69c196cd425ef12 Mon Sep 17 00:00:00 2001
From: kbh <kbh@bde-desktop>
Date: Mon, 3 Oct 2011 12:48:07 +0530
Subject: [PATCH 176/304] [FIX] Minor change in issue of open sidebar on
 checked list record.

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

bzr revid: kbh@bde-desktop-20111003071807-33zlrcc0vopiahoz
---
 addons/web/static/src/js/view_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 2a3170953c3..c8d9bbe270e 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -505,7 +505,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
     do_select: function (ids, records) {
         this.$element.find('.oe-list-delete')
             .attr('disabled', !ids.length);
-        if(ids.length > 0) {
+        if(ids.length) {
             this.sidebar.do_unfold();
         } else {
             this.sidebar.do_fold();

From e2acbb9db76b3a51926a743a120cbbf8727d1fb9 Mon Sep 17 00:00:00 2001
From: kbh <kbh@bde-desktop>
Date: Mon, 3 Oct 2011 12:48:07 +0530
Subject: [PATCH 177/304] [FIX] Minor change in issue of open sidebar on
 checked list record.

bzr revid: kbh@bde-desktop-20111003071807-9rmozt1m9h9tqxci
---
 addons/web/static/src/js/view_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 2a3170953c3..c8d9bbe270e 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -505,7 +505,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
     do_select: function (ids, records) {
         this.$element.find('.oe-list-delete')
             .attr('disabled', !ids.length);
-        if(ids.length > 0) {
+        if(ids.length) {
             this.sidebar.do_unfold();
         } else {
             this.sidebar.do_fold();

From 013e01a52b940559f73f98a15bbaf8eb5f4bcd12 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 3 Oct 2011 10:41:50 +0200
Subject: [PATCH 178/304] [FIX] al hacks

bzr revid: xmo@openerp.com-20111003084150-oz87j979djfng6xb
---
 addons/web/common/dispatch.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py
index 245624f2299..cb998caf891 100644
--- a/addons/web/common/dispatch.py
+++ b/addons/web/common/dispatch.py
@@ -3,6 +3,7 @@ from __future__ import with_statement
 
 import functools
 import logging
+import urllib
 import os
 import pprint
 import sys
@@ -309,7 +310,7 @@ class Root(object):
                       by the server, will be filtered by this pattern
     """
     def __init__(self, options):
-        self.root = '/web/webclient/home?debug=1'
+        self.root = '/web/webclient/home'
         self.config = options
 
         if self.config.backend == 'local':
@@ -348,7 +349,9 @@ class Root(object):
         request.parameter_storage_class = werkzeug.datastructures.ImmutableDict
 
         if request.path == '/':
-            return werkzeug.utils.redirect(self.root, 301)(environ, start_response)
+            params = urllib.urlencode(dict(request.args, debug=''))
+            return werkzeug.utils.redirect(self.root + '?' + params, 301)(
+                environ, start_response)
         elif request.path == '/mobile':
             return werkzeug.utils.redirect(
                 '/web_mobile/static/src/web_mobile.html', 301)(environ, start_response)

From bb596c1bfcd4bb386575f4a36bea264f00597861 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 3 Oct 2011 10:41:50 +0200
Subject: [PATCH 179/304] [FIX] al hacks

bzr revid: xmo@openerp.com-20111003084150-6ti0fa221h14wiik
---
 addons/web/common/dispatch.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py
index 245624f2299..cb998caf891 100644
--- a/addons/web/common/dispatch.py
+++ b/addons/web/common/dispatch.py
@@ -3,6 +3,7 @@ from __future__ import with_statement
 
 import functools
 import logging
+import urllib
 import os
 import pprint
 import sys
@@ -309,7 +310,7 @@ class Root(object):
                       by the server, will be filtered by this pattern
     """
     def __init__(self, options):
-        self.root = '/web/webclient/home?debug=1'
+        self.root = '/web/webclient/home'
         self.config = options
 
         if self.config.backend == 'local':
@@ -348,7 +349,9 @@ class Root(object):
         request.parameter_storage_class = werkzeug.datastructures.ImmutableDict
 
         if request.path == '/':
-            return werkzeug.utils.redirect(self.root, 301)(environ, start_response)
+            params = urllib.urlencode(dict(request.args, debug=''))
+            return werkzeug.utils.redirect(self.root + '?' + params, 301)(
+                environ, start_response)
         elif request.path == '/mobile':
             return werkzeug.utils.redirect(
                 '/web_mobile/static/src/web_mobile.html', 301)(environ, start_response)

From 03e842f67276f64483a63a442d49371772cfa3ba Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 3 Oct 2011 11:07:09 +0200
Subject: [PATCH 180/304] [FIX] double-load on successful login

Session#session_restore is automatically called when the client
session is started, and it performs an RPC call. This RPC call is
checked and leads to the opening of the login form iif the user is not
currently logged in (does not have a valid session).

Due to the behavior of Session#rpc_ajax, this failure on grounds of
invalid session leads to the restore continuation being stored for
deferred execution once the user logs in.

Issue is that both Session#session_login and Session#session_restore
call Session#on_session_valid which tries to load all modules. As a
result and because the '_modules_loaded' flag is only set five billion
years after 'load_modules' is called both calls will try to load all
modules in parallel, leading to double downloading and execution of
all JS and CSS files coming from module data (including translation
files).

bzr revid: xmo@openerp.com-20111003090709-1izso4hrbzk91sf3
---
 addons/web/static/src/js/core.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 2e9294ded12..5bc6bc92b68 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -486,8 +486,6 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
             self.user_context = result.context;
             self.db = result.db;
             self.session_save();
-            if (self.uid)
-                self.on_session_valid();
             return true;
         }).then(success_callback);
     },

From a9da2abd9f2ebcf1ecb548c683c8aeeaa7ffb72e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 3 Oct 2011 11:07:09 +0200
Subject: [PATCH 181/304] [FIX] double-load on successful login

Session#session_restore is automatically called when the client
session is started, and it performs an RPC call. This RPC call is
checked and leads to the opening of the login form iif the user is not
currently logged in (does not have a valid session).

Due to the behavior of Session#rpc_ajax, this failure on grounds of
invalid session leads to the restore continuation being stored for
deferred execution once the user logs in.

Issue is that both Session#session_login and Session#session_restore
call Session#on_session_valid which tries to load all modules. As a
result and because the '_modules_loaded' flag is only set five billion
years after 'load_modules' is called both calls will try to load all
modules in parallel, leading to double downloading and execution of
all JS and CSS files coming from module data (including translation
files).

bzr revid: xmo@openerp.com-20111003090709-ree0luomezw1wzup
---
 addons/web/static/src/js/core.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 2e9294ded12..5bc6bc92b68 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -486,8 +486,6 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
             self.user_context = result.context;
             self.db = result.db;
             self.session_save();
-            if (self.uid)
-                self.on_session_valid();
             return true;
         }).then(success_callback);
     },

From 608274e2926e0463d6c849e60755738ff880b23c Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Mon, 3 Oct 2011 11:33:55 +0200
Subject: [PATCH 182/304] [FIX] use the new xmlrpc-1 URIs in the tests.

bzr revid: vmt@openerp.com-20111003093355-2agzw7euaphdq7yr
---
 tests/common.py      | 11 ++++++-----
 tests/test_xmlrpc.py |  6 ++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/common.py b/tests/common.py
index 9f51f7b595e..116898dc7ef 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -23,6 +23,7 @@ object_proxy_60 = None
 common_proxy_61 = None
 db_proxy_61 = None
 model_proxy_61 = None
+model_uri_61 = None
 
 def setUpModule():
     """
@@ -46,13 +47,13 @@ def setUpModule():
     global common_proxy_61
     global db_proxy_61
     global model_proxy_61
+    global model_uri_61
 
     # Use the new (6.1) API.
-    url = 'http://%s:%d/openerp/6.1/xmlrpc/' % (HOST, PORT)
-    common_proxy_61 = xmlrpclib.ServerProxy(url + 'common')
-    db_proxy_61 = xmlrpclib.ServerProxy(url + 'db')
-    model_proxy_61 = xmlrpclib.ServerProxy(url + 'model/' + DB)
-
+    model_uri_61 = 'http://%s:%d/openerp/xmlrpc/1/' % (HOST, PORT)
+    common_proxy_61 = xmlrpclib.ServerProxy(model_uri_61 + 'common')
+    db_proxy_61 = xmlrpclib.ServerProxy(model_uri_61 + 'db')
+    model_proxy_61 = xmlrpclib.ServerProxy(model_uri_61 + 'model/' + DB)
 
     # Ugly way to ensure the server is listening.
     time.sleep(2)
diff --git a/tests/test_xmlrpc.py b/tests/test_xmlrpc.py
index 5cace01c9a9..4ad530cbeda 100644
--- a/tests/test_xmlrpc.py
+++ b/tests/test_xmlrpc.py
@@ -54,9 +54,11 @@ class test_xmlrpc(unittest2.TestCase):
 
     def test_xmlrpc_61_ir_model_search(self):
         """ Try a search on the object service. """
-        ids = common.model_proxy_61.execute(ADMIN_USER_ID, ADMIN_PASSWORD, 'ir.model', 'search', [])
+
+        proxy = xmlrpclib.ServerProxy(common.model_uri_61 + 'model/' + DB + '/ir.model')
+        ids = proxy.execute(ADMIN_USER_ID, ADMIN_PASSWORD, 'search', [])
         assert ids
-        ids = common.model_proxy_61.execute(ADMIN_USER_ID, ADMIN_PASSWORD, 'ir.model', 'search', [], {})
+        ids = proxy.execute(ADMIN_USER_ID, ADMIN_PASSWORD, 'search', [], {})
         assert ids
 
 if __name__ == '__main__':

From 2dae9519d7c3d0a4c2217b63939bb4eb1d83d39d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 3 Oct 2011 12:27:21 +0200
Subject: [PATCH 183/304] [FIX] installing a module should trigger the launch
 of any pending configuration wizard

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

bzr revid: xmo@openerp.com-20111003102721-d3eizbwef5ix18py
---
 addons/web_default_home/static/src/js/home.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/addons/web_default_home/static/src/js/home.js b/addons/web_default_home/static/src/js/home.js
index ed8561bc44d..67964351873 100644
--- a/addons/web_default_home/static/src/js/home.js
+++ b/addons/web_default_home/static/src/js/home.js
@@ -94,8 +94,10 @@ openerp.web_default_home = function (openerp) {
             })
         },
         install_module: function (module_name) {
+            var self = this;
             var Modules = new openerp.web.DataSetSearch(
-                this, 'ir.module.module', null, [['name', '=', module_name], ['state', '=', 'uninstalled']]);
+                this, 'ir.module.module', null,
+                [['name', '=', module_name], ['state', '=', 'uninstalled']]);
             var Upgrade = new openerp.web.DataSet(this, 'base.module.upgrade');
 
             $.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'});
@@ -105,13 +107,21 @@ openerp.web_default_home = function (openerp) {
                     [_.pluck(records, 'id'), 'to install', ['uninstalled']],
                     function () {
                         Upgrade.call('upgrade_module', [[]], function () {
-                            $.unblockUI();
-                            // TODO: less brutal reloading
-                            window.location.reload(true);
+                            self.run_configuration_wizards();
                         });
                     }
                 )
             });
+        },
+        run_configuration_wizards: function () {
+            var self = this;
+            new openerp.web.DataSet(this, 'res.config').call('start', [[]], function (action) {
+                $.unblockUI();
+                self.do_action(action, function () {
+                    // TODO: less brutal reloading
+                    window.location.reload(true);
+                });
+            });
         }
     });
 };

From d9f58e3aac57ca15c6c2f1818cb5063a8af8cbb4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 3 Oct 2011 12:27:21 +0200
Subject: [PATCH 184/304] [FIX] installing a module should trigger the launch
 of any pending configuration wizard

bzr revid: xmo@openerp.com-20111003102721-ivoioohg83r8tdx3
---
 addons/web_default_home/static/src/js/home.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/addons/web_default_home/static/src/js/home.js b/addons/web_default_home/static/src/js/home.js
index ed8561bc44d..67964351873 100644
--- a/addons/web_default_home/static/src/js/home.js
+++ b/addons/web_default_home/static/src/js/home.js
@@ -94,8 +94,10 @@ openerp.web_default_home = function (openerp) {
             })
         },
         install_module: function (module_name) {
+            var self = this;
             var Modules = new openerp.web.DataSetSearch(
-                this, 'ir.module.module', null, [['name', '=', module_name], ['state', '=', 'uninstalled']]);
+                this, 'ir.module.module', null,
+                [['name', '=', module_name], ['state', '=', 'uninstalled']]);
             var Upgrade = new openerp.web.DataSet(this, 'base.module.upgrade');
 
             $.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'});
@@ -105,13 +107,21 @@ openerp.web_default_home = function (openerp) {
                     [_.pluck(records, 'id'), 'to install', ['uninstalled']],
                     function () {
                         Upgrade.call('upgrade_module', [[]], function () {
-                            $.unblockUI();
-                            // TODO: less brutal reloading
-                            window.location.reload(true);
+                            self.run_configuration_wizards();
                         });
                     }
                 )
             });
+        },
+        run_configuration_wizards: function () {
+            var self = this;
+            new openerp.web.DataSet(this, 'res.config').call('start', [[]], function (action) {
+                $.unblockUI();
+                self.do_action(action, function () {
+                    // TODO: less brutal reloading
+                    window.location.reload(true);
+                });
+            });
         }
     });
 };

From 363ed099b1e11bdb2b81cbb7470655b088ed52f7 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 3 Oct 2011 13:24:08 +0200
Subject: [PATCH 185/304] [FIX] Set the right category for some modules

bzr revid: stw@openerp.com-20111003112408-d6msz53o3boi7g43
---
 addons/fetchmail_crm/__openerp__.py            | 2 +-
 addons/fetchmail_crm_claim/__openerp__.py      | 2 +-
 addons/fetchmail_hr_recruitment/__openerp__.py | 2 +-
 addons/fetchmail_project_issue/__openerp__.py  | 2 +-
 addons/sale_crm/__openerp__.py                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/fetchmail_crm/__openerp__.py b/addons/fetchmail_crm/__openerp__.py
index 2be9920ee83..bff95bc0f70 100644
--- a/addons/fetchmail_crm/__openerp__.py
+++ b/addons/fetchmail_crm/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "crm"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Link',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail_crm_claim/__openerp__.py b/addons/fetchmail_crm_claim/__openerp__.py
index b8f0fa24470..9865d7e791b 100644
--- a/addons/fetchmail_crm_claim/__openerp__.py
+++ b/addons/fetchmail_crm_claim/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "crm_claim"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Link',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail_hr_recruitment/__openerp__.py b/addons/fetchmail_hr_recruitment/__openerp__.py
index fd5b8346227..8efa68fbe79 100644
--- a/addons/fetchmail_hr_recruitment/__openerp__.py
+++ b/addons/fetchmail_hr_recruitment/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "hr_recruitment"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Link',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail_project_issue/__openerp__.py b/addons/fetchmail_project_issue/__openerp__.py
index 641012fc9ab..3d2a1ef912b 100644
--- a/addons/fetchmail_project_issue/__openerp__.py
+++ b/addons/fetchmail_project_issue/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "project_issue"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Link',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 60463a20b02..563cf00050d 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Creates Sales order from Opportunity',
     'version': '1.0',
-    'category': 'Customer Relationship Management',
+    'category': 'Link',
     'complexity': "easy",
     'description': """
 This module adds a shortcut on one or several opportunity cases in the CRM.

From b4d9f085c97b3a8f9787d8dc38030ce761f9c232 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 3 Oct 2011 13:57:18 +0200
Subject: [PATCH 186/304] [FIX] base_setup: Compute the modules to install

bzr revid: stw@openerp.com-20111003115718-g681jwbp25yotvq7
---
 addons/base_setup/base_setup.py | 104 +++++++++-----------------------
 1 file changed, 27 insertions(+), 77 deletions(-)

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index cc94e946b0c..ddba85c09cf 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -61,7 +61,7 @@ class base_setup_installer2(osv.osv_memory):
         fields = {} 
         category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', 'not in', ('Localization', 'Others', 'Tools'))]
+                  ('name', 'not in', ('Localization', 'Others', 'Tools', 'Base', 'Link'))]
         category_ids = category_proxy.search(cr, uid, domain, context=context)
         for category in category_proxy.browse(cr, uid, category_ids, context=context):
             category_name = 'category_%d' % (category.id,)
@@ -78,7 +78,6 @@ class base_setup_installer2(osv.osv_memory):
             module_name = 'module_%d' % (module.id,)
             module_is_installed = module.state == 'installed'
             title = "%s (%s)" % (module.shortdesc, module.complexity,)
-            title = "%s %s (%s)" % (module.shortdesc, module.name, module.complexity,)
 
             fields[module_name] = {
                 'type' : 'boolean',
@@ -110,7 +109,6 @@ class base_setup_installer2(osv.osv_memory):
 
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='from', context=None, toolbar=False, submenu=False):
-
         def in_extended_view_group(cr, uid, context=None):
             try:
                 model, group_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_extended')
@@ -122,7 +120,7 @@ class base_setup_installer2(osv.osv_memory):
 
         module_category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', 'not in', ('Localization', 'Others', 'Tools', 'Base'))]
+                  ('name', 'not in', ('Localization', 'Others', 'Tools', 'Base', 'Link'))]
         module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='sequence asc')
 
         arch = ['<form string="%s">' % _('Automatic Base Setup')]
@@ -131,10 +129,8 @@ class base_setup_installer2(osv.osv_memory):
 
         extended_view = in_extended_view_group(cr, uid, context=context)
 
-        print "extended_view: %r" % (extended_view,)
         for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
-            domain = [('installable', '=', True),
-                      ('category_id', '=', module_category.id)]
+            domain = [('category_id', '=', module_category.id)]
             if not extended_view:
                 domain.append(('complexity', '!=', 'expert'))
 
@@ -142,8 +138,6 @@ class base_setup_installer2(osv.osv_memory):
             if default_modules:
                 domain.append(('name', 'not in', default_modules))
 
-            print "domain: %r" % (domain,)
-
             modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
             if not modules:
                 continue
@@ -163,8 +157,7 @@ class base_setup_installer2(osv.osv_memory):
         # Compute the module to show
 
         for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
-            domain = [('installable', '=', True),
-                      ('category_id', '=', module_category.id)]
+            domain = [('category_id', '=', module_category.id)]
 
             if not extended_view:
                 domain.append(('complexity', '!=', 'expert'))
@@ -173,8 +166,6 @@ class base_setup_installer2(osv.osv_memory):
             if default_modules:
                 domain.append(('name', 'not in', default_modules))
 
-            print "domain2: %r" % (domain,)
-
             modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
 
             if not modules:
@@ -192,7 +183,6 @@ class base_setup_installer2(osv.osv_memory):
 
             for module in modules:
                 #module_modifiers['readonly'] = module.state == 'installed'
-                #print "module_modifiers: %r %r" % (module.name, module_modifiers,)
 
                 arch.append("""<field name="module_%d" modifiers='%s' />""" % (
                     module.id,
@@ -210,9 +200,6 @@ class base_setup_installer2(osv.osv_memory):
         arch.append('</form>')
 
         result['arch'] = ''.join(arch)
-        #from pprint import pprint as pp
-        #pp(result['arch'])
-
         return result
 
     def __getattr__(self, name):
@@ -224,7 +211,6 @@ class base_setup_installer2(osv.osv_memory):
         return getattr(super(base_setup_installer2, self), name)
 
     def _on_change_selection(self, cr, uid, ids, item, value, context=None):
-        #print "on_change_selection: %r" % (item,) 
         if not isinstance(item, basestring) or not value:
             return {}
 
@@ -260,48 +246,6 @@ class base_setup_installer2(osv.osv_memory):
         context.update(dont_compute_virtual_attributes=True)
         return super(base_setup_installer2, self).create(cr, uid, values, context=context)
 
-    def _get_modules_to_install(self, cr, uid, selected_modules, context=None):
-        STATES = ('installed',)
-
-        module_proxy = self.pool.get('ir.module.module')
-        module_ids = module_proxy.search(cr, uid, [('installable', '=', False)], context=context)
-
-        modules = {}
-        for module in module_proxy.browse(cr, uid, module_ids, context=context):
-            depends = [ depend.name for depend in module.dependencies_id ]
-            modules[module.name] = {
-                'state' : module.state,
-                'depends' : depends,
-            }
-
-        installed_modules = []
-        for module, info in modules.iteritems():
-            info.setdefault('depends', [] if module == 'base' else ['base',])
-
-            if info['state'] in STATES:
-                installed_modules.append(module)
-                info['counter'] = 0
-            else:
-                info['counter'] = - len(set(info['depends']))
-
-        selected_modules = set(selected_modules + installed_modules) - set(['base'])
-        print "selected_modules: %r" % (selected_modules,)
-
-        for selected_module in selected_modules:
-            for module, info in modules.iteritems():
-                if info['state'] not in STATES and \
-                   (selected_module in info['depends'] or selected_module == module):
-                    info['counter'] += 1
-
-        to_install_modules = set(module
-                                 for module, info in modules.iteritems()
-                                 if info['counter'] == 0 and
-                                    info['state'] not in STATES)
-
-        print "to_install_modules: %r" % (to_install_modules,)
-
-        return to_install_modules
-
     def apply_cb(self, cr, uid, ids, context=None):
         category_proxy = self.pool.get('ir.module.category')
         for installer in self.browse(cr, uid, ids, context=context):
@@ -317,35 +261,41 @@ class base_setup_installer2(osv.osv_memory):
             selected_categories = set(record['name']
                                       for record in category_proxy.read(cr, uid, category_ids, ['name'], context=context))
 
-            # Workaround :(
             # FIXME: Use a workaround, but can do better
-            #import pdb
-            #pdb.set_trace()
             for category_name, default_modules in DEFAULT_MODULES.iteritems():
                 if category_name in selected_categories:
                     modules.update(default_modules)
 
-            if 'sale' in modules and 'crm' in modules:
-                modules.add('sale_crm')
+            # Special Cases:
+            # * project_mrp: the dependencies are sale, project, procurement, mrp_jit
             if 'sale' in modules and 'project' in modules:
                 modules.add('project_mrp')
 
-            # The current code has a bug
-            # modules = self._get_modules_to_install(cr, uid, list(modules), context=context)
-
-            module_ids = proxy.search(cr, uid, [('name', 'in', list(modules))], context=context)
-
-            print "modules: %r" % (modules,)
-
-            break
-
             need_update = False
-            for module in proxy.browse(cr, uid, module_ids, context=context):
-                module.state_update('to install', ['uninstalled'], context=context)
+            module_ids = proxy.search(cr, uid, [('name', 'in', list(modules))], context=context)
+            if module_ids:
+                proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
+                need_update = True
+
+            category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_link')
+            while True and category_id:
+                cr.execute("select id, name from ir_module_module m where category_id = %s \
+                           and (select count(d.id) from ir_module_module_dependency d \
+                           where d.module_id = m.id) = (select count(d.id) from \
+                           ir_module_module_dependency d inner join ir_module_module m2 on d.name = m2.name \
+                           where d.module_id=m.id and m2.state in %s ) and state = %s",
+                          (category_id[1], ('installed', 'to install', 'to upgrade', ), 'uninstalled',))
+                modules = [name for _, name in cr.fetchall()]
+
+                module_ids = proxy.search(cr, uid, [('name', 'in', modules)], context=context)
+                if not module_ids:
+                    break
+
+                proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
                 need_update = True
-                cr.commit()
 
             if need_update:
+                cr.commit()
                 self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
 
         if 'html' in context:

From b916762b26a8affc3de592936f335b013de2d48f Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 3 Oct 2011 14:06:56 +0200
Subject: [PATCH 187/304] [REF] Remove old codes

bzr revid: stw@openerp.com-20111003120656-5kje5dgpulhz4a9u
---
 addons/base_setup/base_setup.py        | 330 +++----------------------
 addons/base_setup/base_setup_views.xml | 172 +------------
 2 files changed, 35 insertions(+), 467 deletions(-)

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index ddba85c09cf..8d149b522b6 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -43,8 +43,8 @@ DEFAULT_MODULES = {
     'Marketing' : ['marketing',],
 }
 
-class base_setup_installer2(osv.osv_memory):
-    _name = 'base.setup.installer2'
+class base_setup_installer(osv.osv_memory):
+    _name = 'base.setup.installer'
 
     _inherit = 'res.config.installer'
 
@@ -107,7 +107,6 @@ class base_setup_installer2(osv.osv_memory):
 
         return result
 
-
     def fields_view_get(self, cr, uid, view_id=None, view_type='from', context=None, toolbar=False, submenu=False):
         def in_extended_view_group(cr, uid, context=None):
             try:
@@ -116,7 +115,7 @@ class base_setup_installer2(osv.osv_memory):
                 return False
             return group_id in self.pool.get('res.users').read(cr, uid, uid, ['groups_id'], context=context)['groups_id']
 
-        result = super(base_setup_installer2, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+        result = super(base_setup_installer, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
 
         module_category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
@@ -208,7 +207,7 @@ class base_setup_installer2(osv.osv_memory):
                 item = 'category_%s' % name[len('on_change_category_'):]
                 return self._on_change_selection(cr, uid, ids, item, value, context=context)
             return proxy
-        return getattr(super(base_setup_installer2, self), name)
+        return getattr(super(base_setup_installer, self), name)
 
     def _on_change_selection(self, cr, uid, ids, item, value, context=None):
         if not isinstance(item, basestring) or not value:
@@ -244,7 +243,7 @@ class base_setup_installer2(osv.osv_memory):
             'selection' : simplejson.dumps(to_install),
         }
         context.update(dont_compute_virtual_attributes=True)
-        return super(base_setup_installer2, self).create(cr, uid, values, context=context)
+        return super(base_setup_installer, self).create(cr, uid, values, context=context)
 
     def apply_cb(self, cr, uid, ids, context=None):
         category_proxy = self.pool.get('ir.module.category')
@@ -303,301 +302,34 @@ class base_setup_installer2(osv.osv_memory):
         else:
             return {'type' : 'ir.actions.act_window_close'}
 
-base_setup_installer2()
+    # TODO: To implement in this new wizard
+    #def execute(self, cr, uid, ids, context=None):
+    #    module_pool = self.pool.get('ir.module.module')
+    #    modules_selected = []
+    #    datas = self.read(cr, uid, ids, context=context)[0]
+    #    for mod in datas.keys():
+    #        if mod in ('id', 'progress'):
+    #            continue
+    #        if datas[mod] == 1:
+    #            modules_selected.append(mod)
 
-class base_setup_installer(osv.osv_memory):
-    _name = 'base.setup.installer'
-    _inherit = 'res.config.installer'
+    #    module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
+    #    need_install = False
+    #    for module in module_pool.browse(cr, uid, module_ids, context=context):
+    #        if module.state == 'uninstalled':
+    #            module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
+    #            need_install = True
+    #            cr.commit()
+    #        elif module.state == 'installed':
+    #            cr.execute("update ir_actions_todo set state='open' \
+    #                                from ir_model_data as data where data.res_id = ir_actions_todo.id \
+    #                                and ir_actions_todo.type='special'\
+    #                                and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
+    #    if need_install:
+    #        self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
+    #    return
+base_setup_installer()
 
-    _install_if = {
-        ('sale','crm'): ['sale_crm'],
-        ('sale','project'): ['project_mrp'],
-    }
-    _columns = {
-        # Generic modules
-        'crm':fields.boolean('Customer Relationship Management',
-            help="Helps you track and manage relations with customers such as"
-                 " leads, requests or issues. Can automatically send "
-                 "reminders, escalate requests or trigger business-specific "
-                 "actions based on standard events."),
-        'sale':fields.boolean('Sales Management',
-            help="Helps you handle your quotations, sale orders and invoicing"
-                 "."),
-        'project':fields.boolean('Project Management',
-            help="Helps you manage your projects and tasks by tracking them, "
-                 "generating plannings, etc..."),
-        'knowledge':fields.boolean('Knowledge Management',
-            help="Lets you install addons geared towards sharing knowledge "
-                 "with and between your employees."),
-        'stock':fields.boolean('Warehouse Management',
-            help="Helps you manage your inventory and main stock operations: delivery orders, receptions, etc."),
-        'mrp':fields.boolean('Manufacturing',
-            help="Helps you manage your manufacturing processes and generate "
-                 "reports on those processes."),
-        'account_voucher':fields.boolean('Invoicing & Payments',
-            help="Allows you to create your invoices and track the payments. It is an easier version of the accounting module for managers who are not accountants."),
-        'account_accountant':fields.boolean('Accounting & Finance',
-            help="Helps you handle your accounting needs, if you are not an accountant, we suggest you to install only the Invoicing "),
-        'purchase':fields.boolean('Purchase Management',
-            help="Helps you manage your purchase-related processes such as "
-                 "requests for quotations, supplier invoices, etc..."),
-        'hr':fields.boolean('Human Resources',
-            help="Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more."),
-        'point_of_sale':fields.boolean('Point of Sales',
-            help="Helps you get the most out of your points of sales with "
-                 "fast sale encoding, simplified payment mode encoding, "
-                 "automatic picking lists generation and more."),
-        'marketing':fields.boolean('Marketing',
-            help="Helps you manage your marketing campaigns step by step."),
-        'profile_tools':fields.boolean('Extra Tools',
-            help="Lets you install various interesting but non-essential tools "
-                "like Survey, Lunch and Ideas box."),
-        'report_designer':fields.boolean('Advanced Reporting',
-            help="Lets you install various tools to simplify and enhance "
-                 "OpenERP's report creation."),
-        # Vertical modules
-        'product_expiry':fields.boolean('Food Industry',
-            help="Installs a preselected set of OpenERP applications "
-                "which will help you manage your industry."),
-        'association':fields.boolean('Associations',
-            help="Installs a preselected set of OpenERP "
-                 "applications which will help you manage your association "
-                 "more efficiently."),
-        'auction':fields.boolean('Auction Houses',
-            help="Installs a preselected set of OpenERP "
-                 "applications selected to help you manage your auctions "
-                 "as well as the business processes around them."),
-        'account_analytic_plans': fields.boolean('Multiple Analytic Plans',
-            help="Allows invoice lines to impact multiple analytic accounts "
-                 "simultaneously."),
-        'account_payment': fields.boolean('Suppliers Payment Management',
-            help="Streamlines invoice payment and creates hooks to plug "
-                 "automated payment systems in."),
-        'account_followup': fields.boolean('Followups Management',
-            help="Helps you generate reminder letters for unpaid invoices, "
-                 "including multiple levels of reminding and customized "
-                 "per-partner policies."),
-        'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting',
-            help="This module will support the Anglo-Saxons accounting methodology by "
-                "changing the accounting logic with stock transactions."),
-        'account_asset': fields.boolean('Assets Management',
-            help="Helps you to manage your assets and their depreciation entries."),
-        # Manufacturing Resource Planning
-        'stock_location': fields.boolean('Advanced Routes',
-            help="Manages product routes and paths within and between "
-                 "locations (e.g. warehouses)."),
-        'mrp_jit': fields.boolean('Just In Time Scheduling',
-            help="Enables Just In Time computation of procurement orders."
-                 "\n\nWhile it's more resource intensive than the default "
-                 "setup, the JIT computer avoids having to wait for the "
-                 "procurement scheduler to run or having to run the "
-                 "procurement scheduler manually."),
-        'mrp_operations': fields.boolean('Manufacturing Operations',
-            help="Enhances production orders with readiness states as well "
-                 "as the start date and end date of execution of the order."),
-        'mrp_subproduct': fields.boolean('MRP Subproducts',
-            help="Enables multiple product output from a single production "
-                 "order: without this, a production order can have only one "
-                 "output product."),
-        'mrp_repair': fields.boolean('Repairs',
-            help="Enables warranty and repair management (and their impact "
-                 "on stocks and invoicing)."),
-        # Knowledge Management
-        'document_ftp':fields.boolean('Shared Repositories (FTP)',
-            help="Provides an FTP access to your OpenERP's "
-                "Document Management System. It lets you access attachments "
-                "and virtual documents through a standard FTP client."),
-        'document_webdav':fields.boolean('Shared Repositories (WebDAV)',
-            help="Provides a WebDAV access to your OpenERP's Document "
-                 "Management System. Lets you access attachments and "
-                 "virtual documents through your standard file browser."),
-        'wiki':fields.boolean('Collaborative Content (Wiki)',
-            help="Lets you create wiki pages and page groups in order "
-                 "to keep track of business knowledge and share it with "
-                 "and  between your employees."),
-        # Content templates
-        'wiki_faq':fields.boolean('Template: Internal FAQ',
-            help="Creates a skeleton internal FAQ pre-filled with "
-                 "documentation about OpenERP's Document Management "
-                 "System."),
-        'wiki_quality_manual':fields.boolean('Template: Quality Manual',
-            help="Creates an example skeleton for a standard quality manual."),
-        # Reporting
-        'base_report_designer':fields.boolean('OpenOffice Report Designer',help="Adds wizards to Import/Export .SXW report which "
-                                "you can modify in OpenOffice.Once you have modified it you can "
-                                "upload the report using the same wizard."),
-        'base_report_creator':fields.boolean('Query Builder',help="Allows you to create any statistic "
-                                "reports  on several objects. It's a SQL query builder and browser for end users."),
-        'lunch':fields.boolean('Lunch',help='A simple module to help you to manage Lunch orders.'),
-        'subscription':fields.boolean('Recurring Documents',help='Helps to generate automatically recurring documents.'),
-        'survey':fields.boolean('Survey',help='Allows you to organize surveys.'),
-        'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
-        'share':fields.boolean('Web Share',help='Allows you to give restricted access to your OpenERP documents to external users, ' \
-            'such as customers, suppliers, or accountants. You can share any OpenERP Menu such as your project tasks, support requests, invoices, etc.'),
-        'pad': fields.boolean('Collaborative Note Pads',
-            help="This module creates a tighter integration between a Pad "
-                 "instance of your choosing and your OpenERP Web Client by "
-                 "letting you easily link pads to OpenERP objects via "
-                 "OpenERP attachments."),
-        'email_template':fields.boolean('Automated E-Mails',
-            help="Helps you to design templates of emails and integrate them in your different processes."),
-        'marketing_campaign':fields.boolean('Marketing Campaigns',
-            help="Helps you to manage marketing campaigns and automate actions and communication steps."),
-        'crm_profiling':fields.boolean('Profiling Tools',
-            help="Helps you to perform segmentation of partners and design segmentation questionnaires"),
-        # Human Resources Management
-        'hr_holidays': fields.boolean('Leaves Management',
-            help="Tracks employee leaves, allocation requests and planning."),
-        'hr_expense': fields.boolean('Expenses',
-            help="Tracks and manages employee expenses, and can "
-                 "automatically re-invoice clients if the expenses are "
-                 "project-related."),
-        'hr_recruitment': fields.boolean('Recruitment Process',
-            help="Helps you manage and streamline your recruitment process."),
-        'hr_timesheet_sheet':fields.boolean('Timesheets',
-            help="Tracks and helps employees encode and validate timesheets "
-                 "and attendances."),
-        'hr_contract': fields.boolean("Employee's Contracts",
-            help="Extends employee profiles to help manage their contracts."),
-        'hr_evaluation': fields.boolean('Periodic Evaluations',
-            help="Lets you create and manage the periodic evaluation and "
-                 "performance review of employees."),
-        'hr_attendance': fields.boolean('Attendances',
-            help="Simplifies the management of employee's attendances."),
-        'hr_payroll': fields.boolean('Payroll',
-            help="Generic Payroll system."),
-        'hr_payroll_account': fields.boolean('Payroll Accounting',
-            help="Generic Payroll system Integrated with Accountings."),
-        # Project Management
-        'project_long_term': fields.boolean(
-        'Long Term Planning',
-            help="Enables long-term projects tracking, including "
-                 "multiple-phase projects and resource allocation handling."),
-        'hr_timesheet_sheet': fields.boolean('Timesheets',
-            help="Tracks and helps employees encode and validate timesheets "
-                 "and attendances."),
-        'project_timesheet': fields.boolean('Bill Time on Tasks',
-            help="Helps generate invoices based on time spent on tasks, if activated on the project."),
-        'account_budget': fields.boolean('Budgets',
-            help="Helps accountants manage analytic and crossover budgets."),
-        'project_issue': fields.boolean('Issues Tracker',
-            help="Automatically synchronizes project tasks and crm cases."),
-        # Methodologies
-        'project_scrum': fields.boolean('Methodology: SCRUM',
-            help="Implements and tracks the concepts and task types defined "
-                 "in the SCRUM methodology."),
-        'project_gtd': fields.boolean('Methodology: Getting Things Done',
-            help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
-        'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allows you to easily keep track and manage all your purchase orders."),
-        'purchase_analytic_plans': fields.boolean('Purchase Analytic Plans',help="Manages analytic distribution and purchase orders."),
-        'delivery': fields.boolean('Delivery Costs', 
-            help="Allows you to compute delivery costs on your quotations."),
-        'sale_journal': fields.boolean('Invoicing journals',
-            help="Allows you to group and invoice your delivery orders according to different invoicing types: daily, weekly, etc."),
-        'sale_layout': fields.boolean('Sales Orders Print Layout',
-            help="Provides some features to improve the layout of the Sales Order reports."),
-        'sale_margin': fields.boolean('Margins in Sales Orders',
-            help="Gives the margin of profitability by calculating "
-                 "the difference between Unit Price and Cost Price."),
-        'sale_order_dates': fields.boolean('Full Dates on Sales Orders',
-            help="Adds commitment, requested and effective dates on Sales Orders."),
-        'hr_expense':fields.boolean('Resources Management: Expenses Tracking',  help="Tracks and manages employee expenses, and can "
-                 "automatically re-invoice clients if the expenses are "
-                 "project-related."),
-        'event_project':fields.boolean('Event Management: Events', help="Helps you to manage and organize your events."),
-        'project_gtd':fields.boolean('Getting Things Done',
-            help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
-        'wiki': fields.boolean('Wiki', help="Lets you create wiki pages and page groups in order "
-                 "to keep track of business knowledge and share it with "
-                 "and  between your employees."),
-        'name': fields.char('Name', size=64),
-        'crm_helpdesk': fields.boolean('Helpdesk', help="Manages a Helpdesk service."),
-        'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
-        'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
-        'import_sugarcrm': fields.boolean('Import Data from SugarCRM', help="Help you to import and update data from SugarCRM to OpenERP"),
-        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
-        'sale_crm': fields.boolean('Opportunity to Quotation', help="Create a Quotation from an Opportunity."),
-        'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
-        'thunderbird': fields.boolean('Thunderbird Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
-        'outlook': fields.boolean('MS-Outlook Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
-        'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
-        'import_google': fields.boolean('Google Import', help="Imports contacts and events from your google account."),
-    }
-
-    _defaults = {
-        'mrp_jit': lambda self,cr,uid,*a: self.pool.get('res.users').browse(cr, uid, uid).view == 'simple',
-        'document_ftp':True,
-        'marketing_campaign': lambda *a: 1,
-    }
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(base_setup_installer, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
-        doc = etree.XML(res['arch'])
-        for module in ['project_gtd','hr_expense']:
-            count = 0
-            for node in doc.xpath("//field[@name='%s']" % (module)):
-                count = count + 1
-                if count > 1:
-                    node.set('invisible', '1')
-        res['arch'] = etree.tostring(doc)
-        #Checking sale module is installed or not
-        cr.execute("SELECT * from ir_module_module where state='installed' and name = 'sale'")
-        count = cr.fetchall()
-        if count:
-            doc = etree.XML(res['arch'])
-            nodes = doc.xpath("//field[@name='sale_crm']")
-            for node in nodes:
-                node.set('invisible', '0')
-                node.set('modifiers', '{}')
-            res['arch'] = etree.tostring(doc)
-        return res
-
-    def _if_knowledge(self, cr, uid, ids, context=None):
-        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
-               .view == 'simple':
-            return ['document_ftp']
-        return None
-
-    def _if_misc_tools(self, cr, uid, ids, context=None):
-        return ['profile_tools']
-
-    def onchange_moduleselection(self, cr, uid, ids, *args, **kargs):
-        value = {}
-        # Calculate progress
-        closed, total = self.get_current_progress(cr, uid)
-        progress = round(100. * closed / (total + len(filter(None, args))))
-        value.update({'progress':progress})
-        if progress < 10.:
-            progress = 10.
-        
-        return {'value':value}
-
-
-    def execute(self, cr, uid, ids, context=None):
-        module_pool = self.pool.get('ir.module.module')
-        modules_selected = []
-        datas = self.read(cr, uid, ids, context=context)[0]
-        for mod in datas.keys():
-            if mod in ('id', 'progress'):
-                continue
-            if datas[mod] == 1:
-                modules_selected.append(mod)
-
-        module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
-        need_install = False
-        for module in module_pool.browse(cr, uid, module_ids, context=context):
-            if module.state == 'uninstalled':
-                module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
-                need_install = True
-                cr.commit()
-            elif module.state == 'installed':
-                cr.execute("update ir_actions_todo set state='open' \
-                                    from ir_model_data as data where data.res_id = ir_actions_todo.id \
-                                    and ir_actions_todo.type='special'\
-                                    and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
-        if need_install:
-            self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
-        return
 
 
 
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index ee2fb121a5d..f35ca95e529 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,184 +1,20 @@
 <openerp>
   <data>
 
-      <record model="ir.actions.act_window" id="action_base_setup_installer2">
+      <record model="ir.actions.act_window" id="action_base_setup_installer_beta">
           <field name="name">Install Applications (beta)</field>
-          <field name="res_model">base.setup.installer2</field>
+          <field name="res_model">base.setup.installer</field>
           <field name="view_type">form</field>
           <field name="view_mode">form</field>
           <field name="target">new</field>
       </record>
 
-      <record id="todo_base_setup_installer2" model="ir.actions.todo">
-        <field name="action_id" ref="action_base_setup_installer2" />
+      <record id="todo_base_setup_installer_beta" model="ir.actions.todo">
+        <field name="action_id" ref="action_base_setup_installer_beta" />
         <field name="category_id" ref="base.category_administration_config"/>
         <field name="sequence">2</field>
       </record>
 
-    <record id="view_base_setup_installer" model="ir.ui.view">
-      <field name="name">base.setup.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <form position="attributes">
-            <attribute name="string">Install Applications</attribute>
-          </form>
-          <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">Select the Applications you want your system to cover. If you are not sure about your exact needs at this stage, you can easily install them later.</attribute>
-          </xpath>
-          <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                    <attribute name="string"/>
-                    <attribute name="rowspan">15</attribute>
-          </xpath>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-                    <attribute name="string">Install</attribute>
-          </xpath>
-          <separator string="title" position="attributes">
-            <attribute name="string">Install Applications</attribute>
-          </separator>
-          <group colspan="8">
-            <field name="crm" />
-            <field name="sale" />
-            <field name="project" />
-            <field name="knowledge" />
-            <field name="stock" />
-            <field name="mrp" />
-            <field name="account_voucher" />
-            <field name="account_accountant" />
-            <field name="purchase" />
-            <field name="hr" />
-            <field name="profile_tools" />
-            <field name="marketing" groups="base.group_extended" />
-            <field name="point_of_sale"/>
-            <field name="report_designer" groups="base.group_extended" />
-
-            <group name="crm" colspan="4">
-                <separator string="Customer Relationship Management Features" colspan="4"/>
-                <field name="crm_claim" groups="base.group_extended"/>
-                <field name="crm_helpdesk" groups="base.group_extended"/>
-                <field name="crm_fundraising" groups="base.group_extended"/>
-                <field name="wiki_sale_faq" groups="base.group_extended"/>
-                <field name="sale_crm" invisible="1" groups="base.group_extended"/>
-                <field name="crm_caldav"/>
-                <field name="import_sugarcrm"/>
-                <field name="fetchmail"/>
-                <field name="thunderbird"/>
-                <field name="outlook"/>
-            </group>
-            <group name="sale" colspan="4">
-                <separator string="Sales Management Features" colspan="4" />
-                <field name="delivery" />
-                <field name="sale_journal" />
-                <field name="sale_layout" />
-                <field name="sale_margin" />
-                <field name="sale_order_dates" />
-            </group>
-            <group name="project" colspan="4">
-                <separator string="Project Management Features" colspan="4" />
-                <field name="project_issue" />
-                <field name="project_long_term" />
-                <field name="hr_timesheet_sheet" />
-                <field name="project_timesheet" />
-                <field name="account_budget" />
-                <field name="project_scrum" />
-                <field name="project_gtd" />
-            </group>
-            <group name="knowledge" colspan="4">
-                <separator  string="Knowledge Management Features" colspan="4" />
-                <field name="document_ftp" />
-                <field name="document_webdav" />
-                <field name="wiki" />
-                <field name="wiki_faq" />
-                <field name="wiki_quality_manual" />
-                <field name="stock" />
-            </group>
-            <group name="mrp" colspan="4">
-                <separator  string="Manufacturing Features" colspan="4" />
-                <field name="stock_location" />
-                <field name="mrp_jit" />
-                <field name="mrp_operations" />
-                <field name="mrp_subproduct" />
-                <field name="mrp_repair" />
-                <field name="account_voucher" />
-            </group>
-            <group name="account_accountant" colspan="4">
-                <separator string="Accounting &amp; Finance Features" colspan="4"/>
-                <field name="account_followup"/>
-                <field name="account_payment"/>
-                <field name="account_analytic_plans"/>
-                <field name="account_anglo_saxon"/>
-                <field name="account_asset"/>
-                <field name="purchase" />
-            </group>
-
-            <group name="hr" colspan="4">
-                <separator string="Human Resources Features" colspan="4"/>
-                <field name="hr_holidays"/>
-                <field name="hr_expense"/>
-                <field name="hr_recruitment"/>
-                <field name="hr_timesheet_sheet"/>
-                <field name="hr_contract"/>
-                <field name="hr_attendance"/>
-                <field name="hr_evaluation"/>
-                <field name="hr_payroll"/>
-                <field name="hr_payroll_account" groups="base.group_extended"/>
-            </group>
-            <group name="profile_tools" colspan="4">
-                <separator  string="Extra Tools Features" colspan="4" />
-                <field name="share" />
-                <field name="lunch" />
-                <field name="idea" />
-                <field name="survey" />
-                <field name="subscription" />
-                <field name="pad" />
-            </group>
-            <group name="marketing" colspan="4">
-                <separator  string="Marketing Features" colspan="4" />
-                <field name="marketing_campaign" />
-                <field name="email_template" />
-                <field name="crm_profiling" />
-                <field name="point_of_sale"/>
-            </group>
-            <group name="report_designer" colspan="4">
-                <separator  string="Advanced Reporting Features" colspan="4" />
-                <field name="base_report_designer" />
-                <field name="base_report_creator" />
-            </group>
-            <group name="association" colspan="4">
-                <separator  string="Associations Features" colspan="4" />
-                <field name="project_gtd" />
-                <field name="wiki" />
-                <field name="event_project" />
-                <field name="hr_expense" />
-                <field name="auction" />
-                <field name="product_expiry" />
-            </group>
-            <group name="purchase" colspan="4">
-                <separator  string="Purchase Management Features" colspan="4" />
-                <field name="purchase_requisition" />
-                <field name="purchase_analytic_plans" />
-            </group>
-          </group>
-        </data>
-      </field>
-    </record>
-    <record id="action_base_setup_installer" model="ir.actions.act_window">
-      <field name="name">Install Applications</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">base.setup.installer</field>
-      <field name="view_id" ref="view_base_setup_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-    <record id="base_setup_installer_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_base_setup_installer"/>
-        <field name="category_id" ref="base.category_administration_config"/>
-        <field name="sequence">2</field>
-    </record>
-
     <record id="action_start_configurator" model="ir.actions.server">
       <field name="name">Start Configuration</field>
       <field name="model_id" ref="base.model_ir_actions_todo"/>

From 29337910dfa1ce13d1201b79453f395346d9a380 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 3 Oct 2011 14:10:21 +0200
Subject: [PATCH 188/304] [FIX] base: pass the context and define a new
 category for the modules

bzr revid: stw@openerp.com-20111003121021-hmf0xs2wod6rjkwr
---
 openerp/addons/base/module/module.py       | 2 +-
 openerp/addons/base/module/module_data.xml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 08e11bcd6a5..69db5fec4d3 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -303,7 +303,7 @@ class module(osv.osv):
         if level<1:
             raise orm.except_orm(_('Error'), _('Recursion error in modules dependencies !'))
         demo = False
-        for module in self.browse(cr, uid, ids):
+        for module in self.browse(cr, uid, ids, context=context):
             mdemo = False
             for dep in module.dependencies_id:
                 if dep.state == 'unknown':
diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml
index c3117caec64..02b4643b767 100644
--- a/openerp/addons/base/module/module_data.xml
+++ b/openerp/addons/base/module/module_data.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>        
+        <record model="ir.module.category" id="module_category_link">
+            <field name="name">Link</field>
+            <field name="sequence">0</field>
+        </record>
         <record model="ir.module.category" id="module_category_customer_relationship_management">
             <field name="name">Customer Relationship Management</field>
             <field name="description">Helps you track and manage relations with customers such as leads, requests or issues. Can automatically send reminders, escalate requests or trigger business-specific actions based on standard events.</field>

From bdbd19fa8674af370989b5a34bf831e74e7881dd Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 3 Oct 2011 14:27:13 +0200
Subject: [PATCH 189/304] [FIX] base_setup: rename the action of the new
 base.setup.installer wizard

bzr revid: stw@openerp.com-20111003122713-smjc6vtxku57glur
---
 addons/base_setup/base_setup_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 2fc041c63a3..1a6fa9a91fa 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -2,7 +2,7 @@
   <data>
 
       <record model="ir.actions.act_window" id="action_base_setup_installer_beta">
-          <field name="name">Install Applications (beta)</field>
+          <field name="name">Install Applications</field>
           <field name="res_model">base.setup.installer</field>
           <field name="view_type">form</field>
           <field name="view_mode">form</field>

From f4ffbd79f417c6445b630a5a33979321dba67cc0 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 3 Oct 2011 15:26:53 +0200
Subject: [PATCH 190/304] [IMP] field.m2m: better doc for auto-named m2m
 relationships

bzr revid: odo@openerp.com-20111003132653-413c41exoj64q416
---
 openerp/osv/fields.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 0d60a1cbb95..9b437de86e4 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -495,6 +495,15 @@ class one2many(_column):
 class many2many(_column):
     """Encapsulates the logic of a many-to-many bidirectional relationship, handling the
        low-level details of the intermediary relationship table transparently.
+       A many-to-many relationship is always symmetrical, and can be declared and accessed
+       from either endpoint model.
+       If ``rel`` (relationship table name), ``id1`` (source foreign key column name)
+       or id2 (destination foreign key column name) are not specified, the system will
+       provide default values. This will by default only allow one single symmetrical
+       many-to-many relationship between the source and destination model.
+       For multiple many-to-many relationship between the same models and for
+       relationships where source and destination models are the same, ``rel``, ``id1``
+       and ``id2`` should be specified explicitly.
 
        :param str obj: destination model
        :param str rel: optional name of the intermediary relationship table. If not specified,

From 3e1b00747837d8a05996a63abfd1e555ae6c686d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 3 Oct 2011 15:52:03 +0200
Subject: [PATCH 191/304] [IMP] Viewmanager sets dataset's domain & context
 on_search

bzr revid: fme@openerp.com-20111003135203-d3p18cfdh5jko976
---
 addons/web/static/src/js/views.js             |  7 ++++---
 addons/web_calendar/static/src/js/calendar.js |  6 ------
 addons/web_gantt/static/src/js/gantt.js       | 10 +---------
 addons/web_graph/static/src/js/graph.js       |  5 +----
 addons/web_kanban/static/src/js/kanban.js     |  5 +----
 5 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index cfeb70a7e22..3eb4bdafb72 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -281,12 +281,13 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
         var self = this,
             controller = this.views[this.active_view].controller;
         if (domains || contexts) {
-            //if ((!domains || !domains.length) && (!contexts || !contexts.length) && (!groupbys || !groupbys.length) { }
             this.rpc('/web/session/eval_domain_and_context', {
-                domains: [this.dataset.get_domain()].concat(domains || []),
-                contexts: [this.dataset.get_context()].concat(contexts || []),
+                domains: [this.action.domain || []].concat(domains || []),
+                contexts: [this.action.context || {}].concat(contexts || []),
                 group_by_seq: groupbys || []
             }, function (results) {
+                self.dataset.context = results.context;
+                self.dataset.domain = results.domain;
                 controller.do_search(results.domain, results.context, results.group_by);
                 self.last_search = [results.domain, results.context, results.group_by];
             });
diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index f80e57ebf5d..f936547ed8c 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -15,8 +15,6 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         this.model = dataset.model;
         this.fields_view = {};
         this.view_id = view_id;
-        this.domain = this.dataset.domain || [];
-        this.context = this.dataset.context || {};
         this.has_been_loaded = $.Deferred();
         this.creating_event_id = null;
         this.dataset_events = [];
@@ -296,12 +294,8 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         scheduler.clearAll();
         $.when(this.has_been_loaded).then(function() {
             // TODO: handle non-empty results.group_by with read_group
-            self.context = context;
-            self.domain = domain;
             self.dataset.read_slice(_.keys(self.fields), {
                 offset: 0,
-                context: context,
-                domain: domain,
                 limit: self.limit
             }, function(events) {
                 self.dataset_events = events;
diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
index a045bae64e1..73e244edad7 100644
--- a/addons/web_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -509,15 +509,7 @@ init: function(parent, dataset, view_id) {
     do_search: function (domains, contexts, groupbys) {
         var self = this;
         this.grp = groupbys;
-        return this.rpc('/web/session/eval_domain_and_context', {
-            domains: domains,
-            contexts: contexts,
-            group_by_seq: groupbys
-        }, function (results) {
-            self.dataset.context = results.context;
-            self.dataset.domain = results.domain;
-            self.reload_gantt();
-        });
+        self.reload_gantt();
     }
 
 });
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index 5a72bf2a816..ffdec860906 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -369,10 +369,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
         } else {
             this.abscissa = this.first_field;
         }
-        this.dataset.read_slice(this.list_fields(), {
-            context: context,
-            domain: domain
-        }, $.proxy(this, 'schedule_chart'));
+        this.dataset.read_slice(this.list_fields(), {}, $.proxy(this, 'schedule_chart'));
     }
 });
 };
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 2e06482d375..23a0b75a322 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -446,10 +446,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
             },
             function (dataset) {
                 self.groups = [];
-                self.dataset.read_slice([], {
-                    domain: domain,
-                    context: context
-                }, function(records) {
+                self.dataset.read_slice([], {}, function(records) {
                     if (records.length) {
                         self.all_display_data = [{'records': records, 'value':false, 'header' : false, 'ids': self.dataset.ids}];
                     } else {

From 288e8ebcfca60f77d439206528fa7cf1086e9682 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 3 Oct 2011 16:40:49 +0200
Subject: [PATCH 192/304] [IMP] browse_record._table -> browse_record._model

bzr revid: odo@openerp.com-20111003144049-d6o4igae8mslns5x
---
 openerp/osv/orm.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 246187a5424..5a28994460a 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -303,7 +303,8 @@ class browse_record(object):
         self._cr = cr
         self._uid = uid
         self._id = id
-        self._table = table
+        self._table = table # deprecated, use _model!
+        self._model = table
         self._table_name = self._table._name
         self.__logger = logging.getLogger(
             'osv.browse_record.' + self._table_name)
@@ -2853,9 +2854,11 @@ class BaseModel(object):
 
     def _auto_end(self, cr, context=None):
         """ Create the foreign keys recorded by _auto_init. """
+        self.__logger.info('Establishing foreign key references...')
         for t, k, r, d in self._foreign_keys:
             cr.execute('ALTER TABLE "%s" ADD FOREIGN KEY ("%s") REFERENCES "%s" ON DELETE %s' % (t, k, r, d))
         cr.commit()
+        self.__logger.info('Establishing foreign key references... done')
         del self._foreign_keys
 
 

From e5e4ab5739de9543c3c0fcc235d7aef506ec8640 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 3 Oct 2011 17:00:49 +0200
Subject: [PATCH 193/304] [FIX] Fixed error for sidebar-less embedded list
 views

bzr revid: fme@openerp.com-20111003150049-n5xtpo0wjibsrhjx
---
 addons/web/static/src/js/view_list.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index c8d9bbe270e..c78adf769bd 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -505,10 +505,12 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
     do_select: function (ids, records) {
         this.$element.find('.oe-list-delete')
             .attr('disabled', !ids.length);
-        if(ids.length) {
-            this.sidebar.do_unfold();
-        } else {
-            this.sidebar.do_fold();
+        if (this.sidebar) {
+            if (ids.length) {
+                this.sidebar.do_unfold();
+            } else {
+                this.sidebar.do_fold();
+            }
         }
         if (!records.length) {
             this.compute_aggregates();

From e80894b77538739b0f2e0e672f9e077bb7d43cd1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 3 Oct 2011 17:00:49 +0200
Subject: [PATCH 194/304] [FIX] Fixed error for sidebar-less embedded list
 views

bzr revid: fme@openerp.com-20111003150049-hty30u42ozakevc8
---
 addons/web/static/src/js/view_list.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index c8d9bbe270e..c78adf769bd 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -505,10 +505,12 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
     do_select: function (ids, records) {
         this.$element.find('.oe-list-delete')
             .attr('disabled', !ids.length);
-        if(ids.length) {
-            this.sidebar.do_unfold();
-        } else {
-            this.sidebar.do_fold();
+        if (this.sidebar) {
+            if (ids.length) {
+                this.sidebar.do_unfold();
+            } else {
+                this.sidebar.do_fold();
+            }
         }
         if (!records.length) {
             this.compute_aggregates();

From b04d607ec4d005a74bd13b38b172680e21e4933b Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Mon, 3 Oct 2011 17:40:08 +0200
Subject: [PATCH 195/304] [FIX] ir_values: missing trimming of the condition
 (as done elsewhere).

bzr revid: vmt@openerp.com-20111003154008-k8dm2r3yhintm0ql
---
 openerp/addons/base/ir/ir_values.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index d908c2096b3..15e8f3bf3ce 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -233,7 +233,7 @@ class ir_values(osv.osv):
         # remove existing defaults for the same scope
         search_criteria = [
             ('key', '=', 'default'),
-            ('key2', '=', condition),
+            ('key2', '=', condition and condition[:200]),
             ('model', '=', model),
             ('name', '=', field_name),
             ('user_id', '=', False if for_all_users else uid),

From ea019d556f341bf09f316bc7fb6409980dfd74cf Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 3 Oct 2011 19:13:02 +0200
Subject: [PATCH 196/304] [IMP] yaml_import: make !ref nodes work for m2o
 values

bzr revid: odo@openerp.com-20111003171302-n1quzvs2pjyn7xr6
---
 openerp/tools/yaml_import.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index bb4ce9db87d..91cdda1b896 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -340,6 +340,7 @@ class YamlInterpreter(object):
         return record_dict
 
     def process_ref(self, node, column=None):
+        assert node.search or node.id, '!ref node should have a `search` attribute or `id` attribute'
         if node.search:
             if node.model:
                 model_name = node.model
@@ -377,7 +378,10 @@ class YamlInterpreter(object):
             if column._type in ("many2many", "one2many"):
                 value = [(6, 0, elements)]
             else: # many2one
-                value = self._get_first_result(elements)
+                if isinstance(elements, (list,tuple)):
+                    value = self._get_first_result(elements)
+                else:
+                    value = elements
         elif column._type == "many2one":
             value = self.get_id(expression)
         elif column._type == "one2many":

From fd67e605f4f6ffb595c34e71cb697ec69fc0a000 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 3 Oct 2011 19:52:06 +0200
Subject: [PATCH 197/304] [FIX] packaging MANIFEST.in sdist includes everything

bzr revid: al@openerp.com-20111003175206-afjurox08f55jafh
---
 MANIFEST.in | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 70715f18bc2..c864492136d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,12 +1,13 @@
+graft debian
+graft doc
+graft install
+graft openerp
+graft tests
+graft win32
 include README
 include LICENSE
 include MANIFEST.in
-include setup.nsi
-include setup.cfg
-include setup_rpm.sh
-recursive-include win32 *.py *.bat
-recursive-include openerp *css *csv *html *png *po *pot *rml *rng *sql *sxw *xml *xsl *yml
-graft install
-graft debian
-graft doc
+include gunicorn.conf.py
+include openerp-server
+include setup*
 global-exclude *pyc *~    # Exclude possible garbage from previous graft.

From 649d172a6436d5cd66f430ab1d0b0a28896ed2d0 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 3 Oct 2011 20:10:01 +0200
Subject: [PATCH 198/304] [IMP] packaging remove timestamp, use version

bzr revid: al@openerp.com-20111003181001-bu4y5t8u937wb0a7
---
 openerp/release.py | 1 -
 setup.py           | 2 --
 2 files changed, 3 deletions(-)

diff --git a/openerp/release.py b/openerp/release.py
index 23a764bc94c..babe0ca4806 100644
--- a/openerp/release.py
+++ b/openerp/release.py
@@ -36,6 +36,5 @@ url = 'http://www.openerp.com'
 author = 'OpenERP S.A.'
 author_email = 'info@openerp.com'
 license = 'AGPL-3'
-timestamp = None
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/setup.py b/setup.py
index 08c30faf737..9aabfb0a344 100755
--- a/setup.py
+++ b/setup.py
@@ -63,8 +63,6 @@ def py2exe_options():
         return {}
 
 execfile(join(os.path.dirname(__file__), 'openerp', 'release.py'))
-if timestamp:
-    version = version + "-" + timestamp
 
 setuptools.setup(
       name             = 'openerp',

From 0a85361db963355925be3ef41c5d06da7f7e0040 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 4 Oct 2011 05:02:04 +0000
Subject: [PATCH 199/304] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20111004050146-bi1cipzsk35qj5sq
bzr revid: launchpad_translations_on_behalf_of_openerp-20111004050204-nabcu9izdjhcovhd
---
 addons/base_crypt/i18n/es_CL.po   |  33 ++-
 addons/base_tools/i18n/es_CL.po   |  32 +++
 addons/board/i18n/es_CL.po        | 395 ++++++++++++++++++++++++++++++
 addons/stock/i18n/es_CL.po        | 173 +++++++------
 debian/po/es_CL.po                |  15 +-
 openerp/addons/base/i18n/es_CL.po |   8 +-
 6 files changed, 563 insertions(+), 93 deletions(-)
 create mode 100644 addons/base_tools/i18n/es_CL.po
 create mode 100644 addons/board/i18n/es_CL.po

diff --git a/addons/base_crypt/i18n/es_CL.po b/addons/base_crypt/i18n/es_CL.po
index fafe03b997b..98e08733973 100644
--- a/addons/base_crypt/i18n/es_CL.po
+++ b/addons/base_crypt/i18n/es_CL.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-06-06 18:09+0000\n"
-"Last-Translator: doingit.cl <Unknown>\n"
+"PO-Revision-Date: 2011-10-03 17:17+0000\n"
+"Last-Translator: David Acevedo Toledo <Unknown>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-04 05:02+0000\n"
+"X-Generator: Launchpad (build 14071)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "¡No puede tener dos usuarios con el mismo nombre!"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
@@ -31,18 +31,19 @@ msgstr "res.users"
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
-"La compañía seleccionada no está autorizada como compañía para este usuario"
+"La compañía seleccionada no está dentro de las compañías autorizadas para "
+"este usuario"
 
 #. module: base_crypt
 #: code:addons/base_crypt/crypt.py:132
 #, python-format
 msgid "Please specify the password !"
-msgstr ""
+msgstr "¡Por favor, escriba una contraseña!"
 
 #. module: base_crypt
 #: model:ir.module.module,shortdesc:base_crypt.module_meta_information
 msgid "Base - Password Encryption"
-msgstr ""
+msgstr "Base - Encriptación de la Contraseña"
 
 #. module: base_crypt
 #: code:addons/base_crypt/crypt.py:132
@@ -70,3 +71,19 @@ msgid ""
 "unless you are using a secure protocol such as XML-RPCS.\n"
 "                    "
 msgstr ""
+"Este módulo sustituye la contraseña escrita en texto plano por una "
+"codificada,\n"
+"previniendo que alguien pueda leer la contraseña original.\n"
+"Para un usuario existente, el sustitución de la contraseña en texto plano se "
+"realiza la primera vez\n"
+"que el usuario se conecte después de instalar base_crypt.\n"
+"Después de instalar este módulo los usuarios no podrán recuperar su "
+"contraseña olvidada,\n"
+"un administrador tendrá que cambiarla por una nueva.\n"
+"\n"
+"Nota: instalar este módulo no significa que pueda ignorar las medidas "
+"básicas de seguridad,\n"
+"como la contraseña que es enviada por el cliente que sigue sin ser "
+"codificada en la red,\n"
+"a menos que utilice un protocolo seguro como XML-RPCS.\n"
+"                    "
diff --git a/addons/base_tools/i18n/es_CL.po b/addons/base_tools/i18n/es_CL.po
new file mode 100644
index 00000000000..47ebd7bd625
--- /dev/null
+++ b/addons/base_tools/i18n/es_CL.po
@@ -0,0 +1,32 @@
+# Spanish (Chile) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-10-03 16:53+0000\n"
+"Last-Translator: David Acevedo Toledo <Unknown>\n"
+"Language-Team: Spanish (Chile) <es_CL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-10-04 05:02+0000\n"
+"X-Generator: Launchpad (build 14071)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr "Base común para módulos de herramientas"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "
diff --git a/addons/board/i18n/es_CL.po b/addons/board/i18n/es_CL.po
new file mode 100644
index 00000000000..1a603deddb1
--- /dev/null
+++ b/addons/board/i18n/es_CL.po
@@ -0,0 +1,395 @@
+# Spanish (Chile) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-10-03 16:58+0000\n"
+"Last-Translator: David Acevedo Toledo <Unknown>\n"
+"Language-Team: Spanish (Chile) <es_CL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-10-04 05:01+0000\n"
+"X-Generator: Launchpad (build 14071)\n"
+
+#. module: board
+#: view:res.log.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: board
+#: model:ir.model,name:board.model_board_menu_create
+msgid "Menu Create"
+msgstr "Crear menú"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note.type,name:0
+#: model:ir.model,name:board.model_board_note_type
+msgid "Note Type"
+msgstr "Tipo de nota"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,user_id:0
+msgid "Author"
+msgstr "Autor"
+
+#. module: board
+#: model:ir.module.module,shortdesc:board.module_meta_information
+msgid "Dashboard main module"
+msgstr "Módulo principal de tableros"
+
+#. module: board
+#: view:res.users:0
+msgid "Latest Connections"
+msgstr "Últimas conexiones"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:45
+#, python-format
+msgid "User Error!"
+msgstr "¡Error de usuario!"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.open_board_administration_form
+#: model:ir.ui.menu,name:board.menu_board_admin
+msgid "Administration Dashboard"
+msgstr "Tablero de Administración"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,note:0
+#: model:ir.model,name:board.model_board_note
+msgid "Note"
+msgstr "Nota"
+
+#. module: board
+#: view:board.note:0
+#: view:res.log.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "Board"
+msgstr "Tablero"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
+#: view:res.log.report:0
+msgid "Weekly Global Activity"
+msgstr "Actividad global semanal"
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr "Título"
+
+#. module: board
+#: field:res.log.report,nbr:0
+msgid "# of Entries"
+msgstr "Nº de entradas"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.dashboard_open
+msgid "Open Dashboard"
+msgstr "Abrir tablero"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
+#: view:res.log.report:0
+msgid "Monthly Activity per Document"
+msgstr "Actividad mensual por documento"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log Analysis"
+msgstr "Análisis de registro"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_list_form
+#: model:ir.ui.menu,name:board.menu_view_board_form
+msgid "Dashboard Definition"
+msgstr "Definición de tablero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_user_connection_tree
+msgid "User Connections"
+msgstr "Conexiones de usuario"
+
+#. module: board
+#: field:res.log.report,creation_date:0
+msgid "Creation Date"
+msgstr "Fecha de Creación"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_note_form
+#: model:ir.ui.menu,name:board.menu_view_board_note_form
+msgid "Publish a note"
+msgstr "Publicar una nota"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Menu Information"
+msgstr "Información del menú"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: board
+#: field:board.note,type:0
+msgid "Note type"
+msgstr "Tipo de nota"
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr "Vistas de acciones"
+
+#. module: board
+#: model:ir.model,name:board.model_res_log_report
+msgid "Log Report"
+msgstr "Informe de registro"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,day:0
+msgid "Day"
+msgstr "Dia"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Create Menu For Dashboard"
+msgstr "Crear menú para tablero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "Board Line"
+msgstr "Línea tablero"
+
+#. module: board
+#: field:board.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Menú padre"
+
+#. module: board
+#: view:res.log.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: board
+#: view:board.note:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: board
+#: help:board.board.line,sequence:0
+msgid ""
+"Gives the sequence order                         when displaying a list of "
+"board lines."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de líneas de "
+"tablero."
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+#: model:ir.ui.menu,name:board.admin_menu_dasboard
+#: model:ir.ui.menu,name:board.menu_dasboard
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: board
+#: model:ir.module.module,description:board.module_meta_information
+msgid "Base module for all dashboards."
+msgstr "Módulo base para todos los tableros."
+
+#. module: board
+#: field:board.board.line,action_id:0
+msgid "Action"
+msgstr "Acción."
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr "Posición"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: board
+#: field:board.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr "Nombre del menú"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_latest_activities_tree
+msgid "Latest Activities"
+msgstr "Últimas actividades"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr "Izquieda"
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr "Vista de tablero"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr "Derecha"
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr "Ancho"
+
+#. module: board
+#: view:res.log.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: board
+#: view:board.board:0
+#: view:board.menu.create:0
+msgid "Create Menu"
+msgstr "Crear Menú"
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr "Alto"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_board_menu_create
+msgid "Create Board Menu"
+msgstr "Crear menú del tablero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: board
+#: field:res.log.report,res_model:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr "Vista de tablero"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:46
+#, python-format
+msgid "Please Insert Dashboard View(s) !"
+msgstr "¡Por favor inserte alguna vista de tablero!"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,name:0
+msgid "Subject"
+msgstr "Asunto"
diff --git a/addons/stock/i18n/es_CL.po b/addons/stock/i18n/es_CL.po
index ff898a8d261..2a33cd0c47f 100644
--- a/addons/stock/i18n/es_CL.po
+++ b/addons/stock/i18n/es_CL.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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-14 04:42+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
+"PO-Revision-Date: 2011-10-03 18:53+0000\n"
+"Last-Translator: David Acevedo Toledo <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: 2011-09-05 04:57+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-04 05:01+0000\n"
+"X-Generator: Launchpad (build 14071)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -37,7 +37,7 @@ msgstr ""
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr "Ubicación encadenada si fija"
+msgstr "Encadenar Ubicación si es Fija"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -70,20 +70,20 @@ msgstr "Hoy"
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision Number"
-msgstr "Número revisión"
+msgstr "Número de revisión"
 
 #. module: stock
 #: view:stock.move.memory.in:0
 #: view:stock.move.memory.out:0
 msgid "Product Moves"
-msgstr "Movimientos productos"
+msgstr "Movimientos de producto"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_move_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_move_report
 #: view:report.stock.move:0
 msgid "Moves Analysis"
-msgstr "Análisis movimientos"
+msgstr "Análisis de movimientos"
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -194,8 +194,8 @@ msgstr ""
 "de esta categoría, también puede indicarse directamente en cada producto."
 
 #. module: stock
-#: code:addons/stock/stock.py:1170
-#: code:addons/stock/stock.py:2415
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:2436
 #, python-format
 msgid "Missing partial picking data for move #%s"
 msgstr "Faltan datos del albarán parcial para el movimiento #%s"
@@ -260,8 +260,8 @@ msgid "Reference"
 msgstr "Referencia"
 
 #. module: stock
-#: code:addons/stock/stock.py:666
-#: code:addons/stock/stock.py:1472
+#: code:addons/stock/stock.py:679
+#: code:addons/stock/stock.py:1492
 #, python-format
 msgid "Products to Process"
 msgstr "Productos a procesar"
@@ -286,7 +286,7 @@ msgid "Split lines"
 msgstr "Dividir líneas"
 
 #. module: stock
-#: code:addons/stock/stock.py:1120
+#: code:addons/stock/stock.py:1139
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
 msgstr ""
@@ -294,9 +294,9 @@ msgstr ""
 "realizado!"
 
 #. module: stock
-#: code:addons/stock/stock.py:2233
-#: code:addons/stock/stock.py:2274
-#: code:addons/stock/stock.py:2334
+#: code:addons/stock/stock.py:2253
+#: code:addons/stock/stock.py:2295
+#: code:addons/stock/stock.py:2355
 #: code:addons/stock/wizard/stock_fill_inventory.py:53
 #, python-format
 msgid "Warning!"
@@ -506,7 +506,6 @@ msgstr "Filtro lotes de producto"
 #: report:lot.stock.overview:0
 #: report:lot.stock.overview_all:0
 #: report:stock.inventory.move:0
-#: report:stock.picking.list:0
 msgid "["
 msgstr "["
 
@@ -525,7 +524,7 @@ msgid "Move History (child moves)"
 msgstr "Historial movimientos (movimientos hijos)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2015
+#: code:addons/stock/stock.py:2033
 #, python-format
 msgid ""
 "There is no stock output account defined for this product or its category: "
@@ -547,7 +546,7 @@ msgid "Destination Location"
 msgstr "Ubicación destino"
 
 #. module: stock
-#: code:addons/stock/stock.py:754
+#: code:addons/stock/stock.py:769
 #, python-format
 msgid "You can not process picking without stock moves"
 msgstr "No puede procesar un albarán sin movimientos de stock"
@@ -601,7 +600,7 @@ msgid "Location / Product"
 msgstr "Ubicación / Producto"
 
 #. module: stock
-#: code:addons/stock/stock.py:1303
+#: code:addons/stock/stock.py:1323
 #, python-format
 msgid "Reception"
 msgstr "Recepción"
@@ -633,6 +632,11 @@ msgid ""
 "worker/team that should perform the operation. Examples of stock journals "
 "may be: quality control, pick lists, packing, etc."
 msgstr ""
+"El sistema de existencias diarias le permite asignar cada operación de "
+"existencias a un diario específico según el tipo de operación a realizar o "
+"el trabajador / equipo que debe realizar la operación. Algunos ejemplos de "
+"diarios de existencias pueden ser: control de calidad, listas de selección, "
+"embalaje, etc."
 
 #. module: stock
 #: field:stock.location,complete_name:0
@@ -1094,7 +1098,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1302
+#: code:addons/stock/stock.py:1322
 #, python-format
 msgid "Delivery Order"
 msgstr "Orden de entrega"
@@ -1102,7 +1106,7 @@ msgstr "Orden de entrega"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_memory_in
 msgid "stock.move.memory.in"
-msgstr ""
+msgstr "stock.move.memory.in"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1246,7 +1250,7 @@ msgstr ""
 "stock generados por las órdenes de producción."
 
 #. module: stock
-#: code:addons/stock/stock.py:2006
+#: code:addons/stock/stock.py:2024
 #, python-format
 msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
@@ -1256,7 +1260,7 @@ msgstr ""
 "y la cuenta variante de la categoría de producto son la misma."
 
 #. module: stock
-#: code:addons/stock/stock.py:1319
+#: code:addons/stock/stock.py:1339
 #, python-format
 msgid "is in draft state."
 msgstr "está en estado borrador."
@@ -1322,7 +1326,7 @@ msgid "Additional Info"
 msgstr "Información adicional"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1639
 #, python-format
 msgid "Operation forbidden"
 msgstr "Operación prohibida"
@@ -1469,7 +1473,7 @@ msgid "Downstream traceability"
 msgstr "Trazabilidad hacia abajo"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:106
 #, python-format
 msgid "No Invoices were created"
 msgstr "No se han creado facturas"
@@ -1533,7 +1537,7 @@ msgstr ""
 "compañías."
 
 #. module: stock
-#: code:addons/stock/stock.py:2233
+#: code:addons/stock/stock.py:2253
 #, python-format
 msgid "Please provide a positive quantity to scrap!"
 msgstr "¡Introduzca una cantidad positiva a desechar!"
@@ -1564,6 +1568,13 @@ msgid ""
 " When the picking is done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
+"Cuando un movimiento de almacén es creado queda en estado 'Borrador'.\n"
+" Luego, se establece en estado 'No Disponible' si el ... no ha encontrado "
+"los productos.\n"
+" Cuando los productos se han reservado es puesto en 'Disponible'.\n"
+" Cuando el retiro es realizado el estado es puesto en 'Realizado'.           "
+"   \n"
+"El estado es puesto 'En Espera' si se está esperando por otro movimiento."
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1573,7 +1584,7 @@ msgid "Supplier Location"
 msgstr "Ubicación del proveedor"
 
 #. module: stock
-#: code:addons/stock/stock.py:2254
+#: code:addons/stock/stock.py:2275
 #, python-format
 msgid "were scrapped"
 msgstr "estaban desechados"
@@ -1765,7 +1776,7 @@ msgid "Warehouse Dashboard"
 msgstr "Tablero almacén"
 
 #. module: stock
-#: code:addons/stock/stock.py:512
+#: code:addons/stock/stock.py:525
 #, python-format
 msgid "You can not remove a lot line !"
 msgstr "¡No puede eliminar una línea de lote!"
@@ -1779,7 +1790,7 @@ msgid "Scrap Products"
 msgstr "Productos de desecho"
 
 #. module: stock
-#: code:addons/stock/stock.py:1128
+#: code:addons/stock/stock.py:1147
 #, python-format
 msgid "You cannot remove the picking which is in %s state !"
 msgstr "¡No puede eliminar el albarán que está en estado %s!"
@@ -1842,7 +1853,7 @@ msgid "Provide the quantities of the returned products."
 msgstr "Indique las cantidades de los productos devueltos."
 
 #. module: stock
-#: code:addons/stock/stock.py:2009
+#: code:addons/stock/stock.py:2027
 #, python-format
 msgid ""
 "Can not create Journal Entry, Input Account defined on this product and "
@@ -1931,7 +1942,7 @@ msgid "Quantity per lot"
 msgstr "Cantidad por lote"
 
 #. module: stock
-#: code:addons/stock/stock.py:2012
+#: code:addons/stock/stock.py:2030
 #, python-format
 msgid ""
 "There is no stock input account defined for this product or its category: "
@@ -2040,7 +2051,6 @@ msgstr "_Aplicar"
 #: report:lot.stock.overview:0
 #: report:lot.stock.overview_all:0
 #: report:stock.inventory.move:0
-#: report:stock.picking.list:0
 msgid "]"
 msgstr "]"
 
@@ -2146,7 +2156,7 @@ msgid "Inventory loss"
 msgstr "Pérdidas de inventario"
 
 #. module: stock
-#: code:addons/stock/stock.py:1311
+#: code:addons/stock/stock.py:1331
 #, python-format
 msgid "Document"
 msgstr "Documento"
@@ -2271,13 +2281,13 @@ msgid "Shipping Type"
 msgstr "Tipo de envío"
 
 #. module: stock
-#: code:addons/stock/stock.py:2210
+#: code:addons/stock/stock.py:2230
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Sólo puede eliminar movimientos borrador."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
+#: code:addons/stock/wizard/stock_partial_picking.py:98
 #: model:ir.actions.act_window,name:stock.act_product_location_open
 #: model:ir.ui.menu,name:stock.menu_stock_products_menu
 #: view:stock.inventory:0
@@ -2448,7 +2458,7 @@ msgid "Source"
 msgstr "Origen"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
+#: code:addons/stock/stock.py:2610
 #: model:ir.model,name:stock.model_stock_inventory
 #: selection:report.stock.inventory,location_type:0
 #: field:stock.inventory.line,inventory_id:0
@@ -2489,7 +2499,7 @@ msgstr "Seguimiento nº serie"
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:135
-#: code:addons/stock/stock.py:754
+#: code:addons/stock/stock.py:769
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -2673,7 +2683,7 @@ msgstr ""
 "(id: %d)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2339
+#: code:addons/stock/stock.py:2361
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
 msgstr ""
@@ -2736,7 +2746,7 @@ msgid "Quantity (UOS)"
 msgstr "Cantidad (UdV)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1664
+#: code:addons/stock/stock.py:1684
 #, python-format
 msgid ""
 "You are moving %.2f %s products but only %.2f %s available in this lot."
@@ -2777,7 +2787,7 @@ msgid "Properties"
 msgstr "Propiedades"
 
 #. module: stock
-#: code:addons/stock/stock.py:974
+#: code:addons/stock/stock.py:994
 #, python-format
 msgid "Error, no partner !"
 msgstr "¡Error, sin empresa!"
@@ -2828,7 +2838,7 @@ msgid "Inventory Reference"
 msgstr "Referencia inventario"
 
 #. module: stock
-#: code:addons/stock/stock.py:1304
+#: code:addons/stock/stock.py:1324
 #, python-format
 msgid "Internal picking"
 msgstr "Albarán interno"
@@ -2917,7 +2927,7 @@ msgid "Date done"
 msgstr "Fecha realización"
 
 #. module: stock
-#: code:addons/stock/stock.py:975
+#: code:addons/stock/stock.py:995
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3002,8 +3012,8 @@ msgid "Invoicing"
 msgstr "Facturación"
 
 #. module: stock
-#: code:addons/stock/stock.py:2274
-#: code:addons/stock/stock.py:2334
+#: code:addons/stock/stock.py:2295
+#: code:addons/stock/stock.py:2355
 #, python-format
 msgid "Please provide Proper Quantity !"
 msgstr "¡Indique cantidad correcta!"
@@ -3030,7 +3040,7 @@ msgid "Consume Products"
 msgstr "Consumir productos"
 
 #. module: stock
-#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1683
 #, python-format
 msgid "Insufficient Stock in Lot !"
 msgstr "¡Stock insuficiente en el lote!"
@@ -3130,7 +3140,9 @@ msgstr "Referencia paquete"
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,location_id:0
+#: field:stock.inventory.line.split,location_id:0
 #: field:stock.move,location_id:0
+#: field:stock.move.split,location_id:0
 msgid "Source Location"
 msgstr "Ubicación origen"
 
@@ -3183,7 +3195,7 @@ msgid "All at once"
 msgstr "Todo junto"
 
 #. module: stock
-#: code:addons/stock/stock.py:1620
+#: code:addons/stock/stock.py:1640
 #, python-format
 msgid ""
 "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
@@ -3234,7 +3246,7 @@ msgstr "Movimientos para este lote de producción"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_memory_out
 msgid "stock.move.memory.out"
-msgstr ""
+msgstr "stock.move.memory.out"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:115
@@ -3286,8 +3298,8 @@ msgid "Icon"
 msgstr "Icono"
 
 #. module: stock
-#: code:addons/stock/stock.py:2209
-#: code:addons/stock/stock.py:2617
+#: code:addons/stock/stock.py:2229
+#: code:addons/stock/stock.py:2638
 #, python-format
 msgid "UserError"
 msgstr "Error de usuario"
@@ -3314,13 +3326,13 @@ msgstr "Clientes no europeos"
 #: code:addons/stock/product.py:100
 #: code:addons/stock/product.py:121
 #: code:addons/stock/product.py:147
-#: code:addons/stock/stock.py:2006
-#: code:addons/stock/stock.py:2009
-#: code:addons/stock/stock.py:2012
-#: code:addons/stock/stock.py:2015
-#: code:addons/stock/stock.py:2018
-#: code:addons/stock/stock.py:2021
-#: code:addons/stock/stock.py:2339
+#: code:addons/stock/stock.py:2024
+#: code:addons/stock/stock.py:2027
+#: code:addons/stock/stock.py:2030
+#: code:addons/stock/stock.py:2033
+#: code:addons/stock/stock.py:2036
+#: code:addons/stock/stock.py:2039
+#: code:addons/stock/stock.py:2361
 #: code:addons/stock/wizard/stock_fill_inventory.py:47
 #: code:addons/stock/wizard/stock_splitinto.py:49
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3329,7 +3341,7 @@ msgid "Error!"
 msgstr "¡Error!"
 
 #. module: stock
-#: code:addons/stock/stock.py:2021
+#: code:addons/stock/stock.py:2039
 #, python-format
 msgid ""
 "There is no inventory variation account defined on the product category: "
@@ -3363,7 +3375,7 @@ msgid "It specifies goods to be delivered all at once or by direct delivery"
 msgstr "Indica si las mercancías se enviarán todas a la vez o directamente."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:90
 #, python-format
 msgid "This picking list does not require invoicing."
 msgstr "Este albarán no requiere facturación."
@@ -3389,6 +3401,16 @@ msgid ""
 "* Fixed Location: The chained location is taken from the next field: Chained "
 "Location if Fixed."
 msgstr ""
+"Determina si esta ubicación está encadenada a otra, por ejemplo cualquier "
+"producto que entre en esta ubicación \n"
+"debe ir a la siguiente ubicación encadenada. La ubicación encadenada se "
+"determina en función del tipo: \n"
+"* Ninguna: No se encadena con ninguna.\n"
+"* Cliente: Se utiliza la ubicación encadenada definida en el campo Ubicación "
+"del Cliente del Formulario del Cliente especificado en la Guía de Despacho "
+"(albaran) de los productos entrantes.\n"
+"* Ubicación fija: Se utiliza la ubicación encadenada del campo: Ubicación "
+"Encadenada si es Fija."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
@@ -3398,8 +3420,8 @@ msgid "Warning"
 msgstr "Advertencia"
 
 #. module: stock
-#: code:addons/stock/stock.py:1318
-#: code:addons/stock/stock.py:2589
+#: code:addons/stock/stock.py:1338
+#: code:addons/stock/stock.py:2610
 #, python-format
 msgid "is done."
 msgstr "está realizado."
@@ -3505,7 +3527,7 @@ msgid "Reporting"
 msgstr "Informe"
 
 #. module: stock
-#: code:addons/stock/stock.py:1313
+#: code:addons/stock/stock.py:1333
 #, python-format
 msgid " for the "
 msgstr " para el "
@@ -3559,7 +3581,7 @@ msgid "Chaining Journal"
 msgstr "Diario encadenamiento"
 
 #. module: stock
-#: code:addons/stock/stock.py:732
+#: code:addons/stock/stock.py:746
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "No suficiente stock, no ha sido posible reservar los productos."
@@ -3570,7 +3592,7 @@ msgid "Customers"
 msgstr "Clientes"
 
 #. module: stock
-#: code:addons/stock/stock.py:1317
+#: code:addons/stock/stock.py:1337
 #, python-format
 msgid "is cancelled."
 msgstr "está cancelado."
@@ -3581,7 +3603,7 @@ msgid "Stock Inventory Lines"
 msgstr "Líneas regularización de inventario"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
+#: code:addons/stock/wizard/stock_partial_picking.py:98
 #, python-format
 msgid "Process Document"
 msgstr "Procesar documento"
@@ -3775,7 +3797,7 @@ msgstr ""
 "generados por los abastecimientos."
 
 #. module: stock
-#: code:addons/stock/stock.py:1316
+#: code:addons/stock/stock.py:1336
 #, python-format
 msgid "is ready to process."
 msgstr "preparado para procesar."
@@ -3791,7 +3813,7 @@ msgid "Set to zero"
 msgstr "Inicializar a cero"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:92
 #, python-format
 msgid "None of these picking lists require invoicing."
 msgstr "Ninguno de estos albaranes requiere facturación."
@@ -3803,7 +3825,7 @@ msgstr "Noviembre"
 
 #. module: stock
 #: code:addons/stock/product.py:101
-#: code:addons/stock/stock.py:2018
+#: code:addons/stock/stock.py:2036
 #, python-format
 msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -3856,10 +3878,10 @@ msgid "Future Stock"
 msgstr "Stock futuro"
 
 #. module: stock
-#: code:addons/stock/stock.py:512
-#: code:addons/stock/stock.py:1120
-#: code:addons/stock/stock.py:1128
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
+#: code:addons/stock/stock.py:525
+#: code:addons/stock/stock.py:1139
+#: code:addons/stock/stock.py:1147
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:106
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -4124,10 +4146,11 @@ msgid "Invoiced date"
 msgstr "Fecha facturado"
 
 #. module: stock
-#: code:addons/stock/stock.py:732
+#: code:addons/stock/stock.py:746
 #: code:addons/stock/wizard/stock_fill_inventory.py:106
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:65
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:90
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:92
 #: code:addons/stock/wizard/stock_return_picking.py:77
 #: code:addons/stock/wizard/stock_return_picking.py:92
 #: code:addons/stock/wizard/stock_return_picking.py:194
diff --git a/debian/po/es_CL.po b/debian/po/es_CL.po
index 454fa9705eb..9da94b6ce29 100644
--- a/debian/po/es_CL.po
+++ b/debian/po/es_CL.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2011-01-19 14:33+0000\n"
-"Last-Translator: Juan Pizarro <jpizarrom@gmail.com>\n"
+"PO-Revision-Date: 2011-10-03 16:05+0000\n"
+"Last-Translator: doingit.cl <Unknown>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
+"X-Launchpad-Export-Date: 2011-10-04 05:01+0000\n"
+"X-Generator: Launchpad (build 14071)\n"
 
 #. Type: string
 #. Description
 #: ../openerp-server.templates:1001
 msgid "Dedicated system account for the Open ERP server:"
-msgstr ""
+msgstr "Cuenta del sistema dedicada para el servidor OpenERP"
 
 #. Type: string
 #. Description
@@ -31,9 +31,12 @@ msgid ""
 "the system's security is not compromised by running it with superuser "
 "privileges."
 msgstr ""
+"El servidor OpenERP debe utilizar una cuenta dedicada para su "
+"funcionamiento, de tal modo que la seguridad del sistema no se vea "
+"comprometida por su utilización con privilegios de administración."
 
 #. Type: string
 #. Description
 #: ../openerp-server.templates:1001
 msgid "Please choose that account's username."
-msgstr ""
+msgstr "Elija un Nombre de Usuario para la cuenta"
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index 9a5dd8a395a..812eaf625e3 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-07-26 01:09+0000\n"
-"Last-Translator: Juano <Unknown>\n"
+"PO-Revision-Date: 2011-10-03 16:01+0000\n"
+"Last-Translator: Francisco Reyes Acuña <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: 2011-10-01 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-10-04 05:01+0000\n"
 "X-Generator: Launchpad (build 14071)\n"
 
 #. module: base
@@ -5726,7 +5726,7 @@ msgstr "Traducciones"
 #. module: base
 #: field:ir.sequence,padding:0
 msgid "Number Padding"
-msgstr ""
+msgstr "Número(s) de relleno"
 
 #. module: base
 #: view:ir.actions.report.xml:0

From 8c1e052007456ae34d2b0e7fbe0887ada7100fef Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Tue, 4 Oct 2011 09:24:24 +0200
Subject: [PATCH 200/304] [fix] use a more solid selector to get $element

bzr revid: valentin.lab@kalysto.org-20111004072424-uwx50578hhafe2xm
---
 addons/web/static/src/js/view_form.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 11ebad8d093..773cd882405 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -688,7 +688,10 @@ openerp.web.form.Widget = openerp.web.Widget.extend(/** @lends openerp.web.form.
         this.width = this.node.attrs.width;
     },
     start: function() {
-        this.$element = this.view.$element.find('.' + this.element_class);
+        // avoiding find('.' + this.element_class) form because it doesn't work
+        // if class contains some dots.
+        this.$element = this.view.$element
+            .find('[class~="' + this.element_class + '"]');
     },
     process_modifiers: function() {
         var compute_domain = openerp.web.form.compute_domain;

From 2bb8cadb4dcf7311df7f056bda77332fe9d7955b Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Tue, 4 Oct 2011 09:43:21 +0200
Subject: [PATCH 201/304] [imp] notebookpage is now in registry also.

bzr revid: valentin.lab@kalysto.org-20111004074321-b2z121y64yynt948
---
 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 11ebad8d093..19d9a5ee839 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -792,8 +792,7 @@ openerp.web.form.WidgetNotebook = openerp.web.form.Widget.extend({
         for (var i = 0; i < node.children.length; i++) {
             var n = node.children[i];
             if (n.tag == "page") {
-                var page = new openerp.web.form.WidgetNotebookPage(
-                        this.view, n, this, this.pages.length);
+                var page = new (this.view.registry.get_object('notebookpage'))(this.view, n, this, this.pages.length);
                 this.pages.push(page);
             }
         }
@@ -2781,6 +2780,7 @@ openerp.web.form.widgets = new openerp.web.Registry({
     'frame' : 'openerp.web.form.WidgetFrame',
     'group' : 'openerp.web.form.WidgetFrame',
     'notebook' : 'openerp.web.form.WidgetNotebook',
+    'notebookpage' : 'openerp.web.form.WidgetNotebookPage',
     'separator' : 'openerp.web.form.WidgetSeparator',
     'label' : 'openerp.web.form.WidgetLabel',
     'button' : 'openerp.web.form.WidgetButton',

From e2b6e03c3c6ffe3c6e2ed34166b66f953ba35495 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 4 Oct 2011 09:50:39 +0200
Subject: [PATCH 202/304] [FIX] Save last search before triggering do_search

bzr revid: fme@openerp.com-20111004075039-n8a30wnuueiwnbwt
---
 addons/web/static/src/js/views.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index a38825a35a5..28e9772da77 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -288,8 +288,8 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
             }, function (results) {
                 self.dataset.context = results.context;
                 self.dataset.domain = results.domain;
-                controller.do_search(results.domain, results.context, results.group_by);
                 self.last_search = [results.domain, results.context, results.group_by];
+                controller.do_search(results.domain, results.context, results.group_by);
             });
         } else if (this.last_search) {
             controller.do_search.apply(controller, this.last_search);

From a9c2e07c7366a77b977cbebd290fb31fc637022d Mon Sep 17 00:00:00 2001
From: "Vaibhav (OpenERP)" <vda@tinyerp.com>
Date: Tue, 4 Oct 2011 15:10:09 +0530
Subject: [PATCH 203/304] [FIX] Removed exception of events manipulation fields
 to compute calendar scheduler.

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

bzr revid: vda@tinyerp.com-20111004094009-u1vkb6s0u90629rz
---
 addons/web_calendar/static/src/js/calendar.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index 5de601e0921..9af5130a121 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -31,7 +31,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
     },
     start: function() {
         this._super();
-        this.rpc("/web/view/load", {"model": this.model, "view_id": this.view_id, "view_type":"calendar", 'toolbar': true}, this.on_loaded);
+        return this.rpc("/web/view/load", {"model": this.model, "view_id": this.view_id, "view_type":"calendar", 'toolbar': true}, this.on_loaded);
     },
     stop: function() {
         scheduler.clearAll();
@@ -55,6 +55,10 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         this.day_length = this.fields_view.arch.attrs.day_length || 8;
         this.color_field = this.fields_view.arch.attrs.color;
         this.fields =  this.fields_view.fields;
+        
+        if (!this.date_start) {
+            throw new Error("Calendar view has none of the following attributes : 'date_start'");
+        }
 
         //* Calendar Fields *
         this.calendar_fields.date_start = {'name': this.date_start, 'kind': this.fields[this.date_start].type};
@@ -68,9 +72,6 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         if (this.date_stop) {
             this.calendar_fields.date_stop = {'name': this.date_stop, 'kind': this.fields[this.date_stop].type};
         }
-        if (!this.date_delay && !this.date_stop) {
-            throw new Error("Calendar view has none of the following attributes : 'date_stop', 'date_delay'");
-        }
 
         for (var fld = 0; fld < this.fields_view.arch.children.length; fld++) {
             this.info_fields.push(this.fields_view.arch.children[fld].attrs.name);
@@ -200,7 +201,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
     convert_event: function(evt) {
         var date_start = openerp.web.str_to_datetime(evt[this.date_start]),
             date_stop = this.date_stop ? openerp.web.str_to_datetime(evt[this.date_stop]) : null,
-            date_delay = evt[this.date_delay] || null,
+            date_delay = evt[this.date_delay] || 1.0,
             res_text = '',
             res_description = [];
 

From 63cf2019e5b0b74920c92765436e22c36fb8239c Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Tue, 4 Oct 2011 12:20:50 +0200
Subject: [PATCH 204/304] [imp] more efficient selector.

bzr revid: valentin.lab@kalysto.org-20111004102050-http3jvu0sf78fmx
---
 addons/web/static/src/js/view_form.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 773cd882405..b5b54722d68 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -688,10 +688,8 @@ openerp.web.form.Widget = openerp.web.Widget.extend(/** @lends openerp.web.form.
         this.width = this.node.attrs.width;
     },
     start: function() {
-        // avoiding find('.' + this.element_class) form because it doesn't work
-        // if class contains some dots.
-        this.$element = this.view.$element
-            .find('[class~="' + this.element_class + '"]');
+        this.$element = this.view.$element.find(
+            '.' + this.element_class.replace(/([#;&,.+*~\:!^$\[\]=>|\/])/g,'\\$1'));
     },
     process_modifiers: function() {
         var compute_domain = openerp.web.form.compute_domain;

From 3190884fa1abf60c83628b6ff5f4da9fc3837c11 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Oct 2011 12:21:15 +0200
Subject: [PATCH 205/304] [FIX] don't perform a search_read when switching view
 from list to form

I don't remember why I did that originally, it does not seem to serve any purpose and it causes problems in case of records with binary fields

bzr revid: xmo@openerp.com-20111004102115-lz6kgyiw35vp1t99
---
 addons/web/static/src/js/view_list.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index a5e0c4042b2..985380d4c49 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -520,14 +520,8 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      * @param {openerp.web.DataSet} dataset dataset in which the record is available (may not be the listview's dataset in case of nested groups)
      */
     do_activate_record: function (index, id, dataset) {
-        var self = this;
-        // TODO is it needed ?
-        this.dataset.read_slice([],{
-                context: dataset.get_context(),
-                domain: dataset.get_domain()
-            }, function () {
-                self.select_record(index);
-        });
+        this.dataset.ids = dataset.ids;
+        this.select_record(index);
     },
     /**
      * Handles signal for the addition of a new record (can be a creation,

From 29cef016f90c7e1d118abbe899eac57ecaeff2c6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Oct 2011 12:48:48 +0200
Subject: [PATCH 206/304] [FIX] re-rendering of a given list's row (e.g.
 onchange, edition, etc...): 'view' needs to be in the context so the row's
 color can be computed

bzr revid: xmo@openerp.com-20111004104848-277ajqmaud8oc8hn
---
 addons/web/static/src/js/view_list.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 985380d4c49..719c7117d65 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -896,6 +896,7 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
             options: this.options,
             record: record,
             row_parity: (index % 2 === 0) ? 'even' : 'odd',
+            view: this.view,
             render_cell: openerp.web.format_cell
         });
     },

From 780179e0167660b8791937429570ad344847a176 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Oct 2011 14:41:25 +0200
Subject: [PATCH 207/304] [FIX] fetch display mode from calendar view

bzr revid: xmo@openerp.com-20111004124125-34rjj54k2fe0locu
---
 addons/web_calendar/static/src/js/calendar.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index f936547ed8c..42e1c33d4f5 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -46,6 +46,10 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         this.name = this.fields_view.name || this.fields_view.arch.attrs.string;
         this.view_id = this.fields_view.view_id;
 
+        // mode, one of month, week or day
+        this.mode = this.fields_view.arch.attrs.mode;
+
+        // date_start is mandatory, date_delay and date_stop are optional
         this.date_start = this.fields_view.arch.attrs.date_start;
         this.date_delay = this.fields_view.arch.attrs.date_delay;
         this.date_stop = this.fields_view.arch.attrs.date_stop;
@@ -107,9 +111,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         scheduler.config.drag_resize = true;
         scheduler.config.drag_create = true;
 
-        // Initialize Sceduler
-        this.mode = this.mode || 'month';
-        scheduler.init('openerp_scheduler', null, this.mode);
+        scheduler.init('openerp_scheduler', null, this.mode || 'month');
 
         scheduler.detachAllEvents();
         scheduler.attachEvent('onEventAdded', this.do_create_event);

From 0815eff444ae35170b5682e91167df6b37d6c721 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 4 Oct 2011 15:36:13 +0200
Subject: [PATCH 208/304] [FIX] base_setup: fix the xml_id of the default
 shortcut 'Add More Features'

bzr revid: stw@openerp.com-20111004133613-d2pv1csgin2bwfee
---
 addons/base_setup/base_setup_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 1a6fa9a91fa..12b3246ad61 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -9,7 +9,7 @@
           <field name="target">new</field>
       </record>
 
-      <record id="todo_base_setup_installer_beta" model="ir.actions.todo">
+      <record id="base_setup_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_installer_beta" />
         <field name="category_id" ref="base.category_administration_config"/>
         <field name="sequence">2</field>

From cb05cf6ce2a2c14b635701c62d0972dcd7a56ff8 Mon Sep 17 00:00:00 2001
From: "Vaibhav (OpenERP)" <vda@tinyerp.com>
Date: Tue, 4 Oct 2011 19:07:53 +0530
Subject: [PATCH 209/304] [FIX] exception error message.

bzr revid: vda@tinyerp.com-20111004133753-kptuu127azazrmg6
---
 addons/web_calendar/static/src/js/calendar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index 9af5130a121..ce200fe4f5f 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -57,7 +57,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         this.fields =  this.fields_view.fields;
         
         if (!this.date_start) {
-            throw new Error("Calendar view has none of the following attributes : 'date_start'");
+            throw new Error("Calendar view has not defined 'date_start' attribute.");
         }
 
         //* Calendar Fields *

From 3a224dfc06641c7caa892bc73fb67031a9ed514d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Oct 2011 16:25:40 +0200
Subject: [PATCH 210/304] [IMP] res.partner: better context management in
 name_get/name_search

bzr revid: odo@openerp.com-20111004142540-689vy1exk60druhy
---
 openerp/addons/base/res/res_partner.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 1c136b6f30b..f8d1e6dd980 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -188,7 +188,7 @@ notifications, such as the availability of invoices."),
     def name_get(self, cr, uid, ids, context={}):
         if not len(ids):
             return []
-        if context.get('show_ref', False):
+        if context and context.get('show_ref'):
             rec_name = 'ref'
         else:
             rec_name = 'name'
@@ -199,8 +199,6 @@ notifications, such as the availability of invoices."),
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args=[]
-        if not context:
-            context={}
         if name:
             ids = self.search(cr, uid, [('ref', '=', name)] + args, limit=limit, context=context)
             if not ids:
@@ -315,6 +313,8 @@ class res_partner_address(osv.osv):
     }
 
     def name_get(self, cr, user, ids, context={}):
+        if context is None:
+            context = {}
         if not len(ids):
             return []
         res = []

From 4900560931fa934538f8443729e34c297fa2eb2f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Oct 2011 16:29:51 +0200
Subject: [PATCH 211/304] [IMP] res.partner.edi: working edi implementation for
 res.partner + smoke test

bzr revid: odo@openerp.com-20111004142951-klopyd7zn5sxf65g
---
 openerp/addons/base/res/edi_partner.py        | 37 +++++++--
 .../addons/base/test/test_edi_documents.yml   | 80 +++++++++----------
 2 files changed, 70 insertions(+), 47 deletions(-)

diff --git a/openerp/addons/base/res/edi_partner.py b/openerp/addons/base/res/edi_partner.py
index 7a4127315f8..b8b64fad9e6 100644
--- a/openerp/addons/base/res/edi_partner.py
+++ b/openerp/addons/base/res/edi_partner.py
@@ -21,18 +21,45 @@
 from osv import fields,osv
 from base.ir import ir_edi
 
+RES_PARTNER_ADDRESS_EDI_STRUCT = {
+    'name': True,
+    'email': True,
+    'street': True,
+    'street2': True,
+    'zip': True,
+    'city': True,
+    'country_id': True,
+    'state_id': True,
+    'phone': True,
+    'fax': True,
+    'mobile': True,
+}
+
+RES_PARTNER_EDI_STRUCT = {
+    'name': True,
+    'ref': True,
+    'lang': True,
+    'website': True,
+    'address': RES_PARTNER_ADDRESS_EDI_STRUCT
+}
+
+
 class res_partner(osv.osv, ir_edi.edi):
     _inherit = "res.partner"
-    
-res_partner()
+
+    def edi_export(self, cr, uid, records, edi_struct=None, context=None):
+        return super(res_partner,self).edi_export(cr, uid, records,
+                                                  dict(RES_PARTNER_EDI_STRUCT),
+                                                  context=context)
 
 class res_partner_address(osv.osv, ir_edi.edi):
     _inherit = "res.partner.address"
 
-res_partner_address()
+    def edi_export(self, cr, uid, records, edi_struct=None, context=None):
+        return super(res_partner_address,self).edi_export(cr, uid, records,
+                                                          dict(RES_PARTNER_ADDRESS_EDI_STRUCT),
+                                                          context=context)
 
 class res_partner_bank(osv.osv, ir_edi.edi):
     _inherit = "res.partner.bank"
 
-res_partner_bank()
-
diff --git a/openerp/addons/base/test/test_edi_documents.yml b/openerp/addons/base/test/test_edi_documents.yml
index 03dbe623ede..c9695af73e1 100644
--- a/openerp/addons/base/test/test_edi_documents.yml
+++ b/openerp/addons/base/test/test_edi_documents.yml
@@ -1,47 +1,43 @@
 -
-  I create partner
+  In order to test the basic EDI system, I will export a partner,
+  modify the exported EDI document to add an attachment and change
+  the data, and then re-import it and re-export it.
+  
+  with an attached file, check the result, the alter the data
+  and reimport it.
 -
-  !record {model: res.partner, id: res_partner_test33}:
-    name: Ivan
-    title: base.res_partner_title_sir
-    website: www.openerp.com
-    address:
-      - type: default
-        name: Davidson
-        street: M.G. Road
-        zip: 354562
-        city: Alhabad
-        phone: +91 985764653
-    supplier: False
-    customer: True
-    company_id: base.main_company
-    
--
-    I am creating one Document to be attached in partner ".
--
-    !record {model: 'ir.attachment', id: document_4}:
-        name : "My partner document"
-        res_model : res.partner
-        type : binary
-
--
-    I attach a pdf file in "My partner document"
--
-    !python {model: 'ir.attachment'}: |
-        import addons
-        import base64
-        pdf_file = open(addons.get_module_resource('base','test', 'partner.pdf'))
-        self.write(cr, uid, [ref("document_4")], {'res_id':ref("res_partner_test33"), 'datas_fname': 'partner.pdf', 'datas' : base64.encodestring(pdf_file.read())}, context)
-      
--
-  I am Tesing of EDI functionality. so first export partner and than import it again.
--      
-
   !python {model: ir.edi.document}: |
+      import json
       partner_obj = self.pool.get('res.partner')
-      partners = [partner_obj.browse(cr, uid, ref("res_partner_test33"))]
-      tokens = self.export_edi(cr, uid, partners)
-      assert tokens, 'Token is not generated.'
-      document = self.get_document(cr, uid, tokens[0], context=context)
-      a = self.import_edi(cr, uid, edi_document = document)
+      tokens = self.export_edi(cr, uid, [partner_obj.browse(cr, uid, ref('base.res_partner_agrolait'))])
+      doc = self.get_document(cr, uid, tokens[0], context=context)
+      edi_doc, = json.loads(doc)
 
+      # check content of the document
+      assert edi_doc.get('__id').endswith('.res_partner_agrolait'), 'Incorrect external ID'
+      assert edi_doc.get('__model') == 'res.partner', 'Incorrect/Missing __model'
+      assert edi_doc.get('__module') == 'base', 'Incorrect/Missing __module'
+      assert edi_doc.get('__last_update'), 'Missing __last_update'
+
+      # try to import the document after changing the name and id, and attaching a
+      # file, and check that a new partner is returned
+      edi_doc['__id'] = 'base:xxd37f8a-xx55-11e0-xxdd-xx81124c8b50.res_partner_xxx'
+      edi_doc['name'] = 'AgroMilk'
+      attachment = {
+        'name': 'Test file',
+        'file_name': 'test.png',
+        'content': 'iVBORw0KGgoAAAANSUhEUgAAAA4AAAAKCAYAAACE2W/HAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9oIDQ84BkjLWAYAAACNSURBVCjPjZKxDUJBDEOf/wbUbEHDhkxAzRjUDECBhMQYjIApuPBNpK+PpUinOPYll5Nt1iCJXifbSPpJZtHgXLUdu0FWpMEt87a/xtsmqjjNetPFyhuWYFuj7RcgQBNwXNGdw2CqY85yXWi5z7YBnmRyEHvg0YSXrLE9P30nwugOHHr+s5va4x+fofAGm1+JjnJICm0AAAAASUVORK5CYII=',
+      }
+      edi_doc['__attachments'] = [attachment]
+      doc = json.dumps([edi_doc])
+      result, = self.import_edi(cr, uid, edi_document=doc)
+      assert result[0] == 'res.partner' and result[1] > ref('base.res_partner_agrolait'),\
+         "Expected (%r,> %r) after import 1, got %r" % ('res.partner', ref('base.res_partner_agrolait'), result)
+
+      # export the same partner we just created, and see if the output matches the input
+      tokens = self.export_edi(cr, uid, [partner_obj.browse(cr, uid, result[1])])
+      doc_output = self.get_document(cr, uid, tokens[0], context=context)
+      edi_doc_output, = json.loads(doc_output)
+      for attribute in ('__model', '__module', '__id', 'name', '__attachments'):
+        assert edi_doc_output.get(attribute) == edi_doc.get(attribute), \
+            'Incorrect value for %s, expected %r, got %r' % (attribute, edi_doc.get(attribute), edi_doc_output.get(attribute))
\ No newline at end of file

From 82a4a9de0a9ebcac4acc78e62c37ef72d573568e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Oct 2011 16:30:50 +0200
Subject: [PATCH 212/304] [IMP] edi: review/corrected edi logic

bzr revid: odo@openerp.com-20111004143050-wvpp2b9r81cho3m3
---
 openerp/addons/base/ir/ir_edi.py | 676 ++++++++++++++++---------------
 1 file changed, 353 insertions(+), 323 deletions(-)

diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 6bc28f69778..b9ae11fd71b 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -22,6 +22,8 @@
 import base64
 import hashlib
 import json
+import logging
+import re
 import time
 import urllib2
 
@@ -29,24 +31,45 @@ import openerp
 import openerp.release as release
 from osv import osv,fields
 from tools.translate import _
+from tools.parse_version import parse_version
 
-def split_xml_id(xml_id):
-    assert len(xml_id.split('.'))==2, \
-            _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
-    return xml_id.split('.')
+EXTERNAL_ID_PATTERN = re.compile(r'^(\S+:)?(\S+?)\.(\S+)$')
+
+def split_external_id(ext_id):
+    match = EXTERNAL_ID_PATTERN.match(ext_id)
+    assert match, \
+            _("'%s' is an invalid external ID") % (ext_id)
+    return {'module': match.group(1) and match.group(1)[:-1],
+            'db_uuid': match.group(2),
+            'id': match.group(3),
+            'full': match.group(0)}
 
 def safe_unique_id(database_id, model, record_id):
-    """Generate a unique string to represent a (database id,model,record_id) pair
-    without being too long, without revealing the database id, and
-    with a very low probability of collisions.
+    """Generate a unique string to represent a (database_uuid,model,record_id) pair
+    without being too long, and with a very low probability of collisions.
     """
     msg = "%s-%s-%s-%s" % (time.time(), database_id, model, record_id)
     digest = hashlib.sha1(msg).digest()
+    # fold the sha1 20 bytes digest to 9 bytes
     digest = ''.join(chr(ord(x) ^ ord(y)) for (x,y) in zip(digest[:9], digest[9:-2]))
-    # finally, use the b64-encoded folded digest as ID part of the unique ID:
+    # b64-encode the 9-bytes folded digest to a reasonable 12 chars ASCII ID
     digest = base64.urlsafe_b64encode(digest)
     return '%s-%s' % (model.replace('.','_'), digest)
 
+def version_tuple():
+    return parse_version(release.version)
+
+def last_update_for(record):
+    """Returns the last update timestamp for the given record,
+       if available, otherwise False
+    """
+    if record._model._log_access:
+        record_log = record.perm_read()[0]
+        return record_log.get('write_date') or record_log.get('create_date') or False
+    return False
+
+_logger = logging.getLogger('edi')
+
 class ir_edi_document(osv.osv):
     _name = 'ir.edi.document'
     _description = 'EDI Document'
@@ -99,6 +122,7 @@ class ir_edi_document(osv.osv):
         :return: EDI document string
         :raise: ValueError if requested EDI token does not match any know document
         """
+        _logger.debug("get_document(%s)", edi_token)
         edi_ids = self.search(cr, uid, [('name','=', edi_token)], context=context)
         if not edi_ids:
             raise ValueError('Invalid EDI token: %s' % edi_token)
@@ -134,7 +158,7 @@ class ir_edi_document(osv.osv):
 
         :param str|unicode edi_documents_string: UTF-8 string (or unicode) containing
                                                  JSON-serialized EDI document(s)
-        :return: Python object representing the EDI document(s) (usually a list of dicts) 
+        :return: Python object representing the EDI document(s) (usually a list of dicts)
         """
         return json.loads(edi_documents_string)
 
@@ -144,7 +168,7 @@ class ir_edi_document(osv.osv):
         and returns the list of the new corresponding ``ir.edi.document`` records.
 
         :param records: list of browse_record of any model
-        :return: list of IDs of the new ``ir.edi.document`` entries, in the same 
+        :return: list of IDs of the new ``ir.edi.document`` entries, in the same
                  order as the provided ``records``.
         """
         exported_ids = []
@@ -163,7 +187,7 @@ class ir_edi_document(osv.osv):
         from the given ``edi_url`` if provided.
 
         :param str|unicode edi_document: UTF-8 string or unicode containing JSON-serialized
-                                         EDI Document to import. Must not be provided if 
+                                         EDI Document to import. Must not be provided if
                                          ``edi_url`` is given.
         :param str|unicode edi_url: URL where the EDI document (same format as ``edi_document``)
                                     may be retrieved, without authentication.
@@ -182,378 +206,384 @@ class edi(object):
        ``edi_import()`` and ``edi_export()`` methods to implement their
        specific behavior, based on the primitives provided by this mixin."""
 
-    def record_xml_id(self, cr, uid, record, context=None):
-        #TODO: remove this -> use ir.model.data directly
-        model_data_pool = self.pool.get('ir.model.data')
-        data_ids = model_data_pool.search(cr, uid, [('res_id','=',record.id),('model','=',record._name)])
-        if not data_ids:
-            return False
-        xml_record_id = data_ids[0]
-        xml_record = model_data_pool.browse(cr, uid, xml_record_id, context=context)
-        return xml_record.module, xml_record.name
+    # private method, not RPC-exposed as it creates ir.model.data entries as
+    # SUPERUSER based on its parameters
+    def _edi_external_id(self, cr, uid, record, existing_id=None, existing_module=None,
+                        context=None):
+        """Generate/Retrieve unique external ID for ``record``.
+        Each EDI record and each relationship attribute in it is identified by a
+        unique external ID, which includes the database's UUID, as a way to
+        refer to any record within any OpenERP instance, without conflict.
 
-    def edi_xml_id(self, cr, uid, record, xml_id=None, context=None):
-        """
-        Generate a unique string to represent a pair of (the database's UUID, the XML ID).
-        Each EDI record and each relationship value are represented using a unique
-        database identifier. These database identifiers include the database unique
-        ID, as a way to uniquely refer to any record within any OpenERP instance,
-        without conflict.
-
-        For OpenERP records that have an existing "XML ID" (i.e. an entry in
+        For OpenERP records that have an existing "External ID" (i.e. an entry in
         ir.model.data), the EDI unique identifier for this record will be made of
-        "%s:%s" % (the database's UUID, the XML ID). The database's UUID MUST
-        NOT contain a colon characters (this is guaranteed by the UUID algorithm).
+        "%s:%s:%s" % (module, database UUID, ir.model.data ID). The database's
+        UUID MUST NOT contain a colon characters (this is guaranteed by the
+        UUID algorithm).
 
-        For OpenERP records that have no existing "XML ID", a new one should be
-        created during the EDI export. It is recommended that the generated XML ID
+        For records that have no existing ir.model.data entry, a new one will be
+        created during the EDI export. It is recommended that the generated external ID
         contains a readable reference to the record model, plus a unique value that
-        hides the database ID.
-        """
-        model_data_pool = self.pool.get('ir.model.data')
-        db_uuid = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
+        hides the database ID. If ``existing_id`` is provided (because it came from
+        an import), it will be used instead of generating a new one.
+        If ``existing_module`` is provided (because it came from
+        an import), it will be used instead of using local values.
 
-        _record_xml = self.record_xml_id(cr, uid, record, context=context)
-        if _record_xml:
-            module, xml_id = _record_xml
-            xml_id = '%s:%s.%s' % (db_uuid, module, xml_id)
+        :param browse_record record: any browse_record needing an EDI external ID
+        :param string existing_id: optional existing external ID value, usually coming
+                                   from a just-imported EDI record, to be used instead
+                                   of generating a new one
+        :param string existing_module: optional existing module name, usually in the
+                                       format ``module:db_uuid`` and coming from a
+                                       just-imported EDI record, to be used instead
+                                       of local values
+        :return: the full unique External ID to use for record
+        """
+        ir_model_data = self.pool.get('ir.model.data')
+        db_uuid = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
+        ext_id = self.get_external_id(cr, uid, [record.id])[record.id]
+        if not ext_id:
+            ext_id = existing_id or safe_unique_id(db_uuid, record._name, record.id)
+            # ID is unique cross-db thanks to db_uuid (already included in existing_module)
+            module = existing_module or "%s:%s" % (record._module, db_uuid)
+            _logger.debug("%s: Generating new external ID `%s.%s` for %r", self._name,
+                          module, ext_id, record)
+            ir_model_data.create(cr, openerp.SUPERUSER_ID,
+                                 {'name': ext_id,
+                                  'model': record._name,
+                                  'module': module,
+                                  'res_id': record.id})
         else:
-            if not xml_id:
-                uuid = safe_unique_id(db_uuid, record._name, record.id)
-                xml_id = '%s:%s.%s' % (db_uuid, record._module, uuid)
-            module, xml_id2 = split_xml_id(xml_id)
-            xml_record_id = model_data_pool.create(cr, openerp.SUPERUSER_ID, {
-                'name': xml_id2,
-                'model': record._name,
-                'module': module,
-                'res_id': record.id}, context=context)
-        return xml_id
+            module, ext_id = ext_id.split('.')
+            if not ':' in module:
+                # this record was not previously EDI-imported
+                assert module == record._module, 'Module mismatch between record and its current'\
+                                                 'external ID'
+                # ID is unique cross-db thanks to db_uuid
+                module = "%s:%s" % (module, db_uuid)
+
+        return '%s.%s' % (module, ext_id)
 
     def edi_metadata(self, cr, uid, records, context=None):
-        """Return a list representing the boilerplate EDI structure for
-           exporting the record in the given browse_rec_list, including
+        """Return a list containing the boilerplate EDI structures for
+           exporting ``records`` as EDI, including
            the metadata fields
 
-        The metadata fields MUST always include:
-        - __model': the OpenERP model name
-        - __module': the OpenERP module containing the model
-        - __id': the unique (cross-DB) identifier for this record
-        - __last_update': last update date of record, ISO date string in UTC
-        - __version': a list of components for the version
-        - __attachments': a list (possibly empty) of dicts describing the files attached to this record.
-        """
-        if context is None:
-            context = {}
-        data_ids = []
-        attachment_object = self.pool.get('ir.attachment')
-        edi_dict_list = []
-        db_uuid = ''
-        version = []
-        for ver in release.major_version.split('.'):
-            try:
-                ver = int(ver)
-            except:
-                pass
-            version.append(ver)
+        The metadata fields always include::
 
+            {
+               '__model': 'some.model',                # record model
+               '__module': 'module',                   # require module
+               '__id': 'module:db-uuid:model.id',      # unique global external ID for the record
+               '__last_update': '2011-01-01 10:00:00', # last update date in UTC!
+               '__version' : [6,1,0],                  # server version, to check compatibility.
+               '__attachments_':
+           }
+
+        :param list(browse_record) records: records to export
+        :return: list of dicts containing boilerplate EDI metadata for each record,
+                 at the corresponding index from ``records``.
+        """
+        data_ids = []
+        ir_attachment = self.pool.get('ir.attachment')
+        results = []
+        version = version_tuple()
         for record in records:
-            attachment_ids = attachment_object.search(cr, uid, [('res_model','=', record._name), ('res_id', '=', record.id)])
-            attachment_dict_list = []
-            for attachment in attachment_object.browse(cr, uid, attachment_ids, context=context):
-                attachment_dict_list.append({
+            attachment_ids = ir_attachment.search(cr, uid, [('res_model','=', record._name), ('res_id', '=', record.id)])
+            attachments = []
+            for attachment in ir_attachment.browse(cr, uid, attachment_ids, context=context):
+                attachments.append({
                         'name' : attachment.name,
-                        'content': base64.encodestring(attachment.datas),
+                        'content': attachment.datas, # already base64 encoded!
                         'file_name': attachment.datas_fname,
                 })
-
-
-            uuid = self.edi_xml_id(cr, uid, record, context=context)
+            ext_id = self._edi_external_id(cr, uid, record, context=context)
             edi_dict = {
-                '__id': uuid,
-                '__last_update': False, #record.write_date, #TODO: convert into UTC
+                '__id': ext_id,
+                '__last_update': last_update_for(record),
+                '__model' : record._name,
+                '__module' : record._module,
+                '__version': version,
+                '__attachments': attachments,
             }
-            if not context.get('o2m_export'):
-                edi_dict.update({
-                    '__model' : record._name,
-                    '__module' : record._module,
-                    '__version': version,
-                    '__attachments': attachment_dict_list
-                })
-            edi_dict_list.append(edi_dict)
-
-        return edi_dict_list
+            results.append(edi_dict)
+        return results
 
     def edi_m2o(self, cr, uid, record, context=None):
-        """Return a list representing a M2O EDI value for
-           the given browse_record.
-        M2O are passed as pair (ID, Name)
-        Exmaple: ['db-uuid:xml-id',  'Partner Name']
+        """Return a m2o EDI representation for the given record.
+
+        The EDI format for a many2one is::
+
+            ['unique_external_id', 'Document Name']
         """
-        # generic implementation!
-        db_uuid = self.edi_xml_id(cr, uid, record, context=context)
-        relation_model_pool = self.pool.get(record._name)
-        name = relation_model_pool.name_get(cr, uid, [record.id], context=context)
+        edi_ext_id = self._edi_external_id(cr, uid, record, context=context)
+        relation_model = record._model
+        name = relation_model.name_get(cr, uid, [record.id], context=context)
         name = name and name[0][1] or False
-        return [db_uuid, name]
+        return [edi_ext_id, name]
 
     def edi_o2m(self, cr, uid, records, edi_struct=None, context=None):
-        """Return a list representing a O2M EDI value for
-           the browse_records from the given browse_record_list.
+        """Return a list representing a O2M EDI relationship containing
+           all the given records, according to the given ``edi_struct``.
+           This is basically the same as exporting all the record using
+           :meth:`~.edi_export` with the given ``edi_struct``, and wrapping
+           the results in a list.
 
-        Example:
-         [                                # O2M fields would be a list of dicts, with their
-           { '__id': 'db-uuid:xml-id',    # own __id.
-             '__last_update': 'iso date', # The update date, just in case...
-             'name': 'some name',
-             ...
-           }],
+           Example::
+
+             [                                # O2M fields would be a list of dicts, with their
+               { '__id': 'module:db-uuid.id', # own __id.
+                 '__last_update': 'iso date', # update date
+                 'name': 'some name',
+                 #...
+               },
+               # ...
+             ],
         """
-        # generic implementation!
-        dict_list = []
-        if context is None:
-            context = {}
-        ctx = context.copy()
-        ctx.update({'o2m_export':True})
+        result = []
         for record in records:
-
-            model_obj = self.pool.get(record._name)
-            dict_list += model_obj.edi_export(cr, uid, [record], edi_struct=edi_struct, context=ctx)
-
-        return dict_list
+            result += record._model.edi_export(cr, uid, [record], edi_struct=edi_struct, context=context)
+        return result
 
     def edi_m2m(self, cr, uid, records, context=None):
-        """Return a list representing a M2M EDI value for
-           the browse_records from the given browse_record_list.
+        """Return a list representing a M2M EDI relationship directed towards
+           all the given records.
+           This is basically the same as exporting all the record using
+           :meth:`~.edi_m2o` and wrapping the results in a list.
 
-        Example:
-        'related_tasks': [                 # M2M fields would exported as a list of pairs,
-                  ['db-uuid:xml-id1',      # similar to a list of M2O values.
-                   'Task 01: bla bla'],
-                  ['db-uuid:xml-id2',
-                   'Task 02: bla bla']
-            ]
+            Example::
+
+                # M2M fields are exported as a list of pairs, like a list of M2O values
+                [
+                      ['module:db-uuid.id1', 'Task 01: bla bla'],
+                      ['module:db-uuid.id2', 'Task 02: bla bla']
+                ]
         """
-        # generic implementation!
-        dict_list = []
-
-        for record in records:
-            dict_list.append(self.edi_m2o(cr, uid, record, context=None))
-
-        return dict_list
+        return [self.edi_m2o(cr, uid, r, context=context) for r in records]
 
     def edi_export(self, cr, uid, records, edi_struct=None, context=None):
         """Returns a list of dicts representing an edi.document containing the
-           browse_records with ``ids``, using the generic algorithm.
-           :param edi_struct: if provided, edi_struct should be a dictionary
-                              with a skeleton of the OSV fields to export as edi.
-                              Basic fields can have any key as value, but o2m
-                              values should have a sample skeleton dict as value.
-                              For example, for a res.partner record:
-                              edi_struct: {
-                                   'name': True,
-                                   'company_id': True,
-                                   'address': {
-                                       'name': True,
-                                       'street': True,
-                                   }
-                              }
-                              Any field not specified in the edi_struct will not
-                              be included in the exported data.
-        """
-        # generic implementation!
+           records, and matching the given ``edi_struct``, if provided.
 
-        if context is None:
-            context = {}
+           :param edi_struct: if provided, edi_struct should be a dictionary
+                              with a skeleton of the fields to export.
+                              Basic fields can have any key as value, but o2m
+                              values should have a sample skeleton dict as value,
+                              to act like a recursive export.
+                              For example, for a res.partner record::
+
+                                  edi_struct: {
+                                       'name': True,
+                                       'company_id': True,
+                                       'address': {
+                                           'name': True,
+                                           'street': True,
+                                           }
+                                  }
+
+                              Any field not specified in the edi_struct will not
+                              be included in the exported data. Fields with no
+                              value (False) will be omitted in the EDI struct.
+                              If edi_struct is omitted, no fields will be exported
+        """
         if edi_struct is None:
             edi_struct = {}
-        _columns = self._all_columns
-        fields_to_export = edi_struct and edi_struct.keys() or _columns.keys()
-        edi_dict_list = []
-        value = None
-        for row in records:
-            edi_dict = {}
-            edi_dict.update(self.edi_metadata(cr, uid, [row], context=context)[0])
+        fields_to_export = edi_struct.keys()
+        results = []
+        for record in records:
+            edi_dict = self.edi_metadata(cr, uid, [record], context=context)[0]
             for field in fields_to_export:
-                _column = _columns[field].column
-                _column_dict = fields.field_to_dict(self, cr, uid, _column, context=context)
-                record = getattr(row, field)
-                if not record:
+                column = self._all_columns[field].column
+                value = getattr(record, field)
+                if not value:
                     continue
                 #if _fields[field].has_key('function') or _fields[field].has_key('related_columns'):
                 #    # Do not Export Function Fields and related fields
                 #    continue
-                elif _column_dict['type'] == 'many2one':
-                    value = self.edi_m2o(cr, uid, record, context=context)
-                elif _column_dict['type'] == 'many2many':
-                    value = self.edi_m2m(cr, uid, record, context=context)
-                elif _column_dict['type'] == 'one2many':
-                    value = self.edi_o2m(cr, uid, record, edi_struct=edi_struct.get(field, {}), context=context )
-                else:
-                    value = record
+                elif column._type == 'many2one':
+                    value = self.edi_m2o(cr, uid, value, context=context)
+                elif column._type == 'many2many':
+                    value = self.edi_m2m(cr, uid, value, context=context)
+                elif column._type == 'one2many':
+                    value = self.edi_o2m(cr, uid, value, edi_struct=edi_struct.get(field, {}), context=context)
                 edi_dict[field] = value
-            edi_dict_list.append(edi_dict)
-        return edi_dict_list
+            results.append(edi_dict)
+        return results
 
-
-    def edi_get_object_by_name(self, cr, uid, value, model_name, context=None):
-        openobject = False
+    def _edi_get_object_by_name(self, cr, uid, name, model_name, context=None):
         model = self.pool.get(model_name)
-        object_ids = model.name_search(cr, uid, value, operator='=', context=context)
-        if object_ids and len(object_ids) == 1:
-            object_id = object_ids[0][0]
-            openobject = model.browse(cr, uid, object_id, context=context)
-        return openobject
+        search_results = model.name_search(cr, uid, name, operator='=', context=context)
+        if len(search_results) == 1:
+            return model.browse(cr, uid, search_results[0][0], context=context)
+        return False
 
-    def edi_get_object(self, cr, uid, xml_id, model, context=None):
-        model_data = self.pool.get('ir.model.data')
-        module, xml_id2 = split_xml_id(xml_id)
-        openobject = False
-        data_ids = model_data.search(cr, uid, [('model','=', model), ('name','=', xml_id2)])
+    def _edi_import_attachments(self, cr, uid, record_id, edi_document, context=None):
+        ir_attachment = self.pool.get('ir.attachment')
+        for attachment in edi_document.get('__attachments', []):
+            # check attachment data is non-empty and valid
+            file_data = None
+            try:
+                file_data = base64.b64decode(attachment.get('content'))
+            except TypeError:
+                pass
+            assert file_data, 'Incorrect/Missing attachment file content'
+            assert attachment.get('name'), 'Incorrect/Missing attachment name'
+            assert attachment.get('file_name'), 'Incorrect/Missing attachment file name'
+            assert attachment.get('file_name'), 'Incorrect/Missing attachment file name'
+            ir_attachment.create(cr, uid, {'name': attachment['name'],
+                                           'datas_fname': attachment['file_name'],
+                                           'res_model': self._name,
+                                           'res_id': record_id,
+                                           # should be pure 7bit ASCII
+                                           'datas': str(attachment['content']),
+                                           }, context=context)
+
+
+    def _edi_get_object_by_external_id(self, cr, uid, external_id, model, context=None):
+        """Returns browse_record representing object identified by the model and external_id,
+           or None if no record was found with this external id.
+
+           :param external_id: fully qualified external id, in the EDI form
+                               ``module:db_uuid:identifier``.
+           :param model: model name the record belongs to.
+        """
+        ir_model_data = self.pool.get('ir.model.data')
+        # external_id is expected to have the form: ``module:db_uuid:model.random_name``
+        ext_id_members = split_external_id(external_id)
+        db_uuid = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
+        module = ext_id_members['module']
+        ext_id = ext_id_members['id']
+        ext_module = '%s:%s' % (module, ext_id_members['db_uuid'])
+        data_ids = ir_model_data.search(cr, uid, [('model','=',model),
+                                                  ('name','=',ext_id),
+                                                  ('module','in',[ext_module,module])])
         if data_ids:
             model = self.pool.get(model)
-            data = model_data.browse(cr, uid, data_ids[0], context=context)
-            openobject = model.browse(cr, uid, data.res_id, context=context)
-        return openobject
+            data = ir_model_data.browse(cr, uid, data_ids[0], context=context)
+            result = model.browse(cr, uid, data.res_id, context=context)
+            return result
 
-    def edi_create_relation(self, cr, uid, relation_model, relation_value, context=None):
-        relation_model = self.pool.get(relation_model)
-        values = {} #relation_model.default_get(cr, uid, fields, context=context)
-        values[relation_model._rec_name] = relation_value
-        return relation_model.create(cr, uid, values, context=context)
+    def edi_import_relation(self, cr, uid, model, value, external_id, context=None):
+        """Imports a M2O/M2M relation EDI specification ``[external_id,value]`` for the
+           given model, returning the corresponding database ID:
 
-    def edi_import_relation(self, cr, uid, relation_model, relation_value, xml_id=None, context=None):
-        relation = False
-        if xml_id:
-            relation = self.edi_get_object(cr, uid, xml_id, relation_model, context=context)
-        if not relation:
-            relation = self.edi_get_object_by_name(cr, uid, relation_value, relation_model, context=context)
-        if not relation:
-            relation_id = self.edi_create_relation(cr, uid, relation_model, relation_value, context=context)
-            relation = relation_model.browse(cr, uid, relation_id, context=context)
-
-        record_xml = self.record_xml_id(cr, uid, relation, context=context)
-        if record_xml:
-            module, xml_id = record_xml
-            xml_id = '%s.%s' % (module, xml_id)
-        if not xml_id:
-            xml_id = self.edi_xml_id(cr, uid, relation, context=context)
-
-        #TODO: update record from values ?
-        #relation_id = model_data._update(cr, uid, relation_model, module, values, xml_id=xml_id, context=context)
-        return relation and relation.id or False
+           * First, checks if the ``external_id`` is already known, in which case the corresponding
+             database ID is directly returned, without doing anything else;
+           * If the ``external_id`` is unknown, attempts to locate an existing record
+             with the same ``value`` via name_search(). If found, the given external_id will
+             be assigned to this local record (in addition to any existing one)
+           * If previous steps gave no result, create a new record with the given
+             value in the target model, assign it the given external_id, and return
+             the new database ID
+        """
+        _logger.debug("%s: Importing EDI relationship [%r,%r]", self._name, external_id, value)
+        target = self._edi_get_object_by_external_id(cr, uid, external_id, model, context=context)
+        need_new_ext_id = False
+        if not target:
+            _logger.debug("%s: Importing EDI relationship [%r,%r] - ID not found, trying name_get",
+                          self._name, external_id, value)
+            target = self._edi_get_object_by_name(cr, uid, value, model, context=context)
+            need_new_ext_id = True
+        if not target:
+            _logger.debug("%s: Importing EDI relationship [%r,%r] - name not found, creating it!",
+                          self._name, external_id, value)
+            # also need_new_ext_id here, but already been set above
+            res_id, name = self.name_create(cr, uid, value, context=context)
+            target = model.browse(cr, uid, res_id, context=context)
+        if need_new_ext_id:
+            ext_id_members = split_external_id(external_id)
+            # module name is never used bare when creating ir.model.data entries, in order
+            # to avoid being taken as part of the module's data, and cleanup up at next update  
+            module = "%s:%s" % (ext_id_members['module'], ext_id_members['db_uuid'])
+            # create a new ir.model.data entry for this value
+            self._edi_external_id(cr, uid, target, existing_id=ext_id_members['id'], existing_module=module, context=context)
+        return target.id
 
     def edi_import(self, cr, uid, edi_document, context=None):
+        """Imports a dict representing an edi.document into the system,
+           applying the following rules.
 
-        """Imports a list of dicts representing an edi.document, using the
-           generic algorithm.
+           All relationship fields are exported in a special way, and provide their own
+           unique identifier, so that we can avoid duplication of records when importing.
 
-             All relationship fields are exported in a special way, and provide their own
-             unique identifier, so that we can avoid duplication of records when importing.
-             Note: for all ir.model.data entries, the "module" value to use for read/write
-                   should always be "edi_import", and the "name" value should be the full
-                   db_id provided in the EDI.
+           #. Many2One
+               See :meth:`~.edi_import_relation`
 
-             1: Many2One
-             M2O fields are always exported as a pair [db_id, name], where db_id
-             is in the form "db_uuid:xml_id", both being values that come directly
-             from the original database.
-             The import should behave like this:
-                 a. Look in ir.model.data for a record that matches the db_id.
-                    If found, replace the m2o value with the correct database ID and stop.
-                    If not found, continue to next step.
-                 b. Perform name_search(name) to look for a record that matches the
-                    given m2o name. If only one record is found, create the missing
-                    ir.model.data record to link it to the db_id, and the replace the m2o
-                    value with the correct database ID, then stop. If zero result or
-                    multiple results are found, go to next step.
-                 c. Create the new record using the only field value that is known: the
-                    name, and create the ir.model.data entry to map to it.
-                    This should work for many models, and if not, the module should
-                    provide a custom EDI import logic to care for it.
+           #. One2Many
+               O2M fields are always exported as a list of dicts, where each dict corresponds
+               to a full EDI record. The import should not update existing records
+               if they already exist, it should only link them to the parent object, in this
+               fashion:
+                   * First import the parent object, using the usual procedire
+                   * Look for a record that matches the db_id provided in the __id field. If
+                     found, keep the corresponding database id, and connect it to the parent.
+                   * If not found via db_id, create a new entry using the same method that
+                     imports a full EDI record, grab the resulting db id, and use it to
+                     connect to the parent.
 
-             2: One2Many
-             O2M fields are always exported as a list of dicts, where each dict corresponds
-             to a full EDI record. The import should not update existing records
-             if they already exist, it should only link them to the parent object.
-                 a. Look for a record that matches the db_id provided in the __id field. If
-                    found, keep the corresponding database id, and connect it to the parent
-                    using a write value like (4,db_id).
-                 b. If not found via db_id, create a new entry using the same method that
-                    imports a full EDI record (recursive call!), grab the resulting db id,
-                    and use it to connect to the parent via a write value like (4, db_id).
-
-             3: Many2Many
-             M2M fields are always exported as a list of pairs similar to M2O.
-             For each pair in the M2M:
-                 a. Perform the same steps as for a Many2One (see 1.2.1.1)
-                 b. After finding the database ID of the final record in the database,
-                    connect it to the parent record via a write value like (4, db_id).
+           #: Many2Many
+               M2M fields are always exported as a list of pairs similar to M2O.
+               For each pair in the M2M:
+                   * Perform the same steps as for a Many2One (See :meth:`~.edi_import_relation`)
+                   * After finding the database ID of the final record in the database,
+                     connect it to the parent record.
         """
-        # generic implementation!
-        model_data = self.pool.get('ir.model.data')
-        assert self._name == edi_document['__model'], 'EDI Document could not import. Model of EDI Document and current model are does not match'
-        def process(datas, model_name):
-            values = {}
-            model_pool = self.pool.get(model_name)
-            xml_id = datas['__id']
-            module, xml_id2 = split_xml_id(xml_id)
-            _columns = model_pool._all_columns
-            for field in datas.keys():
-                if field not in _columns:
-                    continue
-                if not field.startswith('__'):
-                    _column = _columns[field].column
-                    _column_dict = fields.field_to_dict(self, cr, uid, _column, context=context)
+        assert self._name == edi_document['__model'], "EDI Document Model and current model do not match: "\
+                                                      "'%s' (EDI) vs '%s' (current)" % (edi_document['__model'],
+                                                                                        self._name)
 
-                    edi_field_value = datas[field]
-                    field_type = _column_dict['type']
-                    relation_model = _column_dict.get('relation')
-                    if not edi_field_value:
-                        continue
-                    if _column_dict.has_key('function') or _column_dict.has_key('related_columns'):
-                        # DO NOT IMPORT FUNCTION FIELD AND RELATED FIELD
-                        continue
-                    elif field_type == 'one2many':
-                        # recursive call for getting children and returning [(0,0,{})] or [(1,ID,{})]
-                        relations = []
-                        relation_object = self.pool.get(relation_model)
-                        for edi_relation_document in edi_field_value:
-                            relation = self.edi_get_object(cr, uid, edi_relation_document['__id'], relation_model, context=context)
-                            if not relation and edi_relation_document.get('name'):
-                                relation = self.edi_get_object_by_name(cr, uid, edi_relation_document['name'], relation_model, context=context)
-                            if relation:
-                                self.edi_xml_id(cr, uid, relation, \
-                                                    xml_id=edi_relation_document['__id'], context=context)
-                                relations.append((4, relation.id))
-                            res_module, res_xml_id, newrow = process(edi_relation_document, relation_model)
-                            relations.append( (relation and 1 or 0, relation and relation.id or 0, newrow))
-                        values[field] = relations
-                    elif field_type in ('many2one', 'many2many'):
-                        if field_type == 'many2one':
-                            edi_parent_documents = [edi_field_value]
-                        else:
-                            edi_parent_documents = edi_field_value
+        # First check the record is now already known in the database, in which case it is ignored
+        ext_id_members = split_external_id(edi_document['__id'])
+        existing_id = self._edi_get_object_by_external_id(cr, uid, ext_id_members['full'], self._name, context=context)
+        if existing_id:
+            _logger.info("'%s' EDI Document with ID '%s' is already known, skipping import!", self._name, ext_id_members['full'])
+            return
 
-                        parent_lines = []
+        record_values = {}
+        o2m_todo = {} # o2m values are processed after their parent already exists
+        for field_name, field_value in edi_document.iteritems():
+            # skip metadata and empty fields
+            if field_name.startswith('__') or field_value is None or field_value is False:
+                continue
+            field = self._all_columns[field_name].column
+            # skip function/related fields
+            if isinstance(field, fields.function):
+                _logger.warning("Unexpected function field value found in '%s' EDI document: '%s'" % (self._name, field_name))
+                continue
+            relation_model = field._obj
+            if field._type == 'many2one':
+                record_values[field_name] = self.edi_import_relation(cr, uid, relation_model,
+                                                                      field_value[1], field_value[0],
+                                                                      context=context)
+            elif field._type == 'many2many':
+                record_values[field_name] = [self.edi_import_relation(cr, uid, relation_model, m2m_value[1],
+                                                                       m2m_value[0], context=context)
+                                             for m2m_value in field_value]
+            elif field._type == 'one2many':
+                # must wait until parent report is imported, as the parent relationship
+                # is often required in o2m child records
+                o2m_todo[field_name] = field_value
+            else:
+                record_values[field_name] = field_value
 
-                        for edi_parent_document in edi_parent_documents:
-                            relation_id = self.edi_import_relation(cr, uid, relation_model, edi_parent_document[1], edi_parent_document[0], context=context)
-                            parent_lines.append(relation_id)
+        module_ref = "%s:%s" % (ext_id_members['module'], ext_id_members['db_uuid'])
+        record_id = self.pool.get('ir.model.data')._update(cr, uid, self._name, module_ref, record_values,
+                                                           xml_id=ext_id_members['id'], context=context)
 
-                        if len(parent_lines):
-                            if field_type == 'many2one':
-                                values[field] = parent_lines[0]
+        record_display, = self.name_get(cr, uid, [record_id], context=context)
 
-                            else:
-                                many2many_ids = []
-                                for m2m_id in parent_lines:
-                                    many2many_ids.append((4, m2m_id))
-                                values[field] = many2many_ids
+        # process o2m values, connecting them to their parent on-the-fly
+        for o2m_field, o2m_value in o2m_todo.iteritems():
+            field = self._all_columns[o2m_field].column
+            dest_model = self.pool.get(field._obj)
+            for o2m_line in o2m_value:
+                # link to parent record: expects an (ext_id, name) pair
+                o2m_line[field._fields_id] = (ext_id_members['full'], record_display[1])
+                dest_model.edi_import(cr, uid, o2m_line, context=context)
 
-                    else:
-                        values[field] = edi_field_value
-            return module, xml_id2, values
+        # process the attachments, if any
+        self._edi_import_attachments(cr, uid, record_id, edi_document, context=context)
 
-        module, xml_id, data_values = process(edi_document, self._name)
-        return model_data._update(cr, uid, self._name, module, data_values, xml_id=xml_id, context=context)
-# vim: ts=4 sts=4 sw=4 si et
+        return record_id
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 68a0858c9c5362bf329ba5c9b8111291ca3c2dc0 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Tue, 4 Oct 2011 16:33:35 +0200
Subject: [PATCH 213/304] [FIX] orm: a typo made all models treated as if they
 were transient in check_access_rule().

bzr revid: vmt@openerp.com-20111004143335-7etc6y2kje1y20ef
---
 openerp/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 2b1a3ff9378..9c6d493e48c 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -3480,7 +3480,7 @@ class BaseModel(object):
         if uid == SUPERUSER_ID:
             return
 
-        if self.is_transient:
+        if self.is_transient():
             # Only one single implicit access rule for transient models: owner only!
             # This is ok to hardcode because we assert that TransientModels always
             # have log_access enabled and this the create_uid column is always there.

From f07e1dc5586fd42656a1e2a57afbe2cfc7cbabd3 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Oct 2011 16:38:00 +0200
Subject: [PATCH 214/304] [IMP] res.company: temporarily comment out
 res.company edi helpers, needs review

bzr revid: odo@openerp.com-20111004143800-lzca5kp7hng2djee
---
 openerp/addons/base/res/edi_res_company.py | 196 +++++++++++----------
 1 file changed, 100 insertions(+), 96 deletions(-)

diff --git a/openerp/addons/base/res/edi_res_company.py b/openerp/addons/base/res/edi_res_company.py
index 53ddf487996..3cf236756a4 100644
--- a/openerp/addons/base/res/edi_res_company.py
+++ b/openerp/addons/base/res/edi_res_company.py
@@ -19,101 +19,105 @@
 #
 ##############################################################################
 
-from osv import osv
-from osv import fields
-from tools.translate import _
+#from osv import osv
+#from osv import fields
+#from tools.translate import _
 
-class res_company(osv.osv):
-    _inherit = "res.company"
+# TODO: CHECK below, seems useless
+#
+#class res_company(osv.osv):
+#    """Helper subclass for res.company providing util methods for working with
+#       companies in the context of EDI import/export. The res.company object
+#       itself is not EDI-exportable"""
+#   _inherit = "res.company"
+#
+#    def edi_import_as_partner(self, cr, uid, edi_document, values=None, context=None):
+#        """
+#        import company as a new partner
+#        company_address data used to add address to new partner
+#
+#        edi_document is a dict to have company datas
+#        edi_document = {
+#            'company_address': {
+#                'street': True,
+#                'street2': True,
+#                'zip': True,
+#                'city': True,
+#                'state_id': True,
+#                'country_id': True,
+#                'email': True,
+#                'phone': True,
+#                       
+#            },
+#            'company_id': True,
+#        }
+#        values is a dict to have other datas of partner which are need to import of partner record
+#        values = {
+#            'customer': True,
+#            'supplier': True,
+#        }
+#        """
+#        if values is None:
+#            values = {}
+#        partner_model = 'res.partner'
+#        partner_pool = self.pool.get(partner_model)
+#        xml_id = edi_document['company_id'][0]
+#        company_address = edi_document.get('company_address', False)
+#        partner_name = edi_document['company_id'][1]
+#        partner = partner_pool.edi_get_object(cr, uid, xml_id, partner_model, context=context)
+#        if not partner:
+#            partner = partner_pool.edi_get_object_by_name(cr, uid, partner_name, partner_model, context=context)
+#
+#        if partner:
+            #FIXME
+#            record_xml = partner_pool._get_external_id(cr, uid, [partner.id], context=context)
+#            if record_xml:
+#                module, xml_id = record_xml
+#                xml_id = '%s.%s' % (module, xml_id)
+#
+#        edi_document_partner = {
+#            '__model': partner_model,
+#            '__id' : xml_id,
+#            'name' : partner_name,
+#        }
+#        if company_address:
+#            edi_document_partner['address'] = [company_address]
+#
+#        edi_document_partner.update(values)
+#        return partner_pool.edi_import(cr, uid, edi_document_partner, context=context)
+#
+#    def edi_export_address(self, cr, uid, records, edi_address_struct=None, context=None):
+#        """Return a dict representation of the address of each company record, suitable for
+#           inclusion in an EDI document, and matching the given edi_address_struct if provided.
+#
+#           :param list(browse_record) records: list of companies to export
+#           :rtype: list(dict)
+#           :return: list of dicts, where each dict contains the address representation for
+#                    the company record as the same index in ``records``.
+#        """
+#        if context is None:
+#            context = {}
+#        res_partner = self.pool.get('res.partner')
+#        res_partner_address = self.pool.get('res.partner.address')
+#        if edi_address_struct is None:
+#            edi_address_struct = {
+#                'street': True,
+#                'street2': True,
+#                'zip': True,
+#                'city': True,
+#                'state_id': True,
+#                'country_id': True,
+#                'email': True,
+#                'phone': True,
+#            }
+#        results = []
+#        for company in records:
+#            res = res_partner.address_get(cr, uid, [company.partner_id.id], ['default', 'contact', 'invoice'])
+#            addr_id = res['invoice'] or res['contact'] or res['default']
+#            result = {}
+#            if addr_id:
+#                address = res_partner_address.browse(cr, uid, addr_id, context=context)
+#                result = res_partner_address.edi_export(cr, uid, [address], edi_struct=edi_address_struct, context=ctx)[0]
+#            results.append(result)
+#        return results
 
-    def edi_import_as_partner(self, cr, uid, edi_document, values=None, context=None):
-        """
-        import company as a new partner
-        company_address data used to add address to new partner
-
-        edi_document is a dict to have company datas
-        edi_document = {
-            'company_address': {
-                'street': True,
-                'street2': True,
-                'zip': True,
-                'city': True,
-                'state_id': True,
-                'country_id': True,
-                'email': True,
-                'phone': True,
-                       
-            },
-            'company_id': True,
-        }
-        values is a dict to have other datas of partner which are need to import of partner record
-        values = {
-            'customer': True,
-            'supplier': True,
-        }
-        """
-        if values is None:
-            values = {}
-        partner_model = 'res.partner'
-        partner_pool = self.pool.get(partner_model)
-        xml_id = edi_document['company_id'][0]
-        company_address = edi_document.get('company_address', False)
-        partner_name = edi_document['company_id'][1]
-        partner = partner_pool.edi_get_object(cr, uid, xml_id, partner_model, context=context)
-        if not partner:
-            partner = partner_pool.edi_get_object_by_name(cr, uid, partner_name, partner_model, context=context)
-
-        if partner:
-            record_xml = partner_pool.record_xml_id(cr, uid, partner, context=context)
-            if record_xml:
-                module, xml_id = record_xml
-                xml_id = '%s.%s' % (module, xml_id)
-
-        edi_document_partner = {
-            '__model': partner_model,
-            '__id' : xml_id,
-            'name' : partner_name,
-        }
-        if company_address:
-            edi_document_partner['address'] = [company_address]
-
-        edi_document_partner.update(values)
-        return partner_pool.edi_import(cr, uid, edi_document_partner, context=context)
-
-    def edi_export_address(self, cr, uid, records, edi_address_struct=None, context=None):
-        if context is None:
-            context = {}
-        partner_pool = self.pool.get('res.partner')
-        partner_address_pool = self.pool.get('res.partner.address')
-        if edi_address_struct is None:
-            edi_address_struct = {
-                'street': True,
-                'street2': True,
-                'zip': True,
-                'city': True,
-                'state_id': True,
-                'country_id': True,
-                'email': True,
-                'phone': True,
-                       
-            }
-        edi_company_dict = {}
-        for company in records:
-            edi_doc = {}
-            company_address = False
-            res = partner_pool.address_get(cr, uid, [company.partner_id.id], ['default', 'contact', 'invoice'])
-            addr_id = res['invoice'] or res['contact'] or res['default']
-            if addr_id:
-                address = partner_address_pool.browse(cr, uid, addr_id, context=context)
-                ctx = context.copy()
-                ctx.update({'o2m_export':True})
-                edi_address_dict_list = partner_address_pool.edi_export(cr, uid, [address], edi_struct=edi_address_struct, context=ctx)
-                if edi_address_dict_list:
-                    company_address = edi_address_dict_list[0]
-            edi_doc.update({
-                'company_address': company_address,
-                #'company_logo': company.logo,#TODO
-            })
-            edi_company_dict[company.id] = edi_doc
-        return edi_company_dict
-res_company()

From f164496dc436918855290ed36fcea6d06566975f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Oct 2011 17:10:31 +0200
Subject: [PATCH 215/304] [FIX] correctly call form field's update_dom in all
 cases in editable listview

Form fields are extended/replaced in editable list view in order to
handle @invisible and @tree_invisible correctly in editable-list-form
context (base semantics of @invisible are different between listview
and formview, formview's @invisible is listview's @tree_invisible, and
instead of removing element from visible DOM listview's @invisible
only hides the element but it keeps the space it's taking).

As a result, listview editable needs to override Widget.update_dom for
pretty much all form widgets, in order to manage this difference in
behavior.

In case of @tree_invisible, it did so correctly setting and unsetting
its stuff and calling this.super() to execute the widget's actual
update_dom triggers **but it did not do so when the element was really
visible**.

As a result, in editable listview elements would never appear required
(blue background), invalid (red background) or disabled (gray),
although they were correctly set up, because the display layer was
never updated.

bzr revid: xmo@openerp.com-20111004151031-65o0q8e86op7kdks
---
 addons/web/static/src/js/view_list_editable.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 6f476f4717d..30a12af0828 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -325,11 +325,13 @@ openerp.web.list_editable = function (openerp) {
                 this.$element.children().css('visibility', '');
                 if (this.modifiers.tree_invisible) {
                     var old_invisible = this.invisible;
-                    this.invisible = !!this.modifiers.tree_invisible;
+                    this.invisible = true;
                     this._super();
                     this.invisible = old_invisible;
                 } else if (this.invisible) {
                     this.$element.children().css('visibility', 'hidden');
+                } else {
+                    this._super();
                 }
             }
         });

From 72b852c2c669b92297d75b8adac6a42e3a1ecf6d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Oct 2011 17:42:46 +0200
Subject: [PATCH 216/304] [FIX] insertion position of new lines (in editable
 lists) in case of lists padded to 5 (empty) lines

bzr revid: xmo@openerp.com-20111004154246-7o1cw016cf9ygem3
---
 addons/web/static/src/js/view_list.js          |  4 +++-
 addons/web/static/src/js/view_list_editable.js | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 719c7117d65..8b7f0fbd3f8 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -815,7 +815,9 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
         cells.push('</tr>');
 
         var row = cells.join('');
-        this.$current.append(new Array(count - this.records.length + 1).join(row));
+        this.$current
+            .find('> tr:not([data-id])').remove().end()
+            .append(new Array(count - this.records.length + 1).join(row));
         this.refresh_zebra(this.records.length);
     },
     /**
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 30a12af0828..7daf2bd0685 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -120,6 +120,7 @@ openerp.web.list_editable = function (openerp) {
                 delete self.edition_id;
                 delete self.edition;
             });
+            this.pad_table_to(5);
             return cancelled.promise();
         },
         /**
@@ -173,10 +174,18 @@ openerp.web.list_editable = function (openerp) {
                     });
                 if (row) {
                     $new_row.replaceAll(row);
-                } else if (self.options.editable === 'top') {
-                    self.$current.prepend($new_row);
                 } else if (self.options.editable) {
-                    self.$current.append($new_row);
+                    if (self.options.editable === 'top') {
+                        $new_row.insertBefore(
+                            self.$current.find('> [data-id]:first'));
+                    } else {
+                        $new_row.insertAfter(
+                            self.$current.find('> [data-id]:last'));
+                    }
+                    var $last_child = self.$current.find('> tr:last');
+                    if ($last_child.is(':not([data-id])')) {
+                        $last_child.remove();
+                    }
                 }
                 self.edition = true;
                 self.edition_id = record_id;

From 74db7dd027ba87e4468875634d7fb6e7fbdf7c30 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Oct 2011 17:46:50 +0200
Subject: [PATCH 217/304] [FIX] correctly handle insertion in empty editable
 list

bzr revid: xmo@openerp.com-20111004154650-hx56g1lmefhzgf21
---
 addons/web/static/src/js/view_list_editable.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 7daf2bd0685..41133c102d0 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -175,12 +175,16 @@ openerp.web.list_editable = function (openerp) {
                 if (row) {
                     $new_row.replaceAll(row);
                 } else if (self.options.editable) {
-                    if (self.options.editable === 'top') {
-                        $new_row.insertBefore(
-                            self.$current.find('> [data-id]:first'));
+                    if (self.records.length) {
+                        if (self.options.editable === 'top') {
+                            $new_row.insertBefore(
+                                self.$current.find('> [data-id]:first'));
+                        } else {
+                            $new_row.insertAfter(
+                                self.$current.find('> [data-id]:last'));
+                        }
                     } else {
-                        $new_row.insertAfter(
-                            self.$current.find('> [data-id]:last'));
+                        $new_row.prependTo(self.$current);
                     }
                     var $last_child = self.$current.find('> tr:last');
                     if ($last_child.is(':not([data-id])')) {

From 49de0f4640cf2bfceb3c4f6c6a333739ecd866f4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Oct 2011 17:57:46 +0200
Subject: [PATCH 218/304] [FIX] stupidity: if insert a line in a list with more
 than 5 records (no padding), since the new line does not have a @data-id yet
 it's going to remove it immediately.

select line to remove before inserting new one

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

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 41133c102d0..82365ee5942 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -148,7 +148,7 @@ openerp.web.list_editable = function (openerp) {
                 var $new_row = $('<tr>', {
                         id: _.uniqueId('oe-editable-row-'),
                         'data-id': record_id,
-                        'class': $(row).attr('class') + ' oe_forms',
+                        'class': row ? $(row).attr('class') : '' + ' oe_forms',
                         click: function (e) {e.stopPropagation();}
                     })
                     .delegate('button.oe-edit-row-save', 'click', function () {
@@ -175,6 +175,7 @@ openerp.web.list_editable = function (openerp) {
                 if (row) {
                     $new_row.replaceAll(row);
                 } else if (self.options.editable) {
+                    var $last_child = self.$current.find('> tr:last');
                     if (self.records.length) {
                         if (self.options.editable === 'top') {
                             $new_row.insertBefore(
@@ -186,7 +187,6 @@ openerp.web.list_editable = function (openerp) {
                     } else {
                         $new_row.prependTo(self.$current);
                     }
-                    var $last_child = self.$current.find('> tr:last');
                     if ($last_child.is(':not([data-id])')) {
                         $last_child.remove();
                     }

From 318ec9998b2d7743fa2a1c1d5e6a9d575534c08f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Oct 2011 17:59:18 +0200
Subject: [PATCH 219/304] [IMP] use .children(selector) rather than .find('> '
 + selector)

bzr revid: xmo@openerp.com-20111004155918-c2vy0rwkesvdkmli
---
 addons/web/static/src/js/view_list.js          | 2 +-
 addons/web/static/src/js/view_list_editable.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 8b7f0fbd3f8..7cceec03fb9 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -816,7 +816,7 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
 
         var row = cells.join('');
         this.$current
-            .find('> tr:not([data-id])').remove().end()
+            .children('tr:not([data-id])').remove().end()
             .append(new Array(count - this.records.length + 1).join(row));
         this.refresh_zebra(this.records.length);
     },
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 82365ee5942..dc49c20209c 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -175,14 +175,14 @@ openerp.web.list_editable = function (openerp) {
                 if (row) {
                     $new_row.replaceAll(row);
                 } else if (self.options.editable) {
-                    var $last_child = self.$current.find('> tr:last');
+                    var $last_child = self.$current.children('tr:last');
                     if (self.records.length) {
                         if (self.options.editable === 'top') {
                             $new_row.insertBefore(
-                                self.$current.find('> [data-id]:first'));
+                                self.$current.children('[data-id]:first'));
                         } else {
                             $new_row.insertAfter(
-                                self.$current.find('> [data-id]:last'));
+                                self.$current.children('[data-id]:last'));
                         }
                     } else {
                         $new_row.prependTo(self.$current);

From 15a6b81dbe5c0677f28636d44e4161132ec211b0 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 4 Oct 2011 18:11:16 +0200
Subject: [PATCH 220/304] [fix] just return a promise where necessary

bzr revid: nicolas.vanhoren@openerp.com-20111004161116-6pylm16ty6v69szu
---
 addons/web/static/src/js/core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 5bc6bc92b68..da9c21bf551 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -480,7 +480,7 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
     session_login: function(db, login, password, success_callback) {
         var self = this;
         var params = { db: db, login: login, password: password };
-        this.rpc("/web/session/login", params, function(result) {
+        return this.rpc("/web/session/login", params, function(result) {
             self.session_id = result.session_id;
             self.uid = result.uid;
             self.user_context = result.context;

From 51b1201daae1ce17578f1635ef3328fd666c8dc6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Oct 2011 22:47:05 +0200
Subject: [PATCH 221/304] [IMP] orm: remember Model._original_module when
 constructing inheritance

ORM Models already have a _module attribute that contains the
name of the module that declared this class, however
sometimes we also need the name of the module that
declared this model the first time.
This will be stored in _original_module and is the
name of the module to which the first parent with
the same _name belongs to.

bzr revid: odo@openerp.com-20111004204705-8z9o70n1ynpvng3i
---
 openerp/osv/orm.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 5a28994460a..2464a73ede4 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -816,13 +816,16 @@ class BaseModel(object):
                 raise TypeError('_name is mandatory in case of multiple inheritance')
 
             for parent_name in ((type(parent_names)==list) and parent_names or [parent_names]):
-                parent_class = pool.get(parent_name).__class__
-                if not pool.get(parent_name):
+                parent_model = pool.get(parent_name)
+                if not getattr(cls, '_original_module', None) and name == parent_model._name:
+                    cls._original_module = parent_model._module
+                if not parent_model:
                     raise TypeError('The model "%s" specifies an unexisting parent class "%s"\n'
                         'You may need to add a dependency on the parent class\' module.' % (name, parent_name))
+                parent_class = parent_model.__class__
                 nattr = {}
                 for s in attributes:
-                    new = copy.copy(getattr(pool.get(parent_name), s, {}))
+                    new = copy.copy(getattr(parent_model, s, {}))
                     if s == '_columns':
                         # Don't _inherit custom fields.
                         for c in new.keys():
@@ -850,6 +853,8 @@ class BaseModel(object):
                         new.extend(cls.__dict__.get(s, []))
                     nattr[s] = new
                 cls = type(name, (cls, parent_class), dict(nattr, _register=False))
+        if not getattr(cls, '_original_module', None):
+            cls._original_module = cls._module
         obj = object.__new__(cls)
         obj.__init__(pool, cr)
         return obj

From edf68f510cc62a82632f8d13b644e7a7cf63d683 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Oct 2011 22:48:00 +0200
Subject: [PATCH 222/304] [REM] orm: annoying INFO log lines

bzr revid: odo@openerp.com-20111004204800-f4470vy0ou3ugxnm
---
 openerp/osv/orm.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 2464a73ede4..c66fc2a0d19 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2859,11 +2859,9 @@ class BaseModel(object):
 
     def _auto_end(self, cr, context=None):
         """ Create the foreign keys recorded by _auto_init. """
-        self.__logger.info('Establishing foreign key references...')
         for t, k, r, d in self._foreign_keys:
             cr.execute('ALTER TABLE "%s" ADD FOREIGN KEY ("%s") REFERENCES "%s" ON DELETE %s' % (t, k, r, d))
         cr.commit()
-        self.__logger.info('Establishing foreign key references... done')
         del self._foreign_keys
 
 

From bfdbbb51cb4731808b6465ffdc5bf55d395dc162 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Oct 2011 22:51:40 +0200
Subject: [PATCH 223/304] [FIX] orm.export_data: 'module' column is required
 when creating external IDs

The 'module' field of ir.model.data is required, so we
we need to set it when auto-generating ir.mode.data
entries. This acts as the namespace of the record.
Because we don't want exported records to look like they
belong to an existing module (and risk being garbage
collected at the next module update), we put these
auto-generated names in a reserved '__export__' module
namespace.

bzr revid: odo@openerp.com-20111004205140-duaww77ng4qmktj2
---
 openerp/osv/orm.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c66fc2a0d19..9885c1a9697 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1053,6 +1053,7 @@ class BaseModel(object):
                                 'name': n,
                                 'model': self._name,
                                 'res_id': r['id'],
+                                'module': '__export__',
                             })
                             r = n
                     else:

From de6b69f654c88dbb837edefa002b8c3815df2ecf Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Oct 2011 22:52:54 +0200
Subject: [PATCH 224/304] [REM] edi: moved edi to a separate addon

bzr revid: odo@openerp.com-20111004205254-82krwzabg0wuf2ka
---
 openerp/addons/base/__openerp__.py            |   1 -
 openerp/addons/base/ir/__init__.py            |   1 -
 openerp/addons/base/ir/ir_edi.py              | 589 ------------------
 openerp/addons/base/res/__init__.py           |   2 -
 openerp/addons/base/res/edi_partner.py        |  65 --
 openerp/addons/base/res/edi_res_company.py    | 123 ----
 .../addons/base/security/ir.model.access.csv  |   2 -
 .../addons/base/test/test_edi_documents.yml   |  43 --
 openerp/service/web_services.py               |  63 --
 9 files changed, 889 deletions(-)
 delete mode 100644 openerp/addons/base/ir/ir_edi.py
 delete mode 100644 openerp/addons/base/res/edi_partner.py
 delete mode 100644 openerp/addons/base/res/edi_res_company.py
 delete mode 100644 openerp/addons/base/test/test_edi_documents.yml

diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 5233cdcbfdb..e436a0a6005 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -92,7 +92,6 @@
         'test/test_osv_expression.yml',
         'test/test_ir_rule.yml', # <-- These tests modify/add/delete ir_rules.
         'test/test_ir_values.yml',
-        'test/test_edi_documents.yml',
         # Commented because this takes some time.
         # This must be (un)commented with the corresponding import statement
         # in test/__init__.py.
diff --git a/openerp/addons/base/ir/__init__.py b/openerp/addons/base/ir/__init__.py
index 850a3ae40de..4a6bd3c614c 100644
--- a/openerp/addons/base/ir/__init__.py
+++ b/openerp/addons/base/ir/__init__.py
@@ -36,7 +36,6 @@ import ir_rule
 import wizard
 import ir_config_parameter
 import osv_memory_autovacuum
-import ir_edi
 import ir_mail_server
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
deleted file mode 100644
index b9ae11fd71b..00000000000
--- a/openerp/addons/base/ir/ir_edi.py
+++ /dev/null
@@ -1,589 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Business Applications
-#    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import base64
-import hashlib
-import json
-import logging
-import re
-import time
-import urllib2
-
-import openerp
-import openerp.release as release
-from osv import osv,fields
-from tools.translate import _
-from tools.parse_version import parse_version
-
-EXTERNAL_ID_PATTERN = re.compile(r'^(\S+:)?(\S+?)\.(\S+)$')
-
-def split_external_id(ext_id):
-    match = EXTERNAL_ID_PATTERN.match(ext_id)
-    assert match, \
-            _("'%s' is an invalid external ID") % (ext_id)
-    return {'module': match.group(1) and match.group(1)[:-1],
-            'db_uuid': match.group(2),
-            'id': match.group(3),
-            'full': match.group(0)}
-
-def safe_unique_id(database_id, model, record_id):
-    """Generate a unique string to represent a (database_uuid,model,record_id) pair
-    without being too long, and with a very low probability of collisions.
-    """
-    msg = "%s-%s-%s-%s" % (time.time(), database_id, model, record_id)
-    digest = hashlib.sha1(msg).digest()
-    # fold the sha1 20 bytes digest to 9 bytes
-    digest = ''.join(chr(ord(x) ^ ord(y)) for (x,y) in zip(digest[:9], digest[9:-2]))
-    # b64-encode the 9-bytes folded digest to a reasonable 12 chars ASCII ID
-    digest = base64.urlsafe_b64encode(digest)
-    return '%s-%s' % (model.replace('.','_'), digest)
-
-def version_tuple():
-    return parse_version(release.version)
-
-def last_update_for(record):
-    """Returns the last update timestamp for the given record,
-       if available, otherwise False
-    """
-    if record._model._log_access:
-        record_log = record.perm_read()[0]
-        return record_log.get('write_date') or record_log.get('create_date') or False
-    return False
-
-_logger = logging.getLogger('edi')
-
-class ir_edi_document(osv.osv):
-    _name = 'ir.edi.document'
-    _description = 'EDI Document'
-    _columns = {
-                'name': fields.char("EDI token", size = 128, help="Unique identifier for retrieving an EDI document."),
-                'document': fields.text("Document", help="EDI document content")
-    }
-    _sql_constraints = [
-        ('name_uniq', 'unique (name)', 'EDI Tokens must be unique!')
-    ]
-
-    def new_edi_token(self, cr, uid, record):
-        """Return a new, random unique token to identify this model record,
-        and to be used as token when exporting it as an EDI document.
-
-        :param browse_record record: model record for which a token is needed
-        """
-        db_uuid = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
-        edi_token = hashlib.sha256('%s-%s-%s-%s' % (time.time(), db_uuid, record._name, record.id)).hexdigest()
-        return edi_token
-
-    def serialize(self, edi_documents):
-        """Serialize the given EDI document structures (Python dicts holding EDI data),
-        using JSON serialization.
-
-        :param [dict] edi_documents: list of EDI document structures to serialize
-        :return: UTF-8 encoded string containing the serialized document
-        """
-        serialized_list = json.dumps(edi_documents)
-        return serialized_list
-
-    def generate_edi(self, cr, uid, records, context=None):
-        """Generates a final EDI document containing the EDI serialization
-        of the given records, which should all be instances of a Model
-        that has the :meth:`~.edi` mixin. The document is not saved in the
-        database, this is done by :meth:`~.export_edi`.
-
-        :param list(browse_record) records: records to export as EDI
-        :return: UTF-8 encoded string containing the serialized records
-        """
-        edi_list = []
-        for record in records:
-            record_model_obj = self.pool.get(record._name)
-            edi_list += record_model_obj.edi_export(cr, uid, [record], context=context)
-        return self.serialize(edi_list)
-
-    def get_document(self, cr, uid, edi_token, context=None):
-        """Retrieve the EDI document corresponding to the given edi_token.
-
-        :return: EDI document string
-        :raise: ValueError if requested EDI token does not match any know document
-        """
-        _logger.debug("get_document(%s)", edi_token)
-        edi_ids = self.search(cr, uid, [('name','=', edi_token)], context=context)
-        if not edi_ids:
-            raise ValueError('Invalid EDI token: %s' % edi_token)
-        edi = self.browse(cr, uid, edi_ids[0], context=context)
-        return edi.document
-
-    def load_edi(self, cr, uid, edi_documents, context=None):
-        """Import the given EDI document structures into the system, using
-        :meth:`~.import_edi`.
-
-        :param edi_documents: list of Python dicts containing the deserialized
-                              version of EDI documents
-        :return: list of (model, id) pairs containing the model and database ID
-                 of all records that were imported in the system
-        """
-        ir_module = self.pool.get('ir.module.module')
-        res = []
-        for edi_document in edi_documents:
-            module = edi_document.get('__module')
-            if module != 'base' and not ir_module.search(cr, uid, [('name','=',module),('state','=','installed')]):
-                raise osv.except_osv(_('Missing Application'),
-                            _("The document you are trying to import requires the OpenERP `%s` application. "
-                              "The OpenERP configuration assistant will help with this if you are connected as an administrator.")%(module,))
-            model = edi_document.get('__model')
-            assert model, '__model attribute is required in each EDI document'
-            model_obj = self.pool.get(model)
-            record_id = model_obj.edi_import(cr, uid, edi_document, context=context)
-            res.append((model, record_id))
-        return res
-
-    def deserialize(self, edi_documents_string):
-        """Return deserialized version of the given EDI Document string.
-
-        :param str|unicode edi_documents_string: UTF-8 string (or unicode) containing
-                                                 JSON-serialized EDI document(s)
-        :return: Python object representing the EDI document(s) (usually a list of dicts)
-        """
-        return json.loads(edi_documents_string)
-
-    def export_edi(self, cr, uid, records, context=None):
-        """Export the given database records as EDI documents, stores them
-        permanently with a new unique EDI token, for later retrieval via :meth:`~.get_document`,
-        and returns the list of the new corresponding ``ir.edi.document`` records.
-
-        :param records: list of browse_record of any model
-        :return: list of IDs of the new ``ir.edi.document`` entries, in the same
-                 order as the provided ``records``.
-        """
-        exported_ids = []
-        for record in records:
-            document = self.generate_edi(cr, uid, [record], context)
-            token = self.new_edi_token(cr, uid, record)
-            self.create(cr, uid, {
-                         'name': token,
-                         'document': document
-                        }, context=context)
-            exported_ids.append(token)
-        return exported_ids
-
-    def import_edi(self, cr, uid, edi_document=None, edi_url=None, context=None):
-        """Import a JSON serialized EDI Document string into the system, first retrieving it
-        from the given ``edi_url`` if provided.
-
-        :param str|unicode edi_document: UTF-8 string or unicode containing JSON-serialized
-                                         EDI Document to import. Must not be provided if
-                                         ``edi_url`` is given.
-        :param str|unicode edi_url: URL where the EDI document (same format as ``edi_document``)
-                                    may be retrieved, without authentication.
-        """
-        if edi_url:
-            assert not edi_document, 'edi_document must not be provided if edi_url is given'
-            edi_document = urllib2.urlopen(edi_url).read()
-        assert edi_document, 'EDI Document is empty!'
-        edi_documents = self.deserialize(edi_document)
-        return self.load_edi(cr, uid, edi_documents, context=context)
-
-
-class edi(object):
-    """Mixin class for Model objects that want be exposed as EDI documents.
-       Classes that inherit from this mixin class should override the
-       ``edi_import()`` and ``edi_export()`` methods to implement their
-       specific behavior, based on the primitives provided by this mixin."""
-
-    # private method, not RPC-exposed as it creates ir.model.data entries as
-    # SUPERUSER based on its parameters
-    def _edi_external_id(self, cr, uid, record, existing_id=None, existing_module=None,
-                        context=None):
-        """Generate/Retrieve unique external ID for ``record``.
-        Each EDI record and each relationship attribute in it is identified by a
-        unique external ID, which includes the database's UUID, as a way to
-        refer to any record within any OpenERP instance, without conflict.
-
-        For OpenERP records that have an existing "External ID" (i.e. an entry in
-        ir.model.data), the EDI unique identifier for this record will be made of
-        "%s:%s:%s" % (module, database UUID, ir.model.data ID). The database's
-        UUID MUST NOT contain a colon characters (this is guaranteed by the
-        UUID algorithm).
-
-        For records that have no existing ir.model.data entry, a new one will be
-        created during the EDI export. It is recommended that the generated external ID
-        contains a readable reference to the record model, plus a unique value that
-        hides the database ID. If ``existing_id`` is provided (because it came from
-        an import), it will be used instead of generating a new one.
-        If ``existing_module`` is provided (because it came from
-        an import), it will be used instead of using local values.
-
-        :param browse_record record: any browse_record needing an EDI external ID
-        :param string existing_id: optional existing external ID value, usually coming
-                                   from a just-imported EDI record, to be used instead
-                                   of generating a new one
-        :param string existing_module: optional existing module name, usually in the
-                                       format ``module:db_uuid`` and coming from a
-                                       just-imported EDI record, to be used instead
-                                       of local values
-        :return: the full unique External ID to use for record
-        """
-        ir_model_data = self.pool.get('ir.model.data')
-        db_uuid = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
-        ext_id = self.get_external_id(cr, uid, [record.id])[record.id]
-        if not ext_id:
-            ext_id = existing_id or safe_unique_id(db_uuid, record._name, record.id)
-            # ID is unique cross-db thanks to db_uuid (already included in existing_module)
-            module = existing_module or "%s:%s" % (record._module, db_uuid)
-            _logger.debug("%s: Generating new external ID `%s.%s` for %r", self._name,
-                          module, ext_id, record)
-            ir_model_data.create(cr, openerp.SUPERUSER_ID,
-                                 {'name': ext_id,
-                                  'model': record._name,
-                                  'module': module,
-                                  'res_id': record.id})
-        else:
-            module, ext_id = ext_id.split('.')
-            if not ':' in module:
-                # this record was not previously EDI-imported
-                assert module == record._module, 'Module mismatch between record and its current'\
-                                                 'external ID'
-                # ID is unique cross-db thanks to db_uuid
-                module = "%s:%s" % (module, db_uuid)
-
-        return '%s.%s' % (module, ext_id)
-
-    def edi_metadata(self, cr, uid, records, context=None):
-        """Return a list containing the boilerplate EDI structures for
-           exporting ``records`` as EDI, including
-           the metadata fields
-
-        The metadata fields always include::
-
-            {
-               '__model': 'some.model',                # record model
-               '__module': 'module',                   # require module
-               '__id': 'module:db-uuid:model.id',      # unique global external ID for the record
-               '__last_update': '2011-01-01 10:00:00', # last update date in UTC!
-               '__version' : [6,1,0],                  # server version, to check compatibility.
-               '__attachments_':
-           }
-
-        :param list(browse_record) records: records to export
-        :return: list of dicts containing boilerplate EDI metadata for each record,
-                 at the corresponding index from ``records``.
-        """
-        data_ids = []
-        ir_attachment = self.pool.get('ir.attachment')
-        results = []
-        version = version_tuple()
-        for record in records:
-            attachment_ids = ir_attachment.search(cr, uid, [('res_model','=', record._name), ('res_id', '=', record.id)])
-            attachments = []
-            for attachment in ir_attachment.browse(cr, uid, attachment_ids, context=context):
-                attachments.append({
-                        'name' : attachment.name,
-                        'content': attachment.datas, # already base64 encoded!
-                        'file_name': attachment.datas_fname,
-                })
-            ext_id = self._edi_external_id(cr, uid, record, context=context)
-            edi_dict = {
-                '__id': ext_id,
-                '__last_update': last_update_for(record),
-                '__model' : record._name,
-                '__module' : record._module,
-                '__version': version,
-                '__attachments': attachments,
-            }
-            results.append(edi_dict)
-        return results
-
-    def edi_m2o(self, cr, uid, record, context=None):
-        """Return a m2o EDI representation for the given record.
-
-        The EDI format for a many2one is::
-
-            ['unique_external_id', 'Document Name']
-        """
-        edi_ext_id = self._edi_external_id(cr, uid, record, context=context)
-        relation_model = record._model
-        name = relation_model.name_get(cr, uid, [record.id], context=context)
-        name = name and name[0][1] or False
-        return [edi_ext_id, name]
-
-    def edi_o2m(self, cr, uid, records, edi_struct=None, context=None):
-        """Return a list representing a O2M EDI relationship containing
-           all the given records, according to the given ``edi_struct``.
-           This is basically the same as exporting all the record using
-           :meth:`~.edi_export` with the given ``edi_struct``, and wrapping
-           the results in a list.
-
-           Example::
-
-             [                                # O2M fields would be a list of dicts, with their
-               { '__id': 'module:db-uuid.id', # own __id.
-                 '__last_update': 'iso date', # update date
-                 'name': 'some name',
-                 #...
-               },
-               # ...
-             ],
-        """
-        result = []
-        for record in records:
-            result += record._model.edi_export(cr, uid, [record], edi_struct=edi_struct, context=context)
-        return result
-
-    def edi_m2m(self, cr, uid, records, context=None):
-        """Return a list representing a M2M EDI relationship directed towards
-           all the given records.
-           This is basically the same as exporting all the record using
-           :meth:`~.edi_m2o` and wrapping the results in a list.
-
-            Example::
-
-                # M2M fields are exported as a list of pairs, like a list of M2O values
-                [
-                      ['module:db-uuid.id1', 'Task 01: bla bla'],
-                      ['module:db-uuid.id2', 'Task 02: bla bla']
-                ]
-        """
-        return [self.edi_m2o(cr, uid, r, context=context) for r in records]
-
-    def edi_export(self, cr, uid, records, edi_struct=None, context=None):
-        """Returns a list of dicts representing an edi.document containing the
-           records, and matching the given ``edi_struct``, if provided.
-
-           :param edi_struct: if provided, edi_struct should be a dictionary
-                              with a skeleton of the fields to export.
-                              Basic fields can have any key as value, but o2m
-                              values should have a sample skeleton dict as value,
-                              to act like a recursive export.
-                              For example, for a res.partner record::
-
-                                  edi_struct: {
-                                       'name': True,
-                                       'company_id': True,
-                                       'address': {
-                                           'name': True,
-                                           'street': True,
-                                           }
-                                  }
-
-                              Any field not specified in the edi_struct will not
-                              be included in the exported data. Fields with no
-                              value (False) will be omitted in the EDI struct.
-                              If edi_struct is omitted, no fields will be exported
-        """
-        if edi_struct is None:
-            edi_struct = {}
-        fields_to_export = edi_struct.keys()
-        results = []
-        for record in records:
-            edi_dict = self.edi_metadata(cr, uid, [record], context=context)[0]
-            for field in fields_to_export:
-                column = self._all_columns[field].column
-                value = getattr(record, field)
-                if not value:
-                    continue
-                #if _fields[field].has_key('function') or _fields[field].has_key('related_columns'):
-                #    # Do not Export Function Fields and related fields
-                #    continue
-                elif column._type == 'many2one':
-                    value = self.edi_m2o(cr, uid, value, context=context)
-                elif column._type == 'many2many':
-                    value = self.edi_m2m(cr, uid, value, context=context)
-                elif column._type == 'one2many':
-                    value = self.edi_o2m(cr, uid, value, edi_struct=edi_struct.get(field, {}), context=context)
-                edi_dict[field] = value
-            results.append(edi_dict)
-        return results
-
-    def _edi_get_object_by_name(self, cr, uid, name, model_name, context=None):
-        model = self.pool.get(model_name)
-        search_results = model.name_search(cr, uid, name, operator='=', context=context)
-        if len(search_results) == 1:
-            return model.browse(cr, uid, search_results[0][0], context=context)
-        return False
-
-    def _edi_import_attachments(self, cr, uid, record_id, edi_document, context=None):
-        ir_attachment = self.pool.get('ir.attachment')
-        for attachment in edi_document.get('__attachments', []):
-            # check attachment data is non-empty and valid
-            file_data = None
-            try:
-                file_data = base64.b64decode(attachment.get('content'))
-            except TypeError:
-                pass
-            assert file_data, 'Incorrect/Missing attachment file content'
-            assert attachment.get('name'), 'Incorrect/Missing attachment name'
-            assert attachment.get('file_name'), 'Incorrect/Missing attachment file name'
-            assert attachment.get('file_name'), 'Incorrect/Missing attachment file name'
-            ir_attachment.create(cr, uid, {'name': attachment['name'],
-                                           'datas_fname': attachment['file_name'],
-                                           'res_model': self._name,
-                                           'res_id': record_id,
-                                           # should be pure 7bit ASCII
-                                           'datas': str(attachment['content']),
-                                           }, context=context)
-
-
-    def _edi_get_object_by_external_id(self, cr, uid, external_id, model, context=None):
-        """Returns browse_record representing object identified by the model and external_id,
-           or None if no record was found with this external id.
-
-           :param external_id: fully qualified external id, in the EDI form
-                               ``module:db_uuid:identifier``.
-           :param model: model name the record belongs to.
-        """
-        ir_model_data = self.pool.get('ir.model.data')
-        # external_id is expected to have the form: ``module:db_uuid:model.random_name``
-        ext_id_members = split_external_id(external_id)
-        db_uuid = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
-        module = ext_id_members['module']
-        ext_id = ext_id_members['id']
-        ext_module = '%s:%s' % (module, ext_id_members['db_uuid'])
-        data_ids = ir_model_data.search(cr, uid, [('model','=',model),
-                                                  ('name','=',ext_id),
-                                                  ('module','in',[ext_module,module])])
-        if data_ids:
-            model = self.pool.get(model)
-            data = ir_model_data.browse(cr, uid, data_ids[0], context=context)
-            result = model.browse(cr, uid, data.res_id, context=context)
-            return result
-
-    def edi_import_relation(self, cr, uid, model, value, external_id, context=None):
-        """Imports a M2O/M2M relation EDI specification ``[external_id,value]`` for the
-           given model, returning the corresponding database ID:
-
-           * First, checks if the ``external_id`` is already known, in which case the corresponding
-             database ID is directly returned, without doing anything else;
-           * If the ``external_id`` is unknown, attempts to locate an existing record
-             with the same ``value`` via name_search(). If found, the given external_id will
-             be assigned to this local record (in addition to any existing one)
-           * If previous steps gave no result, create a new record with the given
-             value in the target model, assign it the given external_id, and return
-             the new database ID
-        """
-        _logger.debug("%s: Importing EDI relationship [%r,%r]", self._name, external_id, value)
-        target = self._edi_get_object_by_external_id(cr, uid, external_id, model, context=context)
-        need_new_ext_id = False
-        if not target:
-            _logger.debug("%s: Importing EDI relationship [%r,%r] - ID not found, trying name_get",
-                          self._name, external_id, value)
-            target = self._edi_get_object_by_name(cr, uid, value, model, context=context)
-            need_new_ext_id = True
-        if not target:
-            _logger.debug("%s: Importing EDI relationship [%r,%r] - name not found, creating it!",
-                          self._name, external_id, value)
-            # also need_new_ext_id here, but already been set above
-            res_id, name = self.name_create(cr, uid, value, context=context)
-            target = model.browse(cr, uid, res_id, context=context)
-        if need_new_ext_id:
-            ext_id_members = split_external_id(external_id)
-            # module name is never used bare when creating ir.model.data entries, in order
-            # to avoid being taken as part of the module's data, and cleanup up at next update  
-            module = "%s:%s" % (ext_id_members['module'], ext_id_members['db_uuid'])
-            # create a new ir.model.data entry for this value
-            self._edi_external_id(cr, uid, target, existing_id=ext_id_members['id'], existing_module=module, context=context)
-        return target.id
-
-    def edi_import(self, cr, uid, edi_document, context=None):
-        """Imports a dict representing an edi.document into the system,
-           applying the following rules.
-
-           All relationship fields are exported in a special way, and provide their own
-           unique identifier, so that we can avoid duplication of records when importing.
-
-           #. Many2One
-               See :meth:`~.edi_import_relation`
-
-           #. One2Many
-               O2M fields are always exported as a list of dicts, where each dict corresponds
-               to a full EDI record. The import should not update existing records
-               if they already exist, it should only link them to the parent object, in this
-               fashion:
-                   * First import the parent object, using the usual procedire
-                   * Look for a record that matches the db_id provided in the __id field. If
-                     found, keep the corresponding database id, and connect it to the parent.
-                   * If not found via db_id, create a new entry using the same method that
-                     imports a full EDI record, grab the resulting db id, and use it to
-                     connect to the parent.
-
-           #: Many2Many
-               M2M fields are always exported as a list of pairs similar to M2O.
-               For each pair in the M2M:
-                   * Perform the same steps as for a Many2One (See :meth:`~.edi_import_relation`)
-                   * After finding the database ID of the final record in the database,
-                     connect it to the parent record.
-        """
-        assert self._name == edi_document['__model'], "EDI Document Model and current model do not match: "\
-                                                      "'%s' (EDI) vs '%s' (current)" % (edi_document['__model'],
-                                                                                        self._name)
-
-        # First check the record is now already known in the database, in which case it is ignored
-        ext_id_members = split_external_id(edi_document['__id'])
-        existing_id = self._edi_get_object_by_external_id(cr, uid, ext_id_members['full'], self._name, context=context)
-        if existing_id:
-            _logger.info("'%s' EDI Document with ID '%s' is already known, skipping import!", self._name, ext_id_members['full'])
-            return
-
-        record_values = {}
-        o2m_todo = {} # o2m values are processed after their parent already exists
-        for field_name, field_value in edi_document.iteritems():
-            # skip metadata and empty fields
-            if field_name.startswith('__') or field_value is None or field_value is False:
-                continue
-            field = self._all_columns[field_name].column
-            # skip function/related fields
-            if isinstance(field, fields.function):
-                _logger.warning("Unexpected function field value found in '%s' EDI document: '%s'" % (self._name, field_name))
-                continue
-            relation_model = field._obj
-            if field._type == 'many2one':
-                record_values[field_name] = self.edi_import_relation(cr, uid, relation_model,
-                                                                      field_value[1], field_value[0],
-                                                                      context=context)
-            elif field._type == 'many2many':
-                record_values[field_name] = [self.edi_import_relation(cr, uid, relation_model, m2m_value[1],
-                                                                       m2m_value[0], context=context)
-                                             for m2m_value in field_value]
-            elif field._type == 'one2many':
-                # must wait until parent report is imported, as the parent relationship
-                # is often required in o2m child records
-                o2m_todo[field_name] = field_value
-            else:
-                record_values[field_name] = field_value
-
-        module_ref = "%s:%s" % (ext_id_members['module'], ext_id_members['db_uuid'])
-        record_id = self.pool.get('ir.model.data')._update(cr, uid, self._name, module_ref, record_values,
-                                                           xml_id=ext_id_members['id'], context=context)
-
-        record_display, = self.name_get(cr, uid, [record_id], context=context)
-
-        # process o2m values, connecting them to their parent on-the-fly
-        for o2m_field, o2m_value in o2m_todo.iteritems():
-            field = self._all_columns[o2m_field].column
-            dest_model = self.pool.get(field._obj)
-            for o2m_line in o2m_value:
-                # link to parent record: expects an (ext_id, name) pair
-                o2m_line[field._fields_id] = (ext_id_members['full'], record_display[1])
-                dest_model.edi_import(cr, uid, o2m_line, context=context)
-
-        # process the attachments, if any
-        self._edi_import_attachments(cr, uid, record_id, edi_document, context=context)
-
-        return record_id
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/openerp/addons/base/res/__init__.py b/openerp/addons/base/res/__init__.py
index cb4c68b2a72..ba3e906497e 100644
--- a/openerp/addons/base/res/__init__.py
+++ b/openerp/addons/base/res/__init__.py
@@ -35,8 +35,6 @@ import res_lang
 import res_log
 import res_widget
 import ir_property
-import edi_partner
-import edi_res_company
 import wizard
 import report
 
diff --git a/openerp/addons/base/res/edi_partner.py b/openerp/addons/base/res/edi_partner.py
deleted file mode 100644
index b8b64fad9e6..00000000000
--- a/openerp/addons/base/res/edi_partner.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields,osv
-from base.ir import ir_edi
-
-RES_PARTNER_ADDRESS_EDI_STRUCT = {
-    'name': True,
-    'email': True,
-    'street': True,
-    'street2': True,
-    'zip': True,
-    'city': True,
-    'country_id': True,
-    'state_id': True,
-    'phone': True,
-    'fax': True,
-    'mobile': True,
-}
-
-RES_PARTNER_EDI_STRUCT = {
-    'name': True,
-    'ref': True,
-    'lang': True,
-    'website': True,
-    'address': RES_PARTNER_ADDRESS_EDI_STRUCT
-}
-
-
-class res_partner(osv.osv, ir_edi.edi):
-    _inherit = "res.partner"
-
-    def edi_export(self, cr, uid, records, edi_struct=None, context=None):
-        return super(res_partner,self).edi_export(cr, uid, records,
-                                                  dict(RES_PARTNER_EDI_STRUCT),
-                                                  context=context)
-
-class res_partner_address(osv.osv, ir_edi.edi):
-    _inherit = "res.partner.address"
-
-    def edi_export(self, cr, uid, records, edi_struct=None, context=None):
-        return super(res_partner_address,self).edi_export(cr, uid, records,
-                                                          dict(RES_PARTNER_ADDRESS_EDI_STRUCT),
-                                                          context=context)
-
-class res_partner_bank(osv.osv, ir_edi.edi):
-    _inherit = "res.partner.bank"
-
diff --git a/openerp/addons/base/res/edi_res_company.py b/openerp/addons/base/res/edi_res_company.py
deleted file mode 100644
index 3cf236756a4..00000000000
--- a/openerp/addons/base/res/edi_res_company.py
+++ /dev/null
@@ -1,123 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-#from osv import osv
-#from osv import fields
-#from tools.translate import _
-
-# TODO: CHECK below, seems useless
-#
-#class res_company(osv.osv):
-#    """Helper subclass for res.company providing util methods for working with
-#       companies in the context of EDI import/export. The res.company object
-#       itself is not EDI-exportable"""
-#   _inherit = "res.company"
-#
-#    def edi_import_as_partner(self, cr, uid, edi_document, values=None, context=None):
-#        """
-#        import company as a new partner
-#        company_address data used to add address to new partner
-#
-#        edi_document is a dict to have company datas
-#        edi_document = {
-#            'company_address': {
-#                'street': True,
-#                'street2': True,
-#                'zip': True,
-#                'city': True,
-#                'state_id': True,
-#                'country_id': True,
-#                'email': True,
-#                'phone': True,
-#                       
-#            },
-#            'company_id': True,
-#        }
-#        values is a dict to have other datas of partner which are need to import of partner record
-#        values = {
-#            'customer': True,
-#            'supplier': True,
-#        }
-#        """
-#        if values is None:
-#            values = {}
-#        partner_model = 'res.partner'
-#        partner_pool = self.pool.get(partner_model)
-#        xml_id = edi_document['company_id'][0]
-#        company_address = edi_document.get('company_address', False)
-#        partner_name = edi_document['company_id'][1]
-#        partner = partner_pool.edi_get_object(cr, uid, xml_id, partner_model, context=context)
-#        if not partner:
-#            partner = partner_pool.edi_get_object_by_name(cr, uid, partner_name, partner_model, context=context)
-#
-#        if partner:
-            #FIXME
-#            record_xml = partner_pool._get_external_id(cr, uid, [partner.id], context=context)
-#            if record_xml:
-#                module, xml_id = record_xml
-#                xml_id = '%s.%s' % (module, xml_id)
-#
-#        edi_document_partner = {
-#            '__model': partner_model,
-#            '__id' : xml_id,
-#            'name' : partner_name,
-#        }
-#        if company_address:
-#            edi_document_partner['address'] = [company_address]
-#
-#        edi_document_partner.update(values)
-#        return partner_pool.edi_import(cr, uid, edi_document_partner, context=context)
-#
-#    def edi_export_address(self, cr, uid, records, edi_address_struct=None, context=None):
-#        """Return a dict representation of the address of each company record, suitable for
-#           inclusion in an EDI document, and matching the given edi_address_struct if provided.
-#
-#           :param list(browse_record) records: list of companies to export
-#           :rtype: list(dict)
-#           :return: list of dicts, where each dict contains the address representation for
-#                    the company record as the same index in ``records``.
-#        """
-#        if context is None:
-#            context = {}
-#        res_partner = self.pool.get('res.partner')
-#        res_partner_address = self.pool.get('res.partner.address')
-#        if edi_address_struct is None:
-#            edi_address_struct = {
-#                'street': True,
-#                'street2': True,
-#                'zip': True,
-#                'city': True,
-#                'state_id': True,
-#                'country_id': True,
-#                'email': True,
-#                'phone': True,
-#            }
-#        results = []
-#        for company in records:
-#            res = res_partner.address_get(cr, uid, [company.partner_id.id], ['default', 'contact', 'invoice'])
-#            addr_id = res['invoice'] or res['contact'] or res['default']
-#            result = {}
-#            if addr_id:
-#                address = res_partner_address.browse(cr, uid, addr_id, context=context)
-#                result = res_partner_address.edi_export(cr, uid, [address], edi_struct=edi_address_struct, context=ctx)[0]
-#            results.append(result)
-#        return results
-
diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index 56e6c1b2408..659938a73a3 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -127,5 +127,3 @@
 "access_ir_mail_server_all","ir_mail_server","model_ir_mail_server",,1,0,0,0
 "access_ir_actions_todo_category","ir_actions_todo_category","model_ir_actions_todo_category","group_system",1,1,1,1
 "access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0
-"access_ir_edi_all_read","access_ir_edi_all_read","model_ir_edi_document",,1,0,0,0
-"access_ir_edi_employee_create","access_ir_edi_employee_create","model_ir_edi_document","group_user",1,0,1,0
diff --git a/openerp/addons/base/test/test_edi_documents.yml b/openerp/addons/base/test/test_edi_documents.yml
deleted file mode 100644
index c9695af73e1..00000000000
--- a/openerp/addons/base/test/test_edi_documents.yml
+++ /dev/null
@@ -1,43 +0,0 @@
--
-  In order to test the basic EDI system, I will export a partner,
-  modify the exported EDI document to add an attachment and change
-  the data, and then re-import it and re-export it.
-  
-  with an attached file, check the result, the alter the data
-  and reimport it.
--
-  !python {model: ir.edi.document}: |
-      import json
-      partner_obj = self.pool.get('res.partner')
-      tokens = self.export_edi(cr, uid, [partner_obj.browse(cr, uid, ref('base.res_partner_agrolait'))])
-      doc = self.get_document(cr, uid, tokens[0], context=context)
-      edi_doc, = json.loads(doc)
-
-      # check content of the document
-      assert edi_doc.get('__id').endswith('.res_partner_agrolait'), 'Incorrect external ID'
-      assert edi_doc.get('__model') == 'res.partner', 'Incorrect/Missing __model'
-      assert edi_doc.get('__module') == 'base', 'Incorrect/Missing __module'
-      assert edi_doc.get('__last_update'), 'Missing __last_update'
-
-      # try to import the document after changing the name and id, and attaching a
-      # file, and check that a new partner is returned
-      edi_doc['__id'] = 'base:xxd37f8a-xx55-11e0-xxdd-xx81124c8b50.res_partner_xxx'
-      edi_doc['name'] = 'AgroMilk'
-      attachment = {
-        'name': 'Test file',
-        'file_name': 'test.png',
-        'content': 'iVBORw0KGgoAAAANSUhEUgAAAA4AAAAKCAYAAACE2W/HAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9oIDQ84BkjLWAYAAACNSURBVCjPjZKxDUJBDEOf/wbUbEHDhkxAzRjUDECBhMQYjIApuPBNpK+PpUinOPYll5Nt1iCJXifbSPpJZtHgXLUdu0FWpMEt87a/xtsmqjjNetPFyhuWYFuj7RcgQBNwXNGdw2CqY85yXWi5z7YBnmRyEHvg0YSXrLE9P30nwugOHHr+s5va4x+fofAGm1+JjnJICm0AAAAASUVORK5CYII=',
-      }
-      edi_doc['__attachments'] = [attachment]
-      doc = json.dumps([edi_doc])
-      result, = self.import_edi(cr, uid, edi_document=doc)
-      assert result[0] == 'res.partner' and result[1] > ref('base.res_partner_agrolait'),\
-         "Expected (%r,> %r) after import 1, got %r" % ('res.partner', ref('base.res_partner_agrolait'), result)
-
-      # export the same partner we just created, and see if the output matches the input
-      tokens = self.export_edi(cr, uid, [partner_obj.browse(cr, uid, result[1])])
-      doc_output = self.get_document(cr, uid, tokens[0], context=context)
-      edi_doc_output, = json.loads(doc_output)
-      for attribute in ('__model', '__module', '__id', 'name', '__attachments'):
-        assert edi_doc_output.get(attribute) == edi_doc.get(attribute), \
-            'Incorrect value for %s, expected %r, got %r' % (attribute, edi_doc.get(attribute), edi_doc_output.get(attribute))
\ No newline at end of file
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 09112f884fd..16bf50683c6 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -40,67 +40,6 @@ import openerp.tools as tools
 import openerp.modules
 import openerp.exceptions
 
-class edi(netsvc.ExportService):
-    def exp_get_edi_document(self, edi_token, db_name):
-        res = None
-        if db_name:
-            cr = pooler.get_db(db_name).cursor()
-        else:
-            raise Exception("No database cursor found!")
-        pool = pooler.get_pool(db_name)
-        edi_pool = pool.get('ir.edi.document')
-        try:
-            res = edi_pool.get_document(cr, 1, edi_token)
-        finally:
-            cr.close()
-        return res
-
-    def exp_import_edi_document(self, db, uid, passwd, edi_document, context=None):
-        res = None
-        cr = pooler.get_db(db).cursor()
-        pool = pooler.get_pool(db)
-        edi_pool = pool.get('ir.edi.document')
-        try:
-            res = edi_pool.import_edi(cr, uid, edi_document=edi_document, context=context)
-            cr.commit()
-        except:
-            print traceback.format_exc()
-            cr.rollback()
-        finally:
-            cr.close()
-        return res
-
-    def exp_import_edi_url(self, db, uid, passwd, edi_url, context=None):
-        res = None
-        cr = pooler.get_db(db).cursor()
-        pool = pooler.get_pool(db)
-        edi_pool = pool.get('ir.edi.document')
-        try:
-            res = edi_pool.import_edi(cr, uid, edi_url=edi_url, context=context)
-            cr.commit()
-        except:
-            print traceback.format_exc()
-            cr.rollback()
-        finally:
-            cr.close()
-        return res
-
-    def __init__(self, name="edi"):
-        netsvc.ExportService.__init__(self, name)
-
-    def dispatch(self, method, auth, params):
-        if method in ['import_edi_document',  'import_edi_url']:
-            (db, uid, passwd ) = params[0:3]
-            security.check(db, uid, passwd)
-        elif method in ['get_edi_document']:
-            # params = params
-            # No security check for these methods
-            pass
-        else:
-            raise KeyError("Method not found: %s" % method)
-        fn = getattr(self, 'exp_'+method)
-        return fn(*params)
-
 #.apidoc title: Exported Service methods
 #.apidoc module-mods: member-order: bysource
 
@@ -836,8 +775,6 @@ def start_web_services():
     objects_proxy()
     wizard()
     report_spool()
-    edi()
-
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 982b2a08941714fbc3bfb3af20746619e5fc650a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 5 Oct 2011 00:54:39 +0200
Subject: [PATCH 225/304] [FIX] orm: typo in computation of
 Model._original_module

bzr revid: odo@openerp.com-20111004225439-xnb77gtbl77onysm
---
 openerp/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 9885c1a9697..80c0708b77f 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -818,7 +818,7 @@ class BaseModel(object):
             for parent_name in ((type(parent_names)==list) and parent_names or [parent_names]):
                 parent_model = pool.get(parent_name)
                 if not getattr(cls, '_original_module', None) and name == parent_model._name:
-                    cls._original_module = parent_model._module
+                    cls._original_module = parent_model._original_module
                 if not parent_model:
                     raise TypeError('The model "%s" specifies an unexisting parent class "%s"\n'
                         'You may need to add a dependency on the parent class\' module.' % (name, parent_name))

From 5dd1e2e43c75cb3828d1ba8d0b06c16cdb61e188 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 5 Oct 2011 01:15:34 +0200
Subject: [PATCH 226/304] [FIX] complexity default, and base category

bzr revid: al@openerp.com-20111004231534-ay78ghc46ihb91mx
---
 openerp/addons/base/__openerp__.py   | 3 +--
 openerp/addons/base/module/module.py | 1 +
 openerp/modules/module.py            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index e436a0a6005..f7981133142 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -24,8 +24,7 @@
 {
     'name': 'Base',
     'version': '1.3',
-    'category': 'Generic Modules/Base',
-    'complexity': "easy",
+    'category': 'System',
     'description': """The kernel of OpenERP, needed for all installation.""",
     'author': 'OpenERP SA',
     'maintainer': 'OpenERP SA',
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 676266e5526..3af8d290700 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -220,6 +220,7 @@ class module(osv.osv):
         'demo': False,
         'license': 'AGPL-3',
         'web': False,
+        'complexity': 'normal',
     }
     _order = 'name'
 
diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index 809339897ab..53e8b86d6bf 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -249,7 +249,7 @@ def load_information_from_description_file(module):
             info.setdefault('website', '')
             info.setdefault('name', False)
             info.setdefault('description', '')
-            info.setdefault('complexity', False)
+            info.setdefault('complexity', 'normal')
             info['certificate'] = info.get('certificate') or None
             info['web'] = info.get('web') or False
             info['license'] = info.get('license') or 'AGPL-3'

From 3fe0d0877272ad6d24d9e774fe0130d907d23293 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 5 Oct 2011 01:18:32 +0200
Subject: [PATCH 227/304] [FIX] some catgories and complexity

bzr revid: al@openerp.com-20111004231832-8hx5233nm031nuhs
---
 addons/base_action_rule/__openerp__.py    | 3 +--
 addons/base_setup/base_setup.py           | 6 ++++--
 addons/google_base_account/__openerp__.py | 4 ++--
 addons/google_map/__openerp__.py          | 3 +--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index c60ebda5d26..a33a1f5fc27 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -22,8 +22,7 @@
 {
     'name': 'Action Rule',
     'version': '1.0',
-    'category': 'Base',
-    'complexity': "expert",
+    'category': 'Tools',
     'description': """
 This module allows to implement action rules for any object.
 ============================================================
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index fa251719509..33837b5553b 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -43,6 +43,8 @@ DEFAULT_MODULES = {
     'Marketing' : ['marketing',],
 }
 
+HIDDEN_CATEGORIES = ('Tools', 'System', 'Localization', 'Link', 'Uncategorized')
+
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
 
@@ -61,7 +63,7 @@ class base_setup_installer(osv.osv_memory):
         fields = {} 
         category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', 'not in', ('Localization', 'Others', 'Tools', 'Base', 'Link'))]
+                  ('name', 'not in', HIDDEN_CATEGORIES )]
         category_ids = category_proxy.search(cr, uid, domain, context=context)
         for category in category_proxy.browse(cr, uid, category_ids, context=context):
             category_name = 'category_%d' % (category.id,)
@@ -119,7 +121,7 @@ class base_setup_installer(osv.osv_memory):
 
         module_category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', 'not in', ('Localization', 'Others', 'Tools', 'Base', 'Link'))]
+                  ('name', 'not in', HIDDEN_CATEGORIES)]
         module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='sequence asc')
 
         arch = ['<form string="%s">' % _('Automatic Base Setup')]
diff --git a/addons/google_base_account/__openerp__.py b/addons/google_base_account/__openerp__.py
index 8a8c9925900..3dafebd0cc1 100644
--- a/addons/google_base_account/__openerp__.py
+++ b/addons/google_base_account/__openerp__.py
@@ -23,8 +23,8 @@
 {
     'name': 'Google user',
     'version': '1.0',
-    'category': 'Others',
-    'description': """The module adds google user  in res user""",
+    'category': 'Tools',
+    'description': """The module adds google user in res user""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index 4a778b0daff..0b8566b35e2 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -23,8 +23,7 @@
 {
     'name': 'Google Map',
     'version': '1.0',
-    'category': 'Others',
-    'complexity': "easy",
+    'category': 'Tools',
     'description': """
 The module adds Google Map field in partner address.
 ====================================================

From 7342b8079e71f9a72c39f4bb8e6678c0f9f0ba93 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 5 Oct 2011 02:16:43 +0200
Subject: [PATCH 228/304] [FIX] debian logfile name

bzr revid: al@openerp.com-20111005001643-ngs7quhipn79gauu
---
 debian/openerp.postinst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/openerp.postinst b/debian/openerp.postinst
index 362741bb7e9..f8f653397fe 100644
--- a/debian/openerp.postinst
+++ b/debian/openerp.postinst
@@ -12,9 +12,9 @@ case "${1}" in
         chown openerp:openerp /etc/openerp/openerp-server.conf
         chmod 0640 /etc/openerp/openerp-server.conf
         # Creating log file
-        touch /var/log/openerp.log
-        chown openerp:openerp /var/log/openerp.log
-        chmod 0640 /var/log/openerp.log
+        touch /var/log/openerp-server.log
+        chown openerp:openerp /var/log/openerp-server.log
+        chmod 0640 /var/log/openerp-server.log
         # Creating local storage directory
         mkdir -p /var/lib/openerp/filestore
         chown openerp:openerp -R /var/lib/openerp

From 5cc7c4002e28cf298a94693f76f11b5374b78af4 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 5 Oct 2011 02:24:16 +0200
Subject: [PATCH 229/304] [IMP] res.currency: name_search() implementation to
 match name_get()

bzr revid: odo@openerp.com-20111005002416-vz0vzfpb2uosxu4c
---
 openerp/addons/base/res/res_currency.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py
index 01d8b745e6f..248b379cafa 100644
--- a/openerp/addons/base/res/res_currency.py
+++ b/openerp/addons/base/res/res_currency.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+import re
 import time
 import netsvc
 from osv import fields, osv
@@ -26,6 +27,8 @@ import tools
 from tools.misc import currency
 from tools.translate import _
 
+CURRENCY_DISPLAY_PATTERN = re.compile(r'(\w+)\s*(?:\((.*)\))?')
+
 class res_currency(osv.osv):
     def _current_rate(self, cr, uid, ids, name, arg, context=None):
         if context is None:
@@ -101,6 +104,18 @@ class res_currency(osv.osv):
                     r['date'] = currency_date
         return res
 
+    def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
+        if not args:
+            args = []
+        if name:
+            ids = self.search(cr, user, ([('name','=',name)] + args), limit=limit, context=context)
+            name_match = CURRENCY_DISPLAY_PATTERN.match(name)
+            if not ids and name_match:
+               ids = self.search(cr, user, [('name','=', name_match.group(1))] + args, limit=limit, context=context)
+        else:
+            ids = self.search(cr, user, args, limit=limit, context=context)
+        return self.name_get(cr, user, ids, context=context)
+
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []

From a25933be83c5f675648b651a782c9e0f04d66002 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 5 Oct 2011 02:29:56 +0200
Subject: [PATCH 230/304] [IMP] res.currency: better/working default values

bzr revid: odo@openerp.com-20111005002956-1tfe5u13qid3intk
---
 openerp/addons/base/res/res_currency.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py
index 248b379cafa..4e7029d5172 100644
--- a/openerp/addons/base/res/res_currency.py
+++ b/openerp/addons/base/res/res_currency.py
@@ -71,6 +71,8 @@ class res_currency(osv.osv):
     _defaults = {
         'active': lambda *a: 1,
         'position' : 'after',
+        'rounding': 0.01,
+        'accuracy': 4,
     }
     _sql_constraints = [
         # this constraint does not cover all cases due to SQL NULL handling for company_id,

From 33947042fda455e8b085e9da5512e527c5f6d595 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 5 Oct 2011 03:01:36 +0200
Subject: [PATCH 231/304] [IMP] safe_eval: allow OPCODES for try/except/finally

bzr revid: odo@openerp.com-20111005010136-xkowcqda3kres691
---
 openerp/tools/safe_eval.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/tools/safe_eval.py b/openerp/tools/safe_eval.py
index be7b222f67f..02fcbc19c63 100644
--- a/openerp/tools/safe_eval.py
+++ b/openerp/tools/safe_eval.py
@@ -64,7 +64,7 @@ _SAFE_OPCODES = _EXPR_OPCODES.union(set(opmap[x] for x in [
     'MAKE_FUNCTION', 'SLICE+0', 'SLICE+1', 'SLICE+2', 'SLICE+3',
     # New in Python 2.7 - http://bugs.python.org/issue4715 :
     'JUMP_IF_FALSE_OR_POP', 'JUMP_IF_TRUE_OR_POP', 'POP_JUMP_IF_FALSE',
-    'POP_JUMP_IF_TRUE'
+    'POP_JUMP_IF_TRUE', 'SETUP_EXCEPT', 'END_FINALLY'
     ] if x in opmap))
 
 _logger = logging.getLogger('safe_eval')

From ce903eb54a0616273afd9d9d08a62f386928811d Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 5 Oct 2011 04:44:29 +0000
Subject: [PATCH 232/304] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20111005044429-thiikup2n1y3ayb9
---
 openerp/addons/base/i18n/sl.po | 282 ++++++++++++++++++++-------------
 1 file changed, 168 insertions(+), 114 deletions(-)

diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index dbb290a3b5a..ee292629ca7 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-09-30 21:29+0000\n"
-"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
+"PO-Revision-Date: 2011-10-04 13:54+0000\n"
+"Last-Translator: Mustufa Rangwala (Open ERP) <mra@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-01 05:05+0000\n"
-"X-Generator: Launchpad (build 14071)\n"
+"X-Launchpad-Export-Date: 2011-10-05 04:44+0000\n"
+"X-Generator: Launchpad (build 14085)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -718,7 +718,7 @@ msgstr "Oman"
 #: model:ir.actions.act_window,name:base.action_payterm_form
 #: model:ir.model,name:base.model_res_payterm
 msgid "Payment term"
-msgstr ""
+msgstr "Plačilni pogoj"
 
 #. module: base
 #: model:res.country,name:base.nu
@@ -7966,7 +7966,7 @@ msgstr "Pošlji E-pošto"
 #: field:res.config.users,menu_id:0
 #: field:res.users,menu_id:0
 msgid "Menu Action"
-msgstr "Menuji"
+msgstr "Dejanja menija"
 
 #. module: base
 #: help:ir.model.fields,selection:0
@@ -7975,6 +7975,8 @@ msgid ""
 "defining a list of (key, label) pairs. For example: "
 "[('blue','Blue'),('yellow','Yellow')]"
 msgstr ""
+"Seznam možnosti za izbiro polja, določen kot Python izraz, ki  opredeljuje "
+"seznam (key, label) parov. Na primer: [('blue','Blue'),('yellow','Yellow')]"
 
 #. module: base
 #: selection:base.language.export,state:0
@@ -7987,6 +7989,8 @@ msgid ""
 "Indicates whether this object model lives in memory only, i.e. is not "
 "persisted (osv.osv_memory)"
 msgstr ""
+"Označuje, ali ta model predmeta živi v spominu samo, če ne ostaja tam "
+"(osv.osv_memory)"
 
 #. module: base
 #: field:res.partner,child_ids:0
@@ -7999,12 +8003,12 @@ msgstr "Sklic partnerja"
 #: model:ir.ui.menu,name:base.menu_procurement_management_supplier_name
 #: view:res.partner:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Dobavitelji"
 
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
 msgid "Register"
-msgstr ""
+msgstr "Registracija"
 
 #. module: base
 #: field:res.request,ref_doc2:0
@@ -8014,7 +8018,7 @@ msgstr "2.sklic dokument"
 #. module: base
 #: field:res.request,ref_doc1:0
 msgid "Document Ref 1"
-msgstr "1.sklic dokumenta"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.ga
@@ -8046,7 +8050,7 @@ msgstr "Številka konta"
 #. module: base
 #: view:res.lang:0
 msgid "1.  %c              ==> Fri Dec  5 18:25:20 2008"
-msgstr ""
+msgstr "Copy text \t 1. %c ==> Pet 5.Dec 2008 5 18:25:20"
 
 #. module: base
 #: model:res.country,name:base.nc
@@ -8065,6 +8069,9 @@ msgid ""
 "loading a new language it becomes available as default interface language "
 "for users and partners."
 msgstr ""
+"Ta čarovnik vam pomaga dodati nov jezik v OpenERP sistem. Po nalaganju "
+"novega jezika, postane ta jezik privzeti jezik vmesnika za uporabnike in "
+"partnerje."
 
 #. module: base
 #: field:ir.actions.server,subject:0
@@ -8082,12 +8089,12 @@ msgstr "Od"
 #. module: base
 #: view:res.users:0
 msgid "Preferences"
-msgstr ""
+msgstr "Nastavitve"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_consumers0
 msgid "Consumers"
-msgstr ""
+msgstr "Stranke"
 
 #. module: base
 #: view:res.config:0
@@ -8101,6 +8108,7 @@ msgid ""
 "Name of the method to be called on the object when this scheduler is "
 "executed."
 msgstr ""
+"Ime metode, ki se jo kliče na predmet, ko je izvršen razporejevalnik."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:219
@@ -8108,12 +8116,12 @@ msgstr ""
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
 "format!"
-msgstr ""
+msgstr "Izbor možnosti izraza, ki mora biti v obliki [('key','Label'), ...]!"
 
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Razno"
 
 #. module: base
 #: model:res.country,name:base.cn
@@ -8127,6 +8135,8 @@ msgid ""
 "--\n"
 "%(name)s %(email)s\n"
 msgstr ""
+"--\n"
+"%(name)s %(email)s\n"
 
 #. module: base
 #: model:res.country,name:base.eh
@@ -8136,7 +8146,7 @@ msgstr "Zahodna Sahara"
 #. module: base
 #: model:ir.model,name:base.model_workflow
 msgid "workflow"
-msgstr "potek dela"
+msgstr "delovni proces"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_company_form
@@ -8144,6 +8154,8 @@ msgid ""
 "Create and manage the companies that will be managed by OpenERP from here. "
 "Shops or subsidiaries can be created and maintained from here."
 msgstr ""
+"Ustvarjanje in upravljanje podjetij, ki bo vodil OpenERP od tukaj.  Trgovine "
+"ali hčerinskih družbe je mogoče ustvariti in vzdrževati od tukaj."
 
 #. module: base
 #: model:res.country,name:base.id
@@ -8157,6 +8169,9 @@ msgid ""
 "you can then add translations manually or perform a complete export (as a "
 "template for a new language example)."
 msgstr ""
+"Ta čarovnik bo samodejno zaznal nove izraze za prevod aplikacije, tako da "
+"lahko nato dodate prevode ročno ali izvedete popoln izvoz (kot predlogo za "
+"nov primer jezika)."
 
 #. module: base
 #: help:multi_company.default,expression:0
@@ -8164,6 +8179,8 @@ msgid ""
 "Expression, must be True to match\n"
 "use context.get or user (browse)"
 msgstr ""
+"Izraz mora biti True za ujemanje\n"
+"uporabite context.get ali user (prebrskaj)"
 
 #. module: base
 #: model:res.country,name:base.bg
@@ -8173,7 +8190,7 @@ msgstr "Bolgarija"
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
 msgid "Publisher warranty contract successfully registered!"
-msgstr ""
+msgstr "Pogodba založniške  garancije je bila uspešno registrirana!"
 
 #. module: base
 #: model:res.country,name:base.ao
@@ -8198,23 +8215,23 @@ msgstr "Valuta"
 #. module: base
 #: field:res.partner.canal,name:0
 msgid "Channel Name"
-msgstr "Naziv kanala"
+msgstr "Ime kanala"
 
 #. module: base
 #: view:res.lang:0
 msgid "5.  %y, %Y         ==> 08, 2008"
-msgstr ""
+msgstr "5. %y, %Y ==> 08, 2008"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_ltd
 msgid "ltd"
-msgstr ""
+msgstr "d.o.o."
 
 #. module: base
 #: field:ir.values,res_id:0
 #: field:res.log,res_id:0
 msgid "Object ID"
-msgstr ""
+msgstr "ID predmeta"
 
 #. module: base
 #: view:res.company:0
@@ -8229,7 +8246,7 @@ msgstr "Skrbništvo"
 #. module: base
 #: view:base.module.update:0
 msgid "Click on Update below to start the process..."
-msgstr ""
+msgstr "Kliknite na Posodobi za začetek procesa..."
 
 #. module: base
 #: model:res.country,name:base.ir
@@ -8240,7 +8257,7 @@ msgstr "Iran"
 #: model:ir.actions.act_window,name:base.res_widget_user_act_window
 #: model:ir.ui.menu,name:base.menu_res_widget_user_act_window
 msgid "Widgets per User"
-msgstr ""
+msgstr "Gradiniki na uporabnika"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8257,23 +8274,23 @@ msgstr "neznano"
 #. module: base
 #: field:res.currency,symbol:0
 msgid "Symbol"
-msgstr ""
+msgstr "Simbol"
 
 #. module: base
 #: help:res.config.users,login:0
 #: help:res.users,login:0
 msgid "Used to log into the system"
-msgstr ""
+msgstr "Uporablja se prijavo v sistem"
 
 #. module: base
 #: view:base.update.translations:0
 msgid "Synchronize Translation"
-msgstr ""
+msgstr "Sinhronizacija prevoda"
 
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
 msgid "Resource Ref."
-msgstr "Sklic resursa"
+msgstr "Sklic sredstva"
 
 #. module: base
 #: model:res.country,name:base.ki
@@ -8288,7 +8305,7 @@ msgstr "Irak"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_association
 msgid "Association"
-msgstr ""
+msgstr "Povezava"
 
 #. module: base
 #: model:res.country,name:base.cl
@@ -8300,7 +8317,7 @@ msgstr "Čile"
 #: model:ir.ui.menu,name:base.menu_config_address_book
 #: model:ir.ui.menu,name:base.menu_procurement_management_supplier
 msgid "Address Book"
-msgstr ""
+msgstr "Imenik"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_sequence_type
@@ -8315,23 +8332,23 @@ msgstr "CSV datoteka"
 #. module: base
 #: field:res.company,account_no:0
 msgid "Account No."
-msgstr ""
+msgstr "Številka konta"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:157
 #, python-format
 msgid "Base Language 'en_US' can not be deleted !"
-msgstr ""
+msgstr "Osnovnega jezika 'en_US' ni mogoče izbrisati!"
 
 #. module: base
 #: selection:ir.model,state:0
 msgid "Base Object"
-msgstr "Temeljni objekt"
+msgstr "Temeljni predmet"
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Dependencies :"
-msgstr ""
+msgstr "Odvisnosti:"
 
 #. module: base
 #: field:ir.model.fields,field_description:0
@@ -8360,11 +8377,13 @@ msgid ""
 "Operation prohibited by access rules, or performed on an already deleted "
 "document (Operation: %s, Document type: %s)."
 msgstr ""
+"Operacijo prepovedujejo pravila dostopa ali je izvedena na že zbrisanem "
+"dokumentu (Operacija: %s, vrsta dokumenta: %s)."
 
 #. module: base
 #: model:res.country,name:base.zr
 msgid "Zaire"
-msgstr ""
+msgstr "Zaire"
 
 #. module: base
 #: field:ir.model.data,res_id:0
@@ -8372,7 +8391,7 @@ msgstr ""
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
-msgstr "Resurs ID"
+msgstr "ID vira"
 
 #. module: base
 #: view:ir.cron:0
@@ -8383,12 +8402,12 @@ msgstr "Informacije"
 #. module: base
 #: view:res.widget.user:0
 msgid "User Widgets"
-msgstr ""
+msgstr "Uporabniški gradniki"
 
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
-msgstr ""
+msgstr "Posodobi seznam modulov"
 
 #. module: base
 #: selection:res.partner.address,type:0
@@ -8422,34 +8441,34 @@ msgstr "Samoosvežitev"
 #: code:addons/base/ir/ir_model.py:62
 #, python-format
 msgid "The osv_memory field can only be compared with = and != operator."
-msgstr ""
+msgstr "Polje osv_memory lahko primerjate samo z operatorjem = in !=."
 
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
-msgstr ""
+msgstr "Diagram"
 
 #. module: base
 #: help:multi_company.default,name:0
 msgid "Name it to easily find a record"
-msgstr ""
+msgstr "Poimenujte, da boste lažje našli zapis"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.grant_menu_access
 #: model:ir.ui.menu,name:base.menu_grant_menu_access
 msgid "Menu Items"
-msgstr ""
+msgstr "Postavke menija"
 
 #. module: base
 #: constraint:ir.rule:0
 msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+msgstr "Pravila niso podprta za predmete osv_memory!"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_event_association
 #: model:ir.ui.menu,name:base.menu_event_main
 msgid "Events Organisation"
-msgstr ""
+msgstr "Organizacija dogodkov"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_actions
@@ -8458,7 +8477,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.next_id_6
 #: view:workflow.activity:0
 msgid "Actions"
-msgstr "Akcije"
+msgstr "Dejanja"
 
 #. module: base
 #: selection:res.request,priority:0
@@ -8530,13 +8549,13 @@ msgstr "Vključi/izključi skupno RML glavo"
 #. module: base
 #: help:workflow.transition,act_to:0
 msgid "The destination activity."
-msgstr ""
+msgstr "Cilj aktivnosti."
 
 #. module: base
 #: view:base.module.update:0
 #: view:base.update.translations:0
 msgid "Update"
-msgstr "Osveži"
+msgstr "Posodobi"
 
 #. module: base
 #: model:ir.actions.report.xml,name:base.ir_module_reference_print
@@ -8556,7 +8575,7 @@ msgstr ""
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Advanced Search (deprecated)"
-msgstr ""
+msgstr "Napredno iskanje (opuščeno)"
 
 #. module: base
 #: model:res.country,name:base.cx
@@ -8571,7 +8590,7 @@ msgstr "Konfiguracija ostalih akcij"
 #. module: base
 #: view:res.config.installer:0
 msgid "Install Modules"
-msgstr ""
+msgstr "Namesti module"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_partner_canal-act
@@ -8584,13 +8603,13 @@ msgstr "Kanali"
 #. module: base
 #: view:ir.ui.view:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Dodatne informacije"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_values_form_action
 #: model:ir.ui.menu,name:base.menu_values_form_action
 msgid "Client Events"
-msgstr ""
+msgstr "Dogodki klienta"
 
 #. module: base
 #: view:ir.module.module:0
@@ -8600,18 +8619,18 @@ msgstr "Daj v seznam za namestitev"
 #. module: base
 #: model:ir.model,name:base.model_partner_wizard_ean_check
 msgid "Ean Check"
-msgstr ""
+msgstr "Preveri EAN"
 
 #. module: base
 #: sql_constraint:res.config.users:0
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Ne morete imeti dva uporabnika z istim prijavnim imenom!"
 
 #. module: base
 #: model:ir.model,name:base.model_multi_company_default
 msgid "Default multi company"
-msgstr ""
+msgstr "Privzeto multi podjetje"
 
 #. module: base
 #: view:res.request:0
@@ -8622,7 +8641,7 @@ msgstr "Pošlji"
 #: field:res.config.users,menu_tips:0
 #: field:res.users,menu_tips:0
 msgid "Menu Tips"
-msgstr ""
+msgstr "Namigi menija"
 
 #. module: base
 #: field:ir.translation,src:0
@@ -8632,7 +8651,7 @@ msgstr "Vir"
 #. module: base
 #: help:res.partner.address,partner_id:0
 msgid "Keep empty for a private address, not related to partner."
-msgstr ""
+msgstr "Pustite prazno za zasebni naslov, ki ni povezan s partnerjem."
 
 #. module: base
 #: model:res.country,name:base.vu
@@ -8662,14 +8681,14 @@ msgstr "Začni s konfiguracijo"
 #. module: base
 #: view:base.language.export:0
 msgid "_Export"
-msgstr ""
+msgstr "_Izvoz"
 
 #. module: base
 #: field:base.language.install,state:0
 #: field:base.module.import,state:0
 #: field:base.module.update,state:0
 msgid "state"
-msgstr ""
+msgstr "država"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8693,6 +8712,8 @@ msgid ""
 "Invalid group_by specification: \"%s\".\n"
 "A group_by specification must be a list of valid fields."
 msgstr ""
+"Neveljavna specifikacija group_by: \"%s\".\n"
+"Specifikacija group_by mora biti seznam veljavnih polj."
 
 #. module: base
 #: model:res.country,name:base.sa
@@ -8705,22 +8726,24 @@ msgid ""
 "Check this box if the partner is a supplier. If it's not checked, purchase "
 "people will not see it when encoding a purchase order."
 msgstr ""
+"Označite to polje, če je partner dobavitelj. Če ni označeno, ljudje, ki "
+"skrbijo za nabavo, ne bodo videli dobavitelja ob izdelavi naročila."
 
 #. module: base
 #: field:ir.model.fields,relation_field:0
 msgid "Relation Field"
-msgstr ""
+msgstr "Polje odnosa"
 
 #. module: base
 #: view:res.partner.event:0
 msgid "Event Logs"
-msgstr ""
+msgstr "Dnevniki dogodka"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_configuration.py:37
 #, python-format
 msgid "System Configuration done"
-msgstr ""
+msgstr "Konfiguracija sistema je končana"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -8731,7 +8754,7 @@ msgstr "Ciljni primerek"
 #: field:ir.actions.act_window,multi:0
 #: field:ir.actions.wizard,multi:0
 msgid "Action on Multiple Doc."
-msgstr ""
+msgstr "Dejanje na večih dokumentih"
 
 #. module: base
 #: view:base.language.export:0
@@ -8746,7 +8769,7 @@ msgstr "XML pot"
 #. module: base
 #: selection:ir.actions.todo,restart:0
 msgid "On Skip"
-msgstr ""
+msgstr "Na preskoku"
 
 #. module: base
 #: model:res.country,name:base.gn
@@ -8763,19 +8786,20 @@ msgstr "Luksemburg"
 msgid ""
 "The kind of action or button in the client side that will trigger the action."
 msgstr ""
+"Vrste dejavnosti ali gumba na strani odjemalca, ki bo sprožila dejanje."
 
 #. module: base
 #: code:addons/base/ir/ir_ui_menu.py:285
 #, python-format
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Napaka! Ne morete ustvariti rekurzivnega menija."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_add_wizard
 #: model:ir.ui.menu,name:base.menu_publisher_warranty_contract_add
 #: view:publisher_warranty.contract.wizard:0
 msgid "Register a Contract"
-msgstr ""
+msgstr "Registriraj pogodbo"
 
 #. module: base
 #: view:ir.rule:0
@@ -8783,12 +8807,15 @@ msgid ""
 "3. If user belongs to several groups, the results from step 2 are combined "
 "with logical OR operator"
 msgstr ""
+"3. Če uporabnik pripada večim skupinam, je rezultat od koraka 2 v "
+"kombinaciji z logičnim OR operatorjem."
 
 #. module: base
 #: code:addons/base/publisher_warranty/publisher_warranty.py:145
 #, python-format
 msgid "Please check your publisher warranty contract name and validity."
 msgstr ""
+"Prosim, preverite ime pogodbe založniške garancije in njeno veljavnost."
 
 #. module: base
 #: model:res.country,name:base.sv
@@ -8828,7 +8855,7 @@ msgstr "Tajska"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_lead
 msgid "Leads & Opportunities"
-msgstr ""
+msgstr "Interesi & priložnosti"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8838,7 +8865,7 @@ msgstr ""
 #. module: base
 #: view:res.log:0
 msgid "System Logs"
-msgstr ""
+msgstr "Sistemski dnevniki"
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
@@ -8849,7 +8876,7 @@ msgstr "In"
 #. module: base
 #: field:ir.model.fields,relation:0
 msgid "Object Relation"
-msgstr "Relacija objekta"
+msgstr "Relacija predmeta"
 
 #. module: base
 #: view:ir.rule:0
@@ -8871,7 +8898,7 @@ msgstr "ir.actions.act_window"
 #. module: base
 #: field:ir.rule,perm_create:0
 msgid "Apply For Create"
-msgstr ""
+msgstr "Uporabi za ustvaritev"
 
 #. module: base
 #: model:res.country,name:base.vi
@@ -8897,6 +8924,10 @@ msgid ""
 "be assigned to specific groups in order to make them accessible to some "
 "users within the system."
 msgstr ""
+"Upravljajte in prilagodite predmete, ki so na voljo in se prikažejo v meniju "
+"sistem OpenERP. Lahko izbrišete element s klikom na polje na začetku vsake "
+"vrstice in nato izbrišete s pomočjo gumba, ki se prikaže. Predmeti se lahko "
+"dodelijo posebnim skupinam, da so na voljo nekateri uporabnikom v sistemu."
 
 #. module: base
 #: field:ir.ui.view,field_parent:0
@@ -8911,7 +8942,7 @@ msgstr "Podrejeno polje"
 #: field:ir.actions.server,usage:0
 #: field:ir.actions.wizard,usage:0
 msgid "Action Usage"
-msgstr "Raba akcije"
+msgstr "Rava dejanja"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_workitem
@@ -8931,25 +8962,25 @@ msgstr "Pogled:"
 #. module: base
 #: field:ir.model.fields,view_load:0
 msgid "View Auto-Load"
-msgstr ""
+msgstr "Pogled samodejnega nalaganja"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:232
 #, python-format
 msgid "You cannot remove the field '%s' !"
-msgstr ""
+msgstr "Ne morete odstraniti polja: '%s'!"
 
 #. module: base
 #: field:ir.exports,resource:0
 #: view:ir.property:0
 #: field:ir.property,res_id:0
 msgid "Resource"
-msgstr "Resurs"
+msgstr "Vir"
 
 #. module: base
 #: field:ir.ui.menu,web_icon:0
 msgid "Web Icon File"
-msgstr ""
+msgstr "Datoteka spletne ikone"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8959,13 +8990,13 @@ msgstr ""
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "View Ordering"
-msgstr ""
+msgstr "Pogled naročanja"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_upgrade.py:95
 #, python-format
 msgid "Unmet dependency !"
-msgstr ""
+msgstr "Neizpolnjene odvisnosti!"
 
 #. module: base
 #: view:base.language.import:0
@@ -8973,6 +9004,8 @@ msgid ""
 "Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
 "Portable Objects)"
 msgstr ""
+"Podprti fotmati datoteke: *.csv (Comma-separated values) ali *.po (GetText "
+"Portable Objects)"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:487
@@ -8981,11 +9014,13 @@ msgid ""
 "You can not delete this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"Ne morete izbrisati tega dokumenta (%s)! Bodite prepričani, da vaš uporabnik "
+"pripada eni od teh skupin: %s."
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
 msgid "base.module.configuration"
-msgstr ""
+msgstr "base.module.configuration"
 
 #. module: base
 #: field:base.language.export,name:0
@@ -9007,7 +9042,7 @@ msgstr "Slovaška republika"
 #. module: base
 #: model:ir.ui.menu,name:base.publisher_warranty
 msgid "Publisher Warranty"
-msgstr ""
+msgstr "Založniška garancija"
 
 #. module: base
 #: model:res.country,name:base.aw
@@ -9049,17 +9084,17 @@ msgstr "Razčlenjenost"
 #: view:res.users:0
 #: field:res.users,company_id:0
 msgid "Company"
-msgstr "Družba"
+msgstr "Podjetje"
 
 #. module: base
 #: view:res.users:0
 msgid "Email & Signature"
-msgstr ""
+msgstr "E-pošta & podpis"
 
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Publisher Warranty Contract"
-msgstr ""
+msgstr "Pogodba založniške garancije"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -9069,12 +9104,12 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_aftersale
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Storitve po prodaji"
 
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Launch"
-msgstr ""
+msgstr "Zaženi"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
@@ -9084,7 +9119,7 @@ msgstr "Meja"
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid "Workflow to be executed on this model."
-msgstr ""
+msgstr "Delovni proces, ki naj bo izvršen na tem modelu."
 
 #. module: base
 #: model:res.country,name:base.jm
@@ -9099,6 +9134,10 @@ msgid ""
 "categories have a hierarchy structure: a partner belonging to a category "
 "also belong to his parent category."
 msgstr ""
+"Upravljanje kategorij partnerjev, da bi jih bolje razvrstili za namen "
+"sledenja in analiz. Partner lahko pripada večim kategorijam in kategorijam, "
+"ki  imajo hierarhično strukturo: partner, ki spada v kategorijo, spada tudi "
+"v njegovo matično kategorijo."
 
 #. module: base
 #: model:res.country,name:base.az
@@ -9125,7 +9164,7 @@ msgstr "Deviški otoki (britanski)"
 #: view:ir.property:0
 #: model:ir.ui.menu,name:base.next_id_15
 msgid "Parameters"
-msgstr ""
+msgstr "Parametri"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -9145,6 +9184,10 @@ msgid ""
 "uncheck the 'Suppliers' filter button in order to search in all your "
 "partners, including customers and prospects."
 msgstr ""
+"Lahko dostopate do vseh informacij o vaši dobaviteljih iz obrazca "
+"dobavitelji: računovodski podatki, zgodovina e-pošte, sestankov, nakupi, itd "
+"Lahko odznačite gumb filter \"Dobavitelji\" za iskanje vseh vaših "
+"partnerjev, vključno s kupci in obeti .."
 
 #. module: base
 #: model:res.country,name:base.rw
@@ -9154,7 +9197,7 @@ msgstr "Ruanda"
 #. module: base
 #: view:ir.sequence:0
 msgid "Day of the week (0:Monday): %(weekday)s"
-msgstr ""
+msgstr "Dan v tednu (0:Ponedeljek): %(weekday)s"
 
 #. module: base
 #: model:res.country,name:base.ck
@@ -9164,7 +9207,7 @@ msgstr "Cookovi otoki"
 #. module: base
 #: field:ir.model.data,noupdate:0
 msgid "Non Updatable"
-msgstr "Neposodobljivo"
+msgstr "Ni mogoče posodobiti"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -9184,7 +9227,7 @@ msgstr "Trenutno okno"
 #. module: base
 #: view:ir.values:0
 msgid "Action Source"
-msgstr ""
+msgstr "Vir dejanja"
 
 #. module: base
 #: view:res.config.view:0
@@ -9193,6 +9236,9 @@ msgid ""
 "simplified interface, which has less features but is easier. You can always "
 "switch later from the user preferences."
 msgstr ""
+"Če uporabljate OpenERP prvičkrat, potem vam močno priporočamo, da izberete "
+"poenostavljen vmesnik, ki ima manj možnosti, ampak je lažji za uporabo. "
+"Vedno lahko prestavite način prikaza vmesnika  v nastavitvah uporabnika."
 
 #. module: base
 #: model:ir.model,name:base.model_res_country
@@ -9210,12 +9256,12 @@ msgstr "Država"
 #: field:ir.model.fields,complete_name:0
 #: field:ir.ui.menu,complete_name:0
 msgid "Complete Name"
-msgstr "Celotni naziv"
+msgstr "Celotno ime"
 
 #. module: base
 #: field:ir.values,object:0
 msgid "Is Object"
-msgstr "Je objekt"
+msgstr "Je predmet"
 
 #. module: base
 #: view:ir.rule:0
@@ -9223,6 +9269,8 @@ msgid ""
 "1. Global rules are combined together with a logical AND operator, and with "
 "the result of the following steps"
 msgstr ""
+"1. Globalna pravila so združena skupaj z logičnim AND operatorjem  in z "
+"rezultatom naslednjih korakov"
 
 #. module: base
 #: field:res.partner.category,name:0
@@ -9232,17 +9280,17 @@ msgstr "Naziv kategorije"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
 msgid "IT sector"
-msgstr ""
+msgstr "IT sektor"
 
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "Select Groups"
-msgstr ""
+msgstr "Izberite skupine"
 
 #. module: base
 #: view:res.lang:0
 msgid "%X - Appropriate time representation."
-msgstr ""
+msgstr "%X - primeren čas zastopnja"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -9257,6 +9305,10 @@ msgid ""
 "1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
 "106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Oblika ločila mora biti kot [,n] kjer je 0 < n : začetko od enote števila. - "
+"1 bo končalo ločevanje, npr [3,2,-1] bo predstavljalo 106500 kot 1,06,500; "
+"[1,2,-1] bo predstavljajo kot 106,50,0; [3] bo predstavljalo kot 1060,500. "
+"Določena ',' kot ločilo tisoč v vsakem primeru."
 
 #. module: base
 #: view:res.company:0
@@ -9267,7 +9319,7 @@ msgstr "Pokočno"
 #: code:addons/base/ir/ir_model.py:317
 #, python-format
 msgid "Can only rename one column at a time!"
-msgstr ""
+msgstr "Preimenujete lahko samo en stolpec naenkrat!"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -9277,7 +9329,7 @@ msgstr "Gumb čarovnika"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Report/Template"
-msgstr ""
+msgstr "Poročilo/predloga"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -9311,7 +9363,7 @@ msgstr "Čarovniki za konfiguracijo"
 #. module: base
 #: field:res.lang,code:0
 msgid "Locale Code"
-msgstr ""
+msgstr "Lokalna koda"
 
 #. module: base
 #: field:workflow.activity,split_mode:0
@@ -9321,7 +9373,7 @@ msgstr "Način ločevanja"
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Note that this operation might take a few minutes."
-msgstr ""
+msgstr "Upoštevajte, da lahko ta postopek traja nekaj minut."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_localisation
@@ -9331,12 +9383,12 @@ msgstr "Lokalizacija"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Action to Launch"
-msgstr ""
+msgstr "Dejanje za sprožitev"
 
 #. module: base
 #: view:ir.cron:0
 msgid "Execution"
-msgstr ""
+msgstr "Izvršitev"
 
 #. module: base
 #: field:ir.actions.server,condition:0
@@ -9347,7 +9399,7 @@ msgstr "Pogoj"
 #. module: base
 #: help:ir.values,model_id:0
 msgid "This field is not used, it only helps you to select a good model."
-msgstr ""
+msgstr "Polje ni uporabljeno, pomaga  vam samo izbrati dober model."
 
 #. module: base
 #: field:ir.ui.view,name:0
@@ -9362,7 +9414,7 @@ msgstr "Italijansko"
 #. module: base
 #: field:ir.actions.report.xml,attachment:0
 msgid "Save As Attachment Prefix"
-msgstr ""
+msgstr "Shrani kot pripono priloge"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -9370,16 +9422,18 @@ msgid ""
 "Only one client action will be executed, last client action will be "
 "considered in case of multiple client actions."
 msgstr ""
+"Samo eno dejanje klienta bo izvršeno, zadnje dejanje klienta se bo "
+"obravnavalo v primeru večkratnih dejanj klienta."
 
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
-msgstr ""
+msgstr "%j - dan v letu[001,366]"
 
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
-msgstr ""
+msgstr "Številka mobilnega telefona"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_by_category
@@ -9393,7 +9447,7 @@ msgstr "Partnerjeve kategorije"
 #. module: base
 #: view:base.module.upgrade:0
 msgid "System Update"
-msgstr ""
+msgstr "Posodobitev sistema"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -9403,7 +9457,7 @@ msgstr "Polje čarovnika"
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
-msgstr ""
+msgstr "Predpona vrednosti zapisa za zaporedje"
 
 #. module: base
 #: model:res.country,name:base.sc
@@ -9441,23 +9495,23 @@ msgstr "Lastnik konta"
 #: code:addons/base/res/res_user.py:256
 #, python-format
 msgid "Company Switch Warning"
-msgstr ""
+msgstr "Opozorilo preklopa podjetja"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_widget_wizard
 msgid "Homepage Widgets Management"
-msgstr ""
+msgstr "Upravljanje domače strani gradnikov"
 
 #. module: base
 #: field:workflow,osv:0
 #: field:workflow.instance,res_type:0
 msgid "Resource Object"
-msgstr "Objekt resursa"
+msgstr "Predmet vira"
 
 #. module: base
 #: help:ir.sequence,number_increment:0
 msgid "The next number of the sequence will be incremented by this number"
-msgstr ""
+msgstr "Naslednje število zaporedja bo to število povečalo za to številko"
 
 #. module: base
 #: field:ir.cron,function:0
@@ -9469,12 +9523,12 @@ msgstr "Funkcija"
 #. module: base
 #: view:res.widget:0
 msgid "Search Widget"
-msgstr ""
+msgstr "Iskanje gradnika"
 
 #. module: base
 #: selection:ir.actions.todo,restart:0
 msgid "Never"
-msgstr ""
+msgstr "Nikoli"
 
 #. module: base
 #: selection:res.partner.address,type:0
@@ -9495,7 +9549,7 @@ msgstr "Gvineja Bissau"
 #. module: base
 #: view:workflow.instance:0
 msgid "Workflow Instances"
-msgstr "Primerki poteka dela"
+msgstr "Primeri delovnega procesa"
 
 #. module: base
 #: code:addons/base/res/partner/partner.py:261
@@ -9511,13 +9565,13 @@ msgstr "Severna Koreja"
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Create Object"
-msgstr "Ustvari objekt"
+msgstr "Ustvari predmet"
 
 #. module: base
 #: view:ir.filters:0
 #: field:res.log,context:0
 msgid "Context"
-msgstr ""
+msgstr "Zveza"
 
 #. module: base
 #: field:res.bank,bic:0
@@ -9545,8 +9599,8 @@ msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
 msgstr ""
-"Običajno se samodejno izbere pravi naslov glede na kontest prodajnih in "
-"nabavnih dokumentov."
+"Uporabljeno za avtomatično izbiro pravega naslova, ki se nanaša na  zvezo "
+"dokumentov prodaje in nabave."
 
 #. module: base
 #: model:res.country,name:base.lk

From 4de6b859796e6c18ce40f7776fd46437f376b33b Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 5 Oct 2011 12:21:55 +0530
Subject: [PATCH 233/304] [FIX] fix problem of poperty filed. if property field
 have a default value then check the id.

bzr revid: ysa@tinyerp.com-20111005065155-nfwersyv05ddjq40
---
 openerp/osv/fields.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 47052d0797a..dc6a05b5925 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -525,7 +525,7 @@ class many2many(_column):
     _type = 'many2many'
 
     def __init__(self, obj, rel=None, id1=None, id2=None, string='unknown', limit=None, **args):
-        """ 
+        """
         """
         _column.__init__(self, string=string, **args)
         self._obj = obj
@@ -539,7 +539,7 @@ class many2many(_column):
 
     def _sql_names(self, source_model):
         """Return the SQL names defining the structure of the m2m relationship table
-            
+
             :return: (m2m_table, local_col, dest_col) where m2m_table is the table name,
                      local_col is the name of the column holding the current model's FK, and
                      dest_col is the name of the column holding the destination model's FK, and
@@ -1216,7 +1216,7 @@ class property(function):
         default_val = self._get_default(obj, cr, uid, prop_name, context)
 
         property_create = False
-        if hasattr(default_val, '_id'):
+        if hasattr(default_val, '_id') and default_val:
             if default_val._id != id_val:
                 property_create = True
         elif id_val != default_val:

From a33bd2344c8ec94c73a8fe3ace04c86708b7e9cf Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Oct 2011 10:35:21 +0200
Subject: [PATCH 234/304] [IMP] Improved styling of labels

bzr revid: fme@openerp.com-20111005083521-ofyfzdp8olzpjnbd
---
 addons/web/static/src/css/base.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 8c99823434c..ac1309425cd 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -855,7 +855,7 @@ label.error {
     cursor: help;
 }
 
-.openerp .oe_form_field label.oe_label, .openerp .oe_form_field label.oe_label_help {
+.openerp .oe_forms label.oe_label, .openerp .oe_forms label.oe_label_help {
     text-align: right;
     margin: 3px 0 0 10px;
 }

From e510a9ce619e8b8ba95f1386e67f6717e3919239 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 5 Oct 2011 10:46:21 +0200
Subject: [PATCH 235/304] [REM] base: removed unused pdf test file

bzr revid: odo@openerp.com-20111005084621-totk30u0e0weol2o
---
 openerp/addons/base/test/partner.pdf | 118 ---------------------------
 1 file changed, 118 deletions(-)
 delete mode 100644 openerp/addons/base/test/partner.pdf

diff --git a/openerp/addons/base/test/partner.pdf b/openerp/addons/base/test/partner.pdf
deleted file mode 100644
index 1b1c7f0daac..00000000000
--- a/openerp/addons/base/test/partner.pdf
+++ /dev/null
@@ -1,118 +0,0 @@
-%PDF-1.3
-%���� ReportLab Generated PDF document http://www.reportlab.com
-% 'BasicFonts': class PDFDictionary 
-1 0 obj
-% The standard fonts dictionary
-<< /F1 2 0 R
- /F2 3 0 R
- /F3 4 0 R >>
-endobj
-% 'F1': class PDFType1Font 
-2 0 obj
-% Font Helvetica
-<< /BaseFont /Helvetica
- /Encoding /WinAnsiEncoding
- /Name /F1
- /Subtype /Type1
- /Type /Font >>
-endobj
-% 'F2': class PDFType1Font 
-3 0 obj
-% Font Helvetica-Bold
-<< /BaseFont /Helvetica-Bold
- /Encoding /WinAnsiEncoding
- /Name /F2
- /Subtype /Type1
- /Type /Font >>
-endobj
-% 'F3': class PDFType1Font 
-4 0 obj
-% Font Times-Roman
-<< /BaseFont /Times-Roman
- /Encoding /WinAnsiEncoding
- /Name /F3
- /Subtype /Type1
- /Type /Font >>
-endobj
-% 'Page1': class PDFPage 
-5 0 obj
-% Page dictionary
-<< /Contents 9 0 R
- /MediaBox [ 0
- 0
- 841.8898
- 595.2756 ]
- /Parent 8 0 R
- /Resources << /Font 1 0 R
- /ProcSet [ /PDF
- /Text
- /ImageB
- /ImageC
- /ImageI ] >>
- /Rotate 0
- /Trans <<  >>
- /Type /Page >>
-endobj
-% 'R6': class PDFCatalog 
-6 0 obj
-% Document Root
-<< /Outlines 10 0 R
- /PageMode /UseNone
- /Pages 8 0 R
- /Type /Catalog >>
-endobj
-% 'R7': class PDFInfo 
-7 0 obj
-<< /Author (Generated by OpenERP, Fabien Pinckaers)
- /CreationDate (20100421145542)
- /Keywords ()
- /Producer (ReportLab http://www.reportlab.com)
- /Subject (\(unspecified\))
- /Title (Partner) >>
-endobj
-% 'R8': class PDFPages 
-8 0 obj
-% page tree
-<< /Count 1
- /Kids [ 5 0 R ]
- /Type /Pages >>
-endobj
-% 'R9': class PDFStream 
-9 0 obj
-% page stream
-<< /Filter [ /ASCII85Decode
- /FlateDecode ]
- /Length 524 >>
-stream
-Gat=(?#P<K'R_@f5MSc<`6.HPV2s@dQRlarfjrE>3i<Y4(hW<qY=/IHPo2nd;U2u=SpPc46=:icfCoF922oN\83q_*El(+<i)0C.\*qSa'orY`+p(cC^oTpn8t,B-+=I?_Q1#SGXQbKWJ5-M7"aXRSQCBTu'NHJF046Jno-.K&2kW+&Ddh9bXc1q%)-e?DSC(5(4%=lk+ql;XaX3m]F#7K:"]hph/QW?(0_J4kXQiP</;'9K=]Wd,jeGe.Ma6pqJ&iD]r%qkNclhVq5Q/gSmK+r&6mr`*Z[m8(n)Usu)MZo%TNta^h'I^g6m5Vp92+>e[>S,B2ME\)S7:@oo6@nF8`I+h##OY3a-n#Qm!>5jiD.9pQ@E1#Xj$=)27)F3RmD%fbqZh,T`gJd0/,?A3`0:_VVm`"l`>oOf9p&HGF7>WCGVJoD2&_+c#BDb)/&0>>rL5@]KY$9YOA<rrt#g)1a61mS([/:0_[`)!ctOhSA/p@bq]>qZHTJq8k]!o+?4a5\-KbB#NYJC'`~>endstream
-
-endobj
-% 'R10': class PDFOutlines 
-10 0 obj
-<< /Count 0
- /Type /Outlines >>
-endobj
-xref
-0 11
-0000000000 65535 f
-0000000113 00000 n
-0000000233 00000 n
-0000000398 00000 n
-0000000573 00000 n
-0000000740 00000 n
-0000001017 00000 n
-0000001152 00000 n
-0000001395 00000 n
-0000001500 00000 n
-0000002169 00000 n
-trailer
-<< /ID 
- % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(\210\344\006bE\230CUUi\010[\)Qif) (\210\344\006bE\230CUUi\010[\)Qif)] 
-
- /Info 7 0 R
- /Root 6 0 R
- /Size 11 >>
-startxref
-2221
-%%EOF

From 57d1cbfe38305c5bfacd12efc40e41e77257e144 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 5 Oct 2011 10:50:22 +0200
Subject: [PATCH 236/304] [IMP] base: update default web.base.url: port
 8002->8069

bzr revid: odo@openerp.com-20111005085022-krq4qe95q84s7gol
---
 openerp/addons/base/base_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index aa1d79cc9fe..94a3780653f 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
         <record id="parameter_web_base_url" model="ir.config_parameter">
             <field name="key">web.base.url</field>
-            <field name="value">http://localhost:8002</field>
+            <field name="value">http://localhost:8069</field>
         </record>
         <record id="view_menu" model="ir.ui.view">
             <field name="name">ir.ui.menu.tree</field>

From ae0ba9586147edf8af711303884c172e45ca0c74 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 5 Oct 2011 11:05:18 +0200
Subject: [PATCH 237/304] [REM] @string on in-field filter

bzr revid: xmo@openerp.com-20111005090518-3ht49k8s6vtrxhwl
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 888c2cd7f2b..2ae910a36b3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1196,7 +1196,7 @@
                         <field name="date"/>
                         <field name="account_id"/>
                         <field name="partner_id">
-                            <filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
+                            <filter help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                         </field>
                     </group>
                     <newline/>

From 2b7b51e0b3a00ce6dbc55e5afcec5fc798c41810 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 5 Oct 2011 11:32:37 +0200
Subject: [PATCH 238/304] [fix] problem in web client not supporting graph view
 in one2many

bzr revid: nicolas.vanhoren@openerp.com-20111005093237-22dbe1jwbkqk18pt
---
 addons/idea/idea_view.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 4ac27fee51f..5f7aaaebb48 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -233,11 +233,7 @@
                         <field name="count_comments" />
                         <field name="count_votes" />
                     </group>
-                    <field name="stat_vote_ids" colspan="4" mode="graph,tree" nolabel="1">
-                        <graph string="Votes Statistics" type="bar">
-                            <field name="score"/>
-                            <field name="nbr"/>
-                        </graph>
+                    <field name="stat_vote_ids" colspan="4" mode="tree" nolabel="1">
                         <tree string="Votes Statistics">
                             <field name="score"/>
                             <field name="nbr"/>

From 2fe1e8c0d8e6e5f0b1837e3982e2ce3a5a5760e4 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 5 Oct 2011 15:05:16 +0530
Subject: [PATCH 239/304] [MERGE]

bzr revid: ysa@tinyerp.com-20111005093516-u8v7e58ndsyuxh9u
---
 openerp/osv/expression.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index acb70abd9b7..5d031472de6 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -589,13 +589,8 @@ class expression(object):
                         #Special treatment to ill-formed domains
                         operator = ( operator in ['<','>','<=','>='] ) and 'in' or operator
 
-<<<<<<< TREE
-                        dict_op = {'not in':'!=','in':'=','=':'in','!=':'not in','<>':'not in'}
-                        if isinstance(right,tuple):
-=======
                         dict_op = {'not in':'!=','in':'=','=':'in','!=':'not in'}
                         if isinstance(right, tuple):
->>>>>>> MERGE-SOURCE
                             right = list(right)
                         if (not isinstance(right, list)) and operator in ['not in','in']:
                             operator = dict_op[operator]

From 1bbe15f63441d4620f527d01134e3d4f62e540ba Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 5 Oct 2011 11:36:00 +0200
Subject: [PATCH 240/304] [fix] referencing a field in a domain that is not
 loaded in the view

bzr revid: nicolas.vanhoren@openerp.com-20111005093600-xjyqrmpoqywy1ztq
---
 addons/idea/idea_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 5f7aaaebb48..d5732d51672 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -198,6 +198,7 @@
                 <field name="category_id" select="1"/>
                 <field name="open_date" select="1"/>
                 <field name="user_id" attrs="{'invisible':[('visibility','=',False)]}"/>
+                <field name="visibility" invisible="1"/>
                 <field name="vote_avg" widget="progressbar"/>
                 <group col="4" colspan="2">
                     <field name="my_vote" readonly="1"/>

From 07121a762bf2ce598b99c85affc2f5158ef2f191 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 5 Oct 2011 15:07:09 +0530
Subject: [PATCH 241/304] [MERGE]

bzr revid: ysa@tinyerp.com-20111005093709-u3rg6g10rcs7tf8f
---
 openerp/osv/expression.py | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index 5d031472de6..25cdffd2b83 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -614,30 +614,10 @@ class expression(object):
                         if m2o_str:
                             self.__exp[i] = _get_expression(field_obj, cr, uid, left, right, operator, context=context)
                     elif right == []:
-<<<<<<< TREE
-                        m2o_str = False
-                        if operator in ('not in', '!=', '<>'):
-                            # (many2one not in []) should return all records
-                            self.__exp[i] = self.__DUMMY_LEAF
-                        else:
-                            self.__exp[i] = ('id','=',0)
-                    else:
-                        new_op = '='
-                        if operator in  ['not like','not ilike','not in','<>','!=']:
-                            new_op = '!='
-                        #Is it ok to put 'left' and not 'id' ?
-                        self.__exp[i] = (left,new_op,False)
-=======
                         pass # Handled by __leaf_to_sql().
                     else: # right is False
                         pass # Handled by __leaf_to_sql().
->>>>>>> MERGE-SOURCE
 
-<<<<<<< TREE
-                    if m2o_str:
-                        self.__exp[i] = _get_expression(field_obj,cr, uid, left, right, operator, context=context)
-=======
->>>>>>> MERGE-SOURCE
             else:
                 # other field type
                 # add the time part to datetime field when it's not there:

From e0a68f3be18e404b8eb38309fee117eb8d706fd6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 5 Oct 2011 11:48:43 +0200
Subject: [PATCH 242/304] [REM] res.partner: moved opt_out field to
 email_template module

bzr revid: odo@openerp.com-20111005094843-ov5p9em7mzxb2pkn
---
 openerp/addons/base/res/res_partner.py       |  3 --
 openerp/addons/base/res/res_partner_demo.xml | 30 --------------------
 openerp/addons/base/res/res_partner_view.xml |  1 -
 3 files changed, 34 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index f8d1e6dd980..54f61e6f41e 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -111,8 +111,6 @@ class res_partner(osv.osv):
     _order = "name"
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
-        'opt_out':fields.boolean('Opt-out', help="If checked, this partner will not receive any automated email \
-notifications, such as the availability of invoices."),
         'date': fields.date('Date', select=1),
         'title': fields.many2one('res.partner.title','Partner Firm'),
         'parent_id': fields.many2one('res.partner','Parent Partner'),
@@ -155,7 +153,6 @@ notifications, such as the availability of invoices."),
         'address': [{'type': 'default'}],
         'category_id': _default_category,
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c),
-        'opt_out' : False,
         'color': 0,
     }
 
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index f106702cd61..d3c4db106f9 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -94,7 +94,6 @@
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="website">www.asustek.com</field>
         </record>
         <record id="res_partner_agrolait" model="res.partner">
@@ -102,7 +101,6 @@
             <field eval="[(6, 0, [ref('base.res_partner_category_0')])]" name="category_id"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="website">www.agrolait.com</field>
         </record>
         <record id="res_partner_c2c" model="res.partner">
@@ -111,7 +109,6 @@
             <field name="supplier">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="website">www.camptocamp.com</field>
         </record>
         <record id="res_partner_sednacom" model="res.partner">
@@ -119,14 +116,12 @@
             <field name="name">Syleam</field>
             <field eval="[(6, 0, [ref('res_partner_category_5')])]" name="category_id"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="user_id" ref="user_demo"/>
         </record>
         <record id="res_partner_thymbra" model="res.partner">
             <field name="name">Thymbra</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="[(6, 0, [ref('res_partner_category_4')])]" name="category_id"/>
-            <field name="opt_out" eval="True"/>
             <field name="website">www.thymbra.com/</field>
         </record>
         <record id="res_partner_desertic_hispafuentes" model="res.partner">
@@ -134,7 +129,6 @@
             <field eval="[(6, 0, [ref('res_partner_category_4')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="user_id" ref="user_demo"/>
             <field name="website">www.axelor.com/</field>
         </record>
@@ -142,13 +136,11 @@
             <field name="name">Tiny AT Work</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="[(6, 0, [ref('res_partner_category_5'), ref('res_partner_category_10')])]" name="category_id"/>
-            <field name="opt_out" eval="True"/>
             <field name="website">www.tinyatwork.com/</field>
         </record>
         <record id="res_partner_2" model="res.partner">
             <field name="name">Bank Wealthy and sons</field>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="website">www.wealthyandsons.com/</field>
         </record>
@@ -156,7 +148,6 @@
             <field name="name">China Export</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="website">www.chinaexport.com/</field>
         </record>
@@ -166,14 +157,12 @@
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="website">www.distribpc.com/</field>
         </record>
         <record id="res_partner_5" model="res.partner">
             <field name="name">Ecole de Commerce de Liege</field>
             <field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="user_id" ref="user_demo"/>
             <field name="website">www.eci-liege.info//</field>
         </record>
@@ -184,7 +173,6 @@
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
         </record>
         <record id="res_partner_maxtor" model="res.partner">
             <field name="name">Maxtor</field>
@@ -194,7 +182,6 @@
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
         </record>
         <record id="res_partner_seagate" model="res.partner">
             <field name="name">Seagate</field>
@@ -203,7 +190,6 @@
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
         </record>
         <record id="res_partner_8" model="res.partner">
             <field name="website">http://mediapole.net</field>
@@ -211,7 +197,6 @@
             <field name="user_id" ref="user_demo"/>
             <field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
         </record>
         <record id="res_partner_9" model="res.partner">
             <field name="website">www.balmerinc.com</field>
@@ -221,14 +206,12 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
         </record>
         <record id="res_partner_10" model="res.partner">
             <field name="name">Tecsas</field>
             <field name="ean13">3020170000003</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="user_id" ref="user_demo"/>
         </record>
         <record id="res_partner_11" model="res.partner">
@@ -237,7 +220,6 @@
             <field name="user_id" ref="user_demo"/>
             <field eval="[(6, 0, [ref('res_partner_category_0')])]" name="category_id"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
         </record>
         <record id="res_partner_14" model="res.partner">
             <field name="name">Centrale d'achats BML</field>
@@ -246,7 +228,6 @@
             <field name="parent_id" ref="res_partner_10"/>
             <field eval="[(6, 0, [ref('res_partner_category_11')])]" name="category_id"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="user_id" ref="user_demo"/>
         </record>
         <record id="res_partner_15" model="res.partner">
@@ -257,13 +238,11 @@
             <field name="user_id" ref="user_demo"/>
             <field eval="[(6, 0, [ref('res_partner_category_11')])]" name="category_id"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
         </record>
         <record id="res_partner_accent" model="res.partner">
             <field name="name">Université de Liège</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="user_id" ref="user_demo"/>
             <field name="website">http://www.ulg.ac.be/</field>
         </record>
@@ -277,7 +256,6 @@
             <field model="res.users" name="user_id" search="[('name', '=', u'Thomas Lebrun')]"/>
             <field name="name">Dubois sprl</field>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="website">http://www.dubois.be/</field>
         </record>
 
@@ -285,20 +263,17 @@
             <field name="name">Eric Dubois</field>
             <field name="address" eval="[]"/>
             <field name="user_id" ref="user_demo"/>
-            <field name="opt_out" eval="True"/>
         </record>
 
         <record id="res_partner_fabiendupont0" model="res.partner">
             <field name="name">Fabien Dupont</field>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
 
         <record id="res_partner_lucievonck0" model="res.partner">
             <field name="name">Lucie Vonck</field>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
         </record>
 
         <record id="res_partner_notsotinysarl0" model="res.partner">
@@ -306,7 +281,6 @@
             <field name="address" eval="[]"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="website">notsotiny.be</field>
-            <field name="opt_out" eval="True"/>
         </record>
 
         <record id="res_partner_theshelvehouse0" model="res.partner">
@@ -314,7 +288,6 @@
             <field eval="[(6,0,[ref('res_partner_category_retailers0')])]" name="category_id"/>
             <field name="address" eval="[]"/>
             <field name="user_id" ref="base.user_root"/>
-            <field name="opt_out" eval="True"/>
         </record>
 
         <record id="res_partner_vickingdirect0" model="res.partner">
@@ -323,7 +296,6 @@
             <field name="supplier">1</field>
             <field name="customer">0</field>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="website">vicking-direct.be</field>
         </record>
 
@@ -333,7 +305,6 @@
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
             <field name="address" eval="[]"/>
-            <field name="opt_out" eval="True"/>
             <field name="website">woodywoodpecker.com</field>
         </record>
 
@@ -342,7 +313,6 @@
             <field eval="[(6,0,[ref('res_partner_category_consumers0')])]" name="category_id"/>
             <field name="address" eval="[]"/>
             <field name="user_id" ref="base.user_root"/>
-            <field name="opt_out" eval="True"/>
             <field name="website">http://www.zerooneinc.com/</field>
         </record>
 
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 58a62285ab0..5f3ebf73f46 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -332,7 +332,6 @@
                         <group colspan="1" col="2">
                             <field name="customer" select="1"/>
                             <field name="supplier"/>
-                            <field name="opt_out"/>
 <!--                            <field name="employee"/>-->
                         </group>
                     </group>

From 847ee8333dc9c20bd40ab1135e2388406aa6f8e5 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 5 Oct 2011 11:55:05 +0200
Subject: [PATCH 243/304] [FIX] correct module loading in local mode

bzr revid: chs@openerp.com-20111005095505-vepaqeupdn5qywcc
---
 addons/web/controllers/main.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 9be0794a8bb..843601da5f2 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -358,12 +358,18 @@ class Session(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def modules(self, req):
-        # TODO query server for installed web modules
-        mods = []
-        for name, manifest in openerpweb.addons_manifest.items():
-            # TODO replace by ir.module.module installed web
-            if name not in req.config.server_wide_modules and manifest.get('active', True):
-                mods.append(name)
+        candidates = [mod for mod in openerpweb.addons_manifest.keys() if mod not in req.config.server_wide_modules]
+
+        if req.config.backend == 'local':
+            # if local backend, the modules are shared with the server
+            Modules = req.session.model('ir.module.module')
+            ids = Modules.search(
+                ['&', ('state', '=', 'installed'), ('name', 'in', candidates)]
+            )
+            mods = map(operator.itemgetter('name'), Modules.read(ids, ['name']))
+
+        else:
+            mods = [name for name in candidates if openerpweb.addons_manifest[name].get('active', True)]
         return mods
 
     @openerpweb.jsonrequest

From 708802c3575d5285309eb6bfb888ba583e00075c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 5 Oct 2011 11:56:33 +0200
Subject: [PATCH 244/304] [fix] problem with the idea module trying to override
 the 'active_id' context key, which it should not

bzr revid: nicolas.vanhoren@openerp.com-20111005095633-v53hjz3fkwlb3fso
---
 addons/idea/wizard/idea_post_vote.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index b54c007549d..df35f42cc33 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -73,12 +73,14 @@ class idea_post_vote(osv.osv_memory):
         """
         idea_obj = self.pool.get('idea.idea')
         vote_obj = self.pool.get('idea.vote')
+        
+        ctx_key = 'idea_ids' if context.get('idea_ids') is not None else 'active_ids'
 
-        for idea in idea_obj.browse(cr, uid, context.get('active_ids', []), context=context):
+        for idea in idea_obj.browse(cr, uid, context.get(ctx_key, []), context=context):
 
-            for active_id in context.get('active_ids'):
+            for idea_id in context.get(ctx_key):
 
-                vote_ids = vote_obj.search(cr, uid, [('user_id', '=', uid), ('idea_id', '=', active_id)])
+                vote_ids = vote_obj.search(cr, uid, [('user_id', '=', uid), ('idea_id', '=', idea_id)])
                 vote_obj_id = vote_obj.browse(cr, uid, vote_ids)
                 count = 0
                 for vote in vote_obj_id:
@@ -166,7 +168,7 @@ class idea_select(osv.osv_memory):
             'views': [(id2, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
             'type': 'ir.actions.act_window',
             'target': 'new',
-            'context': {'active_ids': [idea_id]}
+            'context': {'idea_ids': [idea_id]}
        }
        return value
 

From cab4e9c4a51bf82ecc760a0219c2c0ff176da7d0 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 5 Oct 2011 12:14:01 +0200
Subject: [PATCH 245/304] [FIX] orm: allow negative varchar size (meaning no
 limit) as used in some addons.

bzr revid: vmt@openerp.com-20111005101401-7jweikyl9ztibe4q
---
 openerp/osv/orm.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 3f1bb60562c..f00e9319126 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -504,7 +504,8 @@ class browse_record(object):
 def pg_varchar(size=0):
     """ Returns the VARCHAR declaration for the provided size:
 
-    * If no size (or an empty size is provided) return an 'infinite' VARCHAR
+    * If no size (or an empty or negative size is provided) return an
+      'infinite' VARCHAR
     * Otherwise return a VARCHAR(n)
 
     :type int size: varchar size, optional
@@ -514,10 +515,8 @@ def pg_varchar(size=0):
         if not isinstance(size, int):
             raise TypeError("VARCHAR parameter should be an int, got %s"
                             % type(size))
-        if size < 0:
-            raise ValueError("VARCHAR parameter can not be negative, got %d"
-                             % size)
-        return 'VARCHAR(%d)' % size
+        if size > 0:
+            return 'VARCHAR(%d)' % size
     return 'VARCHAR'
 
 FIELDS_TO_PGTYPES = {

From 19b7493711b15af850c59fae2cbc64fa364c3f1e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Oct 2011 12:17:14 +0200
Subject: [PATCH 246/304] [FIX] When reaching ir_actions_act_window_close
 without dialog, call on_closed if any

The static homepage do not reload the page when the module installed have no configuration actions (eg: returning direcly ir_actions_act_window_close)

bzr revid: fme@openerp.com-20111005101714-s5jy3gslni00a5jo
---
 addons/web/static/src/js/views.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 28e9772da77..d7de7ee1633 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -116,6 +116,9 @@ db.web.ActionManager = db.web.Widget.extend({
         */
     },
     ir_actions_act_window_close: function (action, on_closed) {
+        if (!this.dialog && on_closed) {
+            on_closed();
+        }
         this.dialog_stop();
     },
     ir_actions_server: function (action, on_closed) {

From 7ccc7f388f788cabc11692fd2a14dc8a050c0f07 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 5 Oct 2011 12:51:03 +0200
Subject: [PATCH 247/304] [IMP] fields.reference: two loops one loop.

bzr revid: vmt@openerp.com-20111005105103-cutnuvfkgsjej3vc
---
 openerp/osv/fields.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index a358e20a2bf..aae6e4a2539 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -164,14 +164,13 @@ class reference(_column):
     def get(self, cr, obj, ids, name, uid=None, context=None, values=None):
         result = {}
         # copy initial values fetched previously.
-        for row in values:
-            result[row['id']] = row[name]
-        # verify target object exists
-        for id, value in result.iteritems():
-            if value:
-                model, res_id = value.split(',')
-                if not obj.pool.get(model).exists(cr, uid, [int(res_id)], context=context):
-                    result[id] = False
+        for value in values:
+            if value[name]:
+                model, res_id = value[name].split(',')
+                if obj.pool.get(model).exists(cr, uid, [int(res_id)], context=context):
+                    result[value['id']] = value[name]
+                else:
+                    result[value['id']] = False
         return result
 
 class char(_column):

From 68cd9188b988176cf531cd7824afdb70f22c19d9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 5 Oct 2011 12:57:31 +0200
Subject: [PATCH 248/304] [FIX] handling of value and default domain in search
 m2o

bzr revid: xmo@openerp.com-20111005105731-9431uvhay91bt10c
---
 addons/web/static/src/js/search.js | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index cf253c3d54b..f019efa6df9 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -895,16 +895,32 @@ openerp.web.search.ManyToOneField = openerp.web.search.CharField.extend({
         }
         return this._super(defaults);
     },
-    make_domain: function (name, operator, value) {
+    /**
+     * m2o default domain has a different fallback method than normal char widget:
+     *
+     * * If an ``this.id`` is set on the field and the field's input value is
+     *   the same as ``this.name``, the operator is ``this.operator || =``
+     *   and the value is ``this.id``
+     * * If
+     */
+    make_domain: function (name) {
+        var value = this.$element.val();
         if (this.id && this.name) {
             if (value === this.name) {
-                return [[name, '=', this.id]];
+                return [[name, this.attrs.operator || '=', this.id]];
             } else {
                 delete this.id;
                 delete this.name;
             }
         }
-        return this._super(name, operator, value);
+        if (value === null || value === '') { return; }
+        return this._super(name, this.default_operator, value);
+    },
+    /**
+     * m2o field's normal value is the id of the m2o record
+     */
+    get_value: function () {
+        return this.id || false;
     }
 });
 

From 072bb3d8ec4de14db4cef6335d0f4c95f83c2a93 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 5 Oct 2011 13:12:10 +0200
Subject: [PATCH 249/304] [FIX] viewmanageraction loading: auto_search is the
 default, not the exception

this means if the auto_search attribute is missing, search automatically. Search should only
be prevented if auto_search is precisely false

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

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index d7de7ee1633..46091fa91b7 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -382,7 +382,7 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
         var main_view_loaded = this._super();
 
         var manager_ready = $.when(searchview_loaded, main_view_loaded);
-        if (searchview_loaded && this.action['auto_search']) {
+        if (searchview_loaded && this.action['auto_search'] !== false) {
             // schedule auto_search
             manager_ready.then(this.searchview.do_search);
         }

From 5eeeb67e6dafa2e53a5af520d7a3ae77bfbe3b12 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 5 Oct 2011 13:24:44 +0200
Subject: [PATCH 250/304] [IMP] raise error when iterating over browse_record

Python has an iteration fallback protocol: when iterating over an
object which does not define __iter__, if the object defines
__getitem__ it considers that it's a list, and invokes __getitem__
from index `0`.

This can be a problem in openerp in methods which expect an list of
ids but are only given a single id (not a singleton list), in that
case self.browse() will return a single browse_record (instea of a
list) and the method tries to iterate over it by calling
browse_record.__getitem__.

Problem is that browse_record.__getitem__ is pretty deep and does
little validation, so the error appears 3 frames below where the
actual issue is with a completely cryptic message of "KeyError: 0",
which makes the actual harder to track.

By raising an error immediately in browse_record.__iter__, this kind
of issues is much easier to handle, the stack points precisely to the
frame in error with a clearer message.

bzr revid: xmo@openerp.com-20111005112444-jcp9fw6pa36ahpsd
---
 openerp/osv/orm.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 47f6ac34e1b..5bafd964a61 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -462,6 +462,9 @@ class browse_record(object):
     def __contains__(self, name):
         return (name in self._table._columns) or (name in self._table._inherit_fields) or hasattr(self._table, name)
 
+    def __iter__(self):
+        raise NotImplementedError("Iteration is not allowed on %s" % self)
+
     def __hasattr__(self, name):
         return name in self
 

From d801f211460cadf835087a86e8303acec3e7947c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 5 Oct 2011 15:02:52 +0200
Subject: [PATCH 251/304] [REV] 1150, broke filter_domain in case of empty
 field

bzr revid: xmo@openerp.com-20111005130252-oovrpbo4a1pjavwd
---
 addons/web/static/src/js/search.js | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index f019efa6df9..cf253c3d54b 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -895,32 +895,16 @@ openerp.web.search.ManyToOneField = openerp.web.search.CharField.extend({
         }
         return this._super(defaults);
     },
-    /**
-     * m2o default domain has a different fallback method than normal char widget:
-     *
-     * * If an ``this.id`` is set on the field and the field's input value is
-     *   the same as ``this.name``, the operator is ``this.operator || =``
-     *   and the value is ``this.id``
-     * * If
-     */
-    make_domain: function (name) {
-        var value = this.$element.val();
+    make_domain: function (name, operator, value) {
         if (this.id && this.name) {
             if (value === this.name) {
-                return [[name, this.attrs.operator || '=', this.id]];
+                return [[name, '=', this.id]];
             } else {
                 delete this.id;
                 delete this.name;
             }
         }
-        if (value === null || value === '') { return; }
-        return this._super(name, this.default_operator, value);
-    },
-    /**
-     * m2o field's normal value is the id of the m2o record
-     */
-    get_value: function () {
-        return this.id || false;
+        return this._super(name, operator, value);
     }
 });
 

From 25a883b2aad12bbb957b25ba88e0a2c657f2b32b Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 5 Oct 2011 15:33:37 +0200
Subject: [PATCH 252/304] [FIX] expression: we dont add any restriction on the
 main ids as the possible active=True/False is already present in the main
 domain.

bzr revid: vmt@openerp.com-20111005133337-p8nvv26tlii7x253
---
 openerp/addons/base/test/test_osv_expression.yml | 2 +-
 openerp/osv/expression.py                        | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/openerp/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml
index d7e342926d0..f67a99cdf46 100644
--- a/openerp/addons/base/test/test_osv_expression.yml
+++ b/openerp/addons/base/test/test_osv_expression.yml
@@ -500,7 +500,7 @@
         except psycopg2.DataError:
             # Should give: 'DataError: invalid input syntax for type timestamp' or similar
             cr.execute('ROLLBACK TO SAVEPOINT expression_failure_test')
-
+-
     Testing for Many2Many field with category supplier and active=False
 -
     !python {model: res.partner }: |
diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index 25cdffd2b83..cf7ef3b70cf 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -405,10 +405,6 @@ class expression(object):
                 return [value]
             return list(value)
 
-        active = False
-        for exp in self.__exp:
-            if exp[0] == 'active':
-                active = exp
         i = -1
         while i + 1<len(self.__exp):
             i += 1
@@ -466,10 +462,7 @@ class expression(object):
                 # Making search easier when there is a left operand as field.o2m or field.m2m
                 if field._type in ['many2many', 'one2many']:
                     right = field_obj.search(cr, uid, [(field_path[1], operator, right)], context=context)
-                    domain = [(fargs[0],'in', right)]
-                    if active:
-                        domain.append(active)
-                    right1 = table.search(cr, uid, domain, context=context)
+                    right1 = table.search(cr, uid, [(field_path[0],'in', right)], context=dict(context, active_test=False))
                     self.__exp[i] = ('id', 'in', right1)
 
                 if not isinstance(field, fields.property):

From c629763a0f7ac29648a64473a1bfc328d23d40ef Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 5 Oct 2011 15:55:49 +0200
Subject: [PATCH 253/304] [FIX] two loops one loop (a previous commit) was
 wrongly done :(.

bzr revid: vmt@openerp.com-20111005135549-xvhtt57fl1ib7o6e
---
 openerp/osv/fields.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index aae6e4a2539..6cc5255faa7 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -165,11 +165,10 @@ class reference(_column):
         result = {}
         # copy initial values fetched previously.
         for value in values:
+            result[value['id']] = value[name]
             if value[name]:
                 model, res_id = value[name].split(',')
-                if obj.pool.get(model).exists(cr, uid, [int(res_id)], context=context):
-                    result[value['id']] = value[name]
-                else:
+                if not obj.pool.get(model).exists(cr, uid, [int(res_id)], context=context):
                     result[value['id']] = False
         return result
 

From 3dc8168974b024a5fca9d1cd83329f7d19dc17ff Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 5 Oct 2011 16:19:02 +0200
Subject: [PATCH 254/304] [FIX] Set the categories

bzr revid: stw@openerp.com-20111005141902-72du0lku4x176ix9
---
 addons/account_accountant/__openerp__.py            |  2 +-
 addons/account_analytic_analysis/__openerp__.py     |  2 +-
 addons/account_analytic_default/__openerp__.py      |  2 +-
 addons/account_analytic_plans/__openerp__.py        |  2 +-
 addons/account_anglo_saxon/__openerp__.py           |  2 +-
 addons/account_asset/__openerp__.py                 |  4 ++--
 addons/account_budget/__openerp__.py                |  2 +-
 addons/account_cancel/__openerp__.py                |  2 +-
 addons/account_chart/__openerp__.py                 |  2 +-
 addons/account_coda/__openerp__.py                  |  2 +-
 addons/account_followup/__openerp__.py              |  2 +-
 addons/account_invoice_layout/__openerp__.py        |  2 +-
 addons/account_payment/__openerp__.py               |  2 +-
 addons/account_sequence/__openerp__.py              |  2 +-
 addons/account_voucher/__openerp__.py               |  2 +-
 addons/analytic/__openerp__.py                      |  2 +-
 addons/analytic_journal_billing_rate/__openerp__.py |  2 +-
 addons/analytic_user_function/__openerp__.py        |  2 +-
 addons/anonymization/__openerp__.py                 |  2 +-
 addons/association/__openerp__.py                   |  2 +-
 addons/auction/__openerp__.py                       |  2 +-
 addons/audittrail/__openerp__.py                    |  2 +-
 addons/auth_openid/__openerp__.py                   |  2 +-
 addons/base_action_rule/__openerp__.py              |  2 +-
 addons/base_calendar/__openerp__.py                 |  2 +-
 addons/base_contact/__openerp__.py                  |  2 +-
 addons/base_crypt/__openerp__.py                    |  2 +-
 addons/base_iban/__openerp__.py                     |  2 +-
 addons/base_module_doc_rst/__openerp__.py           |  2 +-
 addons/base_module_quality/__openerp__.py           |  2 +-
 addons/base_module_record/__openerp__.py            |  2 +-
 addons/base_report_creator/__openerp__.py           |  2 +-
 addons/base_report_designer/__openerp__.py          |  2 +-
 addons/base_setup/__openerp__.py                    |  2 +-
 addons/base_synchro/__openerp__.py                  |  2 +-
 addons/base_tools/__openerp__.py                    |  2 +-
 addons/base_vat/__openerp__.py                      |  2 +-
 addons/board/__openerp__.py                         |  2 +-
 addons/caldav/__openerp__.py                        |  2 +-
 addons/claim_from_delivery/__openerp__.py           |  2 +-
 addons/crm_caldav/__openerp__.py                    |  2 +-
 addons/crm_claim/__openerp__.py                     |  2 +-
 addons/crm_fundraising/__openerp__.py               |  2 +-
 addons/crm_helpdesk/__openerp__.py                  |  2 +-
 addons/crm_partner_assign/__openerp__.py            |  2 +-
 addons/crm_profiling/__openerp__.py                 |  2 +-
 addons/decimal_precision/__openerp__.py             |  2 +-
 addons/delivery/__openerp__.py                      |  2 +-
 addons/document_ftp/__openerp__.py                  |  2 +-
 addons/document_ics/__openerp__.py                  |  2 +-
 addons/document_webdav/__openerp__.py               |  2 +-
 addons/email_template/__openerp__.py                |  2 +-
 addons/event/__openerp__.py                         |  2 +-
 addons/event_project/__openerp__.py                 |  2 +-
 addons/fetchmail/__openerp__.py                     |  2 +-
 addons/fetchmail_crm/__openerp__.py                 |  2 +-
 addons/fetchmail_crm_claim/__openerp__.py           |  2 +-
 addons/fetchmail_hr_recruitment/__openerp__.py      |  2 +-
 addons/fetchmail_project_issue/__openerp__.py       |  2 +-
 addons/google_base_account/__openerp__.py           |  2 +-
 addons/google_map/__openerp__.py                    |  2 +-
 addons/hr_attendance/__openerp__.py                 |  2 +-
 addons/hr_contract/__openerp__.py                   |  2 +-
 addons/hr_evaluation/__openerp__.py                 |  2 +-
 addons/hr_expense/__openerp__.py                    |  2 +-
 addons/hr_holidays/__openerp__.py                   |  2 +-
 addons/hr_payroll/__openerp__.py                    |  2 +-
 addons/hr_payroll_account/__openerp__.py            |  2 +-
 addons/hr_recruitment/__openerp__.py                |  2 +-
 addons/hr_timesheet/__openerp__.py                  |  2 +-
 addons/hr_timesheet_invoice/__openerp__.py          |  2 +-
 addons/html_view/__openerp__.py                     |  2 +-
 addons/idea/__openerp__.py                          |  4 ++--
 addons/import_base/__openerp__.py                   |  2 +-
 addons/import_google/__openerp__.py                 |  2 +-
 addons/import_sugarcrm/__openerp__.py               |  2 +-
 addons/knowledge/__openerp__.py                     |  6 +++---
 addons/lunch/__openerp__.py                         |  4 ++--
 addons/mail/__openerp__.py                          |  4 ++--
 addons/marketing_campaign/__openerp__.py            |  2 +-
 addons/marketing_campaign_crm_demo/__openerp__.py   |  2 +-
 addons/membership/__openerp__.py                    |  2 +-
 addons/mrp_jit/__openerp__.py                       |  2 +-
 addons/mrp_operations/__openerp__.py                |  2 +-
 addons/mrp_repair/__openerp__.py                    |  2 +-
 addons/mrp_subproduct/__openerp__.py                |  2 +-
 addons/multi_company/__openerp__.py                 |  2 +-
 addons/outlook/__openerp__.py                       |  2 +-
 addons/pad/__openerp__.py                           |  4 ++--
 addons/point_of_sale/__openerp__.py                 |  2 +-
 addons/portal/__openerp__.py                        |  2 +-
 addons/process/__openerp__.py                       |  2 +-
 addons/product/__openerp__.py                       |  2 +-
 addons/product_expiry/__openerp__.py                |  2 +-
 addons/product_manufacturer/__openerp__.py          |  2 +-
 addons/product_margin/__openerp__.py                |  2 +-
 addons/product_visible_discount/__openerp__.py      |  2 +-
 addons/profile_tools/__openerp__.py                 | 10 +++++-----
 addons/project_caldav/__openerp__.py                |  2 +-
 addons/project_gtd/__openerp__.py                   |  2 +-
 addons/project_issue/__openerp__.py                 |  2 +-
 addons/project_issue_sheet/__openerp__.py           |  2 +-
 addons/project_long_term/__openerp__.py             |  2 +-
 addons/project_mailgate/__openerp__.py              |  2 +-
 addons/project_messages/__openerp__.py              |  2 +-
 addons/project_mrp/__openerp__.py                   |  2 +-
 addons/project_planning/__openerp__.py              |  2 +-
 addons/project_retro_planning/__openerp__.py        |  2 +-
 addons/project_scrum/__openerp__.py                 |  2 +-
 addons/project_timesheet/__openerp__.py             |  2 +-
 addons/purchase_analytic_plans/__openerp__.py       |  2 +-
 addons/purchase_double_validation/__openerp__.py    |  2 +-
 addons/purchase_requisition/__openerp__.py          |  2 +-
 addons/report_designer/__openerp__.py               | 10 +++++-----
 addons/report_intrastat/__openerp__.py              |  2 +-
 addons/report_webkit/__openerp__.py                 |  2 +-
 addons/report_webkit_sample/__openerp__.py          |  2 +-
 addons/resource/__openerp__.py                      |  2 +-
 addons/sale_analytic_plans/__openerp__.py           |  2 +-
 addons/sale_crm/__openerp__.py                      |  4 ++--
 addons/sale_journal/__openerp__.py                  |  2 +-
 addons/sale_layout/__openerp__.py                   |  2 +-
 addons/sale_margin/__openerp__.py                   |  2 +-
 addons/sale_mrp/__openerp__.py                      |  2 +-
 addons/sale_order_dates/__openerp__.py              |  2 +-
 addons/share/__openerp__.py                         |  4 ++--
 addons/stock_invoice_directly/__openerp__.py        |  2 +-
 addons/stock_location/__openerp__.py                |  2 +-
 addons/stock_no_autopicking/__openerp__.py          |  2 +-
 addons/stock_planning/__openerp__.py                |  2 +-
 addons/subscription/__openerp__.py                  |  4 ++--
 addons/survey/__openerp__.py                        |  4 ++--
 addons/thunderbird/__openerp__.py                   |  2 +-
 addons/users_ldap/__openerp__.py                    |  2 +-
 addons/warning/__openerp__.py                       |  2 +-
 addons/web_livechat/__openerp__.py                  |  2 +-
 addons/web_uservoice/__openerp__.py                 |  2 +-
 addons/wiki/__openerp__.py                          |  2 +-
 addons/wiki_faq/__openerp__.py                      |  2 +-
 addons/wiki_quality_manual/__openerp__.py           |  2 +-
 addons/wiki_sale_faq/__openerp__.py                 |  2 +-
 141 files changed, 160 insertions(+), 160 deletions(-)

diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index 112eca2a42f..d808a38fa18 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -22,7 +22,7 @@
     "name" : "Accountant Access",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Accounting & Finance',
+    "category": 'Hidden',
     'complexity': "normal",
     "description": """
 Accounting Access Rights.
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index fb1ed78ab9a..f75fe3d1615 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name'      : 'Analytic Account View',
     'version'   : '1.1',
-    'category'  : 'Accounting & Finance',
+    'category'  : 'Hidden',
     '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 f1c6e7c0847..e46f285d9c6 100644
--- a/addons/account_analytic_default/__openerp__.py
+++ b/addons/account_analytic_default/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name'      : 'Account Analytic Defaults',
     'version'   : '1.0',
-    'category'  : 'Accounting & Finance',
+    'category'  : 'Hidden',
     '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 b7bfa1a21ab..ffb20ffe3e8 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name'      : 'Manage multiple plans in Analytic Accounting',
+    'name'      : 'Multiple Analytic Plans',
     'version'   : '1.0',
     'category'  : 'Accounting & Finance',
     'complexity': "normal",
diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py
index d431ef053a0..8cf6a37c3fc 100644
--- a/addons/account_anglo_saxon/__openerp__.py
+++ b/addons/account_anglo_saxon/__openerp__.py
@@ -19,7 +19,7 @@
 ##############################################################################
 
 {
-    "name"      : "Stock Accounting for Anglo-Saxon countries",
+    "name"      : "Anglo-Saxon Accouting",
     "version"   : "1.2",
     "author"    : "OpenERP SA, Veritos",
     "website"   : "http://tinyerp.com - http://veritos.nl",
diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
index 584a1622411..dd1161e1a14 100644
--- a/addons/account_asset/__openerp__.py
+++ b/addons/account_asset/__openerp__.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 {
-    "name" : "Asset management",
+    "name" : "Assets Management",
     "version" : "1.0",
     "depends" : ["account"],
-    "author" : "Tiny",
+    "author" : "OpenERP S.A.",
     "description": """Financial and accounting asset management.
     This Module manages the assets owned by a company or an individual. It will keep track of depreciation's occurred on 
     those assets. And it allows to create Move's of the depreciation lines.
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index 3e4318b7da9..e4782ee0d2a 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Budget Management',
+    'name': 'Budgets',
     'version': '1.0',
     'category': 'Project Management',
     'complexity': "normal",
diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
index 647146f98fb..ac73a2b8c31 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Cancel Entries",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Accounting & Finance',
+    "category": 'Hidden',
     'complexity': "normal",
     "description": """
 Allows cancelling accounting entries.
diff --git a/addons/account_chart/__openerp__.py b/addons/account_chart/__openerp__.py
index 39bcd1e082f..948f13b5dcb 100644
--- a/addons/account_chart/__openerp__.py
+++ b/addons/account_chart/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Charts of Accounts',
     'version': '1.1',
-    'category': 'Accounting & Finance',
+    'category': 'Hidden',
     'description': """
 Remove minimal account chart.
 =============================
diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py
index 17b8cc27e96..dd604e41aca 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/account_coda/__openerp__.py
@@ -23,7 +23,7 @@
     "name"      : "Account CODA - import bank statements from coda file",
     "version"   : "1.0",
     "author"    : "OpenERP SA",
-    "category"  : "Accounting & Finance",
+    "category"  : "Hidden",
     'complexity': "normal",
     "description": """
 Module provides functionality to import bank statements from coda files.
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 90c89dc89b2..ca6321d5672 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Reminders',
+    'name': 'Followups Management',
     'version': '1.0',
     'category': 'Accounting & Finance',
     'complexity': "normal",
diff --git a/addons/account_invoice_layout/__openerp__.py b/addons/account_invoice_layout/__openerp__.py
index dd065fdc4fb..557f3c2e02c 100644
--- a/addons/account_invoice_layout/__openerp__.py
+++ b/addons/account_invoice_layout/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Improve Invoice Layout',
     'version': '1.0',
-    'category': 'Accounting & Finance',
+    'category': 'Hidden',
     '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 24c0a37450d..1912dfa5198 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name": "Payment Management",
+    "name": "Suppliers Payment Management",
     "version": "1.1",
     "author": "OpenERP SA",
     "category": "Accounting & Finance",
diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py
index 57eade4ee28..31d4f373e2f 100644
--- a/addons/account_sequence/__openerp__.py
+++ b/addons/account_sequence/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Entries Sequence Numbering',
     'version': '1.1',
-    'category': 'Accounting & Finance',
+    'category': 'Hidden',
     '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 87d009d2e14..97ac9950efb 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -32,7 +32,7 @@ Account Voucher module includes all the basic requirements of Voucher Entries fo
     * Voucher Receipt
     * Cheque Register
     """,
-    "category" : "Manufacturing",
+    "category" : "Hidden",
     "website" : "http://tinyerp.com",
     "images" : ["images/customer_payment.jpeg","images/journal_voucher.jpeg","images/sales_receipt.jpeg","images/supplier_voucher.jpeg"],
     "depends" : ["account"],
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index ac461d8b596..65f6588a1e3 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -24,7 +24,7 @@
     "version": "1.1",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Accounting & Finance",
+    "category" : "Hidden",
     "depends" : ["base", "decimal_precision"],
     "description": """
 Module for defining analytic accounting object.
diff --git a/addons/analytic_journal_billing_rate/__openerp__.py b/addons/analytic_journal_billing_rate/__openerp__.py
index a9241213251..059e85d9367 100644
--- a/addons/analytic_journal_billing_rate/__openerp__.py
+++ b/addons/analytic_journal_billing_rate/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Analytic Journal Billing Rate, Define the default invoicing rate for a specific journal',
     'version': '1.0',
-    'category': 'Human Resources',
+    'category': 'Hidden',
     'description': """
 This module allows you to define what is the default invoicing rate for a specific journal on a given account.
 ==============================================================================================================
diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py
index 12b6bfe76cf..bb3ca084be7 100644
--- a/addons/analytic_user_function/__openerp__.py
+++ b/addons/analytic_user_function/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Human Resources',
     'version': '1.0',
-    'category': 'Others',
+    'category': 'Hidden',
     'description': """
 This module allows you to define what is the default function of a specific user on a given account.
 ====================================================================================================
diff --git a/addons/anonymization/__openerp__.py b/addons/anonymization/__openerp__.py
index 842b774eb9c..41e906c078a 100644
--- a/addons/anonymization/__openerp__.py
+++ b/addons/anonymization/__openerp__.py
@@ -24,7 +24,7 @@
 {
     'name': 'Database Anonymization',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module allows you to anonymize a database.
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index ba70167fd24..0251eb68d02 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Association profile',
     'version': '0.1',
-    'category': 'Associations',
+    'category': 'Vertical 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 b1deafca157..511407e10a2 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Auction Management',
     'version': '1.0',
-    'category': 'Associations',
+    'category': 'Vertical Applications',
     'complexity': "normal",
     'description': """
 This module manages the records of artists, auction articles, buyers and sellers.
diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py
index 5bfd023ac39..7d2a5955ac0 100644
--- a/addons/audittrail/__openerp__.py
+++ b/addons/audittrail/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Audit Trail',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module lets administrator track every user operation on all the objects of the system.
 ===========================================================================================
diff --git a/addons/auth_openid/__openerp__.py b/addons/auth_openid/__openerp__.py
index 733008ac6e5..040a96a3995 100644
--- a/addons/auth_openid/__openerp__.py
+++ b/addons/auth_openid/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'OpenID',
     'version': '2.0',
-    'category': 'Authentification',
+    'category': 'Hidden',
     'description': """Allow users to login through OpenID.""",
     'author': 'OpenERP s.a.',
     'maintainer': 'OpenERP s.a.',
diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index a33a1f5fc27..18af8d09459 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Action Rule',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module allows to implement action rules for any object.
 ============================================================
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 6edb978301f..0dd72a17038 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -34,7 +34,7 @@ It supports:
     - Recurring events
     - Invitations to people""",
     "author" : "OpenERP SA",
-    'category': 'Tools',
+    'category': 'Hidden',
     'website': 'http://www.openerp.com',
     "init_xml" : [
         'base_calendar_data.xml'
diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index 17e7d3a69c8..5537d6f91eb 100644
--- a/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Base Contact',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "expert",
     'description': """
 This module allows you to manage your contacts entirely.
diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py
index c9e79688288..025f7db0704 100644
--- a/addons/base_crypt/__openerp__.py
+++ b/addons/base_crypt/__openerp__.py
@@ -24,7 +24,7 @@
     "author" : ['OpenERP SA', "FS3"],
     "maintainer" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Tools",
+    "category" : "Hidden",
     '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 da6738dab5d..c9bc3866b4f 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -21,7 +21,7 @@
 {
     'name': 'Create IBAN bank accounts',
     'version': '1.0',
-    'category': 'Accounting & Finance',
+    'category': 'Hidden',
     '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_module_doc_rst/__openerp__.py b/addons/base_module_doc_rst/__openerp__.py
index c2c5ca30a91..41425f77749 100644
--- a/addons/base_module_doc_rst/__openerp__.py
+++ b/addons/base_module_doc_rst/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Module Technical Guide in Restructured Text ',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module generates the Technical Guides of selected modules in Restructured Text format (RST).
 =================================================================================================
diff --git a/addons/base_module_quality/__openerp__.py b/addons/base_module_quality/__openerp__.py
index ec9ec1191d2..af258685629 100644
--- a/addons/base_module_quality/__openerp__.py
+++ b/addons/base_module_quality/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Base module quality - To check the quality of other modules' ,
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 The aim of this module is to check the quality of other modules.
 ================================================================
diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py
index fdb576e0ddd..3e1cf79792a 100644
--- a/addons/base_module_record/__openerp__.py
+++ b/addons/base_module_record/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Module Record',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module allows you to create a new module without any development.
 ======================================================================
diff --git a/addons/base_report_creator/__openerp__.py b/addons/base_report_creator/__openerp__.py
index 57aa22b95f4..5e8bed72d03 100644
--- a/addons/base_report_creator/__openerp__.py
+++ b/addons/base_report_creator/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Statistical Report Creator',
+    'name': 'Query Builder',
     'version': '1.0',
     'category': 'Advanced Reporting',
     'complexity': "expert",
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index 24a7d093b78..a95235d8017 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'OpenOffice Report Designer Interface',
+    'name': 'OpenOffice Report Designer',
     'version': '0.1',
     'category': 'Advanced Reporting',
     'complexity': "normal",
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index c483b4324c1..4417ebf2439 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Base Setup',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module helps to configure the system at the installation of a new database.
diff --git a/addons/base_synchro/__openerp__.py b/addons/base_synchro/__openerp__.py
index a95dcff71da..fba793e0473 100644
--- a/addons/base_synchro/__openerp__.py
+++ b/addons/base_synchro/__openerp__.py
@@ -23,7 +23,7 @@
         "name":"Server Object Synchronization",
         "version":"0.1",
         "author":"OpenERP SA",
-        "category":"Tools",
+        "category":"Hidden",
         "description": """
 Synchronization with all objects.
 =================================
diff --git a/addons/base_tools/__openerp__.py b/addons/base_tools/__openerp__.py
index aade7664041..ec32805533e 100644
--- a/addons/base_tools/__openerp__.py
+++ b/addons/base_tools/__openerp__.py
@@ -4,7 +4,7 @@
     "author": "OpenERP SA",
     "version": "1.0",
     "depends": ["base"],
-    "category" : "Tools",
+    "category" : "Hidden",
     'complexity': "easy",
     'description': """
 Common base for tools modules.
diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index baf02424ec8..5f7c1d2d86d 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'VAT Number Validation',
     'version': '1.0',
-    'category': 'Accounting & Finance',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 VAT validation for Partners' VAT numbers
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index f4de253c4f5..7f37f125903 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Dashboard Creator',
     'version': '1.0',
-    'category': 'Tools',
+    '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 edf852e4d5e..53bee3d0e94 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -49,7 +49,7 @@ To access OpenERP Calendar using WebCal to remote site use the URL like:
         DATABASE_NAME: Name of database on which OpenERP Calendar is created
         CALENDAR_NAME: Name of calendar to access
 """, 
-    'category': 'Tools', 
+    'category': 'Hidden', 
     "author" : "OpenERP SA",
     'website': 'http://www.openerp.com',
     "init_xml" : ["caldav_data.xml"],
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index e032921c13c..c3eec37a229 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Claim from Delivery",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Warehouse Management",
+    "category" : "Hidden",
     "depends" : ["base", "crm_claim", "stock"],
     "init_xml" : [],
     "demo_xml" : [],
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index 9df5b59f542..8f1812862c5 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -22,7 +22,7 @@
 
 
 {
-    'name': 'Extended Module to Add CalDav feature on Meeting',
+    'name': 'Calendar Synchronizing',
     'version': '1.1',
     'category': 'Customer Relationship Management',
     'complexity': "normal",
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 795f683905b..ae493c5dac2 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Customer & Supplier Claims Management',
+    'name': 'Claims',
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'complexity': "easy",
diff --git a/addons/crm_fundraising/__openerp__.py b/addons/crm_fundraising/__openerp__.py
index b3a1c146398..2d75f9e69b7 100644
--- a/addons/crm_fundraising/__openerp__.py
+++ b/addons/crm_fundraising/__openerp__.py
@@ -22,7 +22,7 @@
 
 {
     'category': 'Customer Relationship Management', 
-    'name': 'CRM Fundraising',
+    'name': 'Fundraising',
     'version': '1.0',
     'complexity': "easy",
     'description': """
diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
index 31719cc4e03..5124c3c5817 100644
--- a/addons/crm_helpdesk/__openerp__.py
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -22,7 +22,7 @@
 
 {
     'category': 'Customer Relationship Management', 
-    'name': 'CRM Helpdesk',
+    'name': 'Helpdesk',
     'version': '1.0',
     'complexity': "easy",
     'description': """
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index b0954fa42a2..9e72204e31d 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Partner Geo-Localization',
     'version': '1.0',
-    'category': 'Customer Relationship Management',
+    'category': 'Hidden',
     '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 2ca6b5ec7c3..656f8360f0b 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'CRM Profiling Management - To Perform Segmentation within Partners',
+    'name': 'Profiling Tools',
     'version': '1.3',
     'category': 'Marketing',
     'complexity': "easy",
diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py
index a2e94c7f58d..b8ac25eb379 100644
--- a/addons/decimal_precision/__openerp__.py
+++ b/addons/decimal_precision/__openerp__.py
@@ -30,7 +30,7 @@ The decimal precision is configured per company.
     "author": "OpenERP SA",
     "version": "0.1",
     "depends": ["base"],
-    "category" : "Tools",
+    "category" : "Hidden",
     'complexity': "easy",
     "init_xml": [],
     "update_xml": [
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index b110b8e6172..40dab751f79 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Carriers and Deliveries',
+    'name': 'Delivery Costs',
     'version': '1.0',
     'category': 'Sales Management',
     'complexity': "normal",
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index 2ea9ddb7a82..07de65825d8 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Integrated FTP Server with Document Management System',
+    'name': 'Shared Repositories (FTP)',
     'version': '1.99',
     'category': 'Knowledge Management',
     'complexity': "normal",
diff --git a/addons/document_ics/__openerp__.py b/addons/document_ics/__openerp__.py
index d1278978f52..7d718266d6a 100644
--- a/addons/document_ics/__openerp__.py
+++ b/addons/document_ics/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Support for iCal based on Document Management System',
     'version': '1.0',
-    'category': 'Knowledge Management',
+    'category': 'Hidden',
     'complexity': "normal",
     'description': """
 Allows to synchronise calendars with others applications.
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index 9b52d51dc32..5576c17ba64 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -29,7 +29,7 @@
 ##############################################################################
 
 {
-        "name" : "WebDAV server for Document Management",
+        "name" : "Shared Repositories (WebDAV)",
         "version" : "2.3",
         "author" : "OpenERP SA",
         "category" : "Knowledge Management",
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index f3ada96563f..06fa969c0c2 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -21,7 +21,7 @@
 ##############################################################################
 
 {
-    "name" : "Email Templates",
+    "name" : "Automated E-Mails",
     "version" : "1.1",
     "author" : "Openlabs",
     "website" : "http://openerp.com",
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 9a9acaf0fb3..1890ed7bf84 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Event',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Organization and management of Events.
diff --git a/addons/event_project/__openerp__.py b/addons/event_project/__openerp__.py
index 2fbb280083f..e8d110bc4f8 100644
--- a/addons/event_project/__openerp__.py
+++ b/addons/event_project/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Event Project - Create Retro-Planning to manage your Events',
     'version': '0.1',
-    'category': 'Associations',
+    'category': 'Hidden/Link',
     'complexity': "easy",
     'description': """
 Organization and management of events.
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index d27199b1b30..ae082aacacd 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -21,7 +21,7 @@
 ##############################################################################
 
 {
-    "name" : "Automated Email Retriever",
+    "name" : "Fetch Emails",
     "version" : "1.0",
     "depends" : ["base", 'mail'],
     "author" : "OpenERP SA",
diff --git a/addons/fetchmail_crm/__openerp__.py b/addons/fetchmail_crm/__openerp__.py
index bff95bc0f70..66cff346d0a 100644
--- a/addons/fetchmail_crm/__openerp__.py
+++ b/addons/fetchmail_crm/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "crm"],
     "author" : "OpenERP SA",
-    "category": 'Link',
+    "category": 'Hidden/Link',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail_crm_claim/__openerp__.py b/addons/fetchmail_crm_claim/__openerp__.py
index 9865d7e791b..cfe6a675d20 100644
--- a/addons/fetchmail_crm_claim/__openerp__.py
+++ b/addons/fetchmail_crm_claim/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "crm_claim"],
     "author" : "OpenERP SA",
-    "category": 'Link',
+    "category": 'Hidden/Link',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail_hr_recruitment/__openerp__.py b/addons/fetchmail_hr_recruitment/__openerp__.py
index 8efa68fbe79..75531097645 100644
--- a/addons/fetchmail_hr_recruitment/__openerp__.py
+++ b/addons/fetchmail_hr_recruitment/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "hr_recruitment"],
     "author" : "OpenERP SA",
-    "category": 'Link',
+    "category": 'Hidden/Link',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail_project_issue/__openerp__.py b/addons/fetchmail_project_issue/__openerp__.py
index 3d2a1ef912b..1165949108a 100644
--- a/addons/fetchmail_project_issue/__openerp__.py
+++ b/addons/fetchmail_project_issue/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "project_issue"],
     "author" : "OpenERP SA",
-    "category": 'Link',
+    "category": 'Hidden/Link',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/google_base_account/__openerp__.py b/addons/google_base_account/__openerp__.py
index 3dafebd0cc1..19afc18bf09 100644
--- a/addons/google_base_account/__openerp__.py
+++ b/addons/google_base_account/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Google user',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """The module adds google user in res user""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index 0b8566b35e2..423351a53ef 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Google Map',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 The module adds Google Map field in partner address.
 ====================================================
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index f7111fdb191..3d945910144 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Attendances Of Employees',
+    'name': 'Attendances',
     'version': '1.1',
     'category': 'Human Resources',
     'complexity': "easy",
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
index 091204fcf74..a0d303383f7 100644
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Human Resources Contracts',
+    'name': "Employee's Contracts",
     'version': '1.0',
     'category': 'Human Resources',
     'complexity': "easy",
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 6deba41c05f..bed442dc2ad 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "Human Resources Evaluation",
+    "name" : "Periodic Evaluations",
     "version": "0.1",
     "author": "OpenERP SA",
     "category": "Human Resources",
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 09352fcfa89..4a22f00e076 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Human Resources Expenses Tracking',
+    'name': 'Expenses',
     'version': '1.0',
     'category': 'Human Resources',
     'complexity': "easy",
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 63c2eb76195..563bb409b41 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    "name": "Human Resources: Holidays management",
+    "name": "Leaves Management",
     "version": "1.5",
     "author": ['OpenERP SA', 'Axelor'],
     "category": "Human Resources",
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 9e7debaa992..34e8924bea5 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 {
-    'name': 'Human Resource Payroll',
+    'name': 'Payroll',
     'version': '1.0',
     'category': 'Human Resources',
     'complexity': "expert",
diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index 5a7f67d5d21..beaa08b56cd 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 {
-    'name': 'Human Resource Payroll Accounting',
+    'name': 'Payroll Accounting',
     'version': '1.0',
     'category': 'Human Resources',
     'complexity': "expert",
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 790ac78cd4f..b728609c53d 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 {
-    'name': 'HR - Recruitment',
+    'name': 'Recruitment Process',
     'version': '1.0',
     'category': 'Human Resources',
     'complexity': "easy",
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 40e3f720da1..76886a45aaf 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Human Resources (Timesheet encoding)',
     'version': '1.0',
-    'category': 'Human Resources',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module implements a timesheet system.
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index 95682d00ef0..d4237baf36c 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Invoice on analytic lines',
     'version': '1.0',
-    'category': 'Human Resources',
+    'category': 'Hidden/Link',
     'description': """Generate your Invoices from Expenses, Timesheet Entries, ...
 Module to generate invoices based on costs (human resources, expenses, ...).
 ============================================================================
diff --git a/addons/html_view/__openerp__.py b/addons/html_view/__openerp__.py
index c4a7f033993..3deceff9d6f 100644
--- a/addons/html_view/__openerp__.py
+++ b/addons/html_view/__openerp__.py
@@ -2,7 +2,7 @@
     "name" : "Html View",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden",
     "depends" : ['base'],
     "init_xml" : ['html_view.xml'],
     "demo_xml" : [],
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 2e40992f2cf..e6dab775d6e 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Idea Manager',
+    'name': 'Ideas Box',
     'version': '0.1',
-    'category': 'Extra Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module allows your user to easily and efficiently participate in enterprise innovation.
diff --git a/addons/import_base/__openerp__.py b/addons/import_base/__openerp__.py
index 3d437510292..6d4f4374dfe 100644
--- a/addons/import_base/__openerp__.py
+++ b/addons/import_base/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Base framework for module that need to import complex data',
     'version': '0.9',
-    'category': 'Tools/Importation',
+    'category': 'Hidden',
     'description': """
         This module provide a class import_framework to help importing 
         complex data from other software
diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
index 81563d4fa23..a0a15756ec3 100644
--- a/addons/import_google/__openerp__.py
+++ b/addons/import_google/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Google Import',
     'version': '1.0',
-    'category': 'Tools/Importation',
+    'category': 'Customer Relationship Management',
     'description': """The module adds google contact in partner address and add google calendar events details in Meeting""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py
index ff083e94bb4..927a4b542ed 100644
--- a/addons/import_sugarcrm/__openerp__.py
+++ b/addons/import_sugarcrm/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Import SugarCRM Data into OpenERP Module.',
+    'name': 'Import Data from SugarCRM',
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'description': """This Module Import SugarCRM "Leads", "Opportunities", "Users", "Accounts", 
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index f0f64160286..2ca58e9861f 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -25,14 +25,14 @@
     "version" : "1.0",
     "depends" : ["base","base_setup"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Hidden',
     'complexity': "easy",
     "description": """
-Installer for knowledge-based tools.
+Installer for knowledge-based Hidden.
 ====================================
 
 Makes the Knowledge Application Configuration available from where you can install
-document and Wiki based tools.
+document and Wiki based Hidden.
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index 16d3129f3b7..2a493f39dcf 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name": "Lunch Module",
+    "name": "Lunch",
     "author": "OpenERP SA",
     'complexity': "easy",
     "Description": """
@@ -33,7 +33,7 @@
     """,
     "version": "0.1",
     "depends": ["base_tools"],
-    "category" : "Extra Tools",
+    "category" : "Hidden",
     'description': """
     The base module to manage lunch
 
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 08473cad102..b20b975f3e6 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Email Subsystem',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 A generic email subsystem with message storage and queuing
@@ -54,7 +54,7 @@ The main features are:
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'base_tools'],
+    'depends': ['base', 'base_Hidden'],
     'data': [
         "wizard/mail_compose_message_view.xml",
         "mail_message_view.xml",
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index c94eaf76356..44a2f1e30bd 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    "name" : "Marketing Campaign",
+    "name" : "Marketing Campaigns",
     "version" : "1.1",
     "depends" : ["marketing",
                  "document",
diff --git a/addons/marketing_campaign_crm_demo/__openerp__.py b/addons/marketing_campaign_crm_demo/__openerp__.py
index d1b0dc79516..4841cc1a2e8 100644
--- a/addons/marketing_campaign_crm_demo/__openerp__.py
+++ b/addons/marketing_campaign_crm_demo/__openerp__.py
@@ -27,7 +27,7 @@
                  "crm",
                 ],
     "author" : "OpenERP SA",
-    "category": 'Sales Management',
+    "category": 'Hidden',
     "description": """
 Demo data for the module marketing_campaign.
 ============================================
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index affcf0a0294..20d01b6a60e 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Membership',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module allows you to manage all operations for managing memberships.
 =========================================================================
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index 77bece7cfd6..72ef35ebc4b 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'MRP JIT',
+    'name': 'Just In Time Scheduling',
     'version': '1.0',
     'category': 'Manufacturing',
     'complexity': "easy",
diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index 08f8f5b7f5b..0ac2d83c524 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Work Center Production start end workflow',
+    'name': 'Manufacturing Operations',
     'version': '1.0',
     'category': 'Manufacturing',
     'complexity': "easy",
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index 1fa1ef5cb04..06aa78c30f6 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Products Repairs Module - Manage All products Repairs',
+    'name': 'Repairs',
     'version': '1.0',
     'category': 'Manufacturing',
     'description': """
diff --git a/addons/mrp_subproduct/__openerp__.py b/addons/mrp_subproduct/__openerp__.py
index 52fd3758fbc..5c3db5436d5 100644
--- a/addons/mrp_subproduct/__openerp__.py
+++ b/addons/mrp_subproduct/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'MRP Sub Product - To produce several products from one production order',
+    'name': 'MRP Subproducts',
     'version': '1.0',
     'category': 'Manufacturing',
     'description': """
diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py
index d82f0e1eb7c..636ff1cac29 100644
--- a/addons/multi_company/__openerp__.py
+++ b/addons/multi_company/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Multi-Company',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "expert",
     'description': """
 This module is for managing a multicompany environment.
diff --git a/addons/outlook/__openerp__.py b/addons/outlook/__openerp__.py
index 08e33734317..beab5aca648 100644
--- a/addons/outlook/__openerp__.py
+++ b/addons/outlook/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name' : 'Outlook Interface',
+    'name' : 'Outlook Plug-In',
     'version' : '1.0',
     'author' : 'OpenERP SA',
     'website' : 'http://www.openerp.com/',
diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index 6d2fcf63fb4..65035912d85 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 {
-    'name': 'Enhanced support for (Ether)Pad attachments',
+    'name': 'Collaborative Note Pad',
     'version': '1.0.3',
-    'category': 'Extra Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Adds enhanced support for (Ether)Pad attachments in the web client.
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index cc73364716c..1f6a808d2a0 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Point Of Sale',
     'version': '1.0',
-    'category': 'Marketing',
+    'category': 'Point Of Sale',
     'description': """
 This module provides a quick and easy sale process.
 ===================================================
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 6bb69cd91c9..1b3be74c79f 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -24,7 +24,7 @@
     'version' : "1.0",
     'depends' : ["base", "share"],
     'author' : "OpenERP SA",
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module defines 'portals' to customize the access to your OpenERP database
 for external users.
diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index 4af045ff6bb..e35ae2b06ae 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Enterprise Process',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module shows the basic processes involved in the selected modules and in the sequence they occur.
 ======================================================================================================
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index 7f2d4e48f3a..7498265a5f9 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "Products & Pricelists",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Sales Management",
+    "category" : "Hidden",
     "depends" : ["base", "process", "decimal_precision"],
     "init_xml" : [],
     "demo_xml" : ["product_demo.xml"],
diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py
index 65a9585f684..ebf3b97bc0a 100644
--- a/addons/product_expiry/__openerp__.py
+++ b/addons/product_expiry/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Products Expiry Date",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Associations",
+    "category" : "Vertical Applications",
     'complexity': "easy",
     "depends" : ["stock"],
     "init_xml" : [],
diff --git a/addons/product_manufacturer/__openerp__.py b/addons/product_manufacturer/__openerp__.py
index 5aea3f333d3..d04d0724137 100644
--- a/addons/product_manufacturer/__openerp__.py
+++ b/addons/product_manufacturer/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Products Attributes & Manufacturers",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden",
     'complexity': "easy",
     "depends" : ["stock"],
     "init_xml" : [],
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index d96ff00c44d..b412e8b63eb 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Margins in Product',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Hidden',
     'description': """
 Adds a reporting menu in products that computes sales, purchases, margins and other interesting indicators based on invoices.
 =============================================================================================================================
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index 29ad173b602..d05c3a82c11 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -21,7 +21,7 @@
     "name": "Visible Discount",
     "version": "1.0",
     "author": "OpenERP SA",
-    "category": "Sales Management",
+    "category": "Hidden",
     '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 a381594bb0d..bd8790d1496 100644
--- a/addons/profile_tools/__openerp__.py
+++ b/addons/profile_tools/__openerp__.py
@@ -21,17 +21,17 @@
 
 
 {
-    "name" : "Miscellaneous Tools",
+    "name" : "Miscellaneous Hidden",
     "version" : "1.0",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden",
     'complexity': "easy",
     "description": """
-Installer for extra tools like lunch, survey, idea, share, etc.
+Installer for extra Hidden like lunch, survey, idea, share, etc.
 ===============================================================
 
-Makes the Extra Tools Configuration available from where you can install
+Makes the Extra Hidden Configuration available from where you can install
 modules like share, lunch, pad, idea, survey and subscription.
     """,
     'website': 'http://www.openerp.com',
@@ -42,6 +42,6 @@ modules like share, lunch, pad, idea, survey and subscription.
     'installable': True,
     'active': False,
     'certificate' : '00557100228403879621',
-    'images': ['images/config_extra_tools.jpeg'],
+    'images': ['images/config_extra_Hidden.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_caldav/__openerp__.py b/addons/project_caldav/__openerp__.py
index 29c9ec4d483..37ecbb1c910 100644
--- a/addons/project_caldav/__openerp__.py
+++ b/addons/project_caldav/__openerp__.py
@@ -23,7 +23,7 @@
     "name": "CalDAV for Task Management",
     "version": "1.1",
     "author": "OpenERP SA",
-    "category": "Project Management",
+    "category": "Hidden",
     "description": """
 Synchronization between Project Task and Caldav Vtodo.
 ======================================================
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index 5f70392352b..8d03112ed04 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Getting Things Done - Time Management Module',
+    'name': 'Methodology: Getting Things Done',
     'version': '1.0',
     'category': 'Project Management',
     'complexity': "easy",
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 459c44dea04..e77499df3d0 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -21,7 +21,7 @@
 ##############################################################################
 
 {
-    'name': 'Issue Management in Project Management',
+    'name': 'Issues Tracker',
     'version': '1.0',
     'category': 'Project Management',
     'complexity': "easy",
diff --git a/addons/project_issue_sheet/__openerp__.py b/addons/project_issue_sheet/__openerp__.py
index cc1cd6504b0..972245533ad 100644
--- a/addons/project_issue_sheet/__openerp__.py
+++ b/addons/project_issue_sheet/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Add the Timesheet support for Issue Management in Project Management',
     'version': '1.0',
-    'category': 'Project Management',
+    'category': 'Hidden/Link',
     'description': """
 This module adds the Timesheet support for the Issues/Bugs Management in Project.
 =================================================================================
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 76e872d65f7..ef57f53e5f1 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name": "Long Term Project Management",
+    "name": "Long Term Planning",
     "version": "1.1",
     "author": "OpenERP SA",
     "website": "http://www.openerp.com",
diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py
index 76ff6dbbc47..ba3e2e57ba5 100644
--- a/addons/project_mailgate/__openerp__.py
+++ b/addons/project_mailgate/__openerp__.py
@@ -25,7 +25,7 @@
     "version": "1.1",
     "author": "OpenERP SA",
     "website": "http://www.openerp.com",
-    "category": "Project Management",
+    "category": "Hidden",
     'complexity': "easy",
     "images": ["images/project_mailgate_task.jpeg"],
     "depends": ["project", "mail"],
diff --git a/addons/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py
index 3f1882ed376..f7e50110784 100644
--- a/addons/project_messages/__openerp__.py
+++ b/addons/project_messages/__openerp__.py
@@ -26,7 +26,7 @@
     "images": ["images/project_message.jpeg"],
     "depends": ["project"],
     "author": "OpenERP SA",
-    "category": 'Project Management',
+    "category": 'Hidden',
     '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 86520a0cc78..3cb2fb40179 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Automatic task creation from procurement lines',
     'version': '1.0',
-    'category': 'Project Management',
+    'category': 'Hidden/Link',
     '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 537170d4e3d..9ce5e8a2d9a 100644
--- a/addons/project_planning/__openerp__.py
+++ b/addons/project_planning/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Planning Management Module',
     'version': '1.0',
-    'category': 'Project Management',
+    'category': 'Hidden',
     'complexity': "easy",
     '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 8157180321a..68ea9d5d78e 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Project Retro planning',
     'version': '0.1',
-    'category': 'Project Management',
+    'category': 'Hidden',
     '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 9b2f4c4e046..fb08b8432be 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Scrum, Agile Development Method',
+    'name': 'Methodology: SCRUM',
     'version': '1.0',
     'category': 'Project Management',
     'complexity': "easy",
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 1263a514804..1076eb7065e 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Project Timesheet',
+    'name': 'Bill Time on Tasks',
     'version': '1.0',
     'category': 'Project Management',
     'description': """
diff --git a/addons/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py
index 2ad0f4607aa..a29fd64944c 100644
--- a/addons/purchase_analytic_plans/__openerp__.py
+++ b/addons/purchase_analytic_plans/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Purchase Analytic Distribution Management',
+    'name': 'Purchase Analytic Plans',
     'version': '1.0',
     'category': 'Purchase Management',
     'description': """
diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py
index f58907622b7..9645514076f 100644
--- a/addons/purchase_double_validation/__openerp__.py
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Double Validation for Purchase",
     "version" : "1.1",
-    "category": 'Purchase Management',
+    "category": 'Hidden',
     'complexity': "easy",
     "images" : ["images/purchase_validation.jpeg"],
     "depends" : ["base","purchase"],
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index bef6ac7aec5..cdb13e3e1aa 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -18,7 +18,7 @@
 #
 ##############################################################################
 {
-    "name" : "Purchase - Purchase Requisition",
+    "name" : "Purchase Requisition",
     "version" : "0.1",
     "author" : "OpenERP SA",
     "category" : "Purchase Management",
diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py
index 00296a1d83f..fd29d2b96ee 100644
--- a/addons/report_designer/__openerp__.py
+++ b/addons/report_designer/__openerp__.py
@@ -21,16 +21,16 @@
 
 
 {
-    "name" : "Reporting Tools Installer",
+    "name" : "Reporting Hidden Installer",
     "version" : "1.0",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category": "Tools",
+    "category": "Hidden",
     "description": """
-Installer for reporting tools.
+Installer for reporting Hidden.
 ==============================
 
-Makes the Reporting Tools Configuration available from where you can install
+Makes the Reporting Hidden Configuration available from where you can install
 modules like base_report_designer and base_report_creator.
     """,
     'website': 'http://www.openerp.com',
@@ -42,6 +42,6 @@ modules like base_report_designer and base_report_creator.
     'installable': True,
     'active': False,
     'certificate' : '00764037194670093149',
-    'images': ['images/config_reporting_tools.jpeg'],
+    'images': ['images/config_reporting_Hidden.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index c7f70a5dddb..6c80e0f2b81 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Intrastat Reporting',
     'version': '1.0',
-    'category': 'Warehouse Management',
+    'category': 'Hidden',
     'description': """
 A module that adds intrastat reports.
 =====================================
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index e593791f826..339818a646b 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -74,7 +74,7 @@ Web client WYSIWYG
     "version" : "0.9",
     "depends" : ["base"],
     "author" : "Camptocamp SA - NBessi",
-    "category": "Tools",
+    "category": "Hidden",
     "url": "http://http://www.camptocamp.com/",
     "data": [ "security/ir.model.access.csv",
               "data.xml",
diff --git a/addons/report_webkit_sample/__openerp__.py b/addons/report_webkit_sample/__openerp__.py
index 3670aa4c5d2..d485692c164 100644
--- a/addons/report_webkit_sample/__openerp__.py
+++ b/addons/report_webkit_sample/__openerp__.py
@@ -43,7 +43,7 @@ You have to create the print buttons by calling the wizard. For more details see
                     """,
     "version" : "0.9",
     "depends" : ["base", "account", "report_webkit"],
-    "category": "Tools",
+    "category": "Hidden",
     "author" : "Camptocamp SA - NBessi",
     "url": "http://www.camptocamp.com/",
     "data": ["report_webkit_html_view.xml",
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index dab9b06d5f8..f1e020215a6 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Resource",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Project Management",
+    "category" : "Hidden",
     "website" : "http://www.openerp.com",
     "description": """
 Module for resource management.
diff --git a/addons/sale_analytic_plans/__openerp__.py b/addons/sale_analytic_plans/__openerp__.py
index 3204ae02dcc..1850fbf8b2a 100644
--- a/addons/sale_analytic_plans/__openerp__.py
+++ b/addons/sale_analytic_plans/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Sales Analytic Distribution Management',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Hidden',
     'description': """
 The base module to manage analytic distribution and sales orders.
 =================================================================
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 563cf00050d..c3f4365bfee 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Creates Sales order from Opportunity',
+    'name': 'Opportunity to Quotation',
     'version': '1.0',
-    'category': 'Link',
+    'category': 'Hidden/Link',
     '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 f25730f8a72..1cd2eef2d77 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Managing sales and deliveries by journal',
+    'name': 'Invoicing Journals',
     'version': '1.0',
     'category': 'Sales Management',
     'complexity': "easy",
diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py
index 29c0f0ec98f..b3d033fed44 100644
--- a/addons/sale_layout/__openerp__.py
+++ b/addons/sale_layout/__openerp__.py
@@ -19,7 +19,7 @@
 ##############################################################################
 
 {
-    "name" : "Sale Order Layout",
+    "name" : "Sales Orders Print Layout",
     "version" : "1.0",
     "images" : ["images/sale_layout.jpeg"],
     "depends" : ["sale", "account_invoice_layout"],
diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py
index 0c7b342f9fe..c7eae6daea2 100644
--- a/addons/sale_margin/__openerp__.py
+++ b/addons/sale_margin/__openerp__.py
@@ -19,7 +19,7 @@
 ##############################################################################
 
 {
-    "name":"Margins in Sales Order",
+    "name":"Margins in Sales Orders",
     "version":"1.0",
     "category" : "Sales Management",
     "description": """
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index 889b885532e..7d4443a3cce 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Sales and MRP Management',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Hidden/Link',
     '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 7ae34335588..f88a2777a00 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Sales Order Dates',
+    'name': 'Full Dates on Sales Order',
     'version': '1.0',
     'category': 'Sales Management',
     'complexity': "easy",
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 4eb48f69e77..f6a0c93285d 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -21,11 +21,11 @@
 
 
 {
-    "name" : "Sharing Tools",
+    "name" : "Web Share",
     "version" : "1.5",
     "depends" : ["base", "mail"],
     "author" : "OpenERP SA",
-    "category": 'Extra Tools',
+    "category": 'Hidden',
     'complexity': "easy",
     "description": """
 This module adds generic sharing tools to your current OpenERP database.
diff --git a/addons/stock_invoice_directly/__openerp__.py b/addons/stock_invoice_directly/__openerp__.py
index d6930d1f43a..69acadeb8bd 100644
--- a/addons/stock_invoice_directly/__openerp__.py
+++ b/addons/stock_invoice_directly/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Invoice Picking Directly',
     'version': '1.0',
-    'category': 'Warehouse Management',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Invoice Wizard for Delivery.
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index d70bf098682..1c4b7841a10 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Warehouse Locations Paths',
+    'name': 'Advanced Routes',
     'version': '1.0',
     'category': 'Manufacturing',
     'description': """
diff --git a/addons/stock_no_autopicking/__openerp__.py b/addons/stock_no_autopicking/__openerp__.py
index 1f7b16b704b..bd5629579cc 100644
--- a/addons/stock_no_autopicking/__openerp__.py
+++ b/addons/stock_no_autopicking/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Stock No Auto-Picking',
     'version': '1.0',
-    'category': 'Warehouse Management',
+    'category': 'Hidden',
     'description': """
 This module allows an intermediate picking process to provide raw materials to production orders.
 =================================================================================================
diff --git a/addons/stock_planning/__openerp__.py b/addons/stock_planning/__openerp__.py
index bded9da3692..e3043758b94 100644
--- a/addons/stock_planning/__openerp__.py
+++ b/addons/stock_planning/__openerp__.py
@@ -23,7 +23,7 @@
     "name": "Master Procurement Schedule",
     "version": "1.2",
     "author": "OpenERP SA and Grzegorz Grzelak (OpenGLOBE)",
-    "category": "Warehouse Management",
+    "category": "Hidden",
     "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",
diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index 478c451b6ff..581d54c9c4b 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Subscription and recurring operations',
+    'name': 'Recurring Documents',
     'version': '1.0',
-    'category': 'Extra Tools',
+    'category': 'Hidden',
     'description': """
 Create recurring documents.
 ===========================
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index f9caebd3575..e9bd92f5840 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Survey Module',
+    'name': 'Survey',
     'version': '1.0',
-    'category': 'Extra Tools',
+    'category': 'Hidden',
     'description': """
 This module is used for surveying.
 ==================================
diff --git a/addons/thunderbird/__openerp__.py b/addons/thunderbird/__openerp__.py
index e7418cc9265..5b124af05aa 100644
--- a/addons/thunderbird/__openerp__.py
+++ b/addons/thunderbird/__openerp__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 {
-    "name" : "Thunderbird Interface",
+    "name" : "Thunderbird Plug-In",
     "version" : "1.0",
     "author" : ['OpenERP SA', 'Axelor'],
     "website" : "http://www.openerp.com/",
diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py
index 6d1fe9a720e..fad6f7fbe7e 100644
--- a/addons/users_ldap/__openerp__.py
+++ b/addons/users_ldap/__openerp__.py
@@ -106,7 +106,7 @@ will disable LDAP authentication if installed at the same time.
 
 
     "website" : "http://www.openerp.com",
-    "category" : "Tools",
+    "category" : "Hidden",
     "data" : [
         "users_ldap_view.xml",
         "user_ldap_installer.xml",
diff --git a/addons/warning/__openerp__.py b/addons/warning/__openerp__.py
index 66915423af8..c299d830ed9 100644
--- a/addons/warning/__openerp__.py
+++ b/addons/warning/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Display Warning Messages',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     '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 85187aa492c..0731b003dbc 100644
--- a/addons/web_livechat/__openerp__.py
+++ b/addons/web_livechat/__openerp__.py
@@ -21,7 +21,7 @@
 {
     'name': 'Live Chat Support',
     'version': '2.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Enable live chat support for those who have a maintenance contract.
diff --git a/addons/web_uservoice/__openerp__.py b/addons/web_uservoice/__openerp__.py
index ebcc91e7e67..9cbff61ad54 100644
--- a/addons/web_uservoice/__openerp__.py
+++ b/addons/web_uservoice/__openerp__.py
@@ -21,7 +21,7 @@
 {
     'name': 'Receive User Feedback',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Add Feedback button in header.
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index 40583faf9a0..1c6aae0baaf 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Document Management - Wiki',
+    'name': 'Collaborative Content (Wiki)',
     'version': '1.0.1',
     'category': 'Knowledge Management',
     'complexity': "easy",
diff --git a/addons/wiki_faq/__openerp__.py b/addons/wiki_faq/__openerp__.py
index 6199f3a4cce..96b8c2cdc11 100644
--- a/addons/wiki_faq/__openerp__.py
+++ b/addons/wiki_faq/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Document Management - Wiki - FAQ',
+    'name': 'Template: Internal FAQ',
     'version': '1.0',
     'category': 'Knowledge Management',
     'complexity': "easy",
diff --git a/addons/wiki_quality_manual/__openerp__.py b/addons/wiki_quality_manual/__openerp__.py
index caeaeb28b35..c03b466af0b 100644
--- a/addons/wiki_quality_manual/__openerp__.py
+++ b/addons/wiki_quality_manual/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Document Management - Wiki - Quality Manual',
+    'name': 'Template: Quality Manual',
     'version': '1.0',
     'category': 'Knowledge Management',
     'complexity': "easy",
diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py
index 1df773a8c97..1e56baf58cc 100644
--- a/addons/wiki_sale_faq/__openerp__.py
+++ b/addons/wiki_sale_faq/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Wiki - Sale-FAQ',
+    'name': 'Sale FAQ',
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'complexity': "easy",

From edf0e5730538b7f764371197c70d8acd4f97c0fc Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 5 Oct 2011 16:19:32 +0200
Subject: [PATCH 255/304] [FIX] base_setup: Use a new flag of the
 ir.module.category object for the listing of applications

bzr revid: stw@openerp.com-20111005141932-mw8n1ccs1msino92
---
 addons/base_setup/base_setup.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 33837b5553b..9efc82f2d62 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -35,7 +35,7 @@ DEFAULT_MODULES = {
     'Project Management' : ['project',],
     'Knowledge Management' : ['document',],
     'Warehouse Management' : ['stock',],
-    'Manufacturing' : ['mrp',],
+    'Manufacturing' : ['mrp', 'procurement'],
     'Accounting & Finance' : ['account,'],
     'Purchase Management' : ['purchase,'],
     'Human Resources' : ['hr',],
@@ -43,8 +43,6 @@ DEFAULT_MODULES = {
     'Marketing' : ['marketing',],
 }
 
-HIDDEN_CATEGORIES = ('Tools', 'System', 'Localization', 'Link', 'Uncategorized')
-
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
 
@@ -63,7 +61,8 @@ class base_setup_installer(osv.osv_memory):
         fields = {} 
         category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', 'not in', HIDDEN_CATEGORIES )]
+                  ('name', '!=', 'Uncategorized'),
+                  ('visible', '=', True)]
         category_ids = category_proxy.search(cr, uid, domain, context=context)
         for category in category_proxy.browse(cr, uid, category_ids, context=context):
             category_name = 'category_%d' % (category.id,)
@@ -79,11 +78,10 @@ class base_setup_installer(osv.osv_memory):
         for module in module_proxy.browse(cr, uid, module_ids, context=context):
             module_name = 'module_%d' % (module.id,)
             module_is_installed = module.state == 'installed'
-            title = "%s (%s)" % (module.shortdesc, module.complexity,)
 
             fields[module_name] = {
                 'type' : 'boolean',
-                'string' : title,
+                'string' : module.shortdesc,
                 'name' : module_name,
                 'help' : module.description,
             }
@@ -105,7 +103,8 @@ class base_setup_installer(osv.osv_memory):
                 result['module_%d' % (module.id,)] = module.state == 'installed'
                 category_name = 'category_%d' % (module.category_id.id,)
                 if not result.get('category_name'):
-                    result[category_name] = module.state == 'installed'
+                    result[category_name] = module.state == 'installed' and \
+                            module.category_id.name in DEFAULT_MODULES
 
         return result
 
@@ -121,7 +120,8 @@ class base_setup_installer(osv.osv_memory):
 
         module_category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', 'not in', HIDDEN_CATEGORIES)]
+                  ('name', '!=', 'Uncategorized'),
+                  ('visible', '=', True)]
         module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='sequence asc')
 
         arch = ['<form string="%s">' % _('Automatic Base Setup')]

From 54fcb73fc1aabb30a3eecfedd6e150e64dcf4963 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 5 Oct 2011 16:23:15 +0200
Subject: [PATCH 256/304] [FIX] base: Add the visible field in the
 ir.module.category, this field will be used by the new base.setup.installer

bzr revid: stw@openerp.com-20111005142315-r9ypz1jeqbi8rfpo
---
 openerp/addons/base/module/module.py       |  5 +++++
 openerp/addons/base/module/module_data.xml | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 3af8d290700..b7f9995e2c9 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -78,9 +78,14 @@ class module_category(osv.osv):
         'module_ids' : fields.one2many('ir.module.module', 'category_id', 'Modules'),
         'description' : fields.text("Description"),
         'sequence' : fields.integer('Sequence'),
+        'visible' : fields.boolean('Visible'),
     }
     _order = 'name'
 
+    _defaults = {
+        'visible' : 1,
+    }
+
 class module(osv.osv):
     _name = "ir.module.module"
     _description = "Module"
diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml
index 02b4643b767..3c88b2b1c7e 100644
--- a/openerp/addons/base/module/module_data.xml
+++ b/openerp/addons/base/module/module_data.xml
@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>        
+        <record model="ir.module.category" id="module_category_hidden">
+            <field name="name">Hidden</field>
+            <field name="sequence">0</field>
+            <field name="visible" eval="0" />
+        </record>
+
         <record model="ir.module.category" id="module_category_link">
+            <field name="parent_id" ref="module_category_hidden" />
             <field name="name">Link</field>
             <field name="sequence">0</field>
+            <field name="visible" eval="0" />
         </record>
+
         <record model="ir.module.category" id="module_category_customer_relationship_management">
             <field name="name">Customer Relationship Management</field>
             <field name="description">Helps you track and manage relations with customers such as leads, requests or issues. Can automatically send reminders, escalate requests or trigger business-specific actions based on standard events.</field>
@@ -91,6 +100,7 @@
 
         <record model="ir.module.category" id="module_category_localization">
             <field name="name">Localization</field>
+            <field name="visible" eval="0" />
         </record>
 
         <record model="ir.module.category" id="module_category_localization_account_charts">
@@ -103,6 +113,10 @@
             <field name="description">Installs a preselected set of OpenERP applications which will help you manage your association more efficiently.</field>
         </record>
 
+        <record model="ir.module.category" id="module_category_vertical_applications">
+            <field name="name">Vertical Applications</field>
+        </record>
+
 <!--        <record id="ir_ui_view_sc_modules0" model="ir.ui.view_sc">-->
 <!--            <field name="name">Modules</field>-->
 <!--            <field name="resource">ir.ui.menu</field>-->

From 77a3624fa1c099dc6463e8c9e52ade363a3ffabf Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 5 Oct 2011 16:36:07 +0200
Subject: [PATCH 257/304] [IMP] set module category to Hidden

bzr revid: al@openerp.com-20111005143607-7p5z3gn4ddt3pios
---
 addons/web/__openerp__.py              | 1 +
 addons/web_calendar/__openerp__.py     | 1 +
 addons/web_chat/__openerp__.py         | 1 +
 addons/web_dashboard/__openerp__.py    | 1 +
 addons/web_default_home/__openerp__.py | 1 +
 addons/web_diagram/__openerp__.py      | 1 +
 addons/web_gantt/__openerp__.py        | 1 +
 addons/web_graph/__openerp__.py        | 3 ++-
 addons/web_hello/__openerp__.py        | 1 +
 addons/web_kanban/__openerp__.py       | 1 +
 addons/web_mobile/__openerp__.py       | 1 +
 addons/web_rpc/__openerp__.py          | 1 +
 addons/web_tests/__openerp__.py        | 1 +
 13 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index b611eb91eb5..0afd43190d6 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -1,5 +1,6 @@
 {
     "name" : "web",
+    "category" : "Hidden",
     "depends" : [],
     'active': True,
     'post_load' : 'wsgi_postload',
diff --git a/addons/web_calendar/__openerp__.py b/addons/web_calendar/__openerp__.py
index ba18ef0490e..1eba26065f5 100644
--- a/addons/web_calendar/__openerp__.py
+++ b/addons/web_calendar/__openerp__.py
@@ -1,5 +1,6 @@
 {
     "name": "web calendar",
+    "category" : "Hidden",
     "version": "2.0",
     "depends": ['web'],
     "js": [
diff --git a/addons/web_chat/__openerp__.py b/addons/web_chat/__openerp__.py
index c5e2fa7fc13..1ffe4742378 100644
--- a/addons/web_chat/__openerp__.py
+++ b/addons/web_chat/__openerp__.py
@@ -1,5 +1,6 @@
 {
     "name": "Web Chat",
+    "category" : "Hidden",
     "version": "2.0",
     "depends": ['web'],
     "js": [
diff --git a/addons/web_dashboard/__openerp__.py b/addons/web_dashboard/__openerp__.py
index e4bad9c1eaf..7a527511b03 100644
--- a/addons/web_dashboard/__openerp__.py
+++ b/addons/web_dashboard/__openerp__.py
@@ -1,5 +1,6 @@
 {
     "name": "web Dashboard",
+    "category" : "Hidden",
     "version": "2.0",
     "depends": ['web'],
     "js": [
diff --git a/addons/web_default_home/__openerp__.py b/addons/web_default_home/__openerp__.py
index 2093e6236f0..9d9d2f871af 100644
--- a/addons/web_default_home/__openerp__.py
+++ b/addons/web_default_home/__openerp__.py
@@ -1,5 +1,6 @@
 {
     "name" : "OpenERP Web installer home",
+    "category" : "Hidden",
     "version" : "2.0",
     "depends" : ['web'],
     'active': True,
diff --git a/addons/web_diagram/__openerp__.py b/addons/web_diagram/__openerp__.py
index c1851af362b..584c0a16e66 100644
--- a/addons/web_diagram/__openerp__.py
+++ b/addons/web_diagram/__openerp__.py
@@ -1,5 +1,6 @@
 {
     "name" : "OpenERP Web Diagram",
+    "category" : "Hidden",
     "version" : "2.0",
     "depends" : ["base"],
     "js": [
diff --git a/addons/web_gantt/__openerp__.py b/addons/web_gantt/__openerp__.py
index 6d857e5dc48..d2b24f96d08 100644
--- a/addons/web_gantt/__openerp__.py
+++ b/addons/web_gantt/__openerp__.py
@@ -1,5 +1,6 @@
 {
     "name": "web Gantt",
+    "category" : "Hidden",
     "version": "2.0",
     "depends": ['web'],
     "js": [
diff --git a/addons/web_graph/__openerp__.py b/addons/web_graph/__openerp__.py
index 03839744480..68775b7c0e3 100644
--- a/addons/web_graph/__openerp__.py
+++ b/addons/web_graph/__openerp__.py
@@ -1,5 +1,6 @@
 {
     "name": "web Graph",
+    "category" : "Hidden",
     "version": "2.0",
     "depends": ['web'],
     "js": [
@@ -7,4 +8,4 @@
            "static/src/js/graph.js"],
     "css": ["static/lib/dhtmlxGraph/codebase/dhtmlxchart.css"],
     "active": True
-}
\ No newline at end of file
+}
diff --git a/addons/web_hello/__openerp__.py b/addons/web_hello/__openerp__.py
index 498f5129961..5e48d2e1c5b 100644
--- a/addons/web_hello/__openerp__.py
+++ b/addons/web_hello/__openerp__.py
@@ -1,5 +1,6 @@
 {
     "name": "Hello",
+    "category" : "Hidden",
     "version": "2.0",
     "depends": [],
     "js": ["static/*/*.js", "static/*/js/*.js"],
diff --git a/addons/web_kanban/__openerp__.py b/addons/web_kanban/__openerp__.py
index 30a6421cca1..f39cd64999b 100644
--- a/addons/web_kanban/__openerp__.py
+++ b/addons/web_kanban/__openerp__.py
@@ -1,5 +1,6 @@
 {
     "name" : "Base Kanban",
+    "category" : "Hidden",
     "version" : "2.0",
     "depends" : ["web"],
     "js": [
diff --git a/addons/web_mobile/__openerp__.py b/addons/web_mobile/__openerp__.py
index 8561c9b00ed..ce219df3138 100644
--- a/addons/web_mobile/__openerp__.py
+++ b/addons/web_mobile/__openerp__.py
@@ -1,5 +1,6 @@
 {
     "name" : "OpenERP Web mobile",
+    "category" : "Hidden",
     "version" : "2.0",
     "depends" : [],
     'active': True,
diff --git a/addons/web_rpc/__openerp__.py b/addons/web_rpc/__openerp__.py
index f0cc1dbdaa8..c725489497c 100644
--- a/addons/web_rpc/__openerp__.py
+++ b/addons/web_rpc/__openerp__.py
@@ -1,5 +1,6 @@
 {
     "name" : "OpenERP Web web",
+    "category" : "Hidden",
     "version" : "2.0",
     "depends" : [],
     'active': False,
diff --git a/addons/web_tests/__openerp__.py b/addons/web_tests/__openerp__.py
index d6221900f00..4d952819f53 100644
--- a/addons/web_tests/__openerp__.py
+++ b/addons/web_tests/__openerp__.py
@@ -1,5 +1,6 @@
 {
     "name": "Tests",
+    "category" : "Hidden",
     "version": "2.0",
     "depends": [],
     "js": ["static/src/js/*.js"],

From 61c65fc0a02670820cd746ceca3f686631c536bc Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 5 Oct 2011 16:42:49 +0200
Subject: [PATCH 258/304] [FIX] base: set the right category for base

bzr revid: stw@openerp.com-20111005144249-p46i4up2omsuymqj
---
 openerp/addons/base/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index f7981133142..f1ceb9a0915 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -24,7 +24,7 @@
 {
     'name': 'Base',
     'version': '1.3',
-    'category': 'System',
+    'category': 'Hidden',
     'description': """The kernel of OpenERP, needed for all installation.""",
     'author': 'OpenERP SA',
     'maintainer': 'OpenERP SA',

From db5775888b3bec3fd298821612652072775aeb4f Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 5 Oct 2011 16:58:22 +0200
Subject: [PATCH 259/304] [FIX] stock: set the right category

bzr revid: stw@openerp.com-20111005145822-r0thbg86zt52lis3
---
 addons/stock/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 94b9e10fe73..5b1d392a592 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -47,7 +47,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
     "website" : "http://www.openerp.com",
     "images" : ["images/stock_forecast_report.png", "images/delivery_orders.jpeg", "images/inventory_analysis.jpeg","images/location.jpeg","images/moves_analysis.jpeg","images/physical_inventories.jpeg","images/warehouse_dashboard.jpeg"],
     "depends" : ["product", "account"],
-    "category" : "Knowledge Management",
+    "category" : "Warehouse Management",
     "init_xml" : [],
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [

From b8f9bad1a12ddd93ac0e86a0e08631bdb2f58a32 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 5 Oct 2011 16:58:55 +0200
Subject: [PATCH 260/304] [IMP] base_setup: Add the shortcut 'Add More
 Features' and reindent the code

bzr revid: stw@openerp.com-20111005145855-hu14h1whjiv669iq
---
 addons/base_setup/base_setup_views.xml | 27 ++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 12b3246ad61..01051c4cc60 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -9,20 +9,27 @@
           <field name="target">new</field>
       </record>
 
+
       <record id="base_setup_installer_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_base_setup_installer_beta" />
-        <field name="category_id" ref="base.category_administration_config"/>
-        <field name="sequence">2</field>
+          <field name="action_id" ref="action_base_setup_installer_beta" />
+          <field name="category_id" ref="base.category_administration_config"/>
+          <field name="sequence">2</field>
       </record>
 
-    <record id="action_start_configurator" model="ir.actions.server">
-      <field name="name">Start Configuration</field>
-      <field name="model_id" ref="base.model_ir_actions_todo"/>
-      <field name="state">code</field>
-      <field name="code" eval="'# obj is a browse_record and will provide stupid ids to method\n' 'action = pool.get(\'ir.actions.todo\').action_launch(cr, uid, ' + str([ref('base_setup_installer_todo')]) + ', context=context)'"/>
-    </record>
+      <record id="action_start_configurator" model="ir.actions.server">
+          <field name="name">Start Configuration</field>
+          <field name="model_id" ref="base.model_ir_actions_todo"/>
+          <field name="state">code</field>
+          <field name="code" eval="'# obj is a browse_record and will provide stupid ids to method\n' 'action = pool.get(\'ir.actions.todo\').action_launch(cr, uid, ' + str([ref('base_setup_installer_todo')]) + ', context=context)'"/>
+      </record>
 
-    <menuitem name="Add More Features" action="action_start_configurator" id="menu_view_base_module_configuration" parent="base.menu_config" type="server" icon="STOCK_EXECUTE" sequence="100"/>
+      <menuitem name="Add More Features" action="action_start_configurator" id="menu_view_base_module_configuration" parent="base.menu_config" type="server" icon="STOCK_EXECUTE" sequence="100"/>
+      <record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc">
+          <field name="name">Add More Features</field>
+          <field name="resource">ir.ui.menu</field>
+          <field name="user_id" ref="base.user_root"/>
+          <field name="res_id" ref="menu_view_base_module_configuration" />
+      </record>
 
      <!-- Import or create customers configartion view  -->
      <record id="action_import_create_installer" model="ir.actions.act_window">

From 65745d5142abcd4ecc426a429c9d919dbcb8ebc3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Oct 2011 17:32:02 +0200
Subject: [PATCH 261/304] [FIX] Do not compute modifiers for aggregates in list
 view.

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

bzr revid: fme@openerp.com-20111005153202-4ao575zh3885ukuy
---
 addons/web/static/src/js/formats.js   | 8 ++++++--
 addons/web/static/src/js/view_list.js | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index e7feedf26a5..d3d88bc3731 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -179,9 +179,13 @@ openerp.web.auto_date_to_str = function(value, type) {
  * @param {String} [column.string] button label
  * @param {String} [column.icon] button icon
  * @param {String} [value_if_empty=''] what to display if the field's value is ``false``
+ * @param {Boolean} [process_modifiers=true] should the modifiers be computed ?
  */
-openerp.web.format_cell = function (row_data, column, value_if_empty) {
-    var attrs = column.modifiers_for(row_data);
+openerp.web.format_cell = function (row_data, column, value_if_empty, process_modifiers) {
+    var attrs = {};
+    if (process_modifiers !== false) {
+        attrs = column.modifiers_for(row_data);
+    }
     if (attrs.invisible) { return ''; }
     if (column.tag === 'button') {
         return [
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 7cceec03fb9..bb7b50244d8 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -620,7 +620,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
             }
 
             $footer_cells.filter(_.sprintf('[data-field=%s]', column.id))
-                .html(openerp.web.format_cell(aggregation, column));
+                .html(openerp.web.format_cell(aggregation, column, undefined, false));
         });
     },
     get_selected_ids: function() {

From 491dc693d66ae45d2ddd22b0dbd1d6a554daa549 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 5 Oct 2011 17:48:57 +0200
Subject: [PATCH 262/304] [IMP] fields.property: be more explicit when testing
 if something is a browse_record.

bzr revid: vmt@openerp.com-20111005154857-ic3yzb3dead33us3
---
 openerp/osv/fields.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index dc6a05b5925..4e226f1c0ec 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -41,6 +41,7 @@ import warnings
 import xmlrpclib
 from psycopg2 import Binary
 
+import openerp
 import openerp.netsvc as netsvc
 import openerp.tools as tools
 from openerp.tools.translate import _
@@ -1216,10 +1217,10 @@ class property(function):
         default_val = self._get_default(obj, cr, uid, prop_name, context)
 
         property_create = False
-        if hasattr(default_val, '_id') and default_val:
-            if default_val._id != id_val:
+        if isinstance(default_val, openerp.osv.orm.browse_record):
+            if default_val.id != id_val:
                 property_create = True
-        elif id_val != default_val:
+        elif default_val != id_val:
             property_create = True
 
         if property_create:

From 1cde2fa2de57ab95a6947a73e890cebe012df63f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Oct 2011 17:57:40 +0200
Subject: [PATCH 263/304] [FIX] Fixed addons path for binaries. Improved
 placeholder.

bzr revid: fme@openerp.com-20111005155740-ufdr7lwp4abpsfsu
---
 addons/web/controllers/main.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 9be0794a8bb..5e8efe3b1bd 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1025,16 +1025,17 @@ class Binary(openerpweb.Controller):
 
         try:
             if not id:
-                res = Model.default_get([field], context).get(field, '')
+                res = Model.default_get([field], context).get(field)
             else:
-                res = Model.read([int(id)], [field], context)[0].get(field, '')
+                res = Model.read([int(id)], [field], context)[0].get(field)
             image_data = base64.b64decode(res)
         except (TypeError, xmlrpclib.Fault):
             image_data = self.placeholder(req)
         return req.make_response(image_data, [
             ('Content-Type', 'image/png'), ('Content-Length', len(image_data))])
     def placeholder(self, req):
-        return open(os.path.join(req.addons_path, 'web', 'static', 'src', 'img', 'placeholder.png'), 'rb').read()
+        addons_path = openerpweb.addons_manifest['web']['addons_path']
+        return open(os.path.join(addons_path, 'web', 'static', 'src', 'img', 'placeholder.png'), 'rb').read()
 
     @openerpweb.httprequest
     def saveas(self, req, model, id, field, fieldname, **kw):

From 55e0541b0f0b1e8dba9b8fe741fd33ae1c72bd27 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 5 Oct 2011 18:35:14 +0200
Subject: [PATCH 264/304] [FIX] sed substitution

bzr revid: al@openerp.com-20111005163514-dzvvpsdg1hhhzb5t
---
 addons/mail/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index b20b975f3e6..47d731aa4e5 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -54,7 +54,7 @@ The main features are:
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'base_Hidden'],
+    'depends': ['base', 'base_tools'],
     'data': [
         "wizard/mail_compose_message_view.xml",
         "mail_message_view.xml",

From d72bf86b594065de21f8eea82f3924981ef75392 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 5 Oct 2011 18:52:02 +0200
Subject: [PATCH 265/304] [FIX] category selection

bzr revid: al@openerp.com-20111005165202-s3jv23v7n5py4mx1
---
 addons/base_setup/base_setup.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 9efc82f2d62..312e20c0ffd 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -101,10 +101,13 @@ class base_setup_installer(osv.osv_memory):
             module_ids = module_proxy.search(cr, uid, [], context=context)
             for module in module_proxy.browse(cr, uid, module_ids, context=context):
                 result['module_%d' % (module.id,)] = module.state == 'installed'
-                category_name = 'category_%d' % (module.category_id.id,)
-                if not result.get('category_name'):
-                    result[category_name] = module.state == 'installed' and \
-                            module.category_id.name in DEFAULT_MODULES
+
+            cat_proxy = self.pool.get('ir.module.category')
+            cat_ids = cat_proxy.search(cr, uid, [], context=context)
+            for cat in cat_proxy.browse(cr, uid, cat_ids, context=context):
+                m = DEFAULT_MODULES.get(cat.name,[])
+                r = module_proxy.search(cr, uid, [('state','=','installed'),('name','in',m)])
+                result['category_%d' % (cat.id,)] = bool(r)
 
         return result
 
@@ -330,10 +333,6 @@ class base_setup_installer(osv.osv_memory):
     #    if need_install:
     #        self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
     #    return
-base_setup_installer()
-
-
-
 
 #Migrate data from another application Conf wiz
 
@@ -356,7 +355,6 @@ class product_installer(osv.osv_memory):
     _inherit = 'res.config'
     _columns = {
         'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
-
     }
     _defaults = {
         'customers': 'create',

From 0d79dca93f85312deafe5df32d87dfe0c887d495 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 5 Oct 2011 19:58:26 +0200
Subject: [PATCH 266/304] [IMP] cleanup of web.common

bzr revid: al@openerp.com-20111005175826-7fzk3wesvz198kpm
---
 addons/web/__init__.py                 |   3 +-
 addons/web/common/__init__.py          |   6 +-
 addons/web/common/ast.py               |  48 ---
 addons/web/common/dates.py             |  88 -----
 addons/web/common/dispatch.py          | 428 ------------------------
 addons/web/common/http.py              | 431 ++++++++++++++++++++++++-
 addons/web/common/session.py           |   3 +-
 addons/web/controllers/main.py         |  79 ++---
 addons/web_chat/controllers/main.py    |   2 +-
 addons/web_dashboard/controllers.py    |   2 +-
 addons/web_diagram/controllers/main.py |   2 +-
 openerp-web.py                         |   4 +-
 12 files changed, 459 insertions(+), 637 deletions(-)
 delete mode 100644 addons/web/common/ast.py
 delete mode 100644 addons/web/common/dates.py
 delete mode 100644 addons/web/common/dispatch.py

diff --git a/addons/web/__init__.py b/addons/web/__init__.py
index 8802cb548c3..06e7fa1f0e3 100644
--- a/addons/web/__init__.py
+++ b/addons/web/__init__.py
@@ -1,6 +1,5 @@
 import common
 import controllers
-import common.dispatch
 import logging
 import optparse
 
@@ -22,6 +21,6 @@ def wsgi_postload():
     o.serve_static = True
     o.backend = 'local'
 
-    app = common.dispatch.Root(o)
+    app = common.http.Root(o)
     openerp.wsgi.register_wsgi_handler(app)
 
diff --git a/addons/web/common/__init__.py b/addons/web/common/__init__.py
index 9257f51d037..53bf3e3ed08 100644
--- a/addons/web/common/__init__.py
+++ b/addons/web/common/__init__.py
@@ -1,2 +1,6 @@
 #!/usr/bin/python
-from dispatch import *
+import http
+import nonliterals
+import release
+import session
+import xml2json
diff --git a/addons/web/common/ast.py b/addons/web/common/ast.py
deleted file mode 100644
index 2fd565aa30d..00000000000
--- a/addons/web/common/ast.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-""" Backport of Python 2.6's ast.py for Python 2.5
-"""
-__all__ = ['literal_eval']
-try:
-    from ast import literal_eval
-except ImportError:
-    from _ast import *
-    from _ast import __version__
-
-
-    def parse(expr, filename='<unknown>', mode='exec'):
-        """
-        Parse an expression into an AST node.
-        Equivalent to compile(expr, filename, mode, PyCF_ONLY_AST).
-        """
-        return compile(expr, filename, mode, PyCF_ONLY_AST)
-
-
-    def literal_eval(node_or_string):
-        """
-        Safely evaluate an expression node or a string containing a Python
-        expression.  The string or node provided may only consist of the
-        following Python literal structures: strings, numbers, tuples, lists,
-        dicts, booleans, and None.
-        """
-        _safe_names = {'None': None, 'True': True, 'False': False}
-        if isinstance(node_or_string, basestring):
-            node_or_string = parse(node_or_string, mode='eval')
-        if isinstance(node_or_string, Expression):
-            node_or_string = node_or_string.body
-        def _convert(node):
-            if isinstance(node, Str):
-                return node.s
-            elif isinstance(node, Num):
-                return node.n
-            elif isinstance(node, Tuple):
-                return tuple(map(_convert, node.elts))
-            elif isinstance(node, List):
-                return list(map(_convert, node.elts))
-            elif isinstance(node, Dict):
-                return dict((_convert(k), _convert(v)) for k, v
-                            in zip(node.keys, node.values))
-            elif isinstance(node, Name):
-                if node.id in _safe_names:
-                    return _safe_names[node.id]
-            raise ValueError('malformed string')
-        return _convert(node_or_string)
diff --git a/addons/web/common/dates.py b/addons/web/common/dates.py
deleted file mode 100644
index caa7f83c84a..00000000000
--- a/addons/web/common/dates.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import datetime
-
-DEFAULT_SERVER_DATE_FORMAT = "%Y-%m-%d"
-DEFAULT_SERVER_TIME_FORMAT = "%H:%M:%S"
-DEFAULT_SERVER_DATETIME_FORMAT = "%s %s" % (
-    DEFAULT_SERVER_DATE_FORMAT,
-    DEFAULT_SERVER_TIME_FORMAT)
-
-def str_to_datetime(str):
-    """
-    Converts a string to a datetime object using OpenERP's
-    datetime string format (exemple: '2011-12-01 15:12:35').
-    
-    No timezone information is added, the datetime is a naive instance, but
-    according to OpenERP 6.1 specification the timezone is always UTC.
-    """
-    if not str:
-        return str
-    return datetime.datetime.strptime(str, DEFAULT_SERVER_DATETIME_FORMAT)
-
-def str_to_date(str):
-    """
-    Converts a string to a date object using OpenERP's
-    date string format (exemple: '2011-12-01').
-    """
-    if not str:
-        return str
-    return datetime.datetime.strptime(str, DEFAULT_SERVER_DATE_FORMAT).date()
-
-def str_to_time(str):
-    """
-    Converts a string to a time object using OpenERP's
-    time string format (exemple: '15:12:35').
-    """
-    if not str:
-        return str
-    return datetime.datetime.strptime(str, DEFAULT_SERVER_TIME_FORMAT).time()
-
-def datetime_to_str(obj):
-    """
-    Converts a datetime object to a string using OpenERP's
-    datetime string format (exemple: '2011-12-01 15:12:35').
-    
-    The datetime instance should not have an attached timezone and be in UTC.
-    """
-    if not obj:
-        return False
-    return obj.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
-
-def date_to_str(obj):
-    """
-    Converts a date object to a string using OpenERP's
-    date string format (exemple: '2011-12-01').
-    """
-    if not obj:
-        return False
-    return obj.strftime(DEFAULT_SERVER_DATE_FORMAT)
-
-def time_to_str(obj):
-    """
-    Converts a time object to a string using OpenERP's
-    time string format (exemple: '15:12:35').
-    """
-    if not obj:
-        return False
-    return obj.strftime(DEFAULT_SERVER_TIME_FORMAT)
diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py
deleted file mode 100644
index cb998caf891..00000000000
--- a/addons/web/common/dispatch.py
+++ /dev/null
@@ -1,428 +0,0 @@
-#!/usr/bin/python
-from __future__ import with_statement
-
-import functools
-import logging
-import urllib
-import os
-import pprint
-import sys
-import traceback
-import uuid
-import xmlrpclib
-
-import simplejson
-import werkzeug.datastructures
-import werkzeug.exceptions
-import werkzeug.utils
-import werkzeug.wrappers
-import werkzeug.wsgi
-
-import ast
-import nonliterals
-import http
-import session
-import openerplib
-
-__all__ = ['Root', 'jsonrequest', 'httprequest', 'Controller',
-           'WebRequest', 'JsonRequest', 'HttpRequest']
-
-_logger = logging.getLogger(__name__)
-
-#-----------------------------------------------------------
-# Globals (wont move into a pool)
-#-----------------------------------------------------------
-
-addons_module = {}
-addons_manifest = {}
-controllers_class = {}
-controllers_object = {}
-controllers_path = {}
-
-#----------------------------------------------------------
-# OpenERP Web RequestHandler
-#----------------------------------------------------------
-class WebRequest(object):
-    """ Parent class for all OpenERP Web request types, mostly deals with
-    initialization and setup of the request object (the dispatching itself has
-    to be handled by the subclasses)
-
-    :param request: a wrapped werkzeug Request object
-    :type request: :class:`werkzeug.wrappers.BaseRequest`
-    :param config: configuration object
-
-    .. attribute:: httprequest
-
-        the original :class:`werkzeug.wrappers.Request` object provided to the
-        request
-
-    .. attribute:: httpsession
-
-        a :class:`~collections.Mapping` holding the HTTP session data for the
-        current http session
-
-    .. attribute:: config
-
-        config parameter provided to the request object
-
-    .. attribute:: params
-
-        :class:`~collections.Mapping` of request parameters, not generally
-        useful as they're provided directly to the handler method as keyword
-        arguments
-
-    .. attribute:: session_id
-
-        opaque identifier for the :class:`session.OpenERPSession` instance of
-        the current request
-
-    .. attribute:: session
-
-        :class:`~session.OpenERPSession` instance for the current request
-
-    .. attribute:: context
-
-        :class:`~collections.Mapping` of context values for the current request
-
-    .. attribute:: debug
-
-        ``bool``, indicates whether the debug mode is active on the client
-    """
-    def __init__(self, request, config):
-        self.httprequest = request
-        self.httpresponse = None
-        self.httpsession = request.session
-        self.config = config
-
-    def init(self, params):
-        self.params = dict(params)
-        # OpenERP session setup
-        self.session_id = self.params.pop("session_id", None) or uuid.uuid4().hex
-        self.session = self.httpsession.setdefault(self.session_id, session.OpenERPSession())
-        self.session.config = self.config
-        self.context = self.params.pop('context', None)
-        self.debug = self.params.pop('debug', False) != False
-
-class JsonRequest(WebRequest):
-    """ JSON-RPC2 over HTTP.
-
-    Sucessful request::
-
-      --> {"jsonrpc": "2.0",
-           "method": "call",
-           "params": {"session_id": "SID",
-                      "context": {},
-                      "arg1": "val1" },
-           "id": null}
-
-      <-- {"jsonrpc": "2.0",
-           "result": { "res1": "val1" },
-           "id": null}
-
-    Request producing a error::
-
-      --> {"jsonrpc": "2.0",
-           "method": "call",
-           "params": {"session_id": "SID",
-                      "context": {},
-                      "arg1": "val1" },
-           "id": null}
-
-      <-- {"jsonrpc": "2.0",
-           "error": {"code": 1,
-                     "message": "End user error message.",
-                     "data": {"code": "codestring",
-                              "debug": "traceback" } },
-           "id": null}
-
-    """
-
-    def dispatch(self, controller, method, requestf=None, request=None):
-        """ Calls the method asked for by the JSON-RPC2 request
-
-        :param controller: the instance of the controller which received the request
-        :param method: the method which received the request
-        :param requestf: a file-like object containing an encoded JSON-RPC2 request
-        :param request: a JSON-RPC2 request
-
-        :returns: an utf8 encoded JSON-RPC2 reply
-        """
-        response = {"jsonrpc": "2.0" }
-        error = None
-        try:
-            # Read POST content or POST Form Data named "request"
-            if requestf:
-                self.jsonrequest = simplejson.load(requestf, object_hook=nonliterals.non_literal_decoder)
-            else:
-                self.jsonrequest = simplejson.loads(request, object_hook=nonliterals.non_literal_decoder)
-            self.init(self.jsonrequest.get("params", {}))
-            if _logger.isEnabledFor(logging.DEBUG):
-                _logger.debug("--> %s.%s\n%s", controller.__class__.__name__, method.__name__, pprint.pformat(self.jsonrequest))
-            response['id'] = self.jsonrequest.get('id')
-            response["result"] = method(controller, self, **self.params)
-        except openerplib.AuthenticationError:
-            error = {
-                'code': 100,
-                'message': "OpenERP Session Invalid",
-                'data': {
-                    'type': 'session_invalid',
-                    'debug': traceback.format_exc()
-                }
-            }
-        except xmlrpclib.Fault, e:
-            error = {
-                'code': 200,
-                'message': "OpenERP Server Error",
-                'data': {
-                    'type': 'server_exception',
-                    'fault_code': e.faultCode,
-                    'debug': "Client %s\nServer %s" % (
-                    "".join(traceback.format_exception("", None, sys.exc_traceback)), e.faultString)
-                }
-            }
-        except Exception:
-            logging.getLogger(__name__ + '.JSONRequest.dispatch').exception\
-                ("An error occured while handling a json request")
-            error = {
-                'code': 300,
-                'message': "OpenERP WebClient Error",
-                'data': {
-                    'type': 'client_exception',
-                    'debug': "Client %s" % traceback.format_exc()
-                }
-            }
-        if error:
-            response["error"] = error
-
-        if _logger.isEnabledFor(logging.DEBUG):
-            _logger.debug("<--\n%s", pprint.pformat(response))
-        content = simplejson.dumps(response, cls=nonliterals.NonLiteralEncoder)
-        return werkzeug.wrappers.Response(
-            content, headers=[('Content-Type', 'application/json'),
-                              ('Content-Length', len(content))])
-
-def jsonrequest(f):
-    """ Decorator marking the decorated method as being a handler for a
-    JSON-RPC request (the exact request path is specified via the
-    ``$(Controller._cp_path)/$methodname`` combination.
-
-    If the method is called, it will be provided with a :class:`JsonRequest`
-    instance and all ``params`` sent during the JSON-RPC request, apart from
-    the ``session_id``, ``context`` and ``debug`` keys (which are stripped out
-    beforehand)
-    """
-    @functools.wraps(f)
-    def json_handler(controller, request, config):
-        return JsonRequest(request, config).dispatch(
-            controller, f, requestf=request.stream)
-    json_handler.exposed = True
-    return json_handler
-
-class HttpRequest(WebRequest):
-    """ Regular GET/POST request
-    """
-    def dispatch(self, controller, method):
-        params = dict(self.httprequest.args)
-        params.update(self.httprequest.form)
-        params.update(self.httprequest.files)
-        self.init(params)
-        akw = {}
-        for key, value in self.httprequest.args.iteritems():
-            if isinstance(value, basestring) and len(value) < 1024:
-                akw[key] = value
-            else:
-                akw[key] = type(value)
-        _logger.debug("%s --> %s.%s %r", self.httprequest.method, controller.__class__.__name__, method.__name__, akw)
-        r = method(controller, self, **self.params)
-        if self.debug or 1:
-            if isinstance(r, werkzeug.wrappers.BaseResponse):
-                _logger.debug('<-- %s', r)
-            else:
-                _logger.debug("<-- size: %s", len(r))
-        return r
-
-    def make_response(self, data, headers=None, cookies=None):
-        """ Helper for non-HTML responses, or HTML responses with custom
-        response headers or cookies.
-
-        While handlers can just return the HTML markup of a page they want to
-        send as a string if non-HTML data is returned they need to create a
-        complete response object, or the returned data will not be correctly
-        interpreted by the clients.
-
-        :param basestring data: response body
-        :param headers: HTTP headers to set on the response
-        :type headers: ``[(name, value)]``
-        :param collections.Mapping cookies: cookies to set on the client
-        """
-        response = werkzeug.wrappers.Response(data, headers=headers)
-        if cookies:
-            for k, v in cookies.iteritems():
-                response.set_cookie(k, v)
-        return response
-
-    def not_found(self, description=None):
-        """ Helper for 404 response, return its result from the method
-        """
-        return werkzeug.exceptions.NotFound(description)
-
-def httprequest(f):
-    """ Decorator marking the decorated method as being a handler for a
-    normal HTTP request (the exact request path is specified via the
-    ``$(Controller._cp_path)/$methodname`` combination.
-
-    If the method is called, it will be provided with a :class:`HttpRequest`
-    instance and all ``params`` sent during the request (``GET`` and ``POST``
-    merged in the same dictionary), apart from the ``session_id``, ``context``
-    and ``debug`` keys (which are stripped out beforehand)
-    """
-    @functools.wraps(f)
-    def http_handler(controller, request, config):
-        return HttpRequest(request, config).dispatch(controller, f)
-    http_handler.exposed = True
-    return http_handler
-
-class ControllerType(type):
-    def __init__(cls, name, bases, attrs):
-        super(ControllerType, cls).__init__(name, bases, attrs)
-        controllers_class["%s.%s" % (cls.__module__, cls.__name__)] = cls
-
-class Controller(object):
-    __metaclass__ = ControllerType
-
-class Root(object):
-    """Root WSGI application for the OpenERP Web Client.
-
-    :param options: mandatory initialization options object, must provide
-                    the following attributes:
-
-                    ``server_host`` (``str``)
-                      hostname of the OpenERP server to dispatch RPC to
-                    ``server_port`` (``int``)
-                      RPC port of the OpenERP server
-                    ``serve_static`` (``bool | None``)
-                      whether this application should serve the various
-                      addons's static files
-                    ``storage_path`` (``str``)
-                      filesystem path where HTTP session data will be stored
-                    ``dbfilter`` (``str``)
-                      only used in case the list of databases is requested
-                      by the server, will be filtered by this pattern
-    """
-    def __init__(self, options):
-        self.root = '/web/webclient/home'
-        self.config = options
-
-        if self.config.backend == 'local':
-            conn = openerplib.get_connector(protocol='local')
-        else:
-            conn = openerplib.get_connector(hostname=self.config.server_host,
-                   port=self.config.server_port)
-        self.config.connector = conn
-
-        self.session_cookie = 'sessionid'
-        self.addons = {}
-
-        static_dirs = self._load_addons()
-        if options.serve_static:
-            self.dispatch = werkzeug.wsgi.SharedDataMiddleware(
-                self.dispatch, static_dirs)
-
-        if options.session_storage:
-            if not os.path.exists(options.session_storage):
-                os.mkdir(options.session_storage, 0700)
-            self.session_storage = options.session_storage
-
-    def __call__(self, environ, start_response):
-        """ Handle a WSGI request
-        """
-        return self.dispatch(environ, start_response)
-
-    def dispatch(self, environ, start_response):
-        """
-        Performs the actual WSGI dispatching for the application, may be
-        wrapped during the initialization of the object.
-
-        Call the object directly.
-        """
-        request = werkzeug.wrappers.Request(environ)
-        request.parameter_storage_class = werkzeug.datastructures.ImmutableDict
-
-        if request.path == '/':
-            params = urllib.urlencode(dict(request.args, debug=''))
-            return werkzeug.utils.redirect(self.root + '?' + params, 301)(
-                environ, start_response)
-        elif request.path == '/mobile':
-            return werkzeug.utils.redirect(
-                '/web_mobile/static/src/web_mobile.html', 301)(environ, start_response)
-
-        handler = self.find_handler(*(request.path.split('/')[1:]))
-
-        if not handler:
-            response = werkzeug.exceptions.NotFound()
-        else:
-            with http.session(request, self.session_storage, self.session_cookie) as session:
-                result = handler(
-                    request, self.config)
-
-                if isinstance(result, basestring):
-                    response = werkzeug.wrappers.Response(
-                        result, headers=[('Content-Type', 'text/html; charset=utf-8'),
-                                         ('Content-Length', len(result))])
-                else:
-                    response = result
-
-                response.set_cookie(self.session_cookie, session.sid)
-
-        return response(environ, start_response)
-
-    def _load_addons(self):
-        """
-        Loads all addons at the specified addons path, returns a mapping of
-        static URLs to the corresponding directories
-        """
-        statics = {}
-        for addons_path in self.config.addons_path:
-            if addons_path not in sys.path:
-                sys.path.insert(0, addons_path)
-            for module in os.listdir(addons_path):
-                if module not in addons_module:
-                    manifest_path = os.path.join(addons_path, module, '__openerp__.py')
-                    path_static = os.path.join(addons_path, module, 'static')
-                    if os.path.isfile(manifest_path) and os.path.isdir(path_static):
-                        manifest = ast.literal_eval(open(manifest_path).read())
-                        manifest['addons_path'] = addons_path
-                        _logger.info("Loading %s", module)
-                        m = __import__(module)
-                        addons_module[module] = m
-                        addons_manifest[module] = manifest
-                        statics['/%s/static' % module] = path_static
-        for k, v in controllers_class.items():
-            if k not in controllers_object:
-                o = v()
-                controllers_object[k] = o
-                if hasattr(o, '_cp_path'):
-                    controllers_path[o._cp_path] = o
-        return statics
-
-    def find_handler(self, *l):
-        """
-        Tries to discover the controller handling the request for the path
-        specified by the provided parameters
-
-        :param l: path sections to a controller or controller method
-        :returns: a callable matching the path sections, or ``None``
-        :rtype: ``Controller | None``
-        """
-        if len(l) > 1:
-            for i in range(len(l), 1, -1):
-                ps = "/" + "/".join(l[0:i])
-                if ps in controllers_path:
-                    c = controllers_path[ps]
-                    rest = l[i:] or ['index']
-                    meth = rest[0]
-                    m = getattr(c, meth)
-                    if getattr(m, 'exposed', False):
-                        _logger.debug("Dispatching to %s %s %s", ps, c, meth)
-                        return m
-        return None
diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 0186fd985cc..453484acee7 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -1,13 +1,286 @@
 # -*- coding: utf-8 -*-
-
+#----------------------------------------------------------
+# OpenERP Web HTTP layer
+#----------------------------------------------------------
+import ast
 import contextlib
+import functools
+import logging
+import urllib
+import os
+import pprint
+import sys
+import traceback
+import uuid
+import xmlrpclib
 
+import simplejson
 import werkzeug.contrib.sessions
+import werkzeug.datastructures
+import werkzeug.exceptions
+import werkzeug.utils
+import werkzeug.wrappers
+import werkzeug.wsgi
 
+import nonliterals
+import session
+import openerplib
+
+__all__ = ['Root', 'jsonrequest', 'httprequest', 'Controller',
+           'WebRequest', 'JsonRequest', 'HttpRequest']
+
+_logger = logging.getLogger(__name__)
+
+#----------------------------------------------------------
+# OpenERP Web RequestHandler
+#----------------------------------------------------------
+class WebRequest(object):
+    """ Parent class for all OpenERP Web request types, mostly deals with
+    initialization and setup of the request object (the dispatching itself has
+    to be handled by the subclasses)
+
+    :param request: a wrapped werkzeug Request object
+    :type request: :class:`werkzeug.wrappers.BaseRequest`
+    :param config: configuration object
+
+    .. attribute:: httprequest
+
+        the original :class:`werkzeug.wrappers.Request` object provided to the
+        request
+
+    .. attribute:: httpsession
+
+        a :class:`~collections.Mapping` holding the HTTP session data for the
+        current http session
+
+    .. attribute:: config
+
+        config parameter provided to the request object
+
+    .. attribute:: params
+
+        :class:`~collections.Mapping` of request parameters, not generally
+        useful as they're provided directly to the handler method as keyword
+        arguments
+
+    .. attribute:: session_id
+
+        opaque identifier for the :class:`session.OpenERPSession` instance of
+        the current request
+
+    .. attribute:: session
+
+        :class:`~session.OpenERPSession` instance for the current request
+
+    .. attribute:: context
+
+        :class:`~collections.Mapping` of context values for the current request
+
+    .. attribute:: debug
+
+        ``bool``, indicates whether the debug mode is active on the client
+    """
+    def __init__(self, request, config):
+        self.httprequest = request
+        self.httpresponse = None
+        self.httpsession = request.session
+        self.config = config
+
+    def init(self, params):
+        self.params = dict(params)
+        # OpenERP session setup
+        self.session_id = self.params.pop("session_id", None) or uuid.uuid4().hex
+        self.session = self.httpsession.setdefault(self.session_id, session.OpenERPSession())
+        self.session.config = self.config
+        self.context = self.params.pop('context', None)
+        self.debug = self.params.pop('debug', False) != False
+
+class JsonRequest(WebRequest):
+    """ JSON-RPC2 over HTTP.
+
+    Sucessful request::
+
+      --> {"jsonrpc": "2.0",
+           "method": "call",
+           "params": {"session_id": "SID",
+                      "context": {},
+                      "arg1": "val1" },
+           "id": null}
+
+      <-- {"jsonrpc": "2.0",
+           "result": { "res1": "val1" },
+           "id": null}
+
+    Request producing a error::
+
+      --> {"jsonrpc": "2.0",
+           "method": "call",
+           "params": {"session_id": "SID",
+                      "context": {},
+                      "arg1": "val1" },
+           "id": null}
+
+      <-- {"jsonrpc": "2.0",
+           "error": {"code": 1,
+                     "message": "End user error message.",
+                     "data": {"code": "codestring",
+                              "debug": "traceback" } },
+           "id": null}
+
+    """
+
+    def dispatch(self, controller, method, requestf=None, request=None):
+        """ Calls the method asked for by the JSON-RPC2 request
+
+        :param controller: the instance of the controller which received the request
+        :param method: the method which received the request
+        :param requestf: a file-like object containing an encoded JSON-RPC2 request
+        :param request: a JSON-RPC2 request
+
+        :returns: an utf8 encoded JSON-RPC2 reply
+        """
+        response = {"jsonrpc": "2.0" }
+        error = None
+        try:
+            # Read POST content or POST Form Data named "request"
+            if requestf:
+                self.jsonrequest = simplejson.load(requestf, object_hook=nonliterals.non_literal_decoder)
+            else:
+                self.jsonrequest = simplejson.loads(request, object_hook=nonliterals.non_literal_decoder)
+            self.init(self.jsonrequest.get("params", {}))
+            if _logger.isEnabledFor(logging.DEBUG):
+                _logger.debug("--> %s.%s\n%s", controller.__class__.__name__, method.__name__, pprint.pformat(self.jsonrequest))
+            response['id'] = self.jsonrequest.get('id')
+            response["result"] = method(controller, self, **self.params)
+        except openerplib.AuthenticationError:
+            error = {
+                'code': 100,
+                'message': "OpenERP Session Invalid",
+                'data': {
+                    'type': 'session_invalid',
+                    'debug': traceback.format_exc()
+                }
+            }
+        except xmlrpclib.Fault, e:
+            error = {
+                'code': 200,
+                'message': "OpenERP Server Error",
+                'data': {
+                    'type': 'server_exception',
+                    'fault_code': e.faultCode,
+                    'debug': "Client %s\nServer %s" % (
+                    "".join(traceback.format_exception("", None, sys.exc_traceback)), e.faultString)
+                }
+            }
+        except Exception:
+            logging.getLogger(__name__ + '.JSONRequest.dispatch').exception\
+                ("An error occured while handling a json request")
+            error = {
+                'code': 300,
+                'message': "OpenERP WebClient Error",
+                'data': {
+                    'type': 'client_exception',
+                    'debug': "Client %s" % traceback.format_exc()
+                }
+            }
+        if error:
+            response["error"] = error
+
+        if _logger.isEnabledFor(logging.DEBUG):
+            _logger.debug("<--\n%s", pprint.pformat(response))
+        content = simplejson.dumps(response, cls=nonliterals.NonLiteralEncoder)
+        return werkzeug.wrappers.Response(
+            content, headers=[('Content-Type', 'application/json'),
+                              ('Content-Length', len(content))])
+
+def jsonrequest(f):
+    """ Decorator marking the decorated method as being a handler for a
+    JSON-RPC request (the exact request path is specified via the
+    ``$(Controller._cp_path)/$methodname`` combination.
+
+    If the method is called, it will be provided with a :class:`JsonRequest`
+    instance and all ``params`` sent during the JSON-RPC request, apart from
+    the ``session_id``, ``context`` and ``debug`` keys (which are stripped out
+    beforehand)
+    """
+    @functools.wraps(f)
+    def json_handler(controller, request, config):
+        return JsonRequest(request, config).dispatch(
+            controller, f, requestf=request.stream)
+    json_handler.exposed = True
+    return json_handler
+
+class HttpRequest(WebRequest):
+    """ Regular GET/POST request
+    """
+    def dispatch(self, controller, method):
+        params = dict(self.httprequest.args)
+        params.update(self.httprequest.form)
+        params.update(self.httprequest.files)
+        self.init(params)
+        akw = {}
+        for key, value in self.httprequest.args.iteritems():
+            if isinstance(value, basestring) and len(value) < 1024:
+                akw[key] = value
+            else:
+                akw[key] = type(value)
+        _logger.debug("%s --> %s.%s %r", self.httprequest.method, controller.__class__.__name__, method.__name__, akw)
+        r = method(controller, self, **self.params)
+        if self.debug or 1:
+            if isinstance(r, werkzeug.wrappers.BaseResponse):
+                _logger.debug('<-- %s', r)
+            else:
+                _logger.debug("<-- size: %s", len(r))
+        return r
+
+    def make_response(self, data, headers=None, cookies=None):
+        """ Helper for non-HTML responses, or HTML responses with custom
+        response headers or cookies.
+
+        While handlers can just return the HTML markup of a page they want to
+        send as a string if non-HTML data is returned they need to create a
+        complete response object, or the returned data will not be correctly
+        interpreted by the clients.
+
+        :param basestring data: response body
+        :param headers: HTTP headers to set on the response
+        :type headers: ``[(name, value)]``
+        :param collections.Mapping cookies: cookies to set on the client
+        """
+        response = werkzeug.wrappers.Response(data, headers=headers)
+        if cookies:
+            for k, v in cookies.iteritems():
+                response.set_cookie(k, v)
+        return response
+
+    def not_found(self, description=None):
+        """ Helper for 404 response, return its result from the method
+        """
+        return werkzeug.exceptions.NotFound(description)
+
+def httprequest(f):
+    """ Decorator marking the decorated method as being a handler for a
+    normal HTTP request (the exact request path is specified via the
+    ``$(Controller._cp_path)/$methodname`` combination.
+
+    If the method is called, it will be provided with a :class:`HttpRequest`
+    instance and all ``params`` sent during the request (``GET`` and ``POST``
+    merged in the same dictionary), apart from the ``session_id``, ``context``
+    and ``debug`` keys (which are stripped out beforehand)
+    """
+    @functools.wraps(f)
+    def http_handler(controller, request, config):
+        return HttpRequest(request, config).dispatch(controller, f)
+    http_handler.exposed = True
+    return http_handler
+
+#----------------------------------------------------------
+# OpenERP Web werkzeug Session Managment wraped using with
+#----------------------------------------------------------
 STORES = {}
 
 @contextlib.contextmanager
-def session(request, storage_path, session_cookie='sessionid'):
+def session_context(request, storage_path, session_cookie='sessionid'):
     session_store = STORES.get(storage_path)
     if not session_store:
         session_store = werkzeug.contrib.sessions.FilesystemSessionStore(
@@ -24,3 +297,157 @@ def session(request, storage_path, session_cookie='sessionid'):
         yield request.session
     finally:
         session_store.save(request.session)
+
+#----------------------------------------------------------
+# OpenERP Web Module/Controller Loading and URL Routing
+#----------------------------------------------------------
+addons_module = {}
+addons_manifest = {}
+controllers_class = {}
+controllers_object = {}
+controllers_path = {}
+
+class ControllerType(type):
+    def __init__(cls, name, bases, attrs):
+        super(ControllerType, cls).__init__(name, bases, attrs)
+        controllers_class["%s.%s" % (cls.__module__, cls.__name__)] = cls
+
+class Controller(object):
+    __metaclass__ = ControllerType
+
+class Root(object):
+    """Root WSGI application for the OpenERP Web Client.
+
+    :param options: mandatory initialization options object, must provide
+                    the following attributes:
+
+                    ``server_host`` (``str``)
+                      hostname of the OpenERP server to dispatch RPC to
+                    ``server_port`` (``int``)
+                      RPC port of the OpenERP server
+                    ``serve_static`` (``bool | None``)
+                      whether this application should serve the various
+                      addons's static files
+                    ``storage_path`` (``str``)
+                      filesystem path where HTTP session data will be stored
+                    ``dbfilter`` (``str``)
+                      only used in case the list of databases is requested
+                      by the server, will be filtered by this pattern
+    """
+    def __init__(self, options):
+        self.root = '/web/webclient/home'
+        self.config = options
+
+        if self.config.backend == 'local':
+            conn = openerplib.get_connector(protocol='local')
+        else:
+            conn = openerplib.get_connector(hostname=self.config.server_host,
+                   port=self.config.server_port)
+        self.config.connector = conn
+
+        self.session_cookie = 'sessionid'
+        self.addons = {}
+
+        static_dirs = self._load_addons()
+        if options.serve_static:
+            self.dispatch = werkzeug.wsgi.SharedDataMiddleware(
+                self.dispatch, static_dirs)
+
+        if options.session_storage:
+            if not os.path.exists(options.session_storage):
+                os.mkdir(options.session_storage, 0700)
+            self.session_storage = options.session_storage
+
+    def __call__(self, environ, start_response):
+        """ Handle a WSGI request
+        """
+        return self.dispatch(environ, start_response)
+
+    def dispatch(self, environ, start_response):
+        """
+        Performs the actual WSGI dispatching for the application, may be
+        wrapped during the initialization of the object.
+
+        Call the object directly.
+        """
+        request = werkzeug.wrappers.Request(environ)
+        request.parameter_storage_class = werkzeug.datastructures.ImmutableDict
+
+        if request.path == '/':
+            params = urllib.urlencode(dict(request.args, debug=''))
+            return werkzeug.utils.redirect(self.root + '?' + params, 301)(
+                environ, start_response)
+        elif request.path == '/mobile':
+            return werkzeug.utils.redirect(
+                '/web_mobile/static/src/web_mobile.html', 301)(environ, start_response)
+
+        handler = self.find_handler(*(request.path.split('/')[1:]))
+
+        if not handler:
+            response = werkzeug.exceptions.NotFound()
+        else:
+            with session_context(request, self.session_storage, self.session_cookie) as session:
+                result = handler( request, self.config)
+
+                if isinstance(result, basestring):
+                    headers=[('Content-Type', 'text/html; charset=utf-8'), ('Content-Length', len(result))]
+                    response = werkzeug.wrappers.Response(result, headers=headers)
+                else:
+                    response = result
+
+                response.set_cookie(self.session_cookie, session.sid)
+
+        return response(environ, start_response)
+
+    def _load_addons(self):
+        """
+        Loads all addons at the specified addons path, returns a mapping of
+        static URLs to the corresponding directories
+        """
+        statics = {}
+        for addons_path in self.config.addons_path:
+            if addons_path not in sys.path:
+                sys.path.insert(0, addons_path)
+            for module in os.listdir(addons_path):
+                if module not in addons_module:
+                    manifest_path = os.path.join(addons_path, module, '__openerp__.py')
+                    path_static = os.path.join(addons_path, module, 'static')
+                    if os.path.isfile(manifest_path) and os.path.isdir(path_static):
+                        manifest = ast.literal_eval(open(manifest_path).read())
+                        manifest['addons_path'] = addons_path
+                        _logger.info("Loading %s", module)
+                        m = __import__(module)
+                        addons_module[module] = m
+                        addons_manifest[module] = manifest
+                        statics['/%s/static' % module] = path_static
+        for k, v in controllers_class.items():
+            if k not in controllers_object:
+                o = v()
+                controllers_object[k] = o
+                if hasattr(o, '_cp_path'):
+                    controllers_path[o._cp_path] = o
+        return statics
+
+    def find_handler(self, *l):
+        """
+        Tries to discover the controller handling the request for the path
+        specified by the provided parameters
+
+        :param l: path sections to a controller or controller method
+        :returns: a callable matching the path sections, or ``None``
+        :rtype: ``Controller | None``
+        """
+        if len(l) > 1:
+            for i in range(len(l), 1, -1):
+                ps = "/" + "/".join(l[0:i])
+                if ps in controllers_path:
+                    c = controllers_path[ps]
+                    rest = l[i:] or ['index']
+                    meth = rest[0]
+                    m = getattr(c, meth)
+                    if getattr(m, 'exposed', False):
+                        _logger.debug("Dispatching to %s %s %s", ps, c, meth)
+                        return m
+        return None
+
+#
diff --git a/addons/web/common/session.py b/addons/web/common/session.py
index 2ed50bd6131..e8027db8ea4 100644
--- a/addons/web/common/session.py
+++ b/addons/web/common/session.py
@@ -1,17 +1,16 @@
 #!/usr/bin/python
 import datetime
 import dateutil.relativedelta
+import logging
 import time
 import openerplib
 
 import nonliterals
 
-import logging
 _logger = logging.getLogger(__name__)
 #----------------------------------------------------------
 # OpenERPSession RPC openerp backend access
 #----------------------------------------------------------
-
 class OpenERPSession(object):
     """
     An OpenERP RPC session, a given user can own multiple such sessions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 30128444fb2..2646cbb4dfc 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import ast
 import base64
 import csv
 import glob
@@ -9,60 +10,16 @@ import os
 import re
 import simplejson
 import textwrap
-import xmlrpclib
 import time
+import xmlrpclib
 import zlib
 from xml.etree import ElementTree
 from cStringIO import StringIO
 
-from babel.messages.pofile import read_po
+import babel.messages.pofile
 
-import web.common.dispatch as openerpweb
-import web.common.ast
-import web.common.nonliterals
-import web.common.release
-openerpweb.ast = web.common.ast
-openerpweb.nonliterals = web.common.nonliterals
-
-
-# Should move to web.common.xml2json.Xml2Json
-class Xml2Json:
-    # xml2json-direct
-    # Simple and straightforward XML-to-JSON converter in Python
-    # New BSD Licensed
-    #
-    # URL: http://code.google.com/p/xml2json-direct/
-    @staticmethod
-    def convert_to_json(s):
-        return simplejson.dumps(
-            Xml2Json.convert_to_structure(s), sort_keys=True, indent=4)
-
-    @staticmethod
-    def convert_to_structure(s):
-        root = ElementTree.fromstring(s)
-        return Xml2Json.convert_element(root)
-
-    @staticmethod
-    def convert_element(el, skip_whitespaces=True):
-        res = {}
-        if el.tag[0] == "{":
-            ns, name = el.tag.rsplit("}", 1)
-            res["tag"] = name
-            res["namespace"] = ns[1:]
-        else:
-            res["tag"] = el.tag
-        res["attrs"] = {}
-        for k, v in el.items():
-            res["attrs"][k] = v
-        kids = []
-        if el.text and (not skip_whitespaces or el.text.strip() != ''):
-            kids.append(el.text)
-        for kid in el:
-            kids.append(Xml2Json.convert_element(kid))
-            if kid.tail and (not skip_whitespaces or kid.tail.strip() != ''):
-                kids.append(kid.tail)
-        res["children"] = kids
-        return res
+import web.common
+openerpweb = web.common.http
 
 #----------------------------------------------------------
 # OpenERP Web web Controllers
@@ -200,7 +157,7 @@ class WebClient(openerpweb.Controller):
                     continue
                 try:
                     with open(f_name) as t_file:
-                        po = read_po(t_file)
+                        po = babel.messages.pofile.read_po(t_file)
                 except:
                     continue
                 for x in po:
@@ -398,8 +355,8 @@ class Session(openerpweb.Controller):
                 no group by should be performed)
         """
         context, domain = eval_context_and_domain(req.session,
-                                                  openerpweb.nonliterals.CompoundContext(*(contexts or [])),
-                                                  openerpweb.nonliterals.CompoundDomain(*(domains or [])))
+                                                  web.common.nonliterals.CompoundContext(*(contexts or [])),
+                                                  web.common.nonliterals.CompoundDomain(*(domains or [])))
 
         group_by_sequence = []
         for candidate in (group_by_seq or []):
@@ -816,7 +773,7 @@ class View(openerpweb.Controller):
             xml = self.transform_view(arch, session, evaluation_context)
         else:
             xml = ElementTree.fromstring(arch)
-        fvg['arch'] = Xml2Json.convert_element(xml)
+        fvg['arch'] = web.common.xml2json.Xml2Json.convert_element(xml)
 
         for field in fvg['fields'].itervalues():
             if field.get('views'):
@@ -881,7 +838,7 @@ class View(openerpweb.Controller):
 
     def parse_domain(self, domain, session):
         """ Parses an arbitrary string containing a domain, transforms it
-        to either a literal domain or a :class:`openerpweb.nonliterals.Domain`
+        to either a literal domain or a :class:`web.common.nonliterals.Domain`
 
         :param domain: the domain to parse, if the domain is not a string it
                        is assumed to be a literal domain and is returned as-is
@@ -891,14 +848,14 @@ class View(openerpweb.Controller):
         if not isinstance(domain, (str, unicode)):
             return domain
         try:
-            return openerpweb.ast.literal_eval(domain)
+            return ast.literal_eval(domain)
         except ValueError:
             # not a literal
-            return openerpweb.nonliterals.Domain(session, domain)
+            return web.common.nonliterals.Domain(session, domain)
 
     def parse_context(self, context, session):
         """ Parses an arbitrary string containing a context, transforms it
-        to either a literal context or a :class:`openerpweb.nonliterals.Context`
+        to either a literal context or a :class:`web.common.nonliterals.Context`
 
         :param context: the context to parse, if the context is not a string it
                is assumed to be a literal domain and is returned as-is
@@ -908,9 +865,9 @@ class View(openerpweb.Controller):
         if not isinstance(context, (str, unicode)):
             return context
         try:
-            return openerpweb.ast.literal_eval(context)
+            return ast.literal_eval(context)
         except ValueError:
-            return openerpweb.nonliterals.Context(session, context)
+            return web.common.nonliterals.Context(session, context)
 
     def parse_domains_and_contexts(self, elem, session):
         """ Converts domains and contexts from the view into Python objects,
@@ -998,10 +955,10 @@ class SearchView(View):
     @openerpweb.jsonrequest
     def save_filter(self, req, model, name, context_to_save, domain):
         Model = req.session.model("ir.filters")
-        ctx = openerpweb.nonliterals.CompoundContext(context_to_save)
+        ctx = web.common.nonliterals.CompoundContext(context_to_save)
         ctx.session = req.session
         ctx = ctx.evaluate()
-        domain = openerpweb.nonliterals.CompoundDomain(domain)
+        domain = web.common.nonliterals.CompoundDomain(domain)
         domain.session = req.session
         domain = domain.evaluate()
         uid = req.session._uid
@@ -1393,7 +1350,7 @@ class Reports(View):
 
         report_srv = req.session.proxy("report")
         context = req.session.eval_context(
-            openerpweb.nonliterals.CompoundContext(
+            web.common.nonliterals.CompoundContext(
                 req.context or {}, action[ "context"]))
 
         report_data = {}
diff --git a/addons/web_chat/controllers/main.py b/addons/web_chat/controllers/main.py
index e9a026759b1..87d64806180 100644
--- a/addons/web_chat/controllers/main.py
+++ b/addons/web_chat/controllers/main.py
@@ -2,7 +2,7 @@
 import time
 
 import simplejson
-import web.common as openerpweb
+import web.common.http as openerpweb
 import logging
 
 _logger = logging.getLogger(__name__)
diff --git a/addons/web_dashboard/controllers.py b/addons/web_dashboard/controllers.py
index 80235492c0f..37fe039366c 100644
--- a/addons/web_dashboard/controllers.py
+++ b/addons/web_dashboard/controllers.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import web.common as openerpweb
+import web.common.http as openerpweb
 
 WIDGET_CONTENT_PATTERN = """<!DOCTYPE html>
 <html>
diff --git a/addons/web_diagram/controllers/main.py b/addons/web_diagram/controllers/main.py
index c443b048ea6..51861c17b5f 100644
--- a/addons/web_diagram/controllers/main.py
+++ b/addons/web_diagram/controllers/main.py
@@ -1,4 +1,4 @@
-import web.common as openerpweb
+import web.common.http as openerpweb
 from web.controllers.main import View
 
 class DiagramView(View):
diff --git a/openerp-web.py b/openerp-web.py
index c4e6012fb1f..fe33585a233 100755
--- a/openerp-web.py
+++ b/openerp-web.py
@@ -55,7 +55,7 @@ logging_opts.add_option("--log-config", dest="log_config", default=os.path.join(
                         help="Logging configuration file", metavar="FILE")
 optparser.add_option_group(logging_opts)
 
-import web.common.dispatch
+import web.common.http
 
 if __name__ == "__main__":
     (options, args) = optparser.parse_args(sys.argv[1:])
@@ -71,7 +71,7 @@ if __name__ == "__main__":
     else:
         logging.basicConfig(level=getattr(logging, options.log_level.upper()))
 
-    app = web.common.dispatch.Root(options)
+    app = web.common.http.Root(options)
 
     if options.proxy_mode:
         app = werkzeug.contrib.fixers.ProxyFix(app)

From 545765173e58865238d7d90f27cf5d16866b2b93 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 5 Oct 2011 20:06:01 +0200
Subject: [PATCH 267/304] [FIX] crm tests, openid import

bzr revid: al@openerp.com-20111005180601-z55oq92j3g883akf
---
 addons/auth_openid/controllers/main.py |  2 +-
 addons/crm/test/test_crm_lead.yml      | 22 +++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py
index 056fc2b6832..78b8609e765 100644
--- a/addons/auth_openid/controllers/main.py
+++ b/addons/auth_openid/controllers/main.py
@@ -28,7 +28,7 @@ import werkzeug.urls
 import werkzeug.exceptions
 
 from openerp.modules.registry import RegistryManager
-import web.common.dispatch as openerpweb
+import web.common.http as openerpweb
 
 from openid import oidutil
 from openid.store import memstore
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml
index 5e9b7a5cfca..d5d3c6b933b 100644
--- a/addons/crm/test/test_crm_lead.yml
+++ b/addons/crm/test/test_crm_lead.yml
@@ -1,21 +1,9 @@
--  |
-   In order to test the CRM in OpenERP,
-   I will do a customer qualification process that
-   starts with a fist contact with a customer (a lead), which will be converted to a
-   business opportunity and a partner.
+-
+   In order to test the CRM in OpenERP, I will do a customer qualification
+   process that starts with a fist contact with a customer (a lead), which will
+   be converted to a business opportunity and a partner.
 -
-  I check installer report.
--
-  !record {model: base.setup.installer , id: base_action_rule_0_1}:
-    name: Test_action
--
-  I create the view at the time of setup.
--
-   !python {model: base.setup.installer}: |
-      self.fields_view_get(cr, uid,view_id=None, view_type='form', context=None, toolbar=False, submenu=False)
--  |
-   In order to test the flow, I create a two new users "user_crm" and
-   I assign the group "salesman".
+   I create a two new users "user_crm" and I assign the group "salesman".
 -
    !record {model: res.users, id: res_users_usercrm0}:
      company_id: base.main_company

From 71dd8fd1380a70ac18cd3e28dcd0c392237001bd Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 5 Oct 2011 20:15:29 +0200
Subject: [PATCH 268/304] [FIX] forgot to add xml2json.py

bzr revid: al@openerp.com-20111005181529-dbfsmptdi671l94z
---
 addons/web/common/xml2json.py | 38 +++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 addons/web/common/xml2json.py

diff --git a/addons/web/common/xml2json.py b/addons/web/common/xml2json.py
new file mode 100644
index 00000000000..16022624fe7
--- /dev/null
+++ b/addons/web/common/xml2json.py
@@ -0,0 +1,38 @@
+# xml2json-direct
+# Simple and straightforward XML-to-JSON converter in Python
+# New BSD Licensed
+#
+# URL: http://code.google.com/p/xml2json-direct/
+
+class Xml2Json(object):
+    @staticmethod
+    def convert_to_json(s):
+        return simplejson.dumps(
+            Xml2Json.convert_to_structure(s), sort_keys=True, indent=4)
+
+    @staticmethod
+    def convert_to_structure(s):
+        root = ElementTree.fromstring(s)
+        return Xml2Json.convert_element(root)
+
+    @staticmethod
+    def convert_element(el, skip_whitespaces=True):
+        res = {}
+        if el.tag[0] == "{":
+            ns, name = el.tag.rsplit("}", 1)
+            res["tag"] = name
+            res["namespace"] = ns[1:]
+        else:
+            res["tag"] = el.tag
+        res["attrs"] = {}
+        for k, v in el.items():
+            res["attrs"][k] = v
+        kids = []
+        if el.text and (not skip_whitespaces or el.text.strip() != ''):
+            kids.append(el.text)
+        for kid in el:
+            kids.append(Xml2Json.convert_element(kid))
+            if kid.tail and (not skip_whitespaces or kid.tail.strip() != ''):
+                kids.append(kid.tail)
+        res["children"] = kids
+        return res

From e29e8f80def9c7fe5ad9ebb2772e90e1e95ca13b Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 5 Oct 2011 22:04:58 +0200
Subject: [PATCH 269/304] [FIX] debian packaging only happens if you used
 previous openerp packages

bzr revid: al@openerp.com-20111005200458-7ggpb7envf16yvfw
---
 debian/openerp.postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/openerp.postinst b/debian/openerp.postinst
index f8f653397fe..181c683462d 100644
--- a/debian/openerp.postinst
+++ b/debian/openerp.postinst
@@ -4,7 +4,7 @@ set -e
 
 case "${1}" in
     configure)
-        if ! getent passwd | grep -q "^openerp"; then
+        if ! getent passwd | grep -q "^openerp:"; then
             adduser --system --no-create-home --quiet --gecos 'OpenERP' --group openerp
         fi
         # Register "openerp" as a postgres superuser 

From 527fe0ff656f2c8e39f173b0c52666958204a056 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 6 Oct 2011 02:12:18 +0200
Subject: [PATCH 270/304] [IMP] README cleanups

bzr revid: al@openerp.com-20111006001218-uzsqgl8ilkndxfr0
---
 README                       | 163 +++++++++--------------------------
 debian/openerp.README.Debian |  49 -----------
 debian/openerp.install       |   1 +
 debian/rules                 |   3 +-
 4 files changed, 42 insertions(+), 174 deletions(-)
 delete mode 100644 debian/openerp.README.Debian

diff --git a/README b/README
index a6fe10c8ffb..5683fa0f84c 100644
--- a/README
+++ b/README
@@ -1,138 +1,55 @@
 About OpenERP
 -------------
 
-OpenERP is a free Enterprise Resource Planning and Customer Relationship 
-Management software. It is mainly developed to meet changing needs.
+OpenERP is an OpenSrouce/Free software Enterprise Resource Planning and
+Customer Relationship Management software. More info at:
 
-The main functional features are: CRM & SRM, analytic and financial accounting,
-double-entry stock management, sales and purchases management, tasks automation,
-help desk, marketing campaign, ... and vertical modules for very specific 
-businesses.
+    http://www.openerp.com
 
-Technical features include a distributed server, flexible workflows, an object 
-database, dynamic GUIs, customizable reports, NET-RPC and XML-RPC interfaces, ...
+Installation on Debian Ubuntu
+-----------------------------
 
-For more information, please visit: 
-http://www.openerp.com
+Add the the apt repository in your source.list and type:
 
-OpenERP Quick Installation Guide
----------------------------------
+    $ apt-get install openerp
 
-This file contains a quick guide to configure and install the OpenERP server.
+Installation on RedHat, Fedora, CentOS
+--------------------------------------
 
-Required dependencies:
----------------------
+Install the required dependencies:
+
+    $ yum install python
+    $ easy_install pip
+    $ pip install .....
+
+Install the openerp rpm
+
+    $ rpm -i openerp-VERSION.rpm
+
+Installation on Windows
+-----------------------
+
+Installation on MacOSX
+-----------------------
+
+Setuping you first database
+---------------------------
+
+Point your browser to http://localhost:8069/ and click "Database", the default
+master password is "admin".
+
+Detailed System Requirements
+----------------------------
 
 You need the following software installed:
 
-    * Python 2.5 or 2.6
-    * Postgresql 8.2 or above
-    * Psycopg2 python module 
-    * Reportlab pdf generation library for python
-    * lxml python module
-    * pytz python module
-    * PyYaml python module (install with: easy_install PyYaml)
-
-Some dependencies are only required for specific purposes:
-
-for rendering workflows graphs, you need:
-    * graphviz
-    * pyparsing
+python, postgresql-client, python-dateutil, python-gdata, python-ldap,
+python-libxslt1, python-lxml, python-mako, python-openid, python-psycopg2,
+python-pybabel, python-pychart, python-pydot, python-pyparsing,
+python-reportlab, python-simplejson, python-tz, python-vobject, python-webdav,
+python-werkzeug, python-yaml, python-zsi, graphviz, ghostscript, postgresql,
+python-imaging, python-matplotlib
 
 For Luxembourg localization, you also need:
-    * pdftk (http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/)
-
-for generating reports using non .jpg images, you need:
-    * Python Imaging Library for python
-
-For Debian-based distributions, the required packages can be installed with the 
-following command:
-
-  #> apt-get install -y postgresql graphviz python-psycopg2 python-lxml python-tz python-imaging
-
-For Fedora 
-if they are not installed, install:
-python and postgresql
-
-uses yum or you can recover required packages on fedora web site in "core" or "extra" repository :
-postgresql-python
-python-lxml
-python-imaging
-python-psycopg2
-python-reportlab
-graphviz
-You can find pyparsing at http://pyparsing.sourceforge.net/ 
-
-1. Check that all the required dependencies are installed.
-
-2. Launch the program "python ./bin/openerp-server.py -r db_user -w db_password --db_host 127.0.0.1".
-See the man page for more information about options.
-
-3. Connect to the server using the GUI client. And follow the instructions to create a new database.
-
-Installation Steps
-------------------
-
-1. Check that all the required dependencies are installed.
-
-2. Create a postgresql database.
-
-The default database name is "terp". If you want to use another name, you
-will need to provide it when launching the server (by using the commandline
-option --database).
-
-To create a postgresql database named "terp" using the following command:
-    $ createdb --encoding=UNICODE terp
-
-If it is the first time you use postgresql you might need to create a new user
-to the postgres system using the following commands (where myusername is your
-unix user name):
-
-    $ su -
-    # su - postgres
-    $ createuser openerp
-    Shall the new user be allowed to create databases? (y/n) y
-    Shall the new user be allowed to create more new users? (y/n) y
-    CREATE USER
-    $ logout
-    # logout
-
-3. Launch service daemon by "service openerp-server start".
-
-The first time it is run, the server will initialise the database with all the default values.
-
-4. Connect to the server using the GUI client.
-
-There are two accounts by default:
-    * login: admin, password:admin
-    * login: demo, password:demo
-
-Some instructions to use setup.py for a user-install.
-This file should/will be moved on a proper documentation place later.
-
-
-- Possibly clean any left-over of the previous build.
-  > rm -rf dist openerp_server.egg-info
-
-- Possibly copy the addons in the server if we want them to be packaged
-  together:
-  > rsync -av --delete \
-    --exclude .bzr/ \
-    --exclude .bzrignore \
-    --exclude /__init__.py \
-    --exclude /base \
-    --exclude /base_quality_interrogation.py \
-    <path-to-addons> openerp/addons
-
-- Create the user-local directory where we want the package to be installed:
-   > mkdir -p /home/openerp/openerp-tmp/lib/python2.6/site-packages/
-
-- Use --prefix to specify where the package is installed and include that
-  place in PYTHONPATH:
-  > PYTHONPATH=/home/openerp/openerp-tmp/lib/python2.6/site-packages/ \
-    python setup.py install --prefix=/home/openerp/openerp-tmp
-
-- Run the main script, again specifying the PYTHONPATH:
-  > PYTHONPATH=/home/openerp/openerp-tmp/lib/python2.6/site-packages/ \
-    /home/openerp/openerp-tmp/bin/openerp-server
+* pdftk (http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/)
 
diff --git a/debian/openerp.README.Debian b/debian/openerp.README.Debian
deleted file mode 100644
index af298134af8..00000000000
--- a/debian/openerp.README.Debian
+++ /dev/null
@@ -1,49 +0,0 @@
-openerp-server for Debian
--------------------------
-
-Open ERP uses a PostgreSQL database to store its data. With the first generation
-of packages, you have to setup this database manually. Here is a short
-explanation how to achieve this (you need to execute all commands as root):
-
-  0. Making sure, PostgreSQL is running
-
-     # /etc/init.d/postgresql restart
-
-     Note that depending on the version of PostgreSQL installed on your system,
-     the above syvinit script could also be named postgresql-VERSION (whereas
-     'VERSION' needs to be replace with a version number).
-
-  1. Creating the database user
-
-     # su - postgres -c "createuser --createdb --no-createrole --pwprompt openerp"
-
-     Note: If you want to run the database as another user than 'openerp', you
-     need to replace 'openerp' above with the user you want instead, and you
-     need to adjust 'db_user = openerp' in /etc/openerp-server.conf too.
-
-  3. Restarting openerp-server
-
-     # /etc/init.d/openerp-server restart
-
-
-  4. Initializing the database
-
-     Now you can connect with Open ERP client to the database and initialize it.
-
-Now, you're finish. Please be aware of the following things:
-
-  * openerp-server has by default two accounts:
-    - User: admin; password: admin
-    - User: demo; password; demo
-
-  * openerp-server listens by default on port 8070. If you need to change this,
-    edit /etc/openerp-server.conf and replace 'port = 8070' with
-    'port = <your port>'.
-
-  * openerp-server in the upstreams configuration listens by default to *all*
-    interfaces. For security reasons, we do restrict it in the Debian packages
-    to listen only on localhost. If you need to change this, edit
-    /etc/openerp-server.conf and replace 'interface = localhost' with
-    'interface = <your ip>'.
-
- -- Daniel Baumann <daniel@debian.org>  Fri,  1 Jun 2007 12:00:00 +0200
diff --git a/debian/openerp.install b/debian/openerp.install
index 511075fb7c9..c632929a148 100644
--- a/debian/openerp.install
+++ b/debian/openerp.install
@@ -1 +1,2 @@
 install/openerp-server.conf /etc/openerp
+README /usr/share/doc/openerp
diff --git a/debian/rules b/debian/rules
index 7d8b210d1ba..57be1d0442b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+# vim:noet:
 
 %:
 	dh  ${@}
@@ -11,8 +12,6 @@ override_dh_pysupport:
 	dh_pysupport
 	rm -Rf debian/openerp/usr/lib
 
-
-
 override_dh_installinit:
 	dh_installinit --update-rcd-params='defaults 21'
 

From cbbf60412e1fb79e5897f6ded245d543e975e7c2 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 6 Oct 2011 02:13:57 +0200
Subject: [PATCH 271/304] [IMP] debian remove unused po files

bzr revid: al@openerp.com-20111006001357-29sfz3h2qk7d7zt8
---
 debian/po/POTFILES.in   |  1 -
 debian/po/bg.po         | 42 ----------------------------------------
 debian/po/ca.po         | 43 -----------------------------------------
 debian/po/cs.po         | 41 ---------------------------------------
 debian/po/da.po         | 42 ----------------------------------------
 debian/po/de.po         | 42 ----------------------------------------
 debian/po/el.po         | 42 ----------------------------------------
 debian/po/en_GB.po      | 42 ----------------------------------------
 debian/po/es.po         | 43 -----------------------------------------
 debian/po/es_CL.po      | 42 ----------------------------------------
 debian/po/es_EC.po      | 42 ----------------------------------------
 debian/po/fa.po         | 41 ---------------------------------------
 debian/po/fi.po         | 41 ---------------------------------------
 debian/po/fr.po         | 41 ---------------------------------------
 debian/po/gl.po         | 41 ---------------------------------------
 debian/po/he.po         | 39 -------------------------------------
 debian/po/hr.po         | 42 ----------------------------------------
 debian/po/hu.po         | 43 -----------------------------------------
 debian/po/it.po         | 41 ---------------------------------------
 debian/po/ja.po         | 39 -------------------------------------
 debian/po/ko.po         | 39 -------------------------------------
 debian/po/lv.po         | 39 -------------------------------------
 debian/po/mn.po         | 41 ---------------------------------------
 debian/po/nb.po         | 41 ---------------------------------------
 debian/po/nl.po         | 42 ----------------------------------------
 debian/po/pl.po         | 41 ---------------------------------------
 debian/po/pt.po         | 41 ---------------------------------------
 debian/po/pt_BR.po      | 42 ----------------------------------------
 debian/po/ro.po         | 41 ---------------------------------------
 debian/po/ru.po         | 42 ----------------------------------------
 debian/po/sk.po         | 42 ----------------------------------------
 debian/po/sq.po         | 42 ----------------------------------------
 debian/po/sr.po         | 41 ---------------------------------------
 debian/po/sv.po         | 41 ---------------------------------------
 debian/po/templates.pot | 38 ------------------------------------
 debian/po/tr.po         | 41 ---------------------------------------
 debian/po/uk.po         | 42 ----------------------------------------
 debian/po/vi.po         | 42 ----------------------------------------
 debian/po/zh_CN.po      | 38 ------------------------------------
 debian/po/zh_TW.po      | 40 --------------------------------------
 40 files changed, 1606 deletions(-)
 delete mode 100644 debian/po/POTFILES.in
 delete mode 100644 debian/po/bg.po
 delete mode 100644 debian/po/ca.po
 delete mode 100644 debian/po/cs.po
 delete mode 100644 debian/po/da.po
 delete mode 100644 debian/po/de.po
 delete mode 100644 debian/po/el.po
 delete mode 100644 debian/po/en_GB.po
 delete mode 100644 debian/po/es.po
 delete mode 100644 debian/po/es_CL.po
 delete mode 100644 debian/po/es_EC.po
 delete mode 100644 debian/po/fa.po
 delete mode 100644 debian/po/fi.po
 delete mode 100644 debian/po/fr.po
 delete mode 100644 debian/po/gl.po
 delete mode 100644 debian/po/he.po
 delete mode 100644 debian/po/hr.po
 delete mode 100644 debian/po/hu.po
 delete mode 100644 debian/po/it.po
 delete mode 100644 debian/po/ja.po
 delete mode 100644 debian/po/ko.po
 delete mode 100644 debian/po/lv.po
 delete mode 100644 debian/po/mn.po
 delete mode 100644 debian/po/nb.po
 delete mode 100644 debian/po/nl.po
 delete mode 100644 debian/po/pl.po
 delete mode 100644 debian/po/pt.po
 delete mode 100644 debian/po/pt_BR.po
 delete mode 100644 debian/po/ro.po
 delete mode 100644 debian/po/ru.po
 delete mode 100644 debian/po/sk.po
 delete mode 100644 debian/po/sq.po
 delete mode 100644 debian/po/sr.po
 delete mode 100644 debian/po/sv.po
 delete mode 100644 debian/po/templates.pot
 delete mode 100644 debian/po/tr.po
 delete mode 100644 debian/po/uk.po
 delete mode 100644 debian/po/vi.po
 delete mode 100644 debian/po/zh_CN.po
 delete mode 100644 debian/po/zh_TW.po

diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
deleted file mode 100644
index eb66b9be4c0..00000000000
--- a/debian/po/POTFILES.in
+++ /dev/null
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] openerp-server.templates
diff --git a/debian/po/bg.po b/debian/po/bg.po
deleted file mode 100644
index c4a52d31048..00000000000
--- a/debian/po/bg.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Bulgarian translation for openobject-server
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-12-16 06:46+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: Bulgarian <bg@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Системен акаунт специално за сървъра на Open ERP:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Сървърът на Open ERP трябва да използва специално създаден акаунт за тази "
-"операция,така че да не се допускат компромиси със сигурността на системите, "
-"изпълнявайки я с привилегийте на супер потребител."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Моля, изберете потребителско име за този акаунт."
diff --git a/debian/po/ca.po b/debian/po/ca.po
deleted file mode 100644
index d83dad535b9..00000000000
--- a/debian/po/ca.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# Catalan translation for openobject-server
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-12-14 06:11+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: Catalan <ca@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Compte del sistema dedicat pel servidor OpenERP:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"El servidor OpenERP ha d'utilitzar un compte dedicat pel seu funcionament, "
-"de tal manera que la seguretat del sistema no es vegi compromesa per la seva "
-"utilització amb privilegis d'administració."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Esculliu un nom d'usuari pel compte."
diff --git a/debian/po/cs.po b/debian/po/cs.po
deleted file mode 100644
index 8b8f9f0e943..00000000000
--- a/debian/po/cs.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Czech translation of openerp-server debconf templates.
-# Copyright (C) 2009 Vítězslav Kotrla <vitezslav.kotrla@gmail.com>
-# This file is distributed under the same license as the openerp-server package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-05-06 04:36+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Vyhrazený systémový účet, pod kterým poběží Open ERP server:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Pokud by byl Open ERP server spuštěn se superuživatelskými oprávněními, "
-"mohlo by dojít ke kompromitaci zabezpečení systému. Proto musí Open ERP "
-"server pro svoji činnost používat vyhrazený neprivilegovaný účet."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Zvolte prosím název totoho účtu."
diff --git a/debian/po/da.po b/debian/po/da.po
deleted file mode 100644
index b656e329af0..00000000000
--- a/debian/po/da.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Danish translation for openobject-server
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2011-07-22 14:15+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Dedikeret system konto til Open ERP serveren"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Open ERP serveren skal bruge en dedikeret konto til sine operationer, så "
-"systemets sikkerhed ikke bliver kompromitteret ved at køre serveren med "
-"superbruger privilegier"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Vælg kontoens brugernavn"
diff --git a/debian/po/de.po b/debian/po/de.po
deleted file mode 100644
index 3079de41243..00000000000
--- a/debian/po/de.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# German translation of openerp-server debconf templates.
-# Copyright (C) 2009 Kai Wasserbäch <debian@carbon-project.org>
-# Copyright (C) 2009 Helge Kreutzmann <debian@helgefjell.de>
-# This file is distributed under the same license as the openerp-server package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-server 5.0.1-0-2\n"
-"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-11-26 07:45+0000\n"
-"Last-Translator: Helge Kreutzmann <Unknown>\n"
-"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Eigenes Systemkonto für den Open ERP-Server:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Der Open ERP-Server muss ein eigenes Konto für den Betrieb verwenden, um die "
-"Sicherheit des Systems nicht durch das Betreiben mit Superuser-Rechten zu "
-"kompromittieren."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Bitte wählen Sie den Benutzernamen dieses Kontos."
diff --git a/debian/po/el.po b/debian/po/el.po
deleted file mode 100644
index a95226b6bb1..00000000000
--- a/debian/po/el.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Greek translation for openobject-server
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-12-16 06:46+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: Greek <el@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Αποκλειστικός λογαριασμός του συστήματος για τον server OpenERP."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"O OpenERP server πρέπει να χρησιμοποιεί έναν αποκλειστικό λογαριασμό για την "
-"λειτουργία του, έτσι ώστε να μην κινδυνέψει η ασφάλεια του συστήματος αν "
-"τρέχει με δικαιώματα υπερχρήστη."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Παρακαλώ επιλέξτε το username αυτού του λογαριασμού."
diff --git a/debian/po/en_GB.po b/debian/po/en_GB.po
deleted file mode 100644
index 4188564ceb0..00000000000
--- a/debian/po/en_GB.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# English (United Kingdom) translation for openobject-server
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-07-10 04:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Dedicated system account for the Open ERP server:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Please choose that account's username."
diff --git a/debian/po/es.po b/debian/po/es.po
deleted file mode 100644
index 5025a67b192..00000000000
--- a/debian/po/es.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# Spanish translation of openerp-server debconf templates.
-# Copyright (C) 2009 Software in the Public Interest
-# 2009 Fernando González de Requena <fgrequena@gmail.com>
-# This file is distributed under the same license as the openerp-server package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-server 5.0.1-0-2\n"
-"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-12-14 06:11+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Cuenta del sistema dedicada para el servidor OpenERP:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"El servidor OpenERP debe utilizar una cuenta dedicada para su "
-"funcionamiento, de tal modo que la seguridad del sistema no se vea "
-"comprometida por su utilización con privilegios de administración."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Elija un nombre de usuario para la cuenta."
diff --git a/debian/po/es_CL.po b/debian/po/es_CL.po
deleted file mode 100644
index 9da94b6ce29..00000000000
--- a/debian/po/es_CL.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Spanish (Chile) translation for openobject-server
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2011-10-03 16:05+0000\n"
-"Last-Translator: doingit.cl <Unknown>\n"
-"Language-Team: Spanish (Chile) <es_CL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-04 05:01+0000\n"
-"X-Generator: Launchpad (build 14071)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Cuenta del sistema dedicada para el servidor OpenERP"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"El servidor OpenERP debe utilizar una cuenta dedicada para su "
-"funcionamiento, de tal modo que la seguridad del sistema no se vea "
-"comprometida por su utilización con privilegios de administración."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Elija un Nombre de Usuario para la cuenta"
diff --git a/debian/po/es_EC.po b/debian/po/es_EC.po
deleted file mode 100644
index 4e221ba2c73..00000000000
--- a/debian/po/es_EC.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Spanish (Ecuador) translation for openobject-server
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-12-27 00:29+0000\n"
-"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
-"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Cuenta del sistema, dedicada para el servidor OpenERP"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"El servidor OpenERP debe utilizar una cuenta dedicada para su "
-"funcionamiento, de tal modo que la seguridad del sistema no se vea "
-"comprometida por su utilización con privilegios de administración."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Por favor, elija un nombre de usuario para la cuenta."
diff --git a/debian/po/fa.po b/debian/po/fa.po
deleted file mode 100644
index 74c7d386521..00000000000
--- a/debian/po/fa.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Persian translation for openobject-server
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-04-11 04:52+0000\n"
-"Last-Translator: avion <nat@sethack.com>\n"
-"Language-Team: Persian <fa@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "حساب اختصاصی سامانه برای کارپذیر اپن ای‌آر‌پی:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"کارپذیر اپن ای‌آر‌پی باید از یک حساب اختصاصی برای این عملیات سود برد، "
-"بنابراین امنیت سامانه با اجرای دسترسی‌های کاربرارشد به خطر نمی‌افتد."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "لطفا نام کاربری این حساب را برگزینید."
diff --git a/debian/po/fi.po b/debian/po/fi.po
deleted file mode 100644
index 4af4f533ddf..00000000000
--- a/debian/po/fi.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Finnish translation of openerp-server debconf templates.
-# Copyright (C) 2009 Esko Arajärvi
-# This file is distributed under the same license as the openerp-server package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-server\n"
-"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-11-26 07:45+0000\n"
-"Last-Translator: Esko Arajärvi <Unknown>\n"
-"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Dedikoitu järjestelmätunnus Open ERP-taustaohjelman ajamiseen:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Open ERP-palvelimen tulee käyttää dedikoitua tunnusta toiminnoissaan, jotta "
-"järjestelmän turvallisuus ei vaarannu kuten käytettäessä "
-"pääkäyttäjäoikeuksia."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Valitse kyseisen tunnuksen nimi."
diff --git a/debian/po/fr.po b/debian/po/fr.po
deleted file mode 100644
index 50f4bd33d56..00000000000
--- a/debian/po/fr.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# French translation of openerp-server debconf templates.
-# Copyright (C) 2009 Steve Petruzzello <dlist@bluewin.ch>
-# This file is distributed under the same license as the openerp-server package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: 5.0.1-0-2\n"
-"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-10-13 07:40+0000\n"
-"Last-Translator: Quentin THEURET <Unknown>\n"
-"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Compte dédié au serveur Open ERP :"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Afin de ne pas compromettre la sécurité du système, les opérations du "
-"serveur Open ERP doivent être exécutée avec un compte dédié et différent du "
-"superutilisateur."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Veuillez choisir l'identifiant de ce compte."
diff --git a/debian/po/gl.po b/debian/po/gl.po
deleted file mode 100644
index 7b091419269..00000000000
--- a/debian/po/gl.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Galizian translation of openerp-server debconf templates.
-# Copyright (C) 2009 Marce Villarino <mvillarino@gmail.com>
-# This file is distributed under the same license as the openerp-server package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-11-26 07:45+0000\n"
-"Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
-"Language-Team: Galician <proxecto@trasno.ent>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Conta de usuario do sistema adicada ao servidor Open ERP:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"O servidor Open ERP debe empregar unha conta adicada a el para que a "
-"seguridade do sistema non se poña en perigo ao executalo con privilexios de "
-"administrador."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Escolla o nome de usuario desa conta."
diff --git a/debian/po/he.po b/debian/po/he.po
deleted file mode 100644
index 935838ebb97..00000000000
--- a/debian/po/he.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# Hebrew translation for openobject-server
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2011-02-22 19:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hebrew <he@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr ""
diff --git a/debian/po/hr.po b/debian/po/hr.po
deleted file mode 100644
index 83457705987..00000000000
--- a/debian/po/hr.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Croatian translation for openobject-server
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-02-02 05:55+0000\n"
-"Last-Translator: goranc <goranc@gmail.com>\n"
-"Language-Team: Croatian <hr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr ""
-"Namjenski račun sistemskog korisnika za sustav poslužitelja Open ERP:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Server Open ERP mora koristiti namjenski korisnički račun za svoj rad, tako "
-"da sigurnost sustava nije ugrožena korištenjem privilegija superkorisnika."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Molimo odaberite korisnički račun."
diff --git a/debian/po/hu.po b/debian/po/hu.po
deleted file mode 100644
index 9455447a512..00000000000
--- a/debian/po/hu.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# Hungarian translation for openobject-server
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2011-01-12 09:45+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
-"Language-Team: Hungarian <hu@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Dedikált rendszer felhasználó az Open ERP szerver számára:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Az Open ERP szervernek egy dedikált felhasználóként kell futnia, így a "
-"rendszer biztonsága védettebb, mivel nem rendszergazda felhasználó jogaival "
-"fut."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Kérem válassza ki annak a felhasználónak a nevét."
diff --git a/debian/po/it.po b/debian/po/it.po
deleted file mode 100644
index e4e70cddcc7..00000000000
--- a/debian/po/it.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Italian translation of openerp-server debconf templates.
-# Copyright (C) 2009 Vincenzo Campanella <vinz65@gmail.com>
-# This file is distributed under the same license as the openerp-server package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-server 5.0.1-0-2\n"
-"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-11-26 07:45+0000\n"
-"Last-Translator: vinz65 <vinz65@gmail.com>\n"
-"Language-Team: Italian <tp@lists.linux.it>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Account di sistema dedicato per il server di Open ERP:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Il server Open ERP deve utilizzare un account dedicato per eseguire le "
-"proprie operazioni, in modo che la sicurezza del sistema non rischi di "
-"essere compromessa eseguendolo con privilegi di superutente."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Scegliere il nome utente di tale account."
diff --git a/debian/po/ja.po b/debian/po/ja.po
deleted file mode 100644
index b060104d807..00000000000
--- a/debian/po/ja.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# Japanese translation of openerp-server debconf templates.
-# Copyright (C) 2009 Hideki Yamane <henrich@debian.or.jp>
-# This file is distributed under the same license as the openerp-server package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-server 5.0.1-0-2\n"
-"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-11-26 07:45+0000\n"
-"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
-"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Open ERP デーモン専用のシステムアカウント:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Open ERP サーバはその動作について専用のアカウントを使うようになっているため、管理者特権で動作していてもシステムのセキュリティは侵害されません。"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "アカウントのユーザ名を選んでください。"
diff --git a/debian/po/ko.po b/debian/po/ko.po
deleted file mode 100644
index a080f159ee6..00000000000
--- a/debian/po/ko.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# Korean translation for openobject-server
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-09-29 08:30+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Korean <ko@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Open ERP 서버를 위한 전용 시스템 계정:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr "Open ERP 서버를 운영하실때는 슈퍼유저가 아닌 전용 계정을 이용하셔야 보안을 확보할수 있습니다"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "사용자 이름을 선택하세요"
diff --git a/debian/po/lv.po b/debian/po/lv.po
deleted file mode 100644
index 2470ad8d487..00000000000
--- a/debian/po/lv.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# Latvian translation for openobject-server
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-12-19 08:15+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Latvian <lv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Lūdzu, izvēlēties konta lietotāja vārdu!"
diff --git a/debian/po/mn.po b/debian/po/mn.po
deleted file mode 100644
index eee8600609c..00000000000
--- a/debian/po/mn.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Mongolian translation for openobject-server
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-09-29 08:02+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Open ERP серверт зориулсан системийн тусгай эрх:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Open ERP сервер тусгай хандах эрх хэрэглэх ёстой, ингэснээр супер "
-"хэрэглэгчийн эрх ашиглаж системийн хамгаалалтыг муутгахгүй болно."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Нэвтрэх эрхийг сонгоно уу."
diff --git a/debian/po/nb.po b/debian/po/nb.po
deleted file mode 100644
index 488baaf8e03..00000000000
--- a/debian/po/nb.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Norwegian Bokmal translation for openobject-server
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-03-16 05:12+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Norwegian Bokmal <nb@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Dedikert systemkonto for Open ERP:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Open ERP må av hensyn til sikkerhet kjøre som en egen bruker i stedet for "
-"systemets superbruker."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Vennligst velg et brukernavn til kontoen."
diff --git a/debian/po/nl.po b/debian/po/nl.po
deleted file mode 100644
index 3b9fc417eba..00000000000
--- a/debian/po/nl.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Dutch translation for openobject-server
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-12-17 06:04+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: Dutch <nl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Specifiek gebruikersaccount voor de OpenERP-server:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"De OpenERP-server dient een eigen systeemaccount te gebruiken, om te "
-"voorkomen dat de serverbeveiliging gecompromitteerd kan raken door OpenERP "
-"te laten functioneren met beheerder-privileges."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Kies deze gebruikersnaam."
diff --git a/debian/po/pl.po b/debian/po/pl.po
deleted file mode 100644
index 6d9211b41a5..00000000000
--- a/debian/po/pl.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Polish translation for openobject-server
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-12-08 06:13+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: Polish <pl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Konto dedykowane serwerowi OpenERP"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Serwer OpenERP musi używać dedykowanego konta do swoich operacji, aby nie "
-"obniżać bezpieczeństwa systemu przez stosowanie uprawnień superusera."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Wybierz nazę użytkownika dla konta."
diff --git a/debian/po/pt.po b/debian/po/pt.po
deleted file mode 100644
index e055d3f059f..00000000000
--- a/debian/po/pt.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Portuguese translation of openerp-server debconf templates.
-# Copyright (C) 2009 Américo Monteiro <a_monteiro@netcabo.pt>
-# This file is distributed under the same license as the openerp-server package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-server 5.0.1-0-2\n"
-"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-12-10 06:04+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: Portuguese <traduz@debianpt.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Conta de sistema dedicada para o servidor Open ERP:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"O servidor Open ERP tem de usar uma conta dedicada para as suas operações, "
-"para que a segurança do sistema não seja comprometida ao corrê-lo com "
-"privilégios de superutilizador."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Por favor escolha o nome de utilizador para essa conta."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
deleted file mode 100644
index 941b61931d1..00000000000
--- a/debian/po/pt_BR.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Brazilian Portuguese translation for openobject-server
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-11-07 07:06+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Conta do sistema dedicada para o servidor de Open ERP:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"O servidor Open ERP  deve usar uma conta específica para o seu funcionamento "
-"de modo que a segurança do sistema não seja comprometida por executá-lo com "
-"privilégios de super usuário."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Por favor, escolha um usuário para a conta."
diff --git a/debian/po/ro.po b/debian/po/ro.po
deleted file mode 100644
index da6babe8c10..00000000000
--- a/debian/po/ro.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Romanian translation for openobject-server
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-12-07 07:37+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Contul sistem dedicat serverului Open ERP"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Serverul Open ERP trebuie sa utilizeze un cont dedicat, deoarece din motive "
-"de securitate este contraindicat să ruleze cu privilegii de superuser."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Alegeţi numele utilizatorului (username)"
diff --git a/debian/po/ru.po b/debian/po/ru.po
deleted file mode 100644
index 61b4a0b0858..00000000000
--- a/debian/po/ru.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# German translation of openerp-server debconf templates.
-# Copyright (C) 2009 Sergey Alyoshin <alyoshin.s@gmail.com>
-# Copyright (C) 2009 Yuri Kozlov <yuray@komyakino.ru>
-# This file is distributed under the same license as the openerp-server package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-server 5.0.1-0-2\n"
-"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-10-21 05:57+0000\n"
-"Last-Translator: Kirill <Unknown>\n"
-"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Выделенная в системе учётная запись для сервера OpenERP:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Для улучшения безопасности системы Open ERP сервер должен использовать "
-"специально выделенную учётную запись, а не запускаться с правами "
-"суперпользователя."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Укажите имя такой учётной записи."
diff --git a/debian/po/sk.po b/debian/po/sk.po
deleted file mode 100644
index 1702240e85a..00000000000
--- a/debian/po/sk.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Slovak translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-12-14 07:56+0000\n"
-"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
-"Language-Team: Slovak <sk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Priradený používateľský účet pre OpenERP server:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"OpenERP server musí mať priradený používateľský účet pod ktorým bude "
-"pracovať. Bezpečnosť systému bude vyššia, ako keby server pracoval pod "
-"administrátorským účtom."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Prosím vyberte používateľské meno účtu."
diff --git a/debian/po/sq.po b/debian/po/sq.po
deleted file mode 100644
index c828018e1db..00000000000
--- a/debian/po/sq.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Albanian translation for openobject-server
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2011-03-28 14:50+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Albanian <sq@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Llogari e dedikuar sistemi për serverin e Hapur ERP"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Serveri i Hapur ERP duhet të përdorë llogarinë e dedikuar për veprimet e tij "
-"në mënyrë që siguria e sistemit nuk është në rrezik nga përdorimi i "
-"privilegjuar i super perdoruesve."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Ju lutemi zgjidhni emrin e llogarisë tuaj."
diff --git a/debian/po/sr.po b/debian/po/sr.po
deleted file mode 100644
index 4936cbe6d62..00000000000
--- a/debian/po/sr.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Serbian translation for openobject-server
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-11-15 08:27+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Serbian <sr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Namenski  sistem naloga za OpenERP Server:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"OpenERP server mora koristiti namenski nalog ya svoje operacije tako da "
-"sigurnosni sistem nije kompromitovan pri radu sa superUser privilegijama."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Molim vas izaberite korisničko ime naloga."
diff --git a/debian/po/sv.po b/debian/po/sv.po
deleted file mode 100644
index 11787106bc3..00000000000
--- a/debian/po/sv.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Swedish translation of openerp-server debconf templates.
-# Copyright (C) 2009 Martin Bagge <brother@bsnet.se>
-# This file is distributed under the same license as the openerp-server package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-server\n"
-"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-11-26 07:45+0000\n"
-"Last-Translator: brother <martin@bagge.nu>\n"
-"Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-"X-Poedit-Language: Swedish\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Dedikerat systemkonto för Open ERP server:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Open ERP servern måste ha ett dedikerat konto för att fungera på ett säkert "
-"sätt, att använda privilegier från en superanvändare är inte säkert."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Ange kontots användarnamn."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
deleted file mode 100644
index 556c76375b0..00000000000
--- a/debian/po/templates.pot
+++ /dev/null
@@ -1,38 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr ""
diff --git a/debian/po/tr.po b/debian/po/tr.po
deleted file mode 100644
index d2c89ae20f7..00000000000
--- a/debian/po/tr.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Turkish translation for openobject-server
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-01-29 05:27+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Open ERP sunucusu için ayrılmış sistem hesabı:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Sistem güvenliğinin sağlanabilmesi için Open ERP sunucusu bu iş için "
-"ayrılmış bir hesap kullanmalıdır."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Lütfen o hesabın kullanıcı adını seçiniz."
diff --git a/debian/po/uk.po b/debian/po/uk.po
deleted file mode 100644
index 22b0fc04789..00000000000
--- a/debian/po/uk.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Ukrainian translation for openobject-server
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-12-24 06:54+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: Ukrainian <uk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Специалізований користувач системи для Open ERP сервера:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Open ERP повинен працювати під спеціалізованим користувачем в системі. Якщо "
-"запустити сервер під супер користувачем, рівень безпеки системи може будет "
-"значно знижено."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Будь ласка, оберіть користувача системи."
diff --git a/debian/po/vi.po b/debian/po/vi.po
deleted file mode 100644
index 4cc7447aafc..00000000000
--- a/debian/po/vi.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Vietnamese translation for openobject-server
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-server package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-server\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-12-14 08:07+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Vietnamese <vi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Tài khoản hệ thống chuyên dụng cho máy chủ OpenERP:"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr ""
-"Máy chủ OpenERP phải sử dụng một tài khoản chuyên dụng cho hoạt động của "
-"mình nhằm đảm bảo an ninh của hệ thống không bị xâm hại khi chạy nó với "
-"quyền của siêu người dùng."
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "Xin vui lòng chọn tên người dùng của tài khoản."
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
deleted file mode 100644
index 6a16c115e3d..00000000000
--- a/debian/po/zh_CN.po
+++ /dev/null
@@ -1,38 +0,0 @@
-# Simplified Chinese translation of openerp-server debconf templates.
-# Copyright (C) 2009 Deng Xiyue <manphiz-guest@users.alioth.debian.org>
-# This file is distributed under the same license as the openerp-server package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-server\n"
-"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-11-26 07:45+0000\n"
-"Last-Translator: Deng Xiyue <Unknown>\n"
-"Language-Team: Debian Chinese GB <debian-chinese-gb@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "指定操作 Open ERP 守护进程的专用系统帐户："
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr "Open ERP 服务器必须使用一个专用的账户来进行操作，这样就不会因为使用超级用户权限运行而破坏系统的安全。"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "请选择账户的用户名。"
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
deleted file mode 100644
index 17230e8c04d..00000000000
--- a/debian/po/zh_TW.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (C) 2009 Deng Xiyue <manphiz-guest@users.alioth.debian.org>
-# This file is distributed under the same license as the openerp-server package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-server\n"
-"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
-"POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2011-01-26 04:02+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
-"Language-Team: 桃園小白 <hasrhgni@msn.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
-"X-Generator: Launchpad (build 13827)\n"
-"X-Poedit-Country: TAIWAN\n"
-"X-Poedit-Language: Chinese\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Dedicated system account for the Open ERP server:"
-msgstr "Open ERP 伺服器專屬系統管理員帳號："
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid ""
-"The Open ERP server must use a dedicated account for its operation so that "
-"the system's security is not compromised by running it with superuser "
-"privileges."
-msgstr "Open ERP 伺服器必須使用專屬系統管理員帳號進行操作，如此才不會因最高權限管理者在運行時犧牲系統安全性。"
-
-#. Type: string
-#. Description
-#: ../openerp-server.templates:1001
-msgid "Please choose that account's username."
-msgstr "請選擇帳號用戶名稱。"

From ee5f341ec743a6fc53d4ab0fe7db33065be073b4 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 6 Oct 2011 02:18:10 +0200
Subject: [PATCH 272/304] [IMP] debian remove unused info

bzr revid: al@openerp.com-20111006001810-ew5fm6w2lsr790xy
---
 debian/copyright      | 24 +++---------------------
 debian/openerp.postrm |  6 +-----
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 3f50a3a825e..f681d540a0a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
-Upstream-Contact: OpenERP <support@openerp.com>
+Upstream-Contact: OpenERP <info@openerp.com>
 Upstream-Homepage: http://www.openerp.com/
-Maintainer-Contact: Debian Open Object Maintainers <gnunet@lists.debian-maintainers.org>
+Maintainer-Contact: Debian OpenERP Maintainers <gnunet@lists.debian-maintainers.org>
 Maintainer-Homepage: http://open-object.debian-maintainers.org/
 
 Files: *
-Copyright: (C) 2004-2010 OpenERP SA. (www.openerp.com)
+Copyright: (C) 2004-2011 OpenERP SA. (www.openerp.com)
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -205,21 +205,3 @@ License: other
  distribution of the software without specific, written prior
  permission.
 
-Files: debian/*
-Copyright: (C) 2005-2010 Daniel Baumann <daniel@debian.org>
-License: GPL-3+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-3 file.
diff --git a/debian/openerp.postrm b/debian/openerp.postrm
index 0e5014dc9c8..55c28f04eb5 100644
--- a/debian/openerp.postrm
+++ b/debian/openerp.postrm
@@ -3,7 +3,7 @@
 set -e
 
 case "${1}" in
-	remove)
+    remove)
         deluser --quiet --system "openerp" || true
         delgroup --quiet --system --only-if-empty "openerp" || true
         ;;
@@ -15,10 +15,6 @@ case "${1}" in
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
         ;;
 
-    *)
-        echo "postrm called with unknown argument \`${1}'" >&2
-        exit 1
-        ;;
 esac
 
 #DEBHELPER#

From f7d34d9c2d41a3e8b80660384d6f26ac2341fdb5 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 6 Oct 2011 04:02:50 +0200
Subject: [PATCH 273/304] [FIX] web_chat flagged as not installable

bzr revid: al@openerp.com-20111006020250-6wkp8uxqzo3ezes5
---
 addons/web_chat/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_chat/__openerp__.py b/addons/web_chat/__openerp__.py
index 1ffe4742378..f0525bcadad 100644
--- a/addons/web_chat/__openerp__.py
+++ b/addons/web_chat/__openerp__.py
@@ -11,6 +11,6 @@
         'static/src/js/web_chat.js'
     ],
     "css": [],
-#    'active': True,
     'active': False,
+    'installable': False,
 }

From 7ef2b87d40b1d0c4f58777297e404c7dfba99e6f Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 6 Oct 2011 04:18:41 +0200
Subject: [PATCH 274/304] [IMP] debian missing deps

bzr revid: al@openerp.com-20111006021841-blwc0r0uz3x07mxh
---
 debian/control | 2 ++
 setup.py       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 3165879fa3f..8b404a28a00 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Depends:
  python,
  postgresql-client,
  python-dateutil,
+ python-feedparser,
  python-gdata,
  python-ldap,
  python-libxslt1,
@@ -30,6 +31,7 @@ Depends:
  python-reportlab,
  python-simplejson,
  python-tz,
+ python-vatnumber,
  python-vobject,
  python-webdav,
  python-werkzeug,
diff --git a/setup.py b/setup.py
index 9aabfb0a344..374f7308ca8 100755
--- a/setup.py
+++ b/setup.py
@@ -100,7 +100,7 @@ setuptools.setup(
           'pyyaml',
           'reportlab',
           'simplejson',
-          'vatnumber', # recommended by base_vat
+          'vatnumber',
           'vobject',
           'werkzeug',
           'zsi',

From 45e0b0a671ca8af8ba89d584f18eda9954b62603 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 6 Oct 2011 05:05:16 +0200
Subject: [PATCH 276/304] [FIX] packaging rename doc python rpm build does not
 tolerate spaces in files

bzr revid: al@openerp.com-20111006030516-uy8p3b5y1d2pbia0
---
 addons/caldav/doc/{Path discovery.rst => path_discovery.rst}  | 0
 addons/survey/specification/{final spec => specification.txt} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename addons/caldav/doc/{Path discovery.rst => path_discovery.rst} (100%)
 rename addons/survey/specification/{final spec => specification.txt} (100%)

diff --git a/addons/caldav/doc/Path discovery.rst b/addons/caldav/doc/path_discovery.rst
similarity index 100%
rename from addons/caldav/doc/Path discovery.rst
rename to addons/caldav/doc/path_discovery.rst
diff --git a/addons/survey/specification/final spec b/addons/survey/specification/specification.txt
similarity index 100%
rename from addons/survey/specification/final spec
rename to addons/survey/specification/specification.txt

From 82f4829a64dd9cefb439b776b81c9540dad3c2f4 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 6 Oct 2011 05:14:26 +0200
Subject: [PATCH 277/304] [IMP] redhat remove unused stuff

bzr revid: al@openerp.com-20111006031426-6vkjnku1tygyhptb
---
 setup.cfg | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2f64223e455..7693a84fc3a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,14 +7,4 @@ formats=gztar
 formats=rpm
 
 [bdist_rpm]
-# release must exactly match 'release' as set in bin/release.py
-release=6.0.0-rc1
-
-requires=python >= 2.5
-#build-requires=python-devel >= 2.3
-
-#doc_files = doc/*
-
-# Need to overwrite the install-part of the RPM to patch
-# the filenames of the man pages.
 install_script=setup_rpm.sh

From aed28ba69b11af643b4f0aeee52788f69c720b25 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 6 Oct 2011 04:36:33 +0000
Subject: [PATCH 278/304] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20111006043633-2qqugk8decu2zcj1
---
 addons/base_crypt/i18n/sr@latin.po         | 85 ++++++++++++++++++++
 addons/base_iban/i18n/sr@latin.po          | 25 +++---
 addons/base_module_record/i18n/sr@latin.po | 92 +++++++++++++---------
 addons/stock/i18n/es_CL.po                 | 43 +++++++---
 4 files changed, 188 insertions(+), 57 deletions(-)
 create mode 100644 addons/base_crypt/i18n/sr@latin.po

diff --git a/addons/base_crypt/i18n/sr@latin.po b/addons/base_crypt/i18n/sr@latin.po
new file mode 100644
index 00000000000..8b205c0ea97
--- /dev/null
+++ b/addons/base_crypt/i18n/sr@latin.po
@@ -0,0 +1,85 @@
+# Serbian Latin translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-10-05 13:25+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\n"
+"Language-Team: Serbian Latin <sr@latin@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-10-06 04:36+0000\n"
+"X-Generator: Launchpad (build 14085)\n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Ne možete imati dva korisnika sa istom prijavom!"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Odabrana firma nije u dozvoljena firmama za ovog korisnika"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr "Molimo odredite lozinku"
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr "Baza - Šifrovanje lozinke"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr "Greška"
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid ""
+"This module replaces the cleartext password in the database with a password "
+"hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs "
+"the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it won't be possible to recover a forgotten "
+"password for your\n"
+"users, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security "
+"measures,\n"
+"as the password is still transmitted unencrypted on the network (by the "
+"client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+"                    "
+msgstr ""
+"Ovaj modul zamenjuje vidljivu lozinku u bazi podataka znacima,\n"
+"što onemogućava bilo koga da pročita originalnu lozinku.\n"
+"Što se tiče Vaše baze podataka, ukidanje vidljive lozinke dešava se prvi put "
+"pošto se korisnik prijavi u bazu podataka, po instalaciji base_crypt.\n"
+"Po instalaciji ovog modula neće biti moguće izmeniti zaboravljenu lozinku za "
+"Vaše korisnike, jedino rešenje će biti da im administrator postavi novu "
+"lozinku.\n"
+"\n"
+"Beleška: Instaliranje ovog modula ne znači da možete ignorisati osnovne "
+"sigurnosne mere,\n"
+"budući da se lozinka i dalje prenosi nešifrovana u mreži (od strane "
+"klijenta),\n"
+"ukoliko ne koristite siguran protokol kao XML-RPCS.\n"
+"                    "
diff --git a/addons/base_iban/i18n/sr@latin.po b/addons/base_iban/i18n/sr@latin.po
index d1017c9f6ef..f25a93fc270 100644
--- a/addons/base_iban/i18n/sr@latin.po
+++ b/addons/base_iban/i18n/sr@latin.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-23 15:48+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-10-05 13:32+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 04:58+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-06 04:36+0000\n"
+"X-Generator: Launchpad (build 14085)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 msgid "Create IBAN bank accounts"
-msgstr "Kreiraj IBAN nalog banke"
+msgstr "Napravi IBAN nalog banke"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:120
@@ -28,7 +28,7 @@ msgstr "Kreiraj IBAN nalog banke"
 msgid ""
 "The IBAN does not seems to be correct. You should have entered something "
 "like this %s"
-msgstr "IBAN izgleda da nije ispravan. TRebas uneti nesto nalik na %s"
+msgstr "IBAN izgleda da nije ispravan. Trebalo je uneti nešto kao %s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
@@ -43,7 +43,7 @@ msgstr "Međunarodni broj Bankovnog računa"
 #. module: base_iban
 #: model:ir.model,name:base_iban.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr "Bankovni Računi"
+msgstr "Bankovni računi"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
@@ -64,7 +64,7 @@ msgstr "iban"
 #: code:addons/base_iban/base_iban.py:121
 #, python-format
 msgid "The IBAN is invalid, It should begin with the country code"
-msgstr "IBAN je neispravan, trebalo bi da pocinje sa kodom zemlje"
+msgstr "IBAN je neispravan, trebalo bi da počinje sa kodom zemlje"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
@@ -74,7 +74,7 @@ msgstr "IBAN"
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr "IBAN konto"
+msgstr "IBAN račun"
 
 #. module: base_iban
 #: model:ir.module.module,description:base_iban.module_meta_information
@@ -85,11 +85,16 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Ovaj modul instalira bazu za IBAN (Međunarodni broj bankovnog računa) "
+"bankovne račune i proverava im validnost.\n"
+"\n"
+"    "
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
-msgstr "Broj konta"
+msgstr "acc_number"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
diff --git a/addons/base_module_record/i18n/sr@latin.po b/addons/base_module_record/i18n/sr@latin.po
index 02ad1d3664d..01596dacd24 100644
--- a/addons/base_module_record/i18n/sr@latin.po
+++ b/addons/base_module_record/i18n/sr@latin.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-23 10:53+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"PO-Revision-Date: 2011-10-05 13:53+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:10+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-06 04:36+0000\n"
+"X-Generator: Launchpad (build 14085)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
 msgid "Category"
-msgstr "Категорија"
+msgstr "Kategorija"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 msgid "Information"
-msgstr "Informacija"
+msgstr "Informacije"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
@@ -34,9 +34,9 @@ msgid ""
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
 msgstr ""
-"Ako mislite da vas modul moze zainteresovati i druge ljude, mozete ga "
-"publikovati na OpenERP.com u sekciji 'Moduli'. To mozete uciniti preko "
-"websajta ili koristeci mogucnosti modula 'base_module_publish' ."
+"Ako mislite da Vaš modul može zainteresovati i druge ljude, Voleli bismo da "
+"ga objabvite na OpenERP.com u sekciji 'Moduli'. To možete učiniti preko "
+"vebsajta ili koristeći mogućnosti modula 'base_module_publish' ."
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_data,info,end:0
@@ -48,7 +48,7 @@ msgstr "Kraj"
 #: 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 "Izaberi objekat za cuvanje"
+msgstr "Izaberi stavke za čuvanje"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,author:0
@@ -58,13 +58,13 @@ msgstr "Autor"
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,directory_name:0
 msgid "Directory Name"
-msgstr "Ime Direktorijuma"
+msgstr "Ime fascikle"
 
 #. 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 "Samo Zapisi"
+msgstr "Samo zapisi"
 
 #. module: base_module_record
 #: model:ir.model,name:base_module_record.model_ir_module_record
@@ -74,12 +74,12 @@ msgstr "ir.module.record"
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,info,data_kind:0
 msgid "Demo Data"
-msgstr "Demo Podaci"
+msgstr "Demo podaci"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_filename:0
 msgid "Filename"
-msgstr "Ime Fajla"
+msgstr "Ime datoteke"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,version:0
@@ -92,7 +92,7 @@ msgstr "Verzija"
 #: 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 "Objekti se Snimaju"
+msgstr "Zapisi stavki"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_data,init,check_date:0
@@ -107,29 +107,29 @@ msgstr "Zapis od Datuma"
 #: 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 "Snimanje Modula"
+msgstr "Zapisivanje modula"
 
 #. 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 "Izvezi Podesavanja kao Modul"
+msgstr "Izvezi podešavanja kao modul"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 msgid "Thanks in advance for your contribution."
-msgstr "Hvala unaprijed na Vašem Doprinosu"
+msgstr "Hvala unapred na Vašem doprinosu"
 
 #. 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 "Lista Objekata za zapis"
+msgstr "Spisak stavki za zapis"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,description:0
 msgid "Full Description"
-msgstr "Puni Opis"
+msgstr "Puni opis"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,name:0
@@ -140,63 +140,63 @@ msgstr "Naziv Modula"
 #: 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 "Objekti"
+msgstr "Stavka"
 
 #. 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 datoteka Modula"
+msgstr ".zip datoteka modula"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 msgid "Module successfully created !"
-msgstr "Modul uspješno kreiran !"
+msgstr "Modul uspešno napravljen !"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save_yaml:0
 msgid "YAML file successfully created !"
-msgstr "YAML fajl je uspesno kreiran !"
+msgstr "YAML datoteka uspešno napravljena !"
 
 #. 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 "Rezultat,  zalepi ovo u tvoj xml modul"
+msgstr "Rezultat,  zalepite ovo u Vaš xml modul"
 
 #. 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 "Kreirano"
+msgstr "Napravljeno"
 
 #. 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 "Hvala što ste koristili Snimač Modula"
+msgstr "Hvala što ste koristili Zapisivač modula"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,website:0
 msgid "Documentation URL"
-msgstr "URL Dokumentacije"
+msgstr "URL Dokumentacija"
 
 #. 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 "Izmenjen"
+msgstr "Izmenjeno"
 
 #. 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 "Snima"
+msgstr "Zapis"
 
 #. module: base_module_record
 #: model:ir.module.module,shortdesc:base_module_record.module_meta_information
 msgid "Module Record"
-msgstr "Snimanje Modula"
+msgstr "Zapisivanje modula"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,info,save:0
@@ -207,13 +207,13 @@ msgstr "Nastavi"
 #: 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 "Eksportuj POdesavanja kao Data fajl"
+msgstr "Izvezi podešavanja kao data datoteku"
 
 #. module: base_module_record
 #: code:addons/base_module_record/wizard/base_module_save.py:129
 #, python-format
 msgid "Error"
-msgstr "Greska"
+msgstr "Greška"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,info,data_kind:0
@@ -224,12 +224,12 @@ msgstr "Obični podaci"
 #: 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 "U redu"
+msgstr "OK"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
 msgid "Module Creation"
-msgstr "Kreacija Modula"
+msgstr "Pravljenje Modula"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,data_kind:0
@@ -239,7 +239,7 @@ msgstr "Tip Podataka"
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,info:0
 msgid "Module Information"
-msgstr "Informacija o Modulu"
+msgstr "Informacija o modulu"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_data,init,info_yaml:0
@@ -296,6 +296,26 @@ msgid ""
 "module.\n"
 "    "
 msgstr ""
+"\n"
+"Ovaj modul omogućava da napravite novi modul bez ikakvog razvoja.\n"
+"Zapisuje sve operacije na stavkama za vreme sesija zapisivanaj i\n"
+"pravi .ZIP modul. Tako da možete napraviti sopstvene module direknto iz\n"
+"OpenERP klijenta.\n"
+"\n"
+"Ova verzija radi za pravljenje i izmenu postojećih zapisa. Iznova "
+"obračunava\n"
+"međuzavisnosti i veze između svih tipova vidžeta (man2one, many2many, ...).\n"
+"\n"
+"Ovo bi trebalo da Vam pomogne da lako pravite ponovo upotrebljive module, "
+"koje možete ponovo objaviti,\n"
+"za korisnička podešavanja i demo/testiranje podataka.\n"
+"\n"
+"Kako ga koristiti:\n"
+"Pokrenite Administration/Customization/Module Creation/Export Customizations "
+"kao pomoćni modul.\n"
+"Izaberite datum i vreme kao kriterijume za zapis i stavke za zapis i "
+"zapišite modul.\n"
+"    "
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/stock/i18n/es_CL.po b/addons/stock/i18n/es_CL.po
index 2a33cd0c47f..12c4d47e515 100644
--- a/addons/stock/i18n/es_CL.po
+++ b/addons/stock/i18n/es_CL.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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-10-03 18:53+0000\n"
-"Last-Translator: David Acevedo Toledo <Unknown>\n"
+"PO-Revision-Date: 2011-10-05 16:52+0000\n"
+"Last-Translator: Francisco Reyes Acuña <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: 2011-10-04 05:01+0000\n"
-"X-Generator: Launchpad (build 14071)\n"
+"X-Launchpad-Export-Date: 2011-10-06 04:36+0000\n"
+"X-Generator: Launchpad (build 14085)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -549,7 +549,7 @@ msgstr "Ubicación destino"
 #: code:addons/stock/stock.py:769
 #, python-format
 msgid "You can not process picking without stock moves"
-msgstr "No puede procesar un albarán sin movimientos de stock"
+msgstr "No puede procesar una guía de despacho sin movimientos de stock"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
@@ -853,7 +853,7 @@ msgstr "Contiene"
 #. module: stock
 #: view:board.board:0
 msgid "Incoming Products Delay"
-msgstr "Retraso albaranes entrada"
+msgstr "Retraso de guías de despacho de entrada"
 
 #. module: stock
 #: view:stock.location:0
@@ -1169,9 +1169,9 @@ msgid ""
 "empty to automatically detect the type based on the source and destination "
 "locations)."
 msgstr ""
-"Tipo de envío del albarán que va a contener el movimiento encadenado (dejar "
-"vacío para detectar automáticamente el tipo basado en las ubicaciones de "
-"origen y destino)."
+"Tipo de envío de la guía de despacho que va a contener el movimiento "
+"encadenado (dejar vacío para detectar automáticamente el tipo basado en las "
+"ubicaciones de origen y destino)."
 
 #. module: stock
 #: view:stock.move.split:0
@@ -1378,7 +1378,7 @@ msgstr "Dividir"
 #. module: stock
 #: view:stock.picking:0
 msgid "Search Stock Picking"
-msgstr "Buscar albarán stock"
+msgstr "Buscar guía de despacho de stock"
 
 #. module: stock
 #: code:addons/stock/product.py:93
@@ -2014,6 +2014,27 @@ msgid ""
 "day)\n"
 "    "
 msgstr ""
+"El módulo de OpenERP de gestión de inventario puede gestionar múltiples "
+"almacenes, y varias ubicaciones estructuradas.\n"
+"Gracias a la gestión de doble entrada, el control de inventario es potente y "
+"flexible:\n"
+"* Historial de movimientos y planificación,\n"
+"* Diferentes métodos de inventario (FIFO, LIFO, ...)\n"
+"* Valoración de existencias (precio estándar o medio, ...)\n"
+"* Robustez frente a las diferencias de inventario\n"
+"* Normas de reordenación automática (nivel de existencias, JIT, ...)\n"
+"* Código de barras soportado\n"
+"* Detección rápida de errores a través del sistema de entrada doble\n"
+"* Trazabilidad (ascendente/descendente abajo, lotes de producción, número de "
+"serie, ...)\n"
+"* Panel para almacenes que incluye:\n"
+"    * Productos a recibir con retraso (fecha <= hoy)\n"
+"    * Excepciones de compra\n"
+"    * Gráfico: Número de productos Recibidos frente al previsto (gráfico de "
+"barras semanal por día)\n"
+"    * Gráfico: Número de productos Entregados frente al previsto (gráfico de "
+"barras semanal por día)\n"
+"    "
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -3378,7 +3399,7 @@ msgstr "Indica si las mercancías se enviarán todas a la vez o directamente."
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:90
 #, python-format
 msgid "This picking list does not require invoicing."
-msgstr "Este albarán no requiere facturación."
+msgstr "Esta guía de despacho no requiere facturación."
 
 #. module: stock
 #: selection:report.stock.move,type:0

From a3a45e18b3bf861de4f6b84892f2930dfb7c94b7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 08:39:49 +0200
Subject: [PATCH 279/304] [FIX] m2o fields with selection widget in search view

 Plan was originally to just ignore this because "it should just work"
 but turns out m2o and m2o[@widget=selection] fields have very
 different behaviors when it comes to default values, especially
 custom domains and contexts:

 * An m2o field uses its string value always (behaves like a char
   field), for UI and clarity purposes we added an [[name, '=', id]]
   case when the user specifically selects an autocompletion value,
   but that's not "cannon", when it comes to dealing with custom
   domains (filter_domain) and contexts the field always uses its
   string value.

* An m2o[@widget=selection] field on the other hand uses its ids
  always (behaves like a selection field).

  That's not entirely true, really, because it has the converse to
  what we implemented on the m2o field in the web client (in the GTK
  client): if there is no @filter_domain *and* the user has entered a
  value which is not in the dropdown (it's a combobox in the GTK
  client), then it falls back on using 'ilike'. This string value is
  *not* used in custom domains and custom filters, which simply are
  not submitted.

  This second section has *not* been implemented so far in the web
  client, we'll come round to it if people actually need it.

bzr revid: xmo@openerp.com-20111006063949-fl5rbg3wwubcaay8
---
 addons/web/static/src/js/search.js | 22 ++++++++++++++++++++--
 addons/web/static/src/xml/base.xml |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index cf253c3d54b..ec520a1881a 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -116,8 +116,9 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
      */
     make_field: function (item, field) {
         try {
-            return new (openerp.web.search.fields.get_object(field.type))
-                        (item, field, this);
+            return new (openerp.web.search.fields.get_any(
+                    [item.attrs.widget, field.type]))
+                (item, field, this);
         } catch (e) {
             if (! e instanceof openerp.web.KeyNotFound) {
                 throw e;
@@ -759,7 +760,24 @@ openerp.web.search.FloatField = openerp.web.search.NumberField.extend(/** @lends
  * @extends openerp.web.search.Field
  */
 openerp.web.search.SelectionField = openerp.web.search.Field.extend(/** @lends openerp.web.search.SelectionField# */{
+    // This implementation is a basic <select> field, but it may have to be
+    // altered to be more in line with the GTK client, which uses a combo box
+    // (~ jquery.autocomplete):
+    // * If an option was selected in the list, behave as currently
+    // * If something which is not in the list was entered (via the text input),
+    //   the default domain should become (`ilike` string_value) but **any
+    //   ``context`` or ``filter_domain`` becomes falsy, idem if ``@operator``
+    //   is specified. So at least get_domain needs to be quite a bit
+    //   overridden (if there's no @value and there is no filter_domain and
+    //   there is no @operator, return [[name, 'ilike', str_val]]
     template: 'SearchView.field.selection',
+    init: function () {
+        this._super.apply(this, arguments);
+        // prepend empty option if there is no empty option in the selection list
+        this.prepend_empty = !_(this.attrs.selection).detect(function (item) {
+            return !item[1];
+        });
+    },
     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 f8519c1dfaf..a66ad59f9a5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1092,7 +1092,7 @@
     <div style="white-space: nowrap;">
         <select t-att-name="attrs.name" t-att-id="element_id"
                 t-att-autofocus="attrs.default_focus === '1' || undefined">
-            <option/>
+            <option t-if="prepend_empty"/>
             <t t-foreach="attrs.selection" t-as="option">
                 <t t-set="selected" t-value="defaults[attrs.name] === option[0]"/>
                 <option t-if="selected"

From c73c70550f1aa461dd95e85339f332ae66351475 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 10:11:19 +0200
Subject: [PATCH 280/304] [FIX] originally correct to-be-merged code broken
 during merge

bzr revid: xmo@openerp.com-20111006081119-zyzazce6fkc8oq0q
---
 addons/web/controllers/main.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 2646cbb4dfc..97989bbdfe1 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -315,12 +315,18 @@ class Session(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def modules(self, req):
-        mods_all = openerpweb.addons_manifest.keys()
-        mods_loaded = req.config.server_wide_modules
-        mods_to_check = [i for i in mods_all if i not in mods_loaded]
-        mods_to_load = req.session.model('ir.module.module').search_read([('state','=','installed'), ('name','in', mods_to_check)])
-        r = [i['name'] for i in mods_to_load]
-        return r
+        if req.config.backend == 'local':
+            candidates = [mod for mod in openerpweb.addons_manifest.keys()
+                          if mod not in req.config.server_wide_modules]
+            # if local backend, the modules are shared with the server
+            Modules = req.session.model('ir.module.module')
+            ids = Modules.search(
+                ['&', ('state', '=', 'installed'), ('name', 'in', candidates)]
+            )
+            return map(operator.itemgetter('name'), Modules.read(ids, ['name']))
+
+        return [name for name, descriptor in openerpweb.addons_manifest.iteritems()
+                if descriptor.get('active', True)]
 
     @openerpweb.jsonrequest
     def eval_domain_and_context(self, req, contexts, domains,

From 03918aefa78eaff482b029bbfaf752336b8aeedd Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 11:03:31 +0200
Subject: [PATCH 281/304] [IMP] avoid static home crashing after server side
 was completely broken

bzr revid: xmo@openerp.com-20111006090331-x6euo8vsnzuqqf73
---
 addons/web_default_home/static/src/js/home.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_default_home/static/src/js/home.js b/addons/web_default_home/static/src/js/home.js
index 67964351873..eff0567fd27 100644
--- a/addons/web_default_home/static/src/js/home.js
+++ b/addons/web_default_home/static/src/js/home.js
@@ -102,7 +102,7 @@ openerp.web_default_home = function (openerp) {
 
             $.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'});
             Modules.read_slice(['id'], {}, function (records) {
-                if (!(records.length === 1)) { return; }
+                if (!(records.length === 1)) { $.unblockUI(); return; }
                 Modules.call('state_update',
                     [_.pluck(records, 'id'), 'to install', ['uninstalled']],
                     function () {

From 5df08eb7d72732d56bffe8d4f3c9dd00105c1835 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 6 Oct 2011 11:22:47 +0200
Subject: [PATCH 282/304] [FIX] m2o: Search More cause a traceback. (views now
 excpect to receive evaluated domain, context and group_by)

bzr revid: fme@openerp.com-20111006092247-zcbnrdbld00somam
---
 addons/web/static/src/js/view_form.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 4982e93aaff..d9101bdf651 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2241,11 +2241,11 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
                 });
         this.searchview.on_search.add(function(domains, contexts, groupbys) {
             if (self.initial_ids) {
-                self.view_list.do_search.call(self, domains.concat([[["id", "in", self.initial_ids]], self.domain]),
+                self.do_search(domains.concat([[["id", "in", self.initial_ids]], self.domain]),
                     contexts, groupbys);
                 self.initial_ids = undefined;
             } else {
-                self.view_list.do_search.call(self, domains.concat([self.domain]), contexts, groupbys);
+                self.do_search(domains.concat([self.domain]), contexts, groupbys);
             }
         });
         this.searchview.on_loaded.add_last(function () {
@@ -2272,10 +2272,19 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
             }).pipe(function() {
                 self.searchview.do_search();
             });
-            
         });
         this.searchview.appendTo($("#" + this.element_id + "_search"));
     },
+    do_search: function(domains, contexts, groupbys) {
+        var self = this;
+        this.rpc('/web/session/eval_domain_and_context', {
+            domains: domains || [],
+            contexts: contexts || [],
+            group_by_seq: groupbys || []
+        }, function (results) {
+            self.view_list.do_search(results.domain, results.context, results.group_by);
+        });
+    },
     create_row: function(data) {
         var self = this;
         var wdataset = new openerp.web.DataSetSearch(this, this.model, this.context, this.domain);

From 69c691391585289ed834e170d5114fbcaac77453 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 11:34:30 +0200
Subject: [PATCH 283/304] [FIX] forgot to filter installed modules outside

bzr revid: xmo@openerp.com-20111006093430-knl8fcjh4avc2dvh
---
 addons/web/controllers/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 97989bbdfe1..2946eedcbd8 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -326,6 +326,7 @@ class Session(openerpweb.Controller):
             return map(operator.itemgetter('name'), Modules.read(ids, ['name']))
 
         return [name for name, descriptor in openerpweb.addons_manifest.iteritems()
+                if name not in req.config.server_wide_modules
                 if descriptor.get('active', True)]
 
     @openerpweb.jsonrequest

From 0fc5a423e397d4fe881745a76c01b3838b975755 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 11:53:01 +0200
Subject: [PATCH 284/304] [FIX] don't screw up typing of selection values in
 search view

bzr revid: xmo@openerp.com-20111006095301-98cda38m1y270f3m
---
 addons/web/static/src/js/search.js | 2 +-
 addons/web/static/src/xml/base.xml | 4 ++--
 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 ec520a1881a..d4c58f53ba2 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -779,7 +779,7 @@ openerp.web.search.SelectionField = openerp.web.search.Field.extend(/** @lends o
         });
     },
     get_value: function () {
-        return this.$element.val();
+        return this.attrs.selection[parseInt(this.$element.val(), 10)][0];
     }
 });
 openerp.web.search.BooleanField = openerp.web.search.SelectionField.extend(/** @lends openerp.web.search.BooleanField# */{
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a66ad59f9a5..c57a599d9b6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1096,10 +1096,10 @@
             <t t-foreach="attrs.selection" t-as="option">
                 <t t-set="selected" t-value="defaults[attrs.name] === option[0]"/>
                 <option t-if="selected"
-                        t-att-value="option[0]" selected="selected">
+                        t-att-value="option_index" selected="selected">
                     <t t-esc="option[1]"/>
                 </option>
-                <option t-if="!selected" t-att-value="option[0]">
+                <option t-if="!selected" t-att-value="option_index">
                     <t t-esc="option[1]"/>
                 </option>
             </t>

From 06787922c064c9e90ee1af23e1128f2fb965ebd3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 12:02:35 +0200
Subject: [PATCH 285/304] [FIX] selection field value in case there's no value
 (haha)

bzr revid: xmo@openerp.com-20111006100235-2x41tzki77sk6i3v
---
 addons/web/static/src/js/search.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index d4c58f53ba2..15e7d191ff5 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -779,7 +779,9 @@ openerp.web.search.SelectionField = openerp.web.search.Field.extend(/** @lends o
         });
     },
     get_value: function () {
-        return this.attrs.selection[parseInt(this.$element.val(), 10)][0];
+        var index = parseInt(this.$element.val(), 10);
+        if (isNaN(index)) { return null; }
+        return this.attrs.selection[index][0];
     }
 });
 openerp.web.search.BooleanField = openerp.web.search.SelectionField.extend(/** @lends openerp.web.search.BooleanField# */{

From dd2ff5e7ba64842472f8909ad652c90b80b2ec09 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 6 Oct 2011 12:24:02 +0200
Subject: [PATCH 286/304] [IMP] account_invoice_layout: missing state field in
 list view (used for `states` modifiers)

bzr revid: odo@openerp.com-20111006102402-cdjcw8rv2xfea6v3
---
 addons/account_invoice_layout/account_invoice_layout_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 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 c8bb5e84031..6bdabae9326 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -10,7 +10,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="name" position="before">
-                    <field name="state" select="1" on_change="onchange_invoice_line_view(state)" />
+                    <field name="state" on_change="onchange_invoice_line_view(state)" />
                     <field name="sequence"/>
             	</field>
             </field>
@@ -23,6 +23,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <xpath expr="/tree/field[@name='name']" position="before">
+                    <field name="state" invisible="1"/>
                     <field name="sequence" string="Seq."/>
                 </xpath>
             </field>

From cecd7f5e55aeb55be45f15d93f011a778c87c05f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 13:41:27 +0200
Subject: [PATCH 287/304] [FIX] duplicated element_class on form widgets (on
 container and widget), and some incorrect element_id breaking click-on-label
 behavior

bzr revid: xmo@openerp.com-20111006114127-vc4mbflum68pjlbo
---
 addons/web/static/src/xml/base.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c57a599d9b6..0e5c97c4707 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -767,7 +767,7 @@
     <input type="text" size="1"
         t-att-name="widget.name"
         t-att-id="widget.element_id"
-        t-attf-class="field_#{widget.type} #{widget.element_class}"
+        t-attf-class="field_#{widget.type}"
         t-attf-style="width: #{widget.field.translate ? '99' : '100'}%"
     />
     <img class="oe_field_translate" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
@@ -775,7 +775,7 @@
 <t t-name="FieldChar.readonly">
     <div
         t-att-id="widget.element_id"
-        t-attf-class="field_#{widget.type} #{widget.element_class}"
+        t-attf-class="field_#{widget.type}"
         t-attf-style="width: #{widget.field.translate ? '99' : '100'}%">
     </div>
 </t>
@@ -814,7 +814,7 @@
     <textarea rows="6"
         t-att-name="widget.name"
         t-att-id="widget.element_id"
-        t-attf-class="field_#{widget.type} #{widget.element_class}"
+        t-attf-class="field_#{widget.type}"
         t-attf-style="width: #{widget.field.translate ? '99' : '100'}%"
     ></textarea>
     <img class="oe_field_translate" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
@@ -833,8 +833,8 @@
 <t t-name="FieldSelection">
     <select
         t-att-name="widget.name"
-        t-att-id="widget.element_id + '_field'"
-        t-attf-class="field_#{widget.type} #{widget.element_class}"
+        t-att-id="widget.element_id"
+        t-attf-class="field_#{widget.type}"
         style="width: 100%">
             <t t-foreach="widget.values" t-as="option">
                 <option><t t-esc="option[1]"/></option>
@@ -842,8 +842,9 @@
     </select>
 </t>
 <t t-name="FieldMany2One">
-    <div t-att-class="widget.element_class" class="oe-m2o">
-        <input type="text" size="1" style="width: 100%;"/>
+    <div class="oe-m2o">
+        <input type="text" size="1" style="width: 100%;"
+                t-att-id="widget.element_id"/>
         <span class="oe-m2o-drop-down-button">
             <img src="/web/static/src/img/down-arrow.png" /></span>
         <span class="oe-m2o-cm-button" t-att-id="widget.name + '_open'">
@@ -886,8 +887,8 @@
 <t t-name="FieldBoolean">
     <input type="checkbox"
         t-att-name="widget.name"
-        t-att-id="widget.element_id + '_field'"
-        t-attf-class="field_#{widget.type} #{widget.element_class}"/>
+        t-att-id="widget.element_id"
+        t-attf-class="field_#{widget.type}"/>
 </t>
 <t t-name="FieldProgressBar">
     <div t-opentag="true" class="oe-progressbar">
@@ -902,7 +903,7 @@
                 t-att-border="widget.readonly ? 0 : 1"
                 t-att-id="widget.element_id + '_field'"
                 t-att-name="widget.name"
-                t-attf-class="field_#{widget.type} #{widget.element_class}"
+                t-attf-class="field_#{widget.type}"
                 t-att-width="widget.node.attrs.img_width || widget.node.attrs.width"
                 t-att-height="widget.node.attrs.img_height || widget.node.attrs.height"
             />
@@ -950,7 +951,7 @@
             <input type="text" size="1"
                 t-att-name="widget.name"
                 t-att-id="widget.element_id + '_field'"
-                t-attf-class="field_#{widget.type} #{widget.element_class}" style="width: 100%"
+                t-attf-class="field_#{widget.type}" style="width: 100%"
             />
         </td>
         <td class="oe-binary" nowrap="true">
@@ -995,7 +996,6 @@
 </t>
 <t t-name="WidgetButton">
     <button type="button"
-        t-attf-class="#{widget.element_class}"
         t-att-title="widget.help"
         style="width: 100%" class="button">
         <img t-if="widget.node.attrs.icon" t-att-src="'/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>

From 9990d8126e3ba2932836ba20e97a0c8009d66531 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Thu, 6 Oct 2011 13:44:44 +0200
Subject: [PATCH 288/304] [IMP] orm: added small comment.

bzr revid: vmt@openerp.com-20111006114444-4llzirnl4tg4p5qy
---
 openerp/osv/orm.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index cf61e3a96df..ffd09ff5753 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2959,6 +2959,10 @@ class BaseModel(object):
 
 
     def _select_column_data(self, cr):
+        # attlen is the number of bytes necessary to represent the type when
+        # the type has a fixed size. If the type has a varying size attlen is
+        # -1 and atttypmod is the size limit + 4, or -1 if there is no limit.
+        # Thus the query can return a negative size for a unlimited varchar.
         cr.execute("SELECT c.relname,a.attname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,t.typname,CASE WHEN a.attlen=-1 THEN a.atttypmod-4 ELSE a.attlen END as size " \
            "FROM pg_class c,pg_attribute a,pg_type t " \
            "WHERE c.relname=%s " \

From 253467dfe254e9f67a4209ad25042feed85960f3 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 6 Oct 2011 14:03:38 +0200
Subject: [PATCH 289/304] [FIX] base_setup: Fix a problem with categories to
 show

bzr revid: stw@openerp.com-20111006120338-9zetw1glf0rdxo27
---
 addons/base_setup/base_setup.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 312e20c0ffd..9519644675b 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -138,15 +138,13 @@ class base_setup_installer(osv.osv_memory):
             if not extended_view:
                 domain.append(('complexity', '!=', 'expert'))
 
-            default_modules = DEFAULT_MODULES.get(module_category.name, False)
-            if default_modules:
-                domain.append(('name', 'not in', default_modules))
-
             modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
             if not modules:
                 continue
 
-            readonly = any(module.state == 'installed' for module in modules)
+            m = DEFAULT_MODULES.get(module_category.name, [])
+            r = module_proxy.search(cr, uid, [('state', '=', 'installed'),('name', 'in', m)], context=context)
+            readonly = bool(r)
 
             attributes = {
                 'name' : 'category_%d' % (module_category.id,),
@@ -158,8 +156,7 @@ class base_setup_installer(osv.osv_memory):
             arch.append("""<field %s />""" % (" ".join(["%s='%s'" % (key, value,)
                                                         for key, value in attributes.iteritems()]),))
 
-        # Compute the module to show
-
+        # Compute the modules to show
         for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
             domain = [('category_id', '=', module_category.id)]
 

From bcaac70b1b44909937b46742d508dd900f7ec142 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 14:04:25 +0200
Subject: [PATCH 290/304] [FIX] make m2o form fields focusable

bzr revid: xmo@openerp.com-20111006120425-z154ck3xez87ufbr
---
 addons/web/static/src/js/view_form.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index d9101bdf651..d1d68dba789 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1785,6 +1785,9 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
             result.result.context = _.extend(result.result.context || {}, additional_context);
             self.do_action(result.result);
         });
+    },
+    focus: function () {
+        this.$input.focus();
     }
 });
 

From 84a94d7ec9cc32c3bbf2f5351e2ba661320d5bdc Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 6 Oct 2011 14:14:11 +0200
Subject: [PATCH 291/304] [FIX] Button@special=cancel should not trigger form
 save

bzr revid: fme@openerp.com-20111006121411-sltmagi0n068fbym
---
 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 d1d68dba789..79541510b1c 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -909,7 +909,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
                 return self.on_confirmed();
             }
         };
-        if ((!this.node.attrs.special && this.view.dirty_for_user) || !this.view.datarecord.id) {
+        if (!this.node.attrs.special && (this.view.dirty_for_user || !this.view.datarecord.id)) {
             return this.view.recursive_save().pipe(exec_action);
         } else {
             return exec_action();

From eab1356855f10bd1c87ba49304ef5b9e5d729d58 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 6 Oct 2011 15:09:09 +0200
Subject: [PATCH 292/304] [FIX] base_setup: Set the right modules of the
 category

bzr revid: stw@openerp.com-20111006130909-9sqjw6mgnldeammf
---
 addons/base_setup/base_setup.py | 46 +++++++++++----------------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 9519644675b..4178a5140a8 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -36,8 +36,8 @@ DEFAULT_MODULES = {
     'Knowledge Management' : ['document',],
     'Warehouse Management' : ['stock',],
     'Manufacturing' : ['mrp', 'procurement'],
-    'Accounting & Finance' : ['account,'],
-    'Purchase Management' : ['purchase,'],
+    'Accounting & Finance' : ['account'],
+    'Purchase Management' : ['purchase'],
     'Human Resources' : ['hr',],
     'Point of Sales' : ['pos',],
     'Marketing' : ['marketing',],
@@ -286,15 +286,26 @@ class base_setup_installer(osv.osv_memory):
                            ir_module_module_dependency d inner join ir_module_module m2 on d.name = m2.name \
                            where d.module_id=m.id and m2.state in %s ) and state = %s",
                           (category_id[1], ('installed', 'to install', 'to upgrade', ), 'uninstalled',))
-                modules = [name for _, name in cr.fetchall()]
+                inner_modules = [name for _, name in cr.fetchall()]
 
-                module_ids = proxy.search(cr, uid, [('name', 'in', modules)], context=context)
+                module_ids = proxy.search(cr, uid, [('name', 'in', inner_modules)], context=context)
                 if not module_ids:
                     break
 
+                modules = modules + set(inner_modules)
+
                 proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
                 need_update = True
 
+
+            domain = [('name', 'in', list(modules)),
+                      ('state', '=', 'installed')]
+            for module in proxy.browse(cr, uid, proxy.search(cr, uid, domain, context=context), context):
+                cr.execute("update ir_actions_todo set state='open' \
+                           from ir_model_data as data where data.res_id = ir_actions_todo.id \
+                           and ir_actions_todo.type='special'\
+                           and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
+
             if need_update:
                 cr.commit()
                 self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
@@ -304,33 +315,6 @@ class base_setup_installer(osv.osv_memory):
         else:
             return {'type' : 'ir.actions.act_window_close'}
 
-    # TODO: To implement in this new wizard
-    #def execute(self, cr, uid, ids, context=None):
-    #    module_pool = self.pool.get('ir.module.module')
-    #    modules_selected = []
-    #    datas = self.read(cr, uid, ids, context=context)[0]
-    #    for mod in datas.keys():
-    #        if mod in ('id', 'progress'):
-    #            continue
-    #        if datas[mod] == 1:
-    #            modules_selected.append(mod)
-
-    #    module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
-    #    need_install = False
-    #    for module in module_pool.browse(cr, uid, module_ids, context=context):
-    #        if module.state == 'uninstalled':
-    #            module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
-    #            need_install = True
-    #            cr.commit()
-    #        elif module.state == 'installed':
-    #            cr.execute("update ir_actions_todo set state='open' \
-    #                                from ir_model_data as data where data.res_id = ir_actions_todo.id \
-    #                                and ir_actions_todo.type='special'\
-    #                                and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
-    #    if need_install:
-    #        self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
-    #    return
-
 #Migrate data from another application Conf wiz
 
 class migrade_application_installer_modules(osv.osv_memory):

From 39c490a8424c03c4a91d232cae22e1f81bc816eb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 15:20:09 +0200
Subject: [PATCH 293/304] [IMP] lxml-ify fields_view_get override in
 account.move.line

bzr revid: xmo@openerp.com-20111006132009-ci16jjrylmb23nnn
---
 addons/account/account_move_line.py | 55 ++++++++++++++++-------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index ce349fc4f4e..acee05a5a00 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -23,6 +23,8 @@ import time
 from datetime import datetime
 from operator import itemgetter
 
+from lxml import etree
+
 import netsvc
 from osv import fields, osv
 from tools.translate import _
@@ -970,7 +972,6 @@ class account_move_line(osv.osv):
         fields = {}
         flds = []
         title = _("Accounting Entries") #self.view_header_get(cr, uid, view_id, view_type, context)
-        xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write" colors="red:state==\'draft\';black:state==\'valid\'">\n\t''' % (title)
 
         ids = journal_pool.search(cr, uid, [])
         journals = journal_pool.browse(cr, uid, ids, context=context)
@@ -1001,61 +1002,67 @@ class account_move_line(osv.osv):
             'tax_code_id': 50,
             'move_id': 40,
         }
+
+        document = etree.Element('tree', string=title, editable="top",
+                                 refresh="5", on_write="on_create_write",
+                                 colors="red:state=='draft';black:state=='valid'")
         for field_it in fld:
             field = field_it[0]
             if common_fields.get(field) == total:
                 fields.get(field).append(None)
-#            if field=='state':
-#                state = 'colors="red:state==\'draft\'"'
-            attrs = []
+            # if field=='state':
+            #     state = 'colors="red:state==\'draft\'"'
+            f = etree.SubElement(document, 'field', name=field)
+
             if field == 'debit':
-                attrs.append('sum = "%s"' % _("Total debit"))
+                f.set('sum', _("Total debit"))
 
             elif field == 'credit':
-                attrs.append('sum = "%s"' % _("Total credit"))
+                f.set('sum', _("Total credit"))
 
             elif field == 'move_id':
-                attrs.append('required = "False"')
+                f.set('required', 'False')
 
             elif field == 'account_tax_id':
-                attrs.append('domain="[(\'parent_id\', \'=\' ,False)]"')
-                attrs.append("context=\"{'journal_id': journal_id}\"")
+                f.set('domain', "[('parent_id', '=' ,False)]")
+                f.set('context', "{'journal_id': journal_id}")
 
             elif field == 'account_id' and journal.id:
-                attrs.append('domain="[(\'journal_id\', \'=\', journal_id),(\'type\',\'&lt;&gt;\',\'view\'), (\'type\',\'&lt;&gt;\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"')
+                f.set('domain', "[('journal_id', '=', journal_id),('type','!=','view'), ('type','!=','closed')]")
+                f.set('on_change', 'onchange_account_id(account_id, partner_id)')
 
             elif field == 'partner_id':
-                attrs.append('on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"')
+                f.set('on_change', 'onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)')
 
             elif field == 'journal_id':
-                attrs.append("context=\"{'journal_id': journal_id}\"")
+                f.set('context', "{'journal_id': journal_id}")
 
             elif field == 'statement_id':
-                attrs.append("domain=\"[('state', '!=', 'confirm'),('journal_id.type', '=', 'bank')]\"")
+                f.set('domain', "[('state', '!=', 'confirm'),('journal_id.type', '=', 'bank')]")
 
             elif field == 'date':
-                attrs.append('on_change="onchange_date(date)"')
+                f.set('on_change', 'onchange_date(date)')
 
             elif field == 'analytic_account_id':
-                attrs.append('''groups="analytic.group_analytic_accounting"''') # Currently it is not working due to framework problem may be ..
+                # Currently it is not working due to being executed by superclass's fields_view_get
+                # f.set('groups', 'analytic.group_analytic_accounting')
+                pass
 
             if field in ('amount_currency', 'currency_id'):
-                attrs.append('on_change="onchange_currency(account_id, amount_currency, currency_id, date, journal_id)"')
-                attrs.append('''attrs="{'readonly': [('state', '=', 'valid')]}"''')
+                f.set('on_change', 'onchange_currency(account_id, amount_currency, currency_id, date, journal_id)')
+                f.set('attrs', "{'readonly': [('state', '=', 'valid')]}")
 
             if field in widths:
-                attrs.append('width="'+str(widths[field])+'"')
+                f.set('width', str(widths[field]))
 
             if field in ('journal_id',):
-                attrs.append("invisible=\"context.get('journal_id', False)\"")
+                f.set("invisible", "context.get('journal_id', False)")
             elif field in ('period_id',):
-                attrs.append("invisible=\"context.get('period_id', False)\"")
+                f.set("invisible", "context.get('period_id', False)")
             else:
-                attrs.append("invisible=\"context.get('visible_id') not in %s\"" % (fields.get(field)))
-            xml += '''<field name="%s" %s/>\n''' % (field,' '.join(attrs))
+                f.set('invisible', "context.get('visible_id') not in %s" % (fields.get(field)))
 
-        xml += '''</tree>'''
-        result['arch'] = xml
+        result['arch'] = etree.tostring(document, pretty_print=True)
         result['fields'] = self.fields_get(cr, uid, flds, context)
         return result
 

From 5db16cd946eeb27be400de3f17454406eff6e0be Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 6 Oct 2011 15:22:41 +0200
Subject: [PATCH 294/304] [FIX] Confirmation dialog buttons won't close the
 dialog

bzr revid: fme@openerp.com-20111006132241-b4491vh5jm4ct974
---
 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 79541510b1c..b4eba509018 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -896,11 +896,11 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
                             self.on_confirmed().then(function() {
                                 def.resolve();
                             });
-                            $(self).dialog("close");
+                            $(this).dialog("close");
                         },
                         Cancel: function() {
                             def.resolve();
-                            $(self).dialog("close");
+                            $(this).dialog("close");
                         }
                     }
                 });

From 20411473be0ef9a2e75eddbd53fd49d50eabd3e8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 15:23:07 +0200
Subject: [PATCH 295/304] [IMP] account: unpack field tuple on the fly in
 iteration to generate view fields in account.move.line

also remove unused name (third item of the tuple)

bzr revid: xmo@openerp.com-20111006132307-7fikg28u10023bty
---
 addons/account/account_move_line.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index acee05a5a00..08542d71f9f 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -983,14 +983,14 @@ class account_move_line(osv.osv):
             for field in journal.view_id.columns_id:
                 if not field.field in fields:
                     fields[field.field] = [journal.id]
-                    fld.append((field.field, field.sequence, field.name))
+                    fld.append((field.field, field.sequence))
                     flds.append(field.field)
                     common_fields[field.field] = 1
                 else:
                     fields.get(field.field).append(journal.id)
                     common_fields[field.field] = common_fields[field.field] + 1
-        fld.append(('period_id', 3, _('Period')))
-        fld.append(('journal_id', 10, _('Journal')))
+        fld.append(('period_id', 3))
+        fld.append(('journal_id', 10))
         flds.append('period_id')
         flds.append('journal_id')
         fields['period_id'] = all_journal
@@ -1006,8 +1006,7 @@ class account_move_line(osv.osv):
         document = etree.Element('tree', string=title, editable="top",
                                  refresh="5", on_write="on_create_write",
                                  colors="red:state=='draft';black:state=='valid'")
-        for field_it in fld:
-            field = field_it[0]
+        for field, _seq in fld:
             if common_fields.get(field) == total:
                 fields.get(field).append(None)
             # if field=='state':

From 65456808bc38bc0ebde5381d81c6b0dd4772f513 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 16:27:27 +0200
Subject: [PATCH 296/304] [ADD] wrapper to the modifiers setup process to
 simplify its call by third parties

bzr revid: xmo@openerp.com-20111006142727-spfj8foiln6m2jb9
---
 openerp/osv/orm.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index ffd09ff5753..303842c91d7 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -128,6 +128,32 @@ def transfer_modifiers_to_node(modifiers, node):
         simplify_modifiers(modifiers)
         node.set('modifiers', simplejson.dumps(modifiers))
 
+def setup_modifiers(node, field=None, context=None, in_tree_view=False):
+    """ Processes node attributes and field descriptors to generate
+    the ``modifiers`` node attribute and set it on the provided node.
+
+    Alters its first argument in-place.
+
+    :param node: ``field`` node from an OpenERP view
+    :type node: lxml.etree._Element
+    :param dict field: field descriptor corresponding to the provided node
+    :param dict context: execution context used to evaluate node attributes
+    :param bool in_tree_view: triggers the ``tree_invisible`` code
+                              path (separate from ``invisible``): in
+                              tree view there are two levels of
+                              invisibility, cell content (a column is
+                              present but the cell itself is not
+                              displayed) with ``invisible`` and column
+                              invisibility (the whole column is
+                              hidden) with ``tree_invisible``.
+    :returns: nothing
+    """
+    modifiers = {}
+    if field is not None:
+        transfer_field_to_modifiers(field, modifiers)
+    transfer_node_to_modifiers(
+        node, modifiers, context=context, in_tree_view=in_tree_view)
+    transfer_modifiers_to_node(modifiers, node)
 
 def test_modifiers(what, expected):
     modifiers = {}

From 33963719aaa119150a695376e2bb4dd190c625a0 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 6 Oct 2011 16:29:46 +0200
Subject: [PATCH 297/304] [FIX] base: set the right xml_id for the hidden/link
 category

bzr revid: stw@openerp.com-20111006142946-qebop8c2gs620ma7
---
 openerp/addons/base/module/module_data.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml
index 5a57217e539..58fa98a6b09 100644
--- a/openerp/addons/base/module/module_data.xml
+++ b/openerp/addons/base/module/module_data.xml
@@ -7,7 +7,8 @@
             <field name="visible" eval="0" />
         </record>
 
-        <record model="ir.module.category" id="module_category_link">
+        <record model="ir.module.category" id="module_category_hidden_link">
+            <field name="parent_id" ref="module_category_hidden" />
             <field name="name">Link</field>
             <field name="sequence">0</field>
             <field name="visible" eval="0" />

From 4e44e089205cf716c80f04905c332da8906e3f00 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 16:30:08 +0200
Subject: [PATCH 298/304] [FIX] setup and serialize modifiers on overridden
 view for account.move.line

bzr revid: xmo@openerp.com-20111006143008-awuryu2n7otgaij6
---
 addons/account/account_move_line.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 08542d71f9f..92d71339168 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -26,7 +26,7 @@ from operator import itemgetter
 from lxml import etree
 
 import netsvc
-from osv import fields, osv
+from osv import fields, osv, orm
 from tools.translate import _
 import decimal_precision as dp
 import tools
@@ -1006,6 +1006,7 @@ class account_move_line(osv.osv):
         document = etree.Element('tree', string=title, editable="top",
                                  refresh="5", on_write="on_create_write",
                                  colors="red:state=='draft';black:state=='valid'")
+        fields_get = self.fields_get(cr, uid, flds, context)
         for field, _seq in fld:
             if common_fields.get(field) == total:
                 fields.get(field).append(None)
@@ -1061,8 +1062,11 @@ class account_move_line(osv.osv):
             else:
                 f.set('invisible', "context.get('visible_id') not in %s" % (fields.get(field)))
 
+            orm.setup_modifiers(f, fields_get[field], context=context,
+                                in_tree_view=True)
+
         result['arch'] = etree.tostring(document, pretty_print=True)
-        result['fields'] = self.fields_get(cr, uid, flds, context)
+        result['fields'] = fields_get
         return result
 
     def _check_moves(self, cr, uid, context=None):

From 2d817dfaa10d39d7b53ce16392a79dbba457265a Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 6 Oct 2011 16:31:37 +0200
Subject: [PATCH 299/304] [FIX] base_setup: Set the right xml_id for the
 hidden/link category

bzr revid: stw@openerp.com-20111006143137-vj6y3pczx7euy13i
---
 addons/base_setup/base_setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 4178a5140a8..3610c227142 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -278,7 +278,7 @@ class base_setup_installer(osv.osv_memory):
                 proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
                 need_update = True
 
-            category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_link')
+            category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_hidden_link')
             while True and category_id:
                 cr.execute("select id, name from ir_module_module m where category_id = %s \
                            and (select count(d.id) from ir_module_module_dependency d \
@@ -292,7 +292,7 @@ class base_setup_installer(osv.osv_memory):
                 if not module_ids:
                     break
 
-                modules = modules + set(inner_modules)
+                modules.update(inner_modules)
 
                 proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
                 need_update = True

From bfb7cb0d6e9ab34315aee2846418378810ffd3f6 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 6 Oct 2011 16:34:57 +0200
Subject: [PATCH 300/304] [FIX] compute modules list fixed

bzr revid: al@openerp.com-20111006143457-i74b719vjic34ie4
---
 addons/web/controllers/main.py | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 2946eedcbd8..c0af09a9ee1 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -315,19 +315,26 @@ class Session(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def modules(self, req):
-        if req.config.backend == 'local':
-            candidates = [mod for mod in openerpweb.addons_manifest.keys()
-                          if mod not in req.config.server_wide_modules]
-            # if local backend, the modules are shared with the server
-            Modules = req.session.model('ir.module.module')
-            ids = Modules.search(
-                ['&', ('state', '=', 'installed'), ('name', 'in', candidates)]
-            )
-            return map(operator.itemgetter('name'), Modules.read(ids, ['name']))
+        # Compute available candidates module
+        loadable = openerpweb.addons_manifest.keys()
+        loaded = req.config.server_wide_modules
+        candidates = [mod for mod in loadable if mod not in loaded]
 
-        return [name for name, descriptor in openerpweb.addons_manifest.iteritems()
-                if name not in req.config.server_wide_modules
-                if descriptor.get('active', True)]
+        # Compute active true modules that might be on the web side only
+        active = [(name,1) for name in candidates if openerpweb.addons_manifest[name].get('active')]
+        print active
+
+        # Retrieve database installed modules
+        module_obj = req.session.model('ir.module.module')
+        installed = [(i['name'],1) for i in module_obj.search_read([('state','=','installed'), ('name','in', candidates)])]
+        print installed
+
+        # Merge both
+        merged = dict(installed)
+        merged.update(active)
+        print merged
+
+        return merged.keys()
 
     @openerpweb.jsonrequest
     def eval_domain_and_context(self, req, contexts, domains,

From 404db3a08bd07b6aeaeaf244279351933b028d13 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 16:54:39 +0200
Subject: [PATCH 301/304] [FIX] correctly handle 'false' value on selection
 fields

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

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 15e7d191ff5..d381d2eb6f5 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -781,7 +781,9 @@ openerp.web.search.SelectionField = openerp.web.search.Field.extend(/** @lends o
     get_value: function () {
         var index = parseInt(this.$element.val(), 10);
         if (isNaN(index)) { return null; }
-        return this.attrs.selection[index][0];
+        var value = this.attrs.selection[index][0];
+        if (value === false) { return null; }
+        return value;
     }
 });
 openerp.web.search.BooleanField = openerp.web.search.SelectionField.extend(/** @lends openerp.web.search.BooleanField# */{

From 6c1499ecd99488d2ec11fa6e7e93908a9c1bfb3c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 17:23:32 +0200
Subject: [PATCH 302/304] [FIX] clear in search views should clear small
 filters as well

bzr revid: xmo@openerp.com-20111006152332-g0ifsv53jwq66u9u
---
 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 d381d2eb6f5..5f88b9a1512 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -339,7 +339,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
         this.notification.notify("Invalid Search", "triggered from search view");
     },
     do_clear: function () {
-        this.$element.find('.filter_label').removeClass('enabled');
+        this.$element.find('.filter_label, .filter_icon').removeClass('enabled');
         this.enabled_filters.splice(0);
         var string = $('a.searchview_group_string');
         _.each(string, function(str){

From 18ec2036411fc259802aa0771713dc6c6c63a09e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 17:36:22 +0200
Subject: [PATCH 303/304] [IMP] use sets for modules to load instead of
 value-less dicts

bzr revid: xmo@openerp.com-20111006153622-i6g5pmk25dal358e
---
 addons/web/controllers/main.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index c0af09a9ee1..ea56b3d2f94 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -316,25 +316,21 @@ class Session(openerpweb.Controller):
     @openerpweb.jsonrequest
     def modules(self, req):
         # Compute available candidates module
-        loadable = openerpweb.addons_manifest.keys()
+        loadable = openerpweb.addons_manifest.iterkeys()
         loaded = req.config.server_wide_modules
         candidates = [mod for mod in loadable if mod not in loaded]
 
         # Compute active true modules that might be on the web side only
-        active = [(name,1) for name in candidates if openerpweb.addons_manifest[name].get('active')]
-        print active
+        active = set(name for name in candidates
+                     if openerpweb.addons_manifest[name].get('active'))
 
         # Retrieve database installed modules
-        module_obj = req.session.model('ir.module.module')
-        installed = [(i['name'],1) for i in module_obj.search_read([('state','=','installed'), ('name','in', candidates)])]
-        print installed
+        Modules = req.session.model('ir.module.module')
+        installed = set(module['name'] for module in Modules.search_read(
+                        [('state','=','installed'), ('name','in', candidates)]))
 
         # Merge both
-        merged = dict(installed)
-        merged.update(active)
-        print merged
-
-        return merged.keys()
+        return list(active | installed)
 
     @openerpweb.jsonrequest
     def eval_domain_and_context(self, req, contexts, domains,

From a12c082d55dfdc759483e224b658180cc0151379 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Oct 2011 17:39:59 +0200
Subject: [PATCH 304/304] [IMP] modules have quite a number of fields we don't
 need, get only the name

bzr revid: xmo@openerp.com-20111006153959-mft8gh1g08s4vzqz
---
 addons/web/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index ea56b3d2f94..7ca80fbfdec 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -327,7 +327,7 @@ class Session(openerpweb.Controller):
         # Retrieve database installed modules
         Modules = req.session.model('ir.module.module')
         installed = set(module['name'] for module in Modules.search_read(
-                        [('state','=','installed'), ('name','in', candidates)]))
+            [('state','=','installed'), ('name','in', candidates)], ['name']))
 
         # Merge both
         return list(active | installed)