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/144] [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/144] [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/144] [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/144] [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/144] [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/144] [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/144] [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/144] [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/144] [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 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 010/144] [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 011/144] [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 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 012/144] [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 013/144] [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 014/144] [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 015/144] [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 016/144] [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 017/144] [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 018/144] [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 019/144] [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 020/144] [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 021/144] [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 022/144] [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 023/144] [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 024/144] [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 025/144] [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 026/144] [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 027/144] [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 028/144] [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 029/144] [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 030/144] [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 031/144] [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 032/144] [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 033/144] [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 034/144] [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 035/144] [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 036/144] [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 037/144] [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 038/144] [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 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 039/144] [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 040/144] [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 041/144] [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 042/144] [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 043/144] [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 044/144] [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 045/144] [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 046/144] [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 047/144] [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 048/144] [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 049/144] [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 050/144] [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 051/144] [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 052/144] [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 053/144] [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 054/144] [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 055/144] [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 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 056/144] [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 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 057/144] [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 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 058/144] [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 059/144] [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 060/144] [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 061/144] [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 062/144] [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 063/144] [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 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 064/144] [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 065/144] [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 066/144] [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 067/144] [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 068/144] [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 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 069/144] [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 070/144] [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 071/144] [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 072/144] [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 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 073/144] [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 074/144] [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 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 075/144] [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 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 076/144] [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 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 077/144] [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 078/144] [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 079/144] [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 080/144] [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 fdfe102cc416c1fe70dd30de0aa61c947c1101d1 Mon Sep 17 00:00:00 2001
From: kbh <kbh@bde-desktop>
Date: Mon, 3 Oct 2011 11:32:39 +0530
Subject: [PATCH 081/144] [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 082/144] [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 083/144] [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 084/144] [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 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 085/144] [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 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 086/144] [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 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 087/144] [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 088/144] [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 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 089/144] [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 090/144] [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 091/144] [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 092/144] [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 093/144] [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 094/144] [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 095/144] [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 096/144] [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 097/144] [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 098/144] 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 099/144] [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 100/144] [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 101/144] [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 102/144] [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 103/144] [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 104/144] [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 105/144] [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 106/144] [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 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 107/144] [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 108/144] [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 109/144] [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 110/144] [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 111/144] [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 112/144] [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 113/144] [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 114/144] [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 115/144] [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 116/144] [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 117/144] [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 118/144] [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 119/144] [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 120/144] [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 121/144] [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 122/144] [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 123/144] [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 124/144] [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 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 125/144] [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 126/144] [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 127/144] [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 128/144] [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 129/144] 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 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 130/144] [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 131/144] [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 132/144] [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 133/144] [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 134/144] [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 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 135/144] [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 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 136/144] [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 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 137/144] [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 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 138/144] [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 139/144] [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 140/144] [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 141/144] [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 142/144] [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 143/144] [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 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 144/144] [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