Merge lp:~therp-nl/openobject-extension/oerp6.1-stable_lp1071378_magento_category_export into lp:openobject-extension/oerp6.1-stable

[Stefan Rijnhart (Opener)]

Needed for https://code.launchpad.net/~therp-nl/magentoerpconnect/oerp6.1-stable_lp1071378_magento_category_export

As I wrote on the other branch' merge proposal, I am hoping that the changes base_external_referentials/report.py won't be necessary.

=== modified file 'base_external_referentials/external_osv.py'
--- base_external_referentials/external_osv.py	2013-01-25 09:17:54 +0000
+++ base_external_referentials/external_osv.py	2013-05-13 11:50:34 +0000
@@ -1154,6 +1154,12 @@
 
 @extend(Model)
 def multi_lang_read(self, cr, uid, external_session, ids, fields_to_read, langs, resources=None, use_multi_lang = True, context=None):
+    """
+    Read a full resource on every first read, and then for every
+    extra language only the translatable fields.
+    If 'lang_full_read' is set to True in the context, read all fields
+    for every extra language, not just the translatable fields.
+    """
     if not resources:
         resources = {}
     translatable_fields, untranslatable_fields = self.get_translatable_fields(cr, uid, fields_to_read, context=context)
@@ -1167,7 +1173,9 @@
         if lang == 'no_lang':
             fields = untranslatable_fields
         else:
-            if not first and lang_support == 'fields_with_main_lang' or lang_support == 'fields_with_no_lang':
+            if (not first and not context.get('lang_full_read') and
+                lang_support == 'fields_with_main_lang' or 
+                lang_support == 'fields_with_no_lang'):
                 fields = translatable_fields
             ctx['lang'] = lang
 
 
=== modified file 'base_external_referentials/report.py'
--- base_external_referentials/report.py	2012-11-01 15:51:18 +0000
+++ base_external_referentials/report.py	2013-05-13 11:50:34 +0000
@@ -280,6 +280,10 @@
     def start_log(self, cr, uid, action_on, action, res_id=None,
                   external_id=None, resource=None, args=None, kwargs=None):
         context = kwargs.get('context') or {}
+        if context.get('conn_obj'):
+            log_kwargs = kwargs.copy()
+            log_kwargs['context'] = kwargs['context'].copy()
+            del log_kwargs['context']['conn_obj']
         existing_line_id = self.get_existing_line_id(cr, uid,action_on, action,
                                           res_id=res_id, external_id=external_id, context=context)
         report_id = context.get('report_id')
@@ -292,7 +296,7 @@
                             'res_id': res_id,
                             'external_id': external_id,
                             'args': args,
-                            'kwargs': kwargs,
+                            'kwargs': log_kwargs,
                             })
         else:
             action_on_model_id = self.pool.get('ir.model').search(cr, uid, [['model', '=', action_on]])[0]
@@ -306,7 +310,7 @@
                             'external_id': external_id,
                             'resource': resource,
                             'args': args,
-                            'kwargs': kwargs,
+                            'kwargs': log_kwargs,
                         })
         return existing_line_id