[MERGE]merged with trunk-survey-layout-tta

bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg

4 files changed, 9 insertions, 6 deletions

diff --git a/addons/edi/__init__.py b/addons/edi/__init__.py
index b4a80c0f1dd..46fabbc2fd0 100644
--- a/addons/edi/__init__.py
+++ b/addons/edi/__init__.py
@@ -23,12 +23,13 @@ import logging
 import models
 import edi_service
 from models.edi import EDIMixin, edi_document
+_logger = logging.getLogger(__name__)
 
 # web
 try:
     import controllers
 except ImportError:
-    logging.getLogger('init.load').warn(
+    _logger.warn(
         """Could not load openerp-web section of EDI, EDI will not behave correctly
 
 To fix, launch openerp-web in embedded mode""")
diff --git a/addons/edi/edi_service.py b/addons/edi/edi_service.py
index 074720a03e9..f48cc60950a 100644
--- a/addons/edi/edi_service.py
+++ b/addons/edi/edi_service.py
@@ -23,7 +23,7 @@ import logging
 import netsvc
 import openerp
 
-_logger = logging.getLogger('edi.service')
+_logger = logging.getLogger(__name__)
 
 class edi(netsvc.ExportService):
 
diff --git a/addons/edi/models/edi.py b/addons/edi/models/edi.py
index 589922ff178..dadfeb81209 100644
--- a/addons/edi/models/edi.py
+++ b/addons/edi/models/edi.py
@@ -35,6 +35,7 @@ import pooler
 from osv import osv,fields,orm
 from tools.translate import _
 from tools.safe_eval import safe_eval as eval
+_logger = logging.getLogger(__name__)
 
 EXTERNAL_ID_PATTERN = re.compile(r'^([^.:]+)(?::([^.]+))?\.(\S+)$')
 EDI_VIEW_WEB_URL = '%s/edi/view?db=%s&token=%s'
@@ -72,7 +73,6 @@ def last_update_for(record):
         return record_log.get('write_date') or record_log.get('create_date') or False
     return False
 
-_logger = logging.getLogger('edi')
 
 class edi_document(osv.osv):
     _name = 'edi.document'
@@ -520,7 +520,8 @@ class EDIMixin(object):
                                                                        'datas': result,
                                                                        'datas_fname': file_name,
                                                                        'res_model': self._name,
-                                                                       'res_id': record.id},
+                                                                       'res_id': record.id,
+                                                                       'type': 'binary'},
                                                                       context=context)
 
     def _edi_import_attachments(self, cr, uid, record_id, edi_document, context=None):
diff --git a/addons/edi/models/res_partner.py b/addons/edi/models/res_partner.py
index 357fdec061b..86d8c81b790 100644
--- a/addons/edi/models/res_partner.py
+++ b/addons/edi/models/res_partner.py
@@ -24,6 +24,7 @@ from osv import fields,osv
 from edi import EDIMixin
 from openerp import SUPERUSER_ID
 from tools.translate import _
+_logger = logging.getLogger(__name__)
 
 RES_PARTNER_EDI_STRUCT = {
     'name': True,
@@ -63,7 +64,7 @@ class res_partner(osv.osv, EDIMixin):
         code, label = 'edi_generic', 'Generic Bank Type (auto-created for EDI)'
         bank_code_ids = res_partner_bank_type.search(cr, uid, [('code','=',code)], context=context)
         if not bank_code_ids:
-            logging.getLogger('edi.res_partner').info('Normal bank account type is missing, creating '
+            _logger.info('Normal bank account type is missing, creating '
                                                       'a generic bank account type for EDI.')
             self.res_partner_bank_type.create(cr, SUPERUSER_ID, {'name': label,
                                                                  'code': label})
@@ -84,7 +85,7 @@ class res_partner(osv.osv, EDIMixin):
                                              bank_name, ext_bank_id, context=import_ctx)
                 except osv.except_osv:
                     # failed to import it, try again with unrestricted default type
-                    logging.getLogger('edi.res_partner').warning('Failed to import bank account using'
+                    _logger.warning('Failed to import bank account using'
                                                                  'bank type: %s, ignoring', import_ctx['default_state'],
                                                                  exc_info=True)
         return contact_id