Merge lp:~serpent-consulting-services/openobject-extension/gekko-tek-995350 into lp:openobject-extension/oerp6.1-stable

[Kyle Waid]

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

Sorry the problem was not here.
This functions have correct args.
I fix the bug in rev 638 of magentoerpconnect.

Thanks for helping us.

PS : take care about >>>TREE and <<<MERGE ;)

Unmerged revisions

291. By Serpent Consulting Services on 2012-05-19

[FIX] fix some issue releated to referential_id field.

=== modified file 'base_external_referentials/external_osv.py'
--- base_external_referentials/external_osv.py	2012-05-12 23:48:24 +0000
+++ base_external_referentials/external_osv.py	2012-05-19 17:02:19 +0000
@@ -157,7 +157,7 @@
 def get_or_create_extid(self, cr, uid, external_session, openerp_id, context=None):
     """Returns the external id of a resource by its OpenERP id.
     Returns False if the resource id does not exists."""
-    res = self.get_extid(cr, uid, openerp_id, external_session.referential_id.id, context=context)
+    res = self.get_extid(cr, uid, openerp_id, external_session, context=context)
     if res is not False:
         return res
     else:
@@ -560,7 +560,7 @@
             if self.oe_update(cr, uid, external_session, existing_rec_id, vals,  resource, defaults=defaults, context=context):
                 written = True
     else:
-        existing_rec_id = self.oe_create(cr, uid,  external_session, vals, resource, defaults, context=context)
+        existing_rec_id = self.oe_create(cr, uid,  external_session, vals, resource, defaults, context)
         created = True
 
     if external_id_ok:
@@ -855,7 +855,7 @@
 @extend(osv.osv)
 def _export_one_resource(self, cr, uid, external_session, resource_id, context=None):
     defaults = self._get_default_export_values(cr, uid, external_session, context=context)
-    mapping, mapping_id = self._init_mapping(cr, uid, external_session.referential_id.id, convertion_type='from_openerp_to_external', context=context)
+    mapping, mapping_id = self._init_mapping(cr, uid, external_session, convertion_type='from_openerp_to_external', context=context)
     langs = self.get_lang_to_export(cr, uid, external_session, context=context)
     resource = self._get_oe_resources(cr, uid, external_session, [resource_id], langs=langs,
                                 smart_export=False, last_exported_date=False,

=== modified file 'base_external_referentials/report.py'
--- base_external_referentials/report.py	2012-05-19 13:44:06 +0000
+++ base_external_referentials/report.py	2012-05-19 17:02:19 +0000
@@ -31,7 +31,10 @@
 class external_report(osv.osv):
     _name = 'external.report'
     _description = 'External Report'
+<<<<<<< TREE
     _order = 'name desc'
+=======
+>>>>>>> MERGE-SOURCE
 
 
     def _get_full_name(self, cr, uid, ids, name, arg, context=None):