Merge lp:~magentoerpconnect-core-editors/magentoerpconnect/trunk-fix-876312 into lp:~magentoerpconnect-core-editors/magentoerpconnect/oerp7.0-refactor

[Alexandre Fayolle - camptocamp]

Work around magento bug wrt product categories. Closes https://bugs.launchpad.net/magentoerpconnect/+bug/876312

Unmerged revisions

647. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-07-06

[FIX] magentoerpconnect: fix export product.category issues

* the product.category meta_title has a max length of 255 char on magento
* add mappings for Magento 1.4.0.0 and 1.4.2.0, for the product.category available_sort_by bug (lp:876312)
* duplicate the option used for default value with an empty string and fix mappings (>> 1.4)

  I did not simply change the value of the option as there might be a chance that
  the 'None' trick works with Magento 1.3.x (and I don't have such an instance to
  run a test on it)

  In the mappings, the options are looked for by value, so the new option is used
  with the new mappings.
* added settings/update/fix_product_categories.sql script to fix the related options on product_category on an existing database. Must be run manually

646. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-07-05

bump up version number, reflecting schema change

645. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-07-05

[FIX] magentoerpconnect: the product.category metat_title has a max length of 255 char on magento

644. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-07-05

[FIX] magentoerpconnect: we can get a bool instead of a list of values to log. Don't truncate in that case

643. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-07-05

[IMP] magentoerpconnect: also truncate long strings in logging of returned value

642. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-07-05

[IMP] magentoerpconnect: enhance logging truncation by processing dict argument elements

641. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-06-27

[IMP] reduce verbosity logs for large strings such as images

640. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-06-27

[FIX] write the last_products_export_date only at the end of the products export to avoid locking sale.shop during the whole export

639. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-06-27

[FIX] mappings for page_layout and default_sort_by fail when empty, force export of categories which are missing when exporting a product

638. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-06-27

[FIX] fix product_category export and stock sync problems

=== modified file 'magento_sku_is_code/product.py'
--- magento_sku_is_code/product.py	2012-03-15 09:47:04 +0000
+++ magento_sku_is_code/product.py	2012-07-06 14:53:18 +0000
@@ -19,16 +19,26 @@
 #
 ##############################################################################
 
+import copy
+
 from osv import osv, fields
 
 
 class Product(osv.osv):
-    """Inherit product to use the default code as the Magento SKU. Copy the default code into the magento_sku field."""
+    """Inherit product to use the default code as the Magento SKU.
+    Copy the default code into the magento_sku field, but doesn't
+    change it if the product has already been exported to an
+    external referential."""
+
     _inherit = 'product.product'
 
-    _columns = {'magento_sku':fields.char('Magento SKU', size=64, readonly=True),}
+    _columns = {
+        'magento_sku': fields.char('Magento SKU', size=64, readonly=True),
+    }
 
-    _sql_constraints = [('code_uniq', 'unique(default_code)', 'The code must be unique')]
+    _sql_constraints = [
+        ('code_uniq', 'unique(default_code)', 'The code must be unique')
+    ]
 
     def _get_sku(self, cr, uid, vals, product=None, context=None):
         """
@@ -36,7 +46,7 @@
         @param vals: vals to be created / modified
         @param product: optional browse instance of the product (when writing)
         """
-        return vals['default_code']
+        return vals['default_code'].strip()
 
     def create(self, cr, uid, vals, context=None):
         if vals.get('default_code'):
@@ -49,18 +59,27 @@
         ids_to_write = ids[:]
         if vals.get('default_code'):
             for product in self.browse(cr, uid, ids, context=context):
-                # write separately on each product if they are not already exported
+                # write separately on each product if they
+                # are not already exported. because the sku value
+                # will change for each product. Concretely, when a value
+                # for default_code is given, we should have only one product
+                # in the write
                 if not product.magento_exported:
-                    new_vals = vals.copy()
-                    new_vals['magento_sku'] = self._get_sku(cr, uid, new_vals, product=product, context=context)
-                    super(Product, self).write(cr, uid, [product.id], new_vals, context=context)
+                    atomic_vals = copy.deepcopy(vals)
+                    atomic_vals['magento_sku'] = self._get_sku(
+                        cr, uid, atomic_vals, product=product, context=context)
+
+                    super(Product, self).write(
+                        cr, uid, [product.id], atomic_vals, context=context)
                     ids_to_write.remove(product.id)
 
-        return super(Product, self).write(cr, uid, ids_to_write, vals, context=context)
+        return super(Product, self).write(
+            cr, uid, ids_to_write, vals, context=context)
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default is None: default = {}
         default['default_code'] = False
-        return super(Product, self).copy(cr, uid, id, default=default, context=context)
+        return super(Product, self).copy(
+            cr, uid, id, default=default, context=context)
 
 Product()
 
=== modified file 'magentoerpconnect/__openerp__.py'
--- magentoerpconnect/__openerp__.py	2012-05-16 08:01:05 +0000
+++ magentoerpconnect/__openerp__.py	2012-07-06 14:53:18 +0000
@@ -18,7 +18,7 @@
 #########################################################################
 {
     "name" : "Magento e-commerce",
-    "version" : "1.0",
+    "version" : "1.0.1",
     "depends" : ["base",
                  "product",
                  "product_m2mcategories",
@@ -44,9 +44,22 @@
     "demo_xml" : [],
     "update_xml" : [
             'security/ir.model.access.csv',
+<<<<<<< TREE
             'settings/magerp.product_category_attribute_options.csv',
             'settings/external.referential.type.csv',
             'settings/1.5.0.0/external.referential.version.csv',
+=======
+            'settings/1.3.2.4/external.referential.type.csv',
+            'settings/1.3.2.4/external.mapping.template.csv',
+            'settings/1.3.2.4/external.mappinglines.template.csv',
+            'settings/1.4.0.0/external.referential.type.csv',
+            'settings/1.4.0.0/external.mapping.template.csv',
+            'settings/1.4.0.0/external.mappinglines.template.csv',
+            'settings/1.4.2.0/external.referential.type.csv',
+            'settings/1.4.2.0/external.mapping.template.csv',
+            'settings/1.4.2.0/external.mappinglines.template.csv',
+            'settings/1.5.0.0/external.referential.type.csv',
+>>>>>>> MERGE-SOURCE
             'settings/1.5.0.0/external.mapping.template.csv',
             'settings/1.5.0.0/external.shop.group/external.mappinglines.template.csv',
             'settings/1.5.0.0/magerp.storeviews/external.mappinglines.template.csv',
@@ -64,7 +77,9 @@
             'settings/1.5.0.0/account.invoice/external.mappinglines.template.csv',
             'settings/1.5.0.0/product.link/external.mappinglines.template.csv',
             'settings/magerp_product_product_type.xml',
+            'settings/update/magerp.product_category_attribute_options.xml',
             'magerp_data.xml',
+            'board_view.xml',
             'magerp_core_view.xml',
             'product_view.xml',
             'partner_view.xml',
 
=== added file 'magentoerpconnect/board_view.xml'
--- magentoerpconnect/board_view.xml	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/board_view.xml	2012-07-06 14:53:18 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="board_magentoerpconnect_form" model="ir.ui.view">
+            <field name="name">board.magentoerpconnect.form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Magentoerpconnect Dashboard">
+                    <board style="2-1">
+                        <column>
+                            <action name="%(base_external_referentials.ir_actions_act_window_external_report_line)d" string="Last Synchronizations Errors" />
+                        </column>
+                        <column/>
+                    </board>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_board_magentoerpconnect" model="ir.actions.act_window">
+            <field name="name">Magentoerpconnect Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="board_magentoerpconnect_form"/>
+        </record>
+
+    </data>
+</openerp>
 
=== modified file 'magentoerpconnect/invoice.py'
=== modified file 'magentoerpconnect/magerp_core.py'
--- magentoerpconnect/magerp_core.py	2012-05-25 15:37:26 +0000
+++ magentoerpconnect/magerp_core.py	2012-07-06 14:53:18 +0000
@@ -25,6 +25,10 @@
 from osv import osv, fields
 import magerp_osv
 import pooler
+<<<<<<< TREE
+=======
+import logging
+>>>>>>> MERGE-SOURCE
 import base64, urllib
 from magerp_osv import Connection
 import tools
@@ -101,6 +105,10 @@
     def sync_attribs(self, cr, uid, ids, context=None):
         attr_obj = self.pool.get('magerp.product_attributes')
         attr_set_obj = self.pool.get('magerp.product_attribute_set')
+<<<<<<< TREE
+=======
+        logger = logging.getLogger('ext synchro')
+>>>>>>> MERGE-SOURCE
         for referential in self.browse(cr, uid, ids, context=context):
             external_session = ExternalSession(referential, referential)
             attr_conn = external_session.connection
@@ -130,7 +138,11 @@
                                                             context=context,
                                                         )
                             import_cr.commit()
+<<<<<<< TREE
                     _logger.info("All attributs for the attributs set id %s was succesfully imported", attr_set_id)
+=======
+                    logger.info("All attributs for the attributs set id %s was succesfully imported", attr_set_id)
+>>>>>>> MERGE-SOURCE
                 #Relate attribute sets & attributes
                 mage_inp = {}
                 #Pass in {attribute_set_id:{attributes},attribute_set_id2:{attributes}}
@@ -289,6 +301,8 @@
             filter = [filters]
             return attr_conn.call('ol_customer.search', filter)
 
+        partner_obj = self.pool.get('res.partner')
+
         for referential in self.browse(cr, uid, ids, context):
             attr_conn = referential.external_connection(DEBUG)
             last_imported_id = 0
@@ -296,22 +310,24 @@
                 last_imported_id = referential.last_imported_partner_id
 
             ext_customer_ids = next_partners(attr_conn, last_imported_id + 1, self.SYNC_PARTNER_STEP)
+
+            context['use_external_log'] = True
             import_cr = pooler.get_db(cr.dbname).cursor()
             try:
                 while ext_customer_ids:
                     for ext_customer_id in ext_customer_ids:
-                        customer_info = attr_conn.call('customer.info', [ext_customer_id])
-                        customer_address_info = attr_conn.call('customer_address.list', [ext_customer_id])
-
-                        address_info = False
-                        if customer_address_info:
-                            address_info = customer_address_info[0]
-                            address_info['customer_id'] = ext_customer_id
-                            address_info['email'] = customer_info['email']
-
-                        self.pool.get('res.partner').ext_import(import_cr, uid, [customer_info], referential.id, context=context)
-                        if address_info:
-                            self.pool.get('res.partner.address').ext_import(import_cr, uid, [address_info], referential.id, context=context)
+                        customer_info = attr_conn.call(
+                            'customer.info', [ext_customer_id])
+
+                        partner_obj.ext_import(
+                            import_cr, uid, [customer_info],
+                            referential.id, context=context)
+                        partner_id = partner_obj.extid_to_oeid(
+                            import_cr, uid, ext_customer_id,
+                            referential.id, context=context)
+                        partner_obj.import_magento_address_book(
+                            import_cr, uid, partner_id,
+                            referential.id, context=context)
 
                         last_imported_id = int(ext_customer_id)
                         self.write(import_cr, uid, referential.id, {'last_imported_partner_id': last_imported_id}, context=context)
 
=== modified file 'magentoerpconnect/magerp_menu.xml'
--- magentoerpconnect/magerp_menu.xml	2012-03-15 09:47:04 +0000
+++ magentoerpconnect/magerp_menu.xml	2012-07-06 14:53:18 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data>
-		<menuitem id="menu_magerp" name="MagentoERPconnect" icon="terp-sale"
+		<menuitem id="menu_magerp" name="MagentoERPconnect" icon="terp-sale" action="open_board_magentoerpconnect"
 			web_icon="images/magento.png" 
                         web_icon_hover="images/magento-hover.png"/>
 
@@ -25,41 +25,17 @@
 
         <menuitem id="menu_magerp_reporting" name="Reporting" parent="menu_magerp" />
 
-        <record id="action_magerp_external_report" model="ir.actions.act_window">
-            <field name="name">External Reports</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">external.report</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('external_referential_id.type_id.name', 'like', 'Magento')]</field> <!-- erk -->
-            <field name="view_id" ref="base_external_referentials.external_report_tree_view"/>
-            <field name="search_view_id" ref="base_external_referentials.external_report_search_form_view"/>
-        </record>
-        <menuitem id="menu_magerp_reporting_report" name="Synchronisation Report"
-                  parent="menu_magerp_reporting" action="action_magerp_external_report" sequence="20"/>
-
-        <record id="action_magerp_external_report_history" model="ir.actions.act_window">
-            <field name="name">External Report History</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">external.report.history</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('external_report_id.external_referential_id.type_id.name', 'like', 'Magento')]</field> <!-- erk -->
-            <field name="view_id" ref="base_external_referentials.external_report_history_tree_view"/>
-            <field name="search_view_id" ref="base_external_referentials.external_report_history_search_view"/>
-        </record>
-
-        <menuitem id="menu_magerp_reporting_report_history" name="Synchronisation History"
-                  parent="menu_magerp_reporting" action="action_magerp_external_report_history" sequence="25" />
 
         <record id="action_magerp_external_report_line" model="ir.actions.act_window">
             <field name="name">External Report Lines</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">external.report.line</field>
             <field name="view_type">form</field>
-            <field name="domain">[('external_report_id.external_referential_id.type_id.name', 'like', 'Magento')]</field> <!-- erk -->
+            <field name="domain">[('referential_id.type_id.name', 'like', 'Magento')]</field> <!-- erk -->
             <field name="view_id" ref="base_external_referentials.external_report_line_tree_view"/>
             <field name="search_view_id" ref="base_external_referentials.external_report_line_search_view"/>
         </record>
-        <menuitem id="menu_magerp_reporting_report_line" name="Last Synchronisation Details"
+        <menuitem id="menu_magerp_reporting_report_line" name="Synchronisation Errors"
                   parent="menu_magerp_reporting" action="action_magerp_external_report_line" sequence="30"/>
 	</data>
 </openerp>
 
=== modified file 'magentoerpconnect/magerp_osv.py'
--- magentoerpconnect/magerp_osv.py	2012-05-24 20:52:38 +0000
+++ magentoerpconnect/magerp_osv.py	2012-07-06 14:53:18 +0000
@@ -23,9 +23,16 @@
 import time
 import datetime
 import xmlrpclib
+<<<<<<< TREE
+=======
+import logging
+>>>>>>> MERGE-SOURCE
 import urllib2
 import base64
+import pooler
 from tools.translate import _
+from openerp.addons.base_external_referentials.external_osv import MappingError
+from psycopg2 import IntegrityError
 
 
 #NEW FEATURE
@@ -175,7 +182,7 @@
     def __init__(self, location, username, password, debug=False, logger=False):
         #Append / if not there
         if not location[-1] == '/':
-            location += '/' 
+            location += '/'
         self.corelocation = location
         #Please do not remove the str indeed xmlrpc lib require a string for the location
         #if an unicode is send it will raise you an error
@@ -184,26 +191,46 @@
         self.password = password
         self.debug = debug
         self.result = {}
+<<<<<<< TREE
         self.logger = logger or _logger
 
     
+=======
+        self.logger = logging.getLogger('Connection(%s)' % self.location)
+
+
+>>>>>>> MERGE-SOURCE
     def connect(self):
         if not self.location[-1] == '/':
             self.location += '/'
         if self.debug:
+<<<<<<< TREE
             self.logger.info("Attempting connection with Settings:%s,%s,%s" % (self.location, self.username, self.password))
+=======
+            self.logger.info(_("Attempting connection with Settings:%s,%s,%s"), self.location, self.username, self.password)
+>>>>>>> MERGE-SOURCE
         self.ser = xmlrpclib.ServerProxy(self.location)
         for sleep_time in [1, 3, 6]:
             try:
                 self.session = self.ser.login(self.username, self.password)
                 if self.debug:
+<<<<<<< TREE
                     self.logger.info("Login Successful")
+=======
+                    self.logger.info(_("Login Successful"))
+>>>>>>> MERGE-SOURCE
                 return True
             except IOError, e:
+<<<<<<< TREE
                 self.logger.error("Error in connecting:%s" % e)
                 self.logger.warning("Webservice Failure, sleeping %s second before next attempt" % sleep_time)
+=======
+                self.logger.error(_("Error in connecting:%s"), e, exc_info=True)
+                self.logger.warn(_("Webservice Failure, sleeping %s second before next attempt"), sleep_time)
+>>>>>>> MERGE-SOURCE
                 time.sleep(sleep_time)
             except Exception,e:
+<<<<<<< TREE
                 self.logger.error("Magento Connection" + netsvc.LOG_ERROR +  "Error in connecting:%s" % e)
                 self.logger.warning("Webservice Failure, sleeping %s second before next attempt" % sleep_time)
                 time.sleep(sleep_time)  
@@ -211,6 +238,34 @@
 
     
     def call(self, method, *arguments): 
+=======
+                self.logger.error(_("Error in connecting:%s"), e, exc_info=True)
+                self.logger.warn(_("Webservice Failure, sleeping %s second before next attempt"), sleep_time)
+                time.sleep(sleep_time)
+        raise osv.except_osv(_('User Error'), _('Error connecting to magento, are your sure that your login is right? Did you configure API user in magento?'))
+
+    def _truncate_arguments(self, arguments, max_length=128):
+        """truncate long strings in arguments for logging purpose"""
+        logged_args = []
+        try:
+            for arg in arguments:
+                # reduce verbosity of log for large strings (e.g. base64 encoded images...)
+                if isinstance(arg, basestring) and len(arg) > max_length:
+                    arg = arg[:max_length] + '...'
+                elif isinstance(arg, dict):
+                    new_arg = {}
+                    for key, value in arg.iteritems():
+                        if isinstance(value, basestring) and len(value) > max_length:
+                            value = value[:max_length] + '...'
+                        new_arg[key] = value
+                    arg = new_arg
+                logged_args.append(arg)
+            return logged_args
+        except TypeError: # arguments can be a bool
+            return arguments
+
+    def call(self, method, *arguments):
+>>>>>>> MERGE-SOURCE
         if arguments:
             arguments = list(arguments)[0]
         else:
@@ -218,18 +273,37 @@
         for sleep_time in [1, 3, 6]:
             try:
                 if self.debug:
+<<<<<<< TREE
                     self.logger.info(_("Calling Method:%s,Arguments:%s") % (method, arguments))
+=======
+                    logged_args = self._truncate_arguments(arguments)
+                    self.logger.info(_("Calling Method:%s,Arguments:%s"), method, logged_args)
+>>>>>>> MERGE-SOURCE
                 res = self.ser.call(self.session, method, arguments)
                 if self.debug:
+                    logged_res = self._truncate_arguments(res)
                     if method=='catalog_product.list':
                         # the response of the method catalog_product.list can be very very long so it's better to see it only if debug log is activate
+<<<<<<< TREE
                         self.logger.debug(_("Query Returned:%s") % (res))
+=======
+                        self.logger.debug(_("Query Returned:%s"), logged_res)
+>>>>>>> MERGE-SOURCE
                     else:
+<<<<<<< TREE
                         self.logger.info(_("Query Returned:%s") % (res))
+=======
+                        self.logger.info(_("Query Returned:%s"), logged_res)
+>>>>>>> MERGE-SOURCE
                 return res
             except IOError, e:
+<<<<<<< TREE
                 self.logger.error(_("Method: %s\nArguments:%s\nError:%s") % (method, arguments, e))
                 self.logger.warning(_("Webservice Failure, sleeping %s second before next attempt") % (sleep_time))
+=======
+                self.logger.error(_("Method: %s\nArguments:%s\nError:%s"), method, arguments, e, exc_info=True)
+                self.logger.warn(_("Webservice Failure, sleeping %s second before next attempt"), sleep_time)
+>>>>>>> MERGE-SOURCE
                 time.sleep(sleep_time)
         raise
 
@@ -254,7 +328,7 @@
     _DELETE_METHOD = False
     _mapping = {}
     DEBUG = False
-    
+
     #TODO deprecated, remove use
     def mage_to_oe(self, cr, uid, mageid, instance, *arguments):
         """given a record id in the Magento referential, returns a tuple (id, name) with the id in the OpenERP referential; Magento instance wise"""
@@ -279,7 +353,7 @@
                     read = self.read(cr, uid, oeid, [self._rec_name])
                     return (read[0]['id'], read[0][self._rec_name])
         return False
-    
+
     #TODO deprecated, remove use
     def sync_import(self, cr, uid, magento_records, instance, debug=False, defaults=None, *attrs):
 
@@ -314,7 +388,7 @@
                     'temp_vars':{},
                     'mage2oe_filters':mage2oe_filters
                 }
-                
+
                 #now properly mapp known Magento attributes to OpenERP entity columns:
                 for each_valid_key in self._mapping:
                     if each_valid_key in magento_record.keys():
@@ -347,13 +421,12 @@
                             if self._mapping[each_valid_key][0]:#if not function mapping
                                 vals[self._mapping[each_valid_key][0]] = magento_record[each_valid_key] or False
                 vals['referential_id'] = instance
-                tools.debug(vals)
                 if self._MAGE_FIELD:
                     if self._MAGE_FIELD in vals.keys() and vals[self._MAGE_FIELD]:
                         self.record_save(cr, uid, rec_id, vals, defaults)
                 else:
                     self.record_save(cr, uid, rec_id, vals, defaults)
-                            
+
     def record_save(self, cr, uid, rec_id, vals, defaults):
         if defaults:
             for key in defaults.keys():
@@ -364,7 +437,7 @@
         else:
             #Record is not there, create it
             self.create(cr, uid, vals,)
-            
+
     def cast_string(self, subject):
         """This function will convert string objects to the data type required. Example "0"/"1" to boolean conversion"""
         for key in subject.keys():
@@ -374,7 +447,7 @@
                 else:
                     subject[key] = True
         return subject
-    
+
     def mage_import_base(self,cr,uid,conn, external_referential_id, defaults=None, context=None):
         if context is None:
             context = {}
@@ -396,7 +469,7 @@
                 list_method = self.pool.get('external.mapping').read(cr,uid,mapping_id[0],['external_list_method']).get('external_list_method',False)
                 if list_method:
                     data = conn.call(list_method, context['ids_or_filter'])
-                    
+
                     #it may happen that list method doesn't provide enough information, forcing us to use get_method on each record (case for sale orders)
                     if context.get('one_by_one', False):
                         self.mage_import_one_by_one(cr, uid, conn, external_referential_id, mapping_id[0], data, defaults, context)
@@ -405,24 +478,60 @@
 
         return result
 
+    def _mage_import_one(self, cr, uid, conn, record, referential_id, mapping_id, defaults=None, context=None):
+        ext_id = record[self.pool.get('external.mapping').read(cr, uid, mapping_id, ['external_key_name'])['external_key_name']]
+        get_method = self.pool.get('external.mapping').read(cr, uid, mapping_id, ['external_get_method']).get('external_get_method',False)
+        rec_data = [conn.call(get_method, [ext_id])]
+        rec_result = self.ext_import(cr, uid, rec_data, referential_id, defaults, context)
+        return rec_result['create_ids'], rec_result['write_ids']
+
     def mage_import_one_by_one(self, cr, uid, conn, external_referential_id, mapping_id, data, defaults=None, context=None):
         if context is None:
             context = {}
+        report_line_obj = self.pool.get('external.report.line')
         result = {'create_ids': [], 'write_ids': []}
-        if context.get('one_by_one', False):
-            del(context['one_by_one'])
+        import_ctx = dict(context)
+        import_ctx.pop('one_by_one', False)
+        # avoid to use external logs in submethods as they are handle at this level
+        import_ctx.pop('use_external_log', False)
+        import_ctx['import_no_new_cr'] = True
         for record in data:
-            id = record[self.pool.get('external.mapping').read(cr, uid, mapping_id, ['external_key_name'])['external_key_name']]
-            get_method = self.pool.get('external.mapping').read(cr, uid, mapping_id, ['external_get_method']).get('external_get_method',False)
-            rec_data = [conn.call(get_method, [id])]
-            rec_result = self.ext_import(cr, uid, rec_data, external_referential_id, defaults, context)
-            result['create_ids'].append(rec_result['create_ids'])
-            result['write_ids'].append(rec_result['write_ids'])
-            # and let the import continue, because it will be imported on the next import
+            record_cr = pooler.get_db(cr.dbname).cursor()
+            try:
+                ext_id = record[self.pool.get('external.mapping').read(
+                    record_cr, uid, mapping_id, ['external_key_name'])['external_key_name']]
+                cids, wids = self._mage_import_one(
+                    record_cr, uid, conn, record, external_referential_id, mapping_id, defaults=defaults, context=import_ctx)
+            except (MappingError, osv.except_osv, xmlrpclib.Fault, IntegrityError):
+                record_cr.rollback()
+                report_line_obj.log_failed(
+                    cr, uid,
+                    self._name,
+                    'import',
+                    external_referential_id,
+                    external_id=ext_id,
+                    defaults=defaults,
+                    context=context)
+            else:
+                record_cr.commit()
+                report_line_obj.log_success(
+                    cr, uid,
+                    self._name,
+                    'import',
+                    external_referential_id,
+                    external_id=ext_id,
+                    context=context)
+                result['create_ids'].append(cids)
+                result['write_ids'].append(wids)
+            finally:
+                record_cr.close()
         return result
 
     def get_external_data(self, cr, uid, conn, external_referential_id, defaults=None, context=None):
         """Constructs data using WS or other synch protocols and then call ext_import on it"""
+        if context is None:
+            context = {}
+        context = dict(context)
         return self.mage_import_base(cr, uid, conn, external_referential_id, defaults, context)#TODO refactor mage_import_base calls to this interface
 
     #TODO deprecated, remove use
@@ -438,7 +547,7 @@
                 self.sync_import(cr, uid, magento_records, instance, debug, defaults)
         else:
             raise osv.except_osv(_('Undefined List method !'), _("list method is undefined for this object!"))
-    
+
     #TODO deprecated, remove use
     def get_all_mage_ids(self, cr, uid, ids, instance=False):
         search_param = []
@@ -451,4 +560,4 @@
         for each in reads:
             mageids.append(each[self._MAGE_FIELD])
         return mageids
-        
+
 
=== modified file 'magentoerpconnect/partner.py'
--- magentoerpconnect/partner.py	2012-05-19 13:37:23 +0000
+++ magentoerpconnect/partner.py	2012-07-06 14:53:18 +0000
@@ -22,6 +22,9 @@
 #along with this program.  If not, see <http://www.gnu.org/licenses/>.  #
 #########################################################################
 
+import string
+import copy
+
 from osv import osv, fields
 from tools.translate import _
 import magerp_osv
@@ -52,6 +55,7 @@
         return res
 
     _columns = {
+<<<<<<< TREE
         'name': fields.function(_get_partner_name, obj="res.partner.address", type = 'char', size = 256,
                 store = {
                     'res.partner.address' : (lambda self, cr, uid, ids, c={}: ids,
@@ -60,8 +64,22 @@
         'firstname':fields.char('First Name', size=100),
         'lastname':fields.char('Last Name', size=100),
         'is_magento_order_address':fields.boolean('Magento Order Address?'), #TODO still needed?
+=======
+                    'firstname':fields.char('First Name', size=100),
+                    'lastname':fields.char('Last Name', size=100),
+                    'is_magento_order_address':
+                        fields.boolean('Magento Order Address',
+                                       help="Created for a Magento sale order",
+                                       readonly=True),
+                    'magento_address_book':
+                        fields.boolean('Magento Address Book',
+                                       help="Part of the Magento Address Book",
+                                       readonly=True)
+>>>>>>> MERGE-SOURCE
                 }
+
     _defaults = {
+<<<<<<< TREE
         'is_magento_order_address': lambda * a:False,
                  }
 
@@ -75,6 +93,19 @@
             ext_create_ids[resource_id] = ext_id
         return ext_create_ids
 
+=======
+        'is_magento_order_address': lambda * a: False,
+        }
+
+    def mage_import_base(self,cr,uid,conn, external_referential_id, defaults=None, context=None):
+        # quick hack
+        # remove the id so the address will be imported using "list method"
+        # instead of "get method" because the entity_id field miss in the get method.
+        context.pop('id', False)
+        return super(res_partner_address, self).mage_import_base(
+            cr, uid, conn, external_referential_id, defaults=defaults, context=context)
+
+>>>>>>> MERGE-SOURCE
 res_partner_address()
 
 class res_partner(magerp_osv.magerp_osv):
@@ -107,11 +138,20 @@
                     'mag_birthday':fields.date('Birthday', help="To be able to receive customer birthday you must set it in Magento Admin Panel, menu System / Configuration / Client Configuration / Name and Address Options."),
                     'mag_newsletter':fields.boolean('Newsletter'),
                     'magento_exported': fields.function(_is_magento_exported, type="boolean", method=True, string="Exists on Magento"),
+<<<<<<< TREE
                     'magento_pwd': fields.char('Magento Password', size=256),
+=======
+                    'is_magento_guest': fields.boolean(
+                        'Is a Magento guest',
+                        help="This partner has been created for a Magento "
+                             "guest sale order.",
+                        readonly=True)
+>>>>>>> MERGE-SOURCE
                 }
 
     _sql_constraints = [('emailid_uniq', 'unique(emailid, website_id)', 'A partner already exists with this email address on the selected website.')]
 
+<<<<<<< TREE
     @only_for_referential('magento')
     def get_ids_and_update_date(self, cr, uid, external_session, ids=None, last_exported_date=None, context=None):
         store_ids = [store.id for store in external_session.sync_from_object.storeview_ids]
@@ -143,5 +183,217 @@
             for resource_id in resource_ids:
                 result = address_obj._export_one_resource(cr, uid, external_session, resource_id, context=context)
         return res
+=======
+    def _import_magento_addresses(self, cr, uid, connection, ext_customer_id,
+                                  referential_id, context=None):
+        """
+        Import all the magento addresses of a magento customer's address book
+
+        :param connection: connection to Magento
+        :param int ext_customer_id: id on Magento of the customer
+        :param int referential_id: id of the Magento external referential
+        """
+        if context is None:
+            context = {}
+        address_obj = self.pool.get('res.partner.address')
+        import_ctx = context.copy()
+        import_ctx['ids_or_filter'] = [ext_customer_id]
+        defaults = {'magento_address_book': True}
+        return address_obj.get_external_data(
+            cr, uid, connection, referential_id,
+            defaults=defaults, context=import_ctx)
+
+    def _disable_missing_addresses(self, cr, uid, partner_id, curr_address_ids,
+                                   referential_id, context=None):
+        """
+        Disable the addresses of the partner which have been deleted on
+        Magento since last synchronization.
+
+        :param int partner_id: id of the partner for whom we
+            update the addresses
+        :param list curr_address_ids: list of openerp ids of the addresses
+            which currently exist in the magento address book
+        :param int referential_id: id of the Magento external referential
+        :return: True
+        """
+        # list of the all the addresses in openerp which have been imported
+        # from this referential
+        address_obj = self.pool.get('res.partner.address')
+        partner_address_ids = address_obj.search(
+            cr, uid, [('partner_id', '=', partner_id)], context=context)
+        all_ref_address_ids = \
+            [address_id for address_id in partner_address_ids
+             if address_obj.oeid_to_extid(
+                cr, uid, address_id, referential_id, context=context)]
+
+        # do a diff to know which addresses does not anymore exist
+        # on Magento
+        del_address_ids = set(all_ref_address_ids).difference(curr_address_ids)
+        address_obj.write(
+            cr, uid, del_address_ids, {'active': False}, context=context)
+        return True
+
+    def import_magento_address_book(self, cr, uid, ids, referential_id,
+                                    context=None):
+        """
+        Import all the addresses from the Magento referential's address book
+        Deactivate the addresses which have been deleted from Magento
+        since the last import.
+
+        :param int/list ids: ids or list of ids of partner to import the
+            address book
+        :param int referential_id: id of the Magento external referential
+        """
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        ref_obj = self.pool.get('external.referential')
+        connection = context.get('conn_obj') or \
+                        ref_obj.external_connection(
+                            cr, uid, referential_id, context=context)
+
+        for partner_id in ids:
+            ext_customer_id = self.oeid_to_extid(
+                cr, uid, partner_id, referential_id, context=context)
+
+            result = self._import_magento_addresses(
+                cr, uid, connection, ext_customer_id, referential_id,
+                context=context)
+
+            # list of all addresses currently in the magento address book
+            curr_address_ids = result['create_ids'] + result['write_ids']
+            self._disable_missing_addresses(
+                cr, uid, partner_id, curr_address_ids, referential_id,
+                context=context)
+
+        return True
+
+    def add_magento_vat_number(self, cr, uid, partner_id, tax_vat, country_code=None, context=None):
+        """Adds vat number (country code+magento vat) if base_vat module is installed and Magento sends customer_taxvat
+        TODO replace me by a generic function maybe the best solution will to have a field vat and a flag vat_ok and a flag force vat_ok
+        And so it's will be possible to have an invalid vat number (imported from magento for exemple) but the flag will be not set
+        Also we should think about the way to update customer. Indeed by default there are never updated"""
+        partner_vals = {'mag_vat': tax_vat}
+        cr.execute('select * from ir_module_module where name=%s and state=%s', ('base_vat','installed'))
+        if cr.fetchone():
+            allchars = string.maketrans('', '')
+            delchars = ''.join([c for c in allchars if c not in string.letters + string.digits])
+            vat = tax_vat.translate(allchars, delchars).upper()
+            vat_country, vat_number = vat[:2].lower(), vat[2:]
+            vat_ok = False
+            if 'check_vat_' + vat_country in dir(self):
+                check = getattr(self, 'check_vat_' + vat_country)
+                vat_ok = check(vat_number)
+            else:
+                # Maybe magento vat number has not country code prefix. Take it from billing address.
+                if country_code:
+                    fnct = 'check_vat_' + country_code.lower()
+                    if fnct in dir(self):
+                        check = getattr(self, fnct)
+                        vat_ok = check(vat)
+                        vat = country_code + vat
+                    else:
+                        vat_ok = False
+            if vat_ok:
+                partner_vals.update({'vat_subjected':True, 'vat':vat})
+        self.write(cr, uid, [partner_id], partner_vals)
+        return True
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if vals.get('store_id') and not vals.get('store_ids'):
+            for partner_id in ids:
+                # Add the last store id visited if
+                # it is not in the list of store ids
+                # partner store_id = last store where he bought (so this order)
+                # partner store_ids = all stores where he bought
+                atomic_vals = copy.deepcopy(vals)
+                partner = self.browse(cr, uid, partner_id, context=context)
+                if partner.store_id:
+                    last_store_id = partner.store_id.id
+                    if last_store_id not in [st.id for st in partner.store_ids]:
+                        atomic_vals['store_ids'] = [(4, last_store_id)]
+
+                super(res_partner, self).write(
+                    cr, uid, partner_id, atomic_vals, context=context)
+        else:
+            return super(res_partner, self).write(
+                cr, uid, ids, vals, context=context)
+        return True
+
+    def create(self, cr, uid, vals, context=None):
+        if vals.get('store_id') and not vals.get('store_ids'):
+            vals['store_ids'] = [(4, vals['store_id'])]
+        return super(res_partner, self).create(cr, uid, vals, context=context)
+
+    def search_magento_partner(self, cr, uid, magento_email, website_id, is_bound=None, context=None):
+        """
+        Searches and returns the partners which are potentially the same
+        based on the mail and the magento website id
+
+        :param str magento_email: mail of the customer on magento
+        :param int website_id: id of the website (openerp id!)
+        :param bool is_bound: specify it the partner must already be bound
+            with a magento customer (True) or not (False)
+            When None value: all partners ids are returned
+        :return: id of the found partner or False if any partner's found
+        """
+        partner_ids = False
+        if website_id:
+            partner_ids = self.search(cr, uid,
+                                      [('emailid', '=', magento_email),
+                                       ('website_id', '=', website_id)],
+                                      context=context)
+
+        # when the partner has been created, the website is not necessarily
+        # filled, in such case we search the first occurrence
+        # with the same email not already bound with a magento customer
+        if not partner_ids:
+            partner_ids = self.search(cr, uid,
+                                      [('emailid', '=', magento_email),
+                                       ('website_id', '=', False)],
+                                      context=context)
+        # keep or exclude already bound partners according to argument is_bound
+        if is_bound is not None:
+            partner_ids = [partner.id for partner
+                           in self.browse(cr, uid, partner_ids[:], context=context)
+                           if bool(partner.magento_exported) is is_bound]
+
+        return partner_ids and partner_ids[0] or False
+
+    def _existing_oeid_for_extid_import(self, cr, uid, vals, external_id, external_referential_id, context=None):
+        """
+        When importing a new customer from Magento (no external_id found in ir.model.data), we search
+        for a partner with the same emailid and website than the imported one
+        (fields must be filled in advance).
+
+        The external customer will update the partner returned in the tuple.
+        The external id will be created on this partner with the external resource
+        if the value is False in the tuple.
+
+        :param dict vals: vals to create in OpenERP, already evaluated by oevals_from_extdata
+        :param int external_id: external id of the resource to create
+        :param int external_referential_id: external referential id from where we import the resource
+        :return: tuple of (ir.model.data id / False: external id to create, model resource id / False: resource to create)
+        """
+        existing_ir_model_data_id, existing_res_id = super(res_partner, self)\
+        ._existing_oeid_for_extid_import(cr, uid, vals, external_id, external_referential_id, context=context)
+
+        if existing_res_id:
+            return existing_ir_model_data_id, existing_res_id
+
+        partner_id = self.search_magento_partner(
+            cr, uid,
+            vals['emailid'],
+            vals.get('website_id', False),
+            is_bound=None,
+            context=context)
+
+        return False, partner_id
+>>>>>>> MERGE-SOURCE
 
 res_partner()
 
=== modified file 'magentoerpconnect/partner_view.xml'
--- magentoerpconnect/partner_view.xml	2012-05-19 13:37:23 +0000
+++ magentoerpconnect/partner_view.xml	2012-07-06 14:53:18 +0000
@@ -7,11 +7,15 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form" />
             <field name="arch" type="xml">
+<<<<<<< TREE
                 <xpath expr="/form/notebook/page/field/form/group/field[@name='name']" position="replace" >
                     <field name="company" />
                     <field name="firstname" />
                     <field name="lastname" />
                 </xpath>
+=======
+                <data>
+>>>>>>> MERGE-SOURCE
                 <xpath expr="/form/notebook" position="inside">
                     <page string="Magento Information">
                         <field name="magento_exported" invisible="True"/>
@@ -23,11 +27,19 @@
                         <field name="mag_birthday" />
                         <field name="mag_newsletter" select="2"/>
                         <field name="store_id" />
+                        <field name="is_magento_guest"/>
                         <newline/>
                         <separator string="Store views" colspan="4" />
                         <field name="store_ids" colspan="4" nolabel="1" attrs="{'readonly': [('magento_exported', '=', True)]}"/>
                     </page>
                 </xpath>
+                <xpath expr="//tree[@string='Partner Contacts']/field[@name='email']" position="after">
+                    <field name="magento_address_book"/>
+                </xpath>
+                <xpath expr="//form[@string='Partner Contacts']/group[3]/field[@name='email']" position="after">
+                    <field name="magento_address_book"/>
+                </xpath>
+                </data>
             </field>
         </record>
 
@@ -50,11 +62,37 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_address_form1" />
             <field name="arch" type="xml">
+<<<<<<< TREE
                 <field name="name" position="replace">
                     <field name="company" />
                     <field name="firstname" />
                     <field name="lastname" />
                 </field>
+=======
+                <data>
+                    <field name="active" position="after">
+                        <field name="magento_address_book"/>
+                    </field>
+                    <field name="name" position="after">
+                        <field name="firstname" />
+                        <field name="lastname" />
+                    </field>
+                </data>
+            </field>
+        </record>
+
+        <record id="view_partner_address_tree_mag" model="ir.ui.view">
+            <field name="name">res.partner.address.tree.mag</field>
+            <field name="model">res.partner.address</field>
+            <field name="inherit_id" ref="base.view_partner_address_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <data>
+                    <field name="type" position="after">
+                        <field name="magento_address_book"/>
+                    </field>
+                </data>
+>>>>>>> MERGE-SOURCE
             </field>
         </record>
 
 
=== modified file 'magentoerpconnect/product.py'
--- magentoerpconnect/product.py	2012-05-25 19:24:00 +0000
+++ magentoerpconnect/product.py	2012-07-06 14:53:18 +0000
@@ -28,9 +28,14 @@
 import pooler
 import magerp_osv
 from tools.translate import _
+<<<<<<< TREE
+=======
+import logging
+>>>>>>> MERGE-SOURCE
 import unicodedata
 import base64, urllib
 import os
+import xmlrpclib
 from lxml import etree
 import xmlrpclib
 
@@ -175,7 +180,7 @@
         'description': fields.text('Description'),
         'image': fields.binary('Image'),
         'image_name':fields.char('File Name', size=100),
-        'meta_title': fields.char('Title (Meta)', size=75),
+        'meta_title': fields.char('Title (Meta)', size=255),
         'meta_keywords': fields.text('Meta Keywords'),
         'meta_description': fields.text('Meta Description'),
         'url_key': fields.char('URL-key', size=100), #Readonly
@@ -209,6 +214,7 @@
             vals['magerp_stamp'] = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
         return super(product_category, self).write(cr, uid, ids, vals, context)
 
+<<<<<<< TREE
     def _get_external_resource_ids(self, cr, uid, external_session, resource_filter=None, mapping=None, context=None):
         def get_child_ids(tree):
             result=[]
@@ -222,6 +228,77 @@
             categ_tree = external_session.connection.call('catalog_category.tree')             #Get the tree
             ids = get_child_ids(categ_tree)
         return ids
+=======
+    def record_entire_tree(self, cr, uid, id, conn, categ_tree, DEBUG=False):
+        self.record_category(cr, uid, id, conn, int(categ_tree['category_id']))
+        for each in categ_tree['children']:
+            self.record_entire_tree(cr, uid, id, conn, each)
+        return True
+
+    def record_category(self, cr, uid, external_referential_id, conn, category_id):
+        #This function should record a category
+        #The parent has to be created before creating child
+        imp_vals = conn.call('category.info', [category_id])
+        self.ext_import(cr, uid, [imp_vals], external_referential_id, defaults={}, context={'conn_obj':conn})
+
+    def ext_export(self, cr, uid, ids, external_referential_ids=None, defaults=None, context=None): # We export all the categories if at least one has been modified since last export
+        #TODO Move this function in base_sale_multichannels
+        if context is None:
+            context = {}
+
+        if defaults is None:
+            defaults = {}
+
+        res = False
+        orig_ids = ids[:]
+        ids_exportable = self.search(cr, uid, [('id', 'in', ids), ('magento_exportable', '=', True)]) #restrict export to only exportable products
+        ids = [id for id in ids if id in ids_exportable] #we need to keep the order of the categories
+        if not ids:
+            logger = logging.getLogger('magentoerpconnect')
+            logger.warning('called ext_export with ids %s, of which none were exportable', orig_ids)
+            return res
+
+        shop = self.pool.get('sale.shop').browse(cr, uid, context['shop_id'])
+
+        context_dic = [context.copy()]
+        context_dic[0]['export_url'] = True # for the magento version 1.3.2.4, only one url is autorized by category, so we only export with the MAPPING TEMPLATE the url of the default language
+        context_dic[0]['lang'] = shop.referential_id.default_lang_id.code
+
+        for storeview in shop.storeview_ids:
+            if storeview.lang_id and storeview.lang_id.code != shop.referential_id.default_lang_id.code:
+                context_dic += [context.copy()]
+                context_dic[len(context_dic)-1].update({'storeview_code': storeview.code, 'lang': storeview.lang_id.code})
+
+        if shop.last_products_export_date and not context.get('force_export'):
+            last_exported_time = datetime.datetime.fromtimestamp(time.mktime(time.strptime(shop.last_products_export_date[:19], DEFAULT_SERVER_DATETIME_FORMAT)))
+        else:
+            last_exported_time = False
+
+        if not last_exported_time:
+            for ctx_storeview in context_dic:
+                ctx_storeview['force'] = True
+                res = super(product_category, self).ext_export(cr, uid, ids, external_referential_ids, defaults, ctx_storeview)
+        else:
+            cr.execute("select write_date, create_date from product_category where id in %s", (tuple(ids),))
+            read = cr.fetchall()
+            for categ in read:
+                last_updated_categ = categ[0] and categ[0].split('.')[0] or categ[1] and categ[1].split('.')[0] or False
+                last_updated_categ_time = datetime.datetime.fromtimestamp(time.mktime(time.strptime(last_updated_categ[:19], DEFAULT_SERVER_DATETIME_FORMAT)))
+                if last_updated_categ_time and last_exported_time:
+                    if last_exported_time - datetime.timedelta(seconds=1) < last_updated_categ_time:
+                        for ctx_storeview in context_dic:
+                            ctx_storeview['force'] = True
+                            res = super(product_category, self).ext_export(cr, uid, ids, external_referential_ids, defaults, ctx_storeview)
+                        break
+        return res
+
+    def try_ext_update(self, cr, uid, data, conn, method, oe_id, external_id, ir_model_data_id, create_method, context=None):
+        if context is None: context = {}
+        if context.get('storeview_code', False):
+            return conn.call(method, [external_id, data, context.get('storeview_code', False)])
+        else:
+            return conn.call(method, [external_id, data])
+>>>>>>> MERGE-SOURCE
 
 product_category()
 
@@ -255,6 +332,7 @@
                                            ('gallery', 'Gallery'),
                                            ('weee', 'Fixed Product Tax'),
                                            ('file', 'File'), #this option is not a magento native field it will be better to found a generic solutionto manage this kind of custom option
+                                           ('weight', 'Weight'),
                                            ], 'Frontend Input'
                                           ),
         'frontend_class':fields.char('Frontend Class', size=100),
@@ -290,13 +368,20 @@
         #These parameters are for automatic management
         'field_name':fields.char('Open ERP Field name', size=100),
         'attribute_set_info':fields.text('Attribute Set Information'),
-        'based_on':fields.selection([('product_product', 'Product Product'), ('product_template', 'Product Template')], 'Based On'),
+        'based_on':fields.selection([('product.product', 'Product Product'), ('product.template', 'Product Template')], 'Based On'),
         }
 
     _defaults = {
-        'based_on': lambda*a: 'product_template',
+        'based_on': lambda*a: 'product.template',
     }
 
+    def init(self, cr):
+        """ Replace product_product by product.product
+        and product_template by product.template for
+        consistency with model names"""
+        cr.execute("UPDATE magerp_product_attributes SET based_on = REPLACE(based_on, '_', '.')")
+        cr.execute("UPDATE magerp_product_attributes SET based_on = 'product.template' WHERE based_on IS NULL")
+
     #mapping magentofield:(openerpfield,typecast,)
     #have an entry for each mapped field
     _no_create_list = [
@@ -372,6 +457,7 @@
         'visibility',
     ]
 
+<<<<<<< TREE
 
     #TODO check if this field have to be in only one way and if yes add this feature
     _sync_way = {
@@ -382,19 +468,25 @@
     def _is_attribute_translatable(self, vals):
         """Tells if field associated to attribute should be translatable or not.
         For now we are using a default list, later we could say that any attribute
+=======
+    MODEL_SERIALIZED_FIELD = {
+        'product.template': 'magerp_tmpl',
+        'product.product': 'magerp_variant',
+    }
+
+    def _is_attribute_translatable(self, attribute):
+        """Tells if field associated to attribute
+        should be translatable or not.
+        For now we are using a default list,
+        later we could say that any attribute
+>>>>>>> MERGE-SOURCE
         which scope in Magento is 'store' should be translated."""
-        if vals['attribute_code'] in self._translatable_default_codes:
-            return True
-        else:
-            return False
-
-    def write(self, cr, uid, ids, vals, context=None):
-        """Will recreate the mapping attributes, beware if you customized some!"""
-        if context is None:
-            context = {}
-
-        if type(ids) == int:
+        return bool(attribute.attribute_code in self._translatable_default_codes)
+
+    def create_ir_fields(self, cr, uid, ids, update_options=False, context=None):
+        if isinstance(ids, (int, long)):
             ids = [ids]
+<<<<<<< TREE
         result = super(magerp_product_attributes, self).write(cr, uid, ids, vals, context)
         model_ids = self.pool.get('ir.model').search(cr, uid, [('model', 'in', ['product.product', 'product.template'])])
         product_model_id = self.pool.get('ir.model').search(cr, uid, [('model', 'in', ['product.product'])])[0]
@@ -402,11 +494,26 @@
         for id in ids:
             all_vals = self.read(cr, uid, id, [], context)
 
+=======
+
+        for attribute in self.browse(cr, uid, ids, context=context):
+            if attribute.attribute_code in self._no_create_list:
+                continue
+>>>>>>> MERGE-SOURCE
             #Fetch Options
+<<<<<<< TREE
             if 'frontend_input' in all_vals.keys() and all_vals['frontend_input'] in ['select', 'multiselect']:
                 core_imp_conn = self.pool.get('external.referential').external_connection(cr, uid, [referential_id])
                 options_data = core_imp_conn.call('ol_catalog_product_attribute.options', [all_vals['magento_id']])
+=======
+            if attribute.frontend_input in ['select',  'multiselect']:
+                core_imp_conn = self.pool.get('external.referential').connect(
+                    cr, uid, [attribute.referential_id.id])
+                options_data = core_imp_conn.call(
+                    'ol_catalog_product_attribute.options', [attribute.magento_id])
+>>>>>>> MERGE-SOURCE
                 if options_data:
+<<<<<<< TREE
                     self.pool.get('magerp.product_attribute_options').data_to_save(cr, uid, options_data, update=True, context={'attribute_id': id, 'referential_id': referential_id})
 
 
@@ -415,20 +522,123 @@
             field_ids = self.pool.get('ir.model.fields').search(cr, uid, [('name', '=', field_name), ('model_id', 'in', model_ids)])
             if field_ids:
                 self._create_mapping(cr, uid, self._type_conversion[all_vals.get('frontend_input', False)], field_ids[0], field_name, referential_id, product_model_id, all_vals, id)
+=======
+                    options_obj = self.pool.get('magerp.product_attribute_options')
+                    ctx_opt = dict(context,
+                                   attribute_id=attribute.id,
+                                   referential_id=attribute.referential_id.id)
+                    options_obj.data_to_save(
+                        cr, uid, options_data,
+                        update=update_options,
+                        context=ctx_opt)
+
+            # Create fields in ir.model.data if it does not already exist
+            # Create the field accordingly to the "based_on"
+            # configuration of the attribute (product.product or product.template)
+            if attribute.attribute_code and attribute.frontend_input:
+                model_ids = self.pool.get('ir.model').search(
+                    cr, uid, [('model', '=', attribute.based_on)], context=context)
+
+                fields_obj = self.pool.get('ir.model.fields')
+                # Check if field already exists
+                field_ids = fields_obj.search(
+                        cr, uid,
+                        [('name', '=', attribute.field_name),
+                         ('model', '=', attribute.based_on)],
+                        context=context)
+                field_vals = {
+                    'name': attribute.field_name,
+                    'model_id': model_ids[0],
+                    'model': attribute.based_on,
+                    'field_description': attribute.frontend_label or \
+                        attribute.attribute_code,
+                    'ttype': self._type_conversion[attribute.frontend_input],
+                    'translate': self._is_attribute_translatable(attribute),
+                }
+                if not attribute.attribute_code in self._not_store_in_json:
+                    field_vals['serialization_field_id'] = fields_obj.search(
+                        cr, uid,
+                        [('name', '=', self.MODEL_SERIALIZED_FIELD[attribute.based_on]),
+                         ('model', '=', attribute.based_on)],
+                        context=context)[0]
+                if not field_ids:
+                    #The field is not there create it
+                    #IF char add size
+                    if field_vals['ttype'] == 'char':
+                        field_vals['size'] = 100
+                    elif field_vals['ttype'] == 'many2one':
+                        field_vals['relation'] = 'magerp.product_attribute_options'
+                        field_vals['domain'] = "[('attribute_id', '=', %s)]" % attribute.id
+                    elif field_vals['ttype'] == 'many2many':
+                        field_vals['relation'] = 'magerp.product_attribute_options'
+                        field_vals['domain'] = "[('attribute_id', '=', %s)]" % attribute.id
+                    field_vals['state'] = 'manual'
+
+                    #All field values are computed, now save
+                    self.pool.get('ir.model.fields').create(
+                        cr, uid, field_vals, context=context)
+        return True
+
+    def update_mapping(self, cr, uid, ids, context=None):
+        """Create mappings for the attributes
+        if they have a field name
+        and a field in ir.model.data"""
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        for attribute in self.browse(cr, uid, ids, context=context):
+            if not attribute.field_name:
+                continue
+            field_obj = self.pool.get('ir.model.fields')
+            field_ids = field_obj.search(
+                cr, uid,
+                [('name', '=', attribute.field_name),
+                 ('model', '=', attribute.based_on)],
+                context=context)
+            if not field_ids:
+                continue
+            field = field_obj.browse(
+                cr, uid, field_ids[0], context=context)
+            self._create_mapping(
+                cr, uid,
+                attribute,
+                field,
+                context=context)
+        return True
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """Will recreate the mapping attributes,
+        beware if you customized some!"""
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        result = super(magerp_product_attributes, self).write(cr, uid, ids, vals, context=context)
+
+        self.create_ir_fields(
+            cr, uid, ids, update_options=True, context=context)
+
+        self.update_mapping(cr, uid, ids, context=context)
+>>>>>>> MERGE-SOURCE
         return result
 
     def create(self, cr, uid, vals, context=None):
-        """Will create product.template new fields accordingly to Magento product custom attributes and also create mappings for them"""
+        """Will create product.template new fields accordingly
+        to Magento product custom attributes
+        and also create mappings for them"""
         if context is None:
             context = {}
         if not vals['attribute_code'] in self._no_create_list:
             field_name = "x_magerp_" + vals['attribute_code']
             field_name = convert_to_ascii(field_name)
-            vals['field_name']= field_name
+            vals['field_name'] = field_name
         if 'attribute_set_info' in vals.keys():
             attr_set_info = eval(vals.get('attribute_set_info',{}))
             for each_key in attr_set_info.keys():
                 vals['group_id'] = attr_set_info[each_key].get('group_id', False)
+<<<<<<< TREE
 
         crid = super(magerp_product_attributes, self).create(cr, uid, vals, context)
         if not vals['attribute_code'] in self._no_create_list:
@@ -494,7 +704,31 @@
         #If the field have restriction on domain
         #Maybe we can give the posibility to map directly m2m and m2o field_description
         #by filtrering directly with the domain and the string value
+=======
+
+        # By default some fields should be based on product variants
+        # instead of templates.
+        if vals['attribute_code'] in self._variant_fields:
+            vals['based_on'] = 'product.product'
+
+        attribute_id = super(magerp_product_attributes, self).create(
+            cr, uid, vals, context=context)
+
+        if attribute_id:
+            self.create_ir_fields(
+                cr, uid,
+                attribute_id,
+                update_options=False,
+                context=context)
+            self.update_mapping(cr, uid, attribute_id, context=context)
+        return attribute_id
+
+    def _default_mapping(self, cr, uid, attribute, field, context=None):
+        in_function = out_function = False
+        ttype = field.ttype
+>>>>>>> MERGE-SOURCE
         if ttype in ['char', 'text', 'date', 'float', 'weee', 'boolean']:
+<<<<<<< TREE
             mapping_line['evaluation_type'] = 'direct'
             if ttype == 'float':
                 mapping_line['external_type'] = 'float'
@@ -503,7 +737,12 @@
             else:
                 mapping_line['external_type'] = 'unicode'
 
+=======
+            in_function = "result = [('%s', ifield)]" % (field.name,)
+            out_function = "result = [('%s', record['%s'])]" % (attribute.attribute_code, field.name)
+>>>>>>> MERGE-SOURCE
         elif ttype in ['many2one']:
+<<<<<<< TREE
             mapping_line['evaluation_type'] = 'function'
             mapping_line['in_function'] = \
                ("if '%(attribute_code)s' in resource:\n"
@@ -518,7 +757,20 @@
                 "        option = self.pool.get('magerp.product_attribute_options').browse(cr, uid, resource['%(field_name)s'][0])\n"
                 "        if option:\n"
                 "            result = [('%(attribute_code)s', option.value)]") % ({'field_name': field_name, 'attribute_code': vals['attribute_code']})
+=======
+            in_function = ("if ifield:\n"
+                           "    option_id = self.pool.get('magerp.product_attribute_options').search(cr, uid, [('attribute_id','=',%(attribute_id)s),('value','=',ifield)])\n"
+                           "    if option_id:\n"
+                           "        result = [('%(field_name)s', option_id[0])]")  % ({'attribute_id': attribute.id, 'field_name': field.name})
+            # we browse on record['%(field_name)s'][0] because record[field_name] is in the form (id, name)
+            out_function = ("result = [('%(attribute_code)s', False)]\n"
+                            "if record.get('%(field_name)s'):\n"
+                            "    option = self.pool.get('magerp.product_attribute_options').browse(cr, uid, record['%(field_name)s'][0])\n"
+                            "    if option:\n"
+                            "        result = [('%(attribute_code)s', option.value)]") % ({'field_name': field.name, 'attribute_code': attribute.attribute_code})
+>>>>>>> MERGE-SOURCE
         elif ttype in ['many2many']:
+<<<<<<< TREE
             mapping_line['evaluation_type'] = 'function'
             mapping_line['in_function'] = ("option_ids = []\n"
                 "opt_obj = self.pool.get('magerp.product_attribute_options')\n"
@@ -530,7 +782,20 @@
                 "    options = self.pool.get('magerp.product_attribute_options').browse(cr, uid, resource['%(field_name)s'])\n"
                 "    result = [('%(attribute_code)s', [option.value for option in options])]") % \
                ({'field_name': field_name, 'attribute_code': vals['attribute_code']})
+=======
+            in_function = ("option_ids = []\n"
+                           "opt_obj = self.pool.get('magerp.product_attribute_options')\n"
+                           "for ext_option_id in ifield:\n"
+                           "    option_ids.extend(opt_obj.search(cr, uid, [('attribute_id','=',%(attribute_id)s), ('value','=',ext_option_id)]))\n"
+                           "result = [('%(field_name)s', [(6, 0, option_ids)])]") % ({'attribute_id': attribute.id, 'field_name': field.name})
+            out_function = ("result=[('%(attribute_code)s', [])]\n"
+                            "if record.get('%(field_name)s'):\n"
+                            "    options = self.pool.get('magerp.product_attribute_options').browse(cr, uid, record['%(field_name)s'])\n"
+                            "    result = [('%(attribute_code)s', [option.value for option in options])]") % \
+                           ({'field_name': field.name, 'attribute_code': attribute.attribute_code})
+>>>>>>> MERGE-SOURCE
         elif ttype in ['binary']:
+<<<<<<< TREE
             warning_text = "Binary mapping is actually not supported (attribute: %s)" % (vals['attribute_code'],)
             _logger.warn(warning_text)
             warning_msg = ("import logging\n"
@@ -538,11 +803,21 @@
                            "logger.warn('%s')") % (warning_text,)
             mapping_line['in_function'] = mapping_line['out_function'] = warning_msg
         return mapping_line
+=======
+            logger = logging.getLogger('ext synchro mapping')
+            logger.warn("Binary mapping is actually not supported (attribute: %s)", attribute.attribute_code)
+            warning_msg = ("import logging\n"
+                           "logger = logging.getLogger('ext synchro mapping')\n"
+                           "logger.warn('Binary mapping is actually not supported (attribute: %%s)', %s)") % (attribute.attribute_code)
+            in_function = out_function = warning_msg
+        return in_function, out_function
+>>>>>>> MERGE-SOURCE
 
-    def _create_mapping(self, cr, uid, ttype, field_id, field_name, referential_id, model_id, vals, attribute_id):
-        """Search & create mapping entries"""
-        if vals['attribute_code'] in self._no_create_list:
+    def _create_mapping(self, cr, uid, attribute, field, context=None):
+        """Search and create mapping entries"""
+        if attribute.attribute_code in self._no_create_list:
             return False
+<<<<<<< TREE
         mapping_id = self.pool.get('external.mapping').search(cr, uid, [('referential_id', '=', referential_id), ('model_id', '=', model_id)])
         if mapping_id:
             existing_line = self.pool.get('external.mapping.line').search(cr, uid, [('external_field', '=', vals['attribute_code']), ('mapping_id', '=', mapping_id[0])])
@@ -555,6 +830,38 @@
                                 'field_id': field_id, }
                 mapping_line = self._default_mapping(cr, uid, ttype, field_name, vals, attribute_id, model_id, mapping_line, referential_id)
                 self.pool.get('external.mapping.line').create(cr, uid, mapping_line)
+=======
+        # the mapping should always be created on the product.product
+        # model, and not on product.template
+        mapping_ids = self.pool.get('external.mapping').search(
+            cr, uid,
+            [('referential_id', '=', attribute.referential_id.id),
+             ('model_id.model', '=', 'product.product')],
+            context=context)
+        if not mapping_ids:
+            raise osv.except_osv(
+                _('Error'),
+                _("No Object Mapping \"Product\""
+                  "for \"%s\"." % attribute.referential_id.name))
+        existing_line = self.pool.get('external.mapping.line').search(
+            cr, uid,
+            [('external_field', '=', attribute.attribute_code),
+             ('mapping_id', '=', mapping_ids[0])],
+            context=context)
+        if not existing_line:
+            mapping_line = {
+                'external_field': attribute.attribute_code,
+                'mapping_id': mapping_ids[0],
+                'type': 'in_out',
+                'external_type': self._type_casts[attribute.frontend_input],
+                'field_id': field.id,
+                'evaluation_type': 'function',
+            }
+            mapping_line['in_function'], mapping_line['out_function'] = \
+                self._default_mapping(cr, uid, attribute, field, context=context)
+            self.pool.get('external.mapping.line').create(
+                cr, uid, mapping_line, context=context)
+>>>>>>> MERGE-SOURCE
         return True
 
 magerp_product_attributes()
@@ -683,6 +990,11 @@
             cr.execute(query)
         return True
 
+<<<<<<< TREE
+=======
+        return True
+
+>>>>>>> MERGE-SOURCE
 magerp_product_attribute_set()
 
 class magerp_product_attribute_groups(magerp_osv.magerp_osv):
@@ -695,11 +1007,15 @@
         for attribute_group in self.browse(cr, uid, ids, context):
             res[attribute_group.id] = self.pool.get('magerp.product_attribute_set').extid_to_oeid(cr, uid, attribute_group.attribute_set_id, attribute_group.referential_id.id)
         return res
+<<<<<<< TREE
 
     def _get_filter(self, cr, uid, external_session, step, previous_filter=None, context=None):
         attrset_ids = self.pool.get('magerp.product_attribute_set').get_all_extid_from_referential(cr, uid, external_session.referential_id.id, context=context)
         return {'attribute_set_id':{'in':attrset_ids}}
 
+=======
+
+>>>>>>> MERGE-SOURCE
     _columns = {
         'attribute_set_id':fields.integer('Attribute Set ID'),
         'attribute_set':fields.function(_get_set, type="many2one", relation="magerp.product_attribute_set", method=True, string="Attribute Set"),
@@ -1133,12 +1449,25 @@
     #TODO base the import on the mapping and the function ext_import
     def import_product_image(self, cr, uid, id, referential_id, conn, ext_id=None, context=None):
         image_obj = self.pool.get('product.images')
+<<<<<<< TREE
+=======
+        logger = logging.getLogger('ext synchro')
+>>>>>>> MERGE-SOURCE
         if not ext_id:
+<<<<<<< TREE
             ext_id = self.get_extid(cr, uid, id, referential_id, context=context)
         # TODO everythere will should pass the params 'id' for magento api in order to force
+=======
+            ext_id = self.oeid_to_extid(cr, uid, id, referential_id, context=None)
+        # TODO everythere will should pass the params 'id' for magento api in order to force
+>>>>>>> MERGE-SOURCE
         # to use the id as external key instead of mixed id/sku
         img_list = conn.call('catalog_product_attribute_media.list', [ext_id, False, 'id'])
+<<<<<<< TREE
         _logger.info("Magento image for product ext_id %s: %s", ext_id, img_list)
+=======
+        logger.info("Magento image for product ext_id %s: %s", ext_id, img_list)
+>>>>>>> MERGE-SOURCE
         images_name = []
         for image in img_list:
             img=False
@@ -1148,13 +1477,21 @@
                 data = f.read()
                 f.close()
                 if "DOCTYPE html PUBLIC" in data:
+<<<<<<< TREE
                     _logger.warn("failed to open the image %s from Magento", image['url'])
+=======
+                    logger.warn("Failed to open the image %s from Magento", image['url'])
+>>>>>>> MERGE-SOURCE
                     continue
                 else:
                     img = base64.encodestring(data)
             except Exception, e:
                 #TODO raise correctly the error
+<<<<<<< TREE
                 _logger.error("failed to open the image %s from Magento, error : %s", image['url'], e, exc_info=True)
+=======
+                logger.error("Failed to open the image %s from Magento, error : %s", image['url'], e, exc_info=True)
+>>>>>>> MERGE-SOURCE
                 continue
             mag_filename, extention = os.path.splitext(os.path.basename(image['file']))
             data = {'name': image['label'] and not image['label'] in images_name and image['label'] or mag_filename,
@@ -1180,6 +1517,7 @@
                 new_image_id = image_obj.create(cr, uid, data, context=context)
                 image_obj.create_external_id_vals(cr, uid, new_image_id, image['file'], referential_id, context=context)
         return True
+<<<<<<< TREE
 
     def get_field_to_export(self, cr, uid, ids, mapping, mapping_id, context=None):
         res = super(product_product, self).get_field_to_export(cr, uid, ids, mapping, mapping_id, context=context)
@@ -1215,6 +1553,21 @@
                                                 context=context
                                                 ))
         return resources
+=======
+
+    def extid_to_existing_oeid(self, cr, uid, id, external_referential_id, context=None):
+        """Returns the OpenERP id of a resource by its external id.
+           Returns False if the resource does not exist."""
+        if not context:
+            context={}
+        res = super(product_mag_osv, self).extid_to_existing_oeid(cr, uid, id, external_referential_id, context=context)
+        # TODO : check if this can be replaced by _existing_oeid_for_extid_import (see example in res.partner)
+        # thus when importing a product which do not already exists in OpenERP, ext_import will create the binding and update it directly
+        if not res and context.get('magento_sku', False):
+            product_id = self.search(cr, uid, [('magento_sku', '=', context['magento_sku'])], context=context)
+            return product_id and product_id[0] or False
+        return res
+>>>>>>> MERGE-SOURCE
 
     def _product_type_get(self, cr, uid, context=None):
         ids = self.pool.get('magerp.product_product_type').search(cr, uid, [], order='id')
@@ -1344,6 +1697,266 @@
                 raise osv.except_osv(_('Warning!'), _('This product is related to Magento. It can not be deleted!\nYou can change it Magento status to "Disabled" and uncheck the active box to hide it from OpenERP.'))
         else:
             return super(product_product, self).unlink(cr, uid, ids, context)
+<<<<<<< TREE
+=======
+
+    #TODO move part of this to declarative mapping CSV template
+    def extdata_from_oevals(self, cr, uid, external_referential_id, data_record, mapping_lines, defaults, context=None):
+        product_data = super(product_product, self).extdata_from_oevals(cr, uid, external_referential_id, data_record, mapping_lines, defaults, context) #Aapply custom/attributes mappings
+        if context is None: context = {}
+        product = self.browse(cr, uid, data_record['id'], context)
+        shop = self.pool.get('sale.shop').browse(cr, uid, context['shop_id'], context)
+
+        if not product_data.get('price', False):
+            pl_default_id = shop.pricelist_id and shop.pricelist_id.id or self.pool.get('product.pricelist').search(cr, uid, [('type', '=', 'sale')])
+            if isinstance(pl_default_id, int):
+                pl_default_id = [pl_default_id]
+            product_data.update({'price': self.pool.get('product.pricelist').price_get(cr, uid, pl_default_id, product.id, 1.0)[pl_default_id[0]]})
+
+        if not product_data.get('tax_class_id', False):
+            product_data.update({'tax_class_id': 2}) #FIXME hugly!
+
+        if not product_data.get('status', False):
+            product_data.update({'status': product.active and 1 or 0})
+
+        if not product_data.get('description', False):
+            product_data.update({'description': product.description or _("description")})
+        if not product_data.get('short_description', False):
+            product_data.update({'short_description': product.description_sale or _("short description")})
+        if not product_data.get('meta_title', False):
+            product_data.update({'meta_title': product.name})
+        if not product_data.get('meta_keyword', False):
+            product_data.update({'meta_keyword': product.name})
+        if not product_data.get('meta_description', False):
+            product_data.update({'meta_description': product.description_sale and product.description_sale[:255]})
+
+        return product_data
+
+    def oevals_from_extdata(self, cr, uid, external_referential_id, data_record, mapping_lines, key_for_external_id=None, parent_data=None, previous_lines=None, defaults=None, context=None):
+        res = super(product_product, self).oevals_from_extdata(cr, uid, external_referential_id, data_record, mapping_lines, key_for_external_id=key_for_external_id, parent_data=parent_data, previous_lines=previous_lines, defaults=defaults, context=context)
+        # assign a default product type (Procurement, not the magento's one)
+        if not res.get('type'):
+            magerp_type_obj = self.pool.get('magerp.product_product_type')
+            magerp_type_ids = magerp_type_obj.search(cr, uid, [('product_type', '=', data_record['type_id'])], context=context)
+            if magerp_type_ids:
+                res['type'] = magerp_type_obj.read(cr, uid, magerp_type_ids[0], ['default_type'], context=context)['default_type']
+        return res
+
+    def product_to_sku(self, cr, uid, product):
+        if product.magento_sku:
+            sku = product.magento_sku
+        else:
+            code = product.code or 'mag'
+            same_codes = self.search(cr, uid, [('magento_sku', '=', code)])
+            if same_codes and len(same_codes) > 0:
+                sku = code + "_" + str(product.id)
+            else:
+                sku = code
+        return sku
+
+    def _ext_update_and_rebind(self, cr, uid, data, conn, oe_id, sku=None, context=None):
+        if sku is None:
+            product = self.browse(cr, uid, oe_id, context=context)
+            sku = product.sku
+        ext_data = conn.call('catalog_product.info', [sku, False, 'sku'])
+        ext_id = ext_data['product_id']
+        conn.call('ol_catalog_product.update', [ext_id, data, False, 'id'])
+        return ext_id
+
+    def ext_create(self, cr, uid, data, conn, method, oe_id, context=None):
+        if context is None: context = {}
+        product = self.browse(cr, uid, oe_id, context=context)
+        sku = self.product_to_sku(cr, uid, product)
+        shop = self.pool.get('sale.shop').browse(cr, uid, context['shop_id'])
+        attr_set_id = product.set and self.pool.get('magerp.product_attribute_set').oeid_to_extid(cr, uid, product.set.id, shop.referential_id.id) or context.get('default_set_id', 1)
+
+        product_type = self.read(cr, uid, oe_id, ['product_type'])['product_type'] or 'simple'
+
+        try:
+            ext_id = super(magerp_osv.magerp_osv, self).ext_create(
+                cr, uid, [product_type, attr_set_id, sku, data], conn, method, oe_id, context)
+        except xmlrpclib.Fault, e:
+            # Magento raise error 1 when we try to create
+            # a product with a SKU which already exists
+            if e.faultCode == 1:
+                ext_id = self._ext_update_and_rebind(
+                    cr, uid, data, conn, oe_id, sku=sku, context=context)
+            else:
+                raise
+        self.write(cr, uid, oe_id, {'magento_sku': sku})
+        return ext_id
+
+    def action_before_exporting_grouped_product(self, cr, uid, id, external_referential_ids=None, defaults=None, context=None):
+        logger = logging.getLogger('ext synchro')
+        if context.get('mrp_is_installed', False):
+            bom_ids = self.read(cr, uid, id, ['bom_ids'])['bom_ids']
+            if len(bom_ids): # it has or is part of a BoM
+                cr.execute("SELECT product_id, product_qty FROM mrp_bom WHERE bom_id = %s", (bom_ids[0],)) #FIXME What if there is more than a materials list?
+                results = cr.dictfetchall()
+                child_ids = []
+                quantities = {}
+                for row in results:
+                    child_ids.append(row['product_id'])
+                    quantities.update({row['product_id']: row['product_qty']})
+                if child_ids: #it is an assembly and it contains the products child_ids:
+                    self.ext_export(cr, uid, child_ids, external_referential_ids, defaults, context) #so we export them
+            else:
+                return False
+        else:
+            logger.error("OpenERP 'grouped' products will export to Magento as 'grouped products' only if they have a BOM and if the 'mrp' BOM module is installed")
+        return quantities, child_ids
+
+    def action_before_exporting(self, cr, uid, id, product_type, external_referential_ids=None, defaults=None, context=None):
+        '''Hook to allow your external module to execute some code before exporting a product'''
+        return True
+
+    #todo move this code to a generic module
+    def get_last_update_date(self, cr, uid, product_read, context=None):
+        """if a product have a depends on other object like bom for grouped product, or other product for configurable
+        the date of last update should be based on the last update of the dependence object"""
+        conn = context.get('conn_obj', False)
+        last_updated_date = product_read['write_date'] or product_read['create_date'] or False
+        if product_read['product_type'] == 'grouped':
+            if context.get('mrp_is_installed', False):
+                #TODO improve this part of code as the group product can be based on nan_product_pack
+                cr.execute("select id, write_date, create_date from mrp_bom where product_id = %s", (product_read['id'],))
+                read_bom = cr.dictfetchall()
+                for bom in read_bom:
+                    last_updated_bom_date = bom['write_date'] or bom['create_date'] or False
+                    if last_updated_bom_date > last_updated_date:
+                        last_updated_date=last_updated_bom_date
+            else:
+                conn.logger.error("OpenERP 'grouped' products will export to Magento as 'grouped products' only if they have a BOM and if the 'mrp' BOM module is installed")
+        return last_updated_date
+
+
+    def get_ordered_ids(self, cr, uid, ids, external_referential_ids=None, defaults=None, context=None):
+        #TODO pass the shop better than the referentials
+        dates_2_ids = []
+        ids_2_dates = {}
+        shop = self.pool.get('sale.shop').browse(cr, uid, context['shop_id'])
+        if shop.last_products_export_date:
+            last_exported_date = shop.last_products_export_date
+        else:
+            last_exported_date = False
+        #strangely seems that on inherits structure, write_date/create_date are False for children
+        #TODO check previous comment and check the write date on product template also for variant of product
+        cr.execute("select id, write_date, create_date, product_type from product_product where id in %s", (tuple(ids),))
+        read = cr.dictfetchall()
+        ids = []
+        context['force']=True
+
+        for product_read in read:
+            last_updated_date = self.get_last_update_date(cr, uid, product_read, context=context)
+            if last_exported_date and last_updated_date < last_exported_date:
+                continue
+            dates_2_ids += [(last_updated_date, product_read['id'])]
+            ids_2_dates[product_read['id']] = last_updated_date
+
+        dates_2_ids.sort()
+        ids = [x[1] for x in dates_2_ids]
+
+        return ids, ids_2_dates
+
+    def _ext_export_one(self, cr, uid, record_data, referential_id, defaults=None, context=None):
+        res = super(product_product, self)._ext_export_one(
+            cr, uid, record_data, referential_id, defaults=defaults, context=context)
+
+        self.ext_assign_links(
+            cr, uid,
+            record_data['id'],
+            external_referential_ids=[referential_id],
+            defaults=defaults,
+            context=context)
+
+        return res
+
+    def ext_export(self, cr, uid, ids, external_referential_ids=None, defaults=None, context=None):
+        #check if mrp is installed
+        cr.execute('select * from ir_module_module where name=%s and state=%s', ('mrp','installed'))
+        data_record = cr.fetchone()
+        if data_record and 'mrp' in data_record:
+            context['mrp_is_installed']=True
+
+        if context is None:
+            context = {}
+
+        if defaults is None:
+            defaults = {}
+        #TODO Is external_referential_ids is still used?
+        if external_referential_ids is None:
+            external_referential_ids = []
+
+        result = {'create_ids':[], 'write_ids':[]}
+        shop = self.pool.get('sale.shop').browse(cr, uid, context['shop_id'])
+        context['external_referential_id'] = shop.referential_id.id
+        #TODO It will be better if this check was done before
+        #restrict export to only exportable products
+        ids = self.search(cr, uid, [('id', 'in', ids), ('magento_exportable', '=', True)])
+        if not ids:
+            return result
+
+        if not context.get('force_export', False):
+            ids, ids_2_dates = self.get_ordered_ids(cr, uid, ids, external_referential_ids, defaults, context)
+
+        #set the default_set_id in context and avoid extra request for each product upload
+
+        conn = context.get('conn_obj', False)
+        attr_sets = conn.call('product_attribute_set.list')
+        default_set_id = 1
+        for attr_set in attr_sets:
+            if attr_set['name'] == 'Default':
+                default_set_id = attr_set['set_id']
+                break
+        context['default_set_id'] = default_set_id
+
+        context_dic = [context.copy()]
+        context_dic[0]['export_url'] = True # for the magento version 1.3.2.4, only one url is autorized by product, so we only export with the MAPPING TEMPLATE the url of the default language
+        context_dic[0]['lang'] = shop.referential_id.default_lang_id.code
+
+        for storeview in shop.storeview_ids:
+            if storeview.lang_id and storeview.lang_id.code != shop.referential_id.default_lang_id.code:
+                context_dic += [context.copy()]
+                context_dic[len(context_dic)-1].update({'storeview_code': storeview.code, 'lang': storeview.lang_id.code})
+
+        last_export_date = None
+        try:
+            for id in ids:
+                child_ids = []
+                product_type = self.read(cr, uid, id, ['product_type'])['product_type']
+                if product_type == 'grouped': # lookup for Magento "grouped product"
+                    quantities, child_ids = self.action_before_exporting_grouped_product(cr, uid, id, external_referential_ids, defaults, context)
+
+                self.action_before_exporting(cr, uid, id, product_type, external_referential_ids, defaults, context=context)
+
+                for context_storeview in context_dic:
+                    temp_result = super(magerp_osv.magerp_osv, self).ext_export(cr, uid, [id], external_referential_ids, defaults, context_storeview)
+                    #TODO maybe refactor this part, did we need to assign and make the link for every store?
+                    if child_ids:
+                        self.ext_product_assign(cr, uid, 'grouped', id, child_ids, quantities=quantities, external_referential_ids=external_referential_ids, defaults=defaults, context=context_storeview)
+                if not context.get('force_export'):
+                    last_export_date = ids_2_dates[id]
+
+                result['create_ids'] += temp_result['create_ids']
+                result['write_ids'] += temp_result['write_ids']
+        finally:
+            if last_export_date is not None:
+                self.pool.get('sale.shop').write(
+                        cr, uid, context['shop_id'], {'last_products_export_date': last_export_date}, context=context)
+        return result
+
+    def try_ext_update(self, cr, uid, data, conn, method, oe_id, external_id, ir_model_data_id, create_method, context=None):
+        if context is None: context = {}
+        if context.get('storeview_code', False):
+            return conn.call(method, [external_id, data, context.get('storeview_code', False)])
+        else:
+            return conn.call(method, [external_id, data])
+
+    def ext_update(self, cr, uid, data, conn, method, oe_id, external_id, ir_model_data_id, create_method, context=None):
+        product = self.browse(cr, uid, oe_id)
+        sku = self.product_to_sku(cr, uid, product)
+        return super(magerp_osv.magerp_osv, self).ext_update(cr, uid, data, conn, method, oe_id, sku, ir_model_data_id, create_method, context)
+>>>>>>> MERGE-SOURCE
 
     def _prepare_inventory_magento_vals(self, cr, uid, product, stock, shop,
                                         context=None):
@@ -1380,6 +1993,10 @@
         #TODO get also the list of product which the option mag_manage_stock have changed
         #This can be base on the group_fields that can try tle last write date of a group of fields
         if context is None: context = {}
+<<<<<<< TREE
+=======
+        logger = logging.getLogger('ext synchro')
+>>>>>>> MERGE-SOURCE
 
         shop = external_session.sync_from_object
 
@@ -1400,6 +2017,7 @@
             cr, uid, stock_product_ids, context=location_ctx)
 
         for product in products:
+<<<<<<< TREE
             self._export_inventory(cr, uid, external_session, product, stock, context=location_ctx)
         return True
 
@@ -1424,6 +2042,30 @@
     # ol_catalog_product.update
     def ext_update_link_data(self, cr, uid, external_session, resources, mapping=None, mapping_id=None, context=None):
         for resource_id, resource in resources.items():
+=======
+            mag_product_id = self.oeid_to_extid(
+                cr, uid, product.id, referential.id, context=context)
+            if not mag_product_id:
+                continue  # skip products which are not exported
+            inventory_vals = self._prepare_inventory_magento_vals(
+                cr, uid, product, stock, shop, context=location_ctx)
+
+            connection.call('product_stock.update',
+                            [mag_product_id, inventory_vals])
+
+            logger.info(
+                "Successfully updated stock level at %s for product with SKU %s",
+                inventory_vals.get('qty', 'N/A'),
+                product.magento_sku
+            )
+        return True
+
+    def ext_assign_links(self, cr, uid, ids, external_referential_ids=None, defaults=None, context=None):
+        """ Assign links of type up-sell, cross-sell, related """
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        for product in self.browse(cr, uid, ids, context):
+>>>>>>> MERGE-SOURCE
             for type_selection in self.pool.get('product.link').get_link_type_selection(cr, uid, context):
                 link_type = type_selection[0]
                 position = {}
@@ -1442,6 +2084,7 @@
         context = context or {}
         position = position or {}
         quantities = quantities or {}
+<<<<<<< TREE
 
 
         #Patch for magento api prototype
@@ -1493,6 +2136,83 @@
                            'qty': quantities.get(c_ext_id, 1)}])
             external_session.logger.info(("Successfully updated assignment of type %s of"
                                  "product %s to product %s") %(link_type, ext_parent_id, c_ext_id))
+=======
+        external_referential_ids = external_referential_ids or []
+        logger = logging.getLogger('ext assign')
+        conn = context.get('conn_obj', False)
+
+        for ref_id in external_referential_ids:
+            # ensure that the product to link is exported before assigning it,
+            # export it if necessary
+            ids_to_export = []
+            for child_id in child_ids:
+                if not self.oeid_to_extid(cr, uid, child_id, ref_id, context=context):
+                    ids_to_export.append(child_id)
+            export_ctx = context.copy()
+            export_ctx['force_export'] = True
+            self.ext_export(
+                cr, uid, ids_to_export, [ref_id], defaults=defaults, context=export_ctx)
+
+            ext_id = self.oeid_to_extid(
+                cr, uid, parent_id, ref_id, context=context)
+            if not ext_id:
+                continue
+
+            # get the sku of the products already assigned
+            magento_args = [type, ext_id]
+
+            # magento existing children ids
+            child_list = conn.call('product_link.list', magento_args)
+            old_child_ext_ids = [x['product_id'] for x in child_list]
+
+            ext_id_to_remove = []
+            ext_id_to_assign = []
+            ext_id_to_update = []
+
+            # list of children setup on openerp
+            new_child_ext_ids = dict([(self.oeid_to_extid(cr, uid, child_id, ref_id, context=context),
+                                       child_id)
+                                      for child_id in child_ids])
+
+            skus = dict([(p.id, p.magento_sku)
+                    for p in
+                    self.browse(
+                        cr, uid, child_ids + [parent_id], context=context)])
+
+            # compute the diff between openerp and magento
+            for c_ext_id in old_child_ext_ids:
+                if c_ext_id not in new_child_ext_ids:
+                    ext_id_to_remove.append(c_ext_id)
+            for c_ext_id in new_child_ext_ids.keys():
+                if c_ext_id in old_child_ext_ids:
+                    ext_id_to_update.append(c_ext_id)
+                else:
+                    ext_id_to_assign.append(c_ext_id)
+
+            # calls to magento to delete, create or update the links
+            for c_ext_id in ext_id_to_remove:
+                 # remove the product links that are no more setup on openerp
+                conn.call('product_link.remove', magento_args + [c_ext_id])
+                logger.info("Successfully removed assignment of type %s for product %s to product %s", type, skus[parent_id], c_ext_id)
+            for child_ext_id in ext_id_to_assign:
+                # assign new product links
+                product_id = new_child_ext_ids[child_ext_id]
+                conn.call('product_link.assign',
+                          magento_args +
+                          [child_ext_id,
+                              {'position': position.get(product_id, 0),
+                               'qty': quantities.get(product_id, 1)}])
+                logger.info("Successfully assigned product %s to product %s with type %s", skus[parent_id], skus[product_id], type)
+            for child_ext_id in ext_id_to_update:
+                # update products links already assigned
+                product_id = new_child_ext_ids[child_ext_id]
+                conn.call('product_link.update',
+                          magento_args +
+                          [child_ext_id,
+                              {'position': position.get(product_id, 0),
+                               'qty': quantities.get(product_id, 1)}])
+                logger.info("Successfully updated assignment of type %s of product %s to product %s", type, skus[parent_id], skus[product_id])
+>>>>>>> MERGE-SOURCE
         return True
 
     #TODO move this code (get exportable image) and also some code in product_image.py and sale.py in base_sale_multichannel or in a new module in order to be more generic
@@ -1508,7 +2228,11 @@
 
     def _mag_import_product_links_type(self, cr, uid, product, link_type, external_session, context=None):
         if context is None: context = {}
+<<<<<<< TREE
         conn = external_session.connection
+=======
+        logger = logging.getLogger('ext synchro')
+>>>>>>> MERGE-SOURCE
         product_link_obj = self.pool.get('product.link')
         selection_link_types = product_link_obj.get_link_type_selection(cr, uid, context)
         mag_product_id = self.get_extid(
@@ -1520,8 +2244,13 @@
             try:
                 product_links = conn.call('product_link.list', [link_type, mag_product_id])
             except Exception, e:
+<<<<<<< TREE
                 self.log(cr, uid, product.id, "Error when retrieving the list of links in Magento for product with reference %s and product id %s !" % (product.default_code, product.id,))
                 conn.logger.debug("Error when retrieving the list of links in Magento for product with reference %s and product id %s !" % (product.magento_sku, product.id,))
+=======
+                self.log(cr, uid, product.id, "Error when retrieving the list of links in Magento for product with sku %s and product id %s !" % (product.magento_sku, product.id,))
+                logger.debug("Error when retrieving the list of links in Magento for product with sku %s and product id %s !", product.magento_sku, product.id)
+>>>>>>> MERGE-SOURCE
 
             for product_link in product_links:
                 linked_product_id = self.get_or_create_oeid(
@@ -1545,7 +2274,11 @@
                     product_link_obj.write(cr, uid, existing_link, link_data, context=context)
                 else:
                     product_link_obj.create(cr, uid, link_data, context=context)
+<<<<<<< TREE
                 conn.logger.info("Successfully imported product link of type %s on product %s to product %s" %(link_type, product.id, linked_product_id))
+=======
+                logger.info("Successfully imported product link of type %s on product %s to product %s", link_type, product.id, linked_product_id)
+>>>>>>> MERGE-SOURCE
         return True
 
     def mag_import_product_links_types(self, cr, uid, ids, link_types, external_session, context=None):
 
=== modified file 'magentoerpconnect/product_images.py'
--- magentoerpconnect/product_images.py	2012-05-09 15:40:38 +0000
+++ magentoerpconnect/product_images.py	2012-07-06 14:53:18 +0000
@@ -23,7 +23,7 @@
 from osv import osv, fields
 import magerp_osv
 import mimetypes
-import netsvc
+import logging
 from tools.translate import _
 import base64
 
@@ -52,12 +52,12 @@
         'thumbnail':lambda * a:True,
         'exclude':lambda * a:False
     }
-    
+
     def get_changed_ids(self, cr, uid, start_date=False):
         proxy = self.pool.get('product.images')
         domain = start_date and ['|', ('create_date', '>', start_date), ('write_date', '>', start_date)] or []
         return proxy.search(cr, uid, domain)
-     
+
     def del_image_name(self, cr, uid, id, context=None):
         if context is None: context = {}
         image_ext_name_obj = self.pool.get('product.images.external.name')
@@ -69,6 +69,13 @@
     def update_remote_images(self, cr, uid, external_session, ids, context=None):
         if context is None:
             context = {}
+<<<<<<< TREE
+=======
+        logger = logging.getLogger('ext synchro')
+        conn = context.get('conn_obj', False)
+        if not conn:
+            return False
+>>>>>>> MERGE-SOURCE
 
         ir_model_data_obj = self.pool.get('ir.model.data')
 
@@ -112,12 +119,13 @@
             image_2_date[image['id']] = image['write_date'] or image['create_date']
         list_date = date_2_image.keys()
         list_date.sort()
-        
+
         ids = [date_2_image[date] for date in list_date]
 
         while ids:
             product_images = self.browse_w_order(cr, uid, ids[:1000], context=context)
             for each in product_images:
+<<<<<<< TREE
                 product_extid = each.product_id.get_extid(external_session.referential_id.id)
                 if not product_extid:
                     external_session.logger.info("The product %s do not exist on magento" %(each.product_id.default_code))
@@ -163,10 +171,51 @@
 
 
                 if context.get('last_images_export_date') and image_2_date[each.id] > context['last_images_export_date']: #indeed if a product was created a long time ago and checked as exportable recently, the write date of the image can be far away in the past
+=======
+                need_to_be_created = True
+                ext_file_name = each.oeid_to_extid(context['external_referential_id'])
+                if ext_file_name: #If update
+                    try:
+                        logger.info("Updating %s's image: %s", each.product_id.magento_sku, each.name)
+                        result = update_image(ext_file_name, each)
+                        logger.info("%s's image updated with sucess: %s", each.product_id.magento_sku, each.name)
+                        need_to_be_created = False
+                    except Exception, e:
+                        logger.error(_("Error in connecting:%s"), e, exc_info=True)
+                        if not "Fault 103" in str(e):
+                            logger.error(_("Unknow error stop export"))
+                            raise
+                        else:
+                            #If the image was deleded in magento, the external name is automatically deleded before trying to re-create the image in magento
+                            model_data_ids = ir_model_data_obj.search(cr, uid, [('model', '=', self._name), ('res_id', '=', each.id), ('external_referential_id', '=', context['external_referential_id'])])
+                            if model_data_ids and len(model_data_ids) > 0:
+                                ir_model_data_obj.unlink(cr, uid, model_data_ids, context=context)
+                            logger.error(_("The image don't exist in magento, try to create it"))
+                if need_to_be_created:
+                    if each.product_id.magento_sku:
+                        logger.info("Sending %s's image: %s", each.product_id.magento_sku, each.name)
+                        result = conn.call('catalog_product_attribute_media.create',
+                                  [each.product_id.magento_sku,
+                                   {'file':{
+                                            'name':each.name,
+                                            'content': each.file,
+                                            'mime': each.link and each.url and mimetypes.guess_type(each.url)[0] or each.extention and mimetypes.guess_type(each.extention)[0] or 'image/jpeg',
+                                            }
+                                   }
+                                   ])
+                        self.create_external_id_vals(cr, uid, each.id, result, context['external_referential_id'], context=context)
+                        result = update_image(result, each)
+                        logger.info("%s's image send with sucess: %s", each.product_id.magento_sku, each.name)
+                if image_2_date[each.id] > context['last_images_export_date']: #indeed if a product was created a long time ago and checked as exportable recently, the write date of the image can be far away in the past
+>>>>>>> MERGE-SOURCE
                     self.pool.get('sale.shop').write(cr,uid,context['shop_id'],{'last_images_export_date':image_2_date[each.id]})
                 cr.commit()
             ids = ids[1000:]
+<<<<<<< TREE
             external_session.logger.info("still %s image to export" %len(ids))
+=======
+            logger.info("still %s image to export", len(ids))
+>>>>>>> MERGE-SOURCE
         return True
-        
+
 product_images()
 
=== modified file 'magentoerpconnect/sale.py'
--- magentoerpconnect/sale.py	2012-05-28 19:39:10 +0000
+++ magentoerpconnect/sale.py	2012-07-06 14:53:18 +0000
@@ -26,6 +26,7 @@
 import pooler
 import magerp_osv
 import netsvc
+import logging
 from tools.translate import _
 import string
 import tools
@@ -56,6 +57,7 @@
 
 class sale_shop(magerp_osv.magerp_osv):
     _inherit = "sale.shop"
+<<<<<<< TREE
 
     @only_for_referential('magento')
     def init_context_before_exporting_resource(self, cr, uid, external_session, object_id, resource_name, context=None):
@@ -73,6 +75,9 @@
 
 
 
+=======
+
+>>>>>>> MERGE-SOURCE
     def _get_exportable_product_ids(self, cr, uid, ids, name, args, context=None):
         res = super(sale_shop, self)._get_exportable_product_ids(cr, uid, ids, name, args, context=None)
         for shop_id in res:
@@ -95,6 +100,10 @@
 
     def export_images(self, cr, uid, ids, context=None):
         if context is None: context = {}
+<<<<<<< TREE
+=======
+        logger = logging.getLogger('ext synchro')
+>>>>>>> MERGE-SOURCE
         start_date = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
         image_obj = self.pool.get('product.images')
         for shop in self.browse(cr, uid, ids):
@@ -102,11 +111,19 @@
             exportable_product_ids = self.read(cr, uid, shop.id, ['exportable_product_ids'], context=context)['exportable_product_ids']
             res = self.pool.get('product.product').get_exportable_images(cr, uid, external_session, exportable_product_ids, context=context)
             if res:
+<<<<<<< TREE
                 _logger.info("Creating %s images", len(res['to_create']))
                 _logger.info("Updating %s images", len(res['to_update']))
                 image_obj.update_remote_images(cr, uid, external_session, res['to_update']+res['to_create'], context)
             shop.write({'last_images_export_date': start_date})
+=======
+                logger.info("Creating %s images", len(res['to_create']))
+                logger.info("Updating %s images", len(res['to_update']))
+                image_obj.update_remote_images(cr, uid, res['to_update']+res['to_create'], context)
+            self.write(cr,uid,context['shop_id'],{'last_images_export_date': start_date})
+>>>>>>> MERGE-SOURCE
         return True
+<<<<<<< TREE
 
     #TODO refactor the ay to export images
     #No time for doing it now so I just overwrite the generic function
@@ -119,6 +136,11 @@
             return super(sale_shop, self).export_resources(cr, uid, ids, resource_name, context=context)
 
     def _get_rootcategory(self, cr, uid, ids, name, value, context=None):
+=======
+
+
+    def _get_rootcategory(self, cr, uid, ids, prop, unknow_none, context=None):
+>>>>>>> MERGE-SOURCE
         res = {}
         for shop in self.browse(cr, uid, ids, context):
             if shop.root_category_id and shop.shop_group_id.referential_id:
@@ -175,12 +197,66 @@
         'allow_magento_notification': lambda * a: False,
     }
 
+<<<<<<< TREE
     def _get_magento_status(self, cr, uid, order, context=None):
         return ORDER_STATUS_MAPPING.get(order.state)
 
     def update_shop_orders(self, cr, uid, external_session, order, ext_id, context=None):
         if context is None: context = {}
         result = False
+=======
+
+    def import_shop_orders(self, cr, uid, shop, defaults, context=None):
+        if context is None: context = {}
+        result = super(sale_shop, self).import_shop_orders(cr, uid, shop, defaults=defaults, context=context)
+        [result.setdefault(key, []) for key in ['create_ids', 'write_ids', 'unchanged_ids']]
+        if shop.magento_shop:
+            self.check_need_to_update(cr, uid, [shop.id], context=context)
+            for storeview in shop.storeview_ids:
+                magento_storeview_id = self.pool.get('magerp.storeviews').oeid_to_extid(cr, uid, storeview.id, shop.referential_id.id, context={})
+                ids_or_filter = {'store_id': {'eq': magento_storeview_id}, 'state': {'neq': 'canceled'}}
+                if shop.import_orders_from_date:
+                    ids_or_filter.update({'created_at' : {'gt': shop.import_orders_from_date}})
+                nb_last_created_ids = SALE_ORDER_IMPORT_STEP
+                while nb_last_created_ids:
+                    defaults['magento_storeview_id'] = storeview.id
+                    ctx = context.copy()
+                    ctx['ids_or_filter'] = ids_or_filter
+                    resp = self.pool.get('sale.order').mage_import_base(cr, uid, context.get('conn_obj', False),
+                                                                        shop.referential_id.id, defaults=defaults,
+                                                                        context=ctx)
+                    result['create_ids'] += resp.get('create_ids', [])
+                    result['write_ids'] += resp.get('write_ids', [])
+                    result['unchanged_ids'] += resp.get('unchanged_ids', [])
+                    nb_last_created_ids = len(resp.get('create_ids', []) + resp.get('write_ids', []) + resp.get('unchanged_ids', []))
+                    print nb_last_created_ids
+        return result
+
+    def check_need_to_update(self, cr, uid, ids, context=None):
+        """ This function will update the order status in OpenERP for
+        the order which are in the state 'need to update' """
+        so_obj = self.pool.get('sale.order')
+
+        for shop in self.browse(cr, uid, ids):
+            conn = shop.referential_id.external_connection()
+            # Update the state of orders in OERP that are in "need_to_update":True
+            # from the Magento's corresponding orders
+
+            # Get all need_to_update orders in OERP
+            orders_to_update = so_obj.search(
+                cr, uid,
+                [('need_to_update', '=', True),
+                 ('shop_id', '=', shop.id)],
+                context=context)
+            so_obj.check_need_to_update(
+                cr, uid, orders_to_update, conn, context=context)
+        return False
+
+    def update_shop_orders(self, cr, uid, order, ext_id, context=None):
+        if context is None: context = {}
+        result = {}
+
+>>>>>>> MERGE-SOURCE
         if order.shop_id.allow_magento_order_status_push:
             sale_obj = self.pool.get('sale.order')
             #status update:
@@ -252,6 +328,7 @@
         cr.execute("ALTER TABLE account_invoice_line ALTER COLUMN discount TYPE numeric(16,6);")
         self.pool.get('sale.report').init(cr)
         super(sale_order, self)._auto_init(cr, context)
+<<<<<<< TREE
 
 #TODO reimplement the check on tva in a good way
 #        # Adds vat number (country code+magento vat) if base_vat module is installed and Magento sends customer_taxvat
@@ -296,6 +373,389 @@
             vals['paid'] = True
             vals['amount'] = float(payment_info['amount_paid'])
         return vals
+=======
+
+    def get_order_addresses(self, cr, uid, referential_id, data_record, context=None):
+        partner_obj = self.pool.get('res.partner')
+        partner_address_obj = self.pool.get('res.partner.address')
+        res = {}
+
+        # Magento allows to create a sale order
+        # without register as a user
+        is_guest_order = bool(int(data_record.get('customer_is_guest', 0)))
+
+        # for a guest order or when magento
+        # does not provide customer_id on a normal order
+        # (it happens magento inconsistencies are common)
+        if (is_guest_order or
+           (data_record.get('website_id') and
+           not data_record.get('customer_id'))):
+
+            website_obj = self.pool.get('external.shop.group')
+            oerp_website_id = website_obj.extid_to_oeid(
+                cr, uid, data_record['website_id'], referential_id, context=context)
+
+            # first, try to find an already bound partner
+            # with same mail for same website
+            partner_id = partner_obj.search_magento_partner(
+                cr, uid,
+                data_record['customer_email'],
+                oerp_website_id,
+                is_bound=True,  # search only for partners already bound
+                context=context)
+
+            # if we have found one, we "fix" the data_record
+            # with the magento customer id
+            if partner_id:
+                ext_customer_id = partner_obj.oeid_to_extid(
+                    cr, uid, partner_id, referential_id, context=context)
+                data_record['customer_id'] = ext_customer_id
+
+            # no bound partner matching
+            # means that we have to consider it as a guest order
+            else:
+                is_guest_order = True
+
+        # if we do not have a customer_id, the sale order
+        # is a guest sale order, so we cannot link the customer
+        if is_guest_order:
+            # when we import a guest sale order, we create the partner
+            # on the fly and we do not bind it ir.model.data
+
+            # as we do not have a customer data record in the sale order
+            # data record, we manually populate one from the magento
+            # sale order record and import it with the standard mappings
+            address = data_record['billing_address']
+
+            customer_record = {
+                'firstname': address['firstname'],
+                'middlename': address['middlename'],
+                'lastname': address['lastname'],
+                'prefix': address['prefix'],
+                'suffix': address.get('suffix', False),
+                'email': data_record.get('customer_email', False),
+                'taxvat': data_record.get('customer_taxvat', False),
+                'group_id': data_record.get('customer_group_id', False),
+                'gender': data_record.get('customer_gender', False),
+                'store_id': data_record['store_id'],
+                'created_at': data_record['created_at'],
+                'updated_at': False,
+                'created_in': False,
+                'dob': data_record.get('customer_dob', False),
+                'website_id': data_record.get('website_id', False),
+            }
+            partner_defaults = {'is_magento_guest': True}
+            partner_id = partner_obj.ext_import_unbound(
+                cr, uid, customer_record, referential_id,
+                defaults=partner_defaults, context=context)
+        else:
+            # always update the customer when importing an order
+            imp_ctx = dict(context)
+            imp_ctx['id'] = data_record['customer_id']
+            partner_obj.get_external_data(
+                cr, uid,
+                context.get('conn_obj'),
+                referential_id,
+                defaults={},
+                context=imp_ctx)
+            partner_id = partner_obj.extid_to_oeid(
+                cr, uid, data_record['customer_id'], referential_id)
+
+            # update the address book of the customer, this addresses
+            # will be available in the partner form and the searches
+            partner_obj.import_magento_address_book(
+                cr, uid, partner_id, referential_id, context=context)
+
+        # The addresses of the sale order are imported as active=false
+        # so they are linked with the sale order but they are not displayed
+        # in the customer form and the searches.
+
+        # We import the addresses of the sale order as Active = False
+        # so they will be available in the documents generated as the
+        # sale order or the picking, but they won't be available on
+        # the partner form or the searches. Too many adresses would
+        # be displayed.
+        # They are never synchronized,
+        # we keep the revision of the sale order
+        # For the orders which are from guests, we let the addresses
+        # as active because they doesn't have an address book.
+        addresses_defaults = {'partner_id': partner_id,
+                              'email': data_record.get('customer_email', False),
+                              'active': is_guest_order,
+                              'is_magento_order_address': True}
+        # We import the addresses as unbound becauses Magento is not able to
+        # give us an ID when the address is created during the order.
+        # It gives an empty id, a 0 or worse, a wrong id.
+        billing_address = data_record['billing_address'].copy()
+        # remove customer_id because we force it in the defaults
+        # it avoid to try to import the partner by customer_id
+        billing_address.pop('customer_id', False)
+        billing_id = partner_address_obj.ext_import_unbound(
+            cr, uid, billing_address,
+            referential_id, defaults=addresses_defaults,
+            context=context)
+
+        shipping_id = False
+        if data_record['shipping_address']:
+            shipping_address = data_record['shipping_address'].copy()
+            # remove customer_id because we force it in the defaults
+            # it avoid to try to import the partner by customer_id
+            shipping_address.pop('customer_id', False)
+            shipping_id = partner_address_obj.ext_import_unbound(
+                cr, uid, shipping_address,
+                referential_id, defaults=addresses_defaults,
+                context=context)
+
+        # default addresses ids for the sale order
+        res['partner_id'] = partner_id
+        res['partner_order_id'] = res['partner_invoice_id'] = billing_id
+        res['partner_shipping_id'] = shipping_id or billing_id
+
+        if data_record.get('customer_taxvat'):
+            partner_obj.add_magento_vat_number(
+                cr, uid, partner_id,
+                data_record['customer_taxvat'],
+                data_record['billing_address'].get('country_id'),
+                context=context)
+        return res
+
+    def add_order_extra_line(self, cr, uid, res, data_record, ext_field, product_ref, defaults, context=None):
+        """ Add or substract amount on order as a separate line item with single quantity for each type of amounts like :
+        shipping, cash on delivery, discount, gift certificates...
+
+        @param res: dict of the order to create
+        @param data_record: full data dict of the order
+        @param ext_field: name of the field in data_record where the amount of the extra lineis stored
+        @param product_ref: tuple with module and xml_id (module, xml_id) of the product to use for the extra line
+
+        Optional arguments in context:
+        sign: multiply the amount with the sign to add or substract it from the sale order
+        ext_tax_field: name of the field in data_record where the tax amount is stored
+        ext_code_field: name of the field in data_record containing a code (for coupons and gift certificates) which will be printed on the product name
+        """
+        if context is None: context = {}
+        model_data_obj = self.pool.get('ir.model.data')
+        sign = 'sign' in context and context['sign'] or 1
+        ext_tax_field = 'ext_tax_field' in context and context['ext_tax_field'] or None
+        ext_code_field = 'ext_code_field' in context and context['ext_code_field'] or None
+
+        model, product_id = model_data_obj.get_object_reference(cr, uid, *product_ref)
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context)
+        is_tax_included = context.get('price_is_tax_included', False)
+        amount = float(data_record[ext_field]) * sign
+        name = product.name
+        if ext_code_field and data_record.get(ext_code_field, False):
+            name = "%s [%s]" % (name, data_record[ext_code_field])
+
+        if is_tax_included:
+            price_unit = float(amount) + float(data_record[ext_tax_field])
+        else:
+            price_unit = float(amount)
+
+        extra_line = {
+                        'product_id': product.id,
+                        'name': name,
+                        'product_uom': product.uom_id.id,
+                        'product_uom_qty': 1,
+                        'price_unit': price_unit,
+                    }
+
+        if not res.get('order_line'):
+            res['order_line'] = []
+
+        if context.get('use_external_tax'):
+            # get the tax computed by the external system
+            tax_vat = abs(float(data_record[ext_tax_field]) / amount)
+            line_tax_id = self.pool.get('account.tax').get_tax_from_rate(cr, uid, tax_vat, context.get('is_tax_included'), context=context)
+            extra_line['tax_id'] = [(6, 0, line_tax_id)]
+        else:
+            # compute the taxes, apply fiscal positions, default values and so on
+            extra_line = self.pool.get('sale.order.line').play_sale_order_line_onchange(cr, uid, extra_line, res, res['order_line'], defaults, context=context)
+        res['order_line'].append((0, 0, extra_line))
+
+        return res
+
+    def add_order_shipping(self, cr, uid, res, external_referential_id, data_record, defaults, context=None):
+        if context is None: context = {}
+        if data_record.get('shipping_amount', False) and float(data_record.get('shipping_amount', False)) > 0:
+            ctx = context.copy()
+            ctx.update({
+                'ext_tax_field': 'shipping_tax_amount',
+            })
+            product_ref = ('base_sale_multichannels', 'product_product_shipping')
+            res = self.add_order_extra_line(cr, uid, res, data_record, 'shipping_amount', product_ref, defaults, ctx)
+        return res
+
+    def add_gift_certificates(self, cr, uid, res, external_referential_id, data_record, defaults, context=None):
+        if context is None: context = {}
+        if data_record.get('giftcert_amount', False) and float(data_record.get('giftcert_amount', False)) > 0:
+            ctx = context.copy()
+            ctx.update({
+                'ext_code_field': 'giftcert_code',
+                'sign': -1,
+            })
+            product_ref = ('magentoerpconnect', 'product_product_gift')
+            res = self.add_order_extra_line(cr, uid, res, data_record, 'giftcert_amount', product_ref, defaults, ctx)
+        return res
+
+    def add_discount(self, cr, uid, res, external_referential_id, data_record, defaults, context=None):
+        #TODO fix me rev 476
+        #if data_record.get('discount_amount', False) and float(data_record.get('discount_amount', False)) < 0:
+        #    ctx = context.copy()
+        #    ctx.update({
+        #        'ext_code_field': 'coupon_code',
+        #    })
+        #    product_ref = ('magentoerpconnect', 'product_product_discount')
+        #    res = self.add_order_extra_line(cr, uid, res, data_record, 'discount_amount', product_ref, defaults, ctx)
+        return res
+
+    def add_cash_on_delivery(self, cr, uid, res, external_referential_id, data_record, defaults, context=None):
+        if context is None: context = {}
+        if data_record.get('cod_fee', False) and float(data_record.get('cod_fee', False)) > 0:
+            ctx = context.copy()
+            ctx.update({
+                'ext_tax_field': 'cod_tax_amount',
+            })
+            product_ref = ('magentoerpconnect', 'product_product_cash_on_delivery')
+            res = self.add_order_extra_line(cr, uid, res, data_record, 'cod_fee', product_ref, defaults, ctx)
+        return res
+
+    def convert_extdata_into_oedata(self, cr, uid, external_data, external_referential_id, parent_data=None, defaults=None, context=None):
+        res = super(sale_order, self).convert_extdata_into_oedata(cr, uid, external_data, external_referential_id, parent_data=parent_data, defaults=defaults, context=context)
+        res=res[0]
+        external_data = external_data[0]
+        res = self.add_order_shipping(cr, uid, res, external_referential_id, external_data, defaults, context)
+        res = self.add_gift_certificates(cr, uid, res, external_referential_id, external_data, defaults, context)
+        res = self.add_discount(cr, uid, res, external_referential_id, external_data, defaults, context)
+        res = self.add_cash_on_delivery(cr, uid, res, external_referential_id, external_data, defaults, context)
+        return [res]
+
+    def _merge_sub_items(self, cr, uid, product_type, top_item, child_items, context=None):
+        """
+        Manage the sub items of the magento sale order lines. A top item contains one
+        or many child_items. For some product types, we want to merge them in the main
+        item, or keep them as order line.
+
+        A list may be returned to add many items (ie to keep all child_items as items.
+
+        :param top_item: main item (bundle, configurable)
+        :param child_items: list of childs of the top item
+        :return: item or list of items
+        """
+        if product_type == 'configurable':
+            item = top_item.copy()
+            # For configurable product all information regarding the price is in the configurable item
+            # In the child a lot of information is empty, but contains the right sku and product_id
+            # So the real product_id and the sku and the name have to be extracted from the child
+            for field in ['sku', 'product_id', 'name']:
+                item[field] = child_items[0][field]
+            return item
+        return top_item
+
+    def data_record_filter(self, cr, uid, data_record, context=None):
+        child_items = {}  # key is the parent item id
+        top_items = []
+
+        # Group the childs with their parent
+        for item in data_record['items']:
+            if item.get('parent_item_id'):
+                child_items.setdefault(item['parent_item_id'], []).append(item)
+            else:
+                top_items.append(item)
+
+        all_items = []
+        for top_item in top_items:
+            if top_item['item_id'] in child_items:
+                item_modified = self._merge_sub_items(cr, uid,
+                                                      top_item['product_type'],
+                                                      top_item,
+                                                      child_items[top_item['item_id']],
+                                                      context=context)
+                if not isinstance(item_modified, list):
+                    item_modified = [item_modified]
+                all_items.extend(item_modified)
+            else:
+                all_items.append(top_item)
+
+        data_record['items'] = all_items
+        return data_record
+
+    def oevals_from_extdata(self, cr, uid, external_referential_id, data_record, key_field, mapping_lines, parent_data=None, previous_lines=None, defaults=None, context=None):
+        if context is None: context = {}
+        if data_record.get('items', False):
+            data_record = self.data_record_filter(cr, uid, data_record, context=context)
+        #TODO refactor this code regarding the new feature of sub-mapping in base_external_referential
+        if not context.get('one_by_one', False):
+            # we fix the website_id when it is empty because we need it to
+            # find the correct partner (based on email + website_id)
+            # website is based on the store_id which is:
+            # website m2o -> store
+            if not data_record.get('website_id') and data_record.get('store_id'):
+                store_obj = self.pool.get('magerp.storeviews')
+                store_id = store_obj.extid_to_oeid(
+                    cr, uid, data_record['store_id'], external_referential_id)
+                store = store_obj.browse(cr, uid, store_id, context=context)
+                data_record['website_id'] = store.website_id.oeid_to_extid(
+                    external_referential_id=external_referential_id, context=context)
+
+            defaults.update(self.get_order_addresses(
+                cr, uid, external_referential_id, data_record, context=context))
+        res = super(magerp_osv.magerp_osv, self).oevals_from_extdata(cr, uid, external_referential_id, data_record, key_field, mapping_lines, parent_data, previous_lines, defaults, context)
+
+        #Move me in a mapping
+        if not context.get('one_by_one', False):
+            if data_record.get('status_history', False) and len(data_record['status_history']) > 0:
+                res['date_order'] = data_record['status_history'][len(data_record['status_history'])-1]['created_at']
+        return res
+
+    def _parse_external_payment(self, cr, uid, order_data, context=None):
+        """
+        Parse the external order data and return if the sale order
+        has been paid and the amount to pay or to be paid
+
+        :param dict order_data: payment information of the magento sale
+            order
+        :return: tuple where :
+            - first item indicates if the payment has been done (True or False)
+            - second item represents the amount paid or to be paid
+        """
+        paid = amount = False
+        payment_info = order_data.get('payment')
+        if payment_info:
+            amount = False
+            if payment_info.get('amount_paid', False):
+                amount =  payment_info.get('amount_paid', False)
+                paid = True
+            elif payment_info.get('amount_ordered', False):
+                amount = payment_info.get('amount_ordered', False)
+        return paid, amount
+
+    def create_payments(self, cr, uid, order_id, data_record, context=None):
+        if context is None:
+            context = {}
+
+        if 'Magento' in context.get('external_referential_type', ''):
+            payment_info = data_record.get('payment')
+            paid, amount = self._parse_external_payment(
+                cr, uid, data_record, context=context)
+            if paid:
+                order = self.pool.get('sale.order').browse(
+                    cr, uid, order_id, context)
+                self.generate_payment_with_pay_code(
+                    cr, uid,
+                    payment_info['method'],
+                    order.partner_id.id,
+                    float(amount),
+                    "mag_" + payment_info['payment_id'],
+                    "mag_" + data_record['increment_id'],
+                    order.date_order,
+                    paid,
+                    context=context)
+        else:
+            paid = super(sale_order, self).create_payments(
+                cr, uid, order_id, data_record, context=context)
+        return paid
+>>>>>>> MERGE-SOURCE
 
     def _chain_cancel_orders(self, cr, uid, external_id, external_referential_id, defaults=None, context=None):
         """ Get all the chain of edited orders (an edited order is canceled on Magento)
@@ -304,6 +764,10 @@
         """
         if context is None:
             context = {}
+<<<<<<< TREE
+=======
+        logger = logging.getLogger('ext synchro')
+>>>>>>> MERGE-SOURCE
         conn = context.get('conn_obj', False)
         parent_list = []
         # get all parents orders (to cancel) of the sale orders
@@ -319,7 +783,11 @@
                 try:
                     wf_service.trg_validate(uid, 'sale.order', canceled_order_id, 'cancel', cr)
                     self.log(cr, uid, canceled_order_id, "order %s canceled when updated from external system" % (canceled_order_id,))
+<<<<<<< TREE
                     _logger.info("Order %s canceled when updated from external system because it has been replaced by a new one", canceled_order_id)
+=======
+                    logger.info("Order %s canceled when updated from external system because it has been replaced by a new one", canceled_order_id)
+>>>>>>> MERGE-SOURCE
                 except osv.except_osv, e:
                     #TODO: generic reporting of errors in magentoerpconnect
                     # except if the sale order has been confirmed for example, we cannot cancel the order
@@ -342,6 +810,7 @@
                                     'priority': '2'
                                     })
 
+<<<<<<< TREE
 #NEW FEATURE
 
 #TODO reimplement chain cancel orders
@@ -433,6 +902,118 @@
 
     @only_for_referential('magento')
     def _check_need_to_update_single(self, cr, uid, external_session, order, context=None):
+=======
+    def _ext_import_one(self, cr, uid, external_id, vals, external_data, referential_id, defaults=None, context=None):
+        """
+        Inherit the method to flag the order to "Imported" on Magento right after the importation
+        Before the import, check if the order is already imported and in a such case, skip the import
+         and flag "imported" on Magento.
+        """
+        if context is None: context = {}
+        if not (context.get('external_referential_type', False) and 'Magento' in context['external_referential_type']):
+            return super(sale_order, self)._ext_import_one(
+            cr, uid, external_id, vals, external_data, referential_id, defaults=defaults, context=context)
+
+        res = False, False
+        if not self.extid_to_existing_oeid(cr, uid, external_id, referential_id, context=context):
+            res = super(sale_order, self)._ext_import_one(
+                cr, uid, external_id, vals, external_data, referential_id, defaults=defaults, context=context)
+
+        if any(res):
+            # if a created order has a relation_parent_real_id,
+            # the new one replaces the original, so we have to cancel the old ones
+            if external_data.get('relation_parent_real_id', False):
+                self._chain_cancel_orders(cr, uid, external_id, referential_id, defaults=defaults, context=context)
+
+        return res
+
+    def _ext_import_one_cr(self, cr, uid, external_data, referential_id, defaults=None, context=None):
+        """ Import one external resource, with cursor management, open a new cursor
+        which is commited on each import
+
+        This method can be inherited to do an action which have to be done after
+        that the imported resource is commited in database.
+
+        @param dict external_data: vals of the external resource before conversion
+        @param external_referential_id: external referential id from where we import the resource
+        @param defaults: defaults value for fields which are not in vals
+        @return: tuple created id / updated id
+        """
+
+        cid, wid = super(sale_order, self)._ext_import_one_cr(
+            cr, uid, external_data, referential_id, defaults=defaults, context=context)
+
+        if (cid or wid and
+           (context.get('external_referential_type') and
+               'Magento' in context['external_referential_type'])):
+            ext_id = self.oeid_to_extid(cr, uid, cid or wid, referential_id,
+                context=context)
+            # set the "imported" flag to true on Magento
+            self.ext_set_order_imported(cr, uid, ext_id, referential_id, context=context)
+        return cid, wid
+
+    def ext_set_order_imported(self, cr, uid, external_id, external_referential_id, context=None):
+        if context is None:
+            context = {}
+        logger = logging.getLogger('ext synchro')
+        conn = context.get('conn_obj', False)
+        conn.call('sales_order.done', [external_id])
+        logger.info("Successfully set the imported flag on Magento on sale order %s", external_id)
+        return True
+
+    def mage_import_base(self, cr, uid, conn, external_referential_id, defaults=None, context=None):
+        """ Inherited method for Sales orders in order to import only order not flagged as "imported" on Magento
+        """
+        if context is None:
+            context = {}
+        if not 'ids_or_filter' in context.keys():
+            context['ids_or_filter'] = []
+        result = {'create_ids': [], 'write_ids': []}
+
+        # returns the non already imported order (limit returns the n first orders)
+        order_retrieve_params = {
+            'imported': False,
+            'limit': SALE_ORDER_IMPORT_STEP,
+            'filters': context['ids_or_filter'],
+        }
+        ext_order_ids = conn.call('sales_order.search', [order_retrieve_params])
+        result = self._import_orders(
+            cr, uid, conn, ext_order_ids, external_referential_id, defaults=defaults, context=context)
+        return result
+
+    def _import_orders(self, cr, uid, conn, external_ids, referential_id, defaults=None, context=None):
+        if context is None:
+            context = {}
+
+        logger = logging.getLogger('ext synchro')
+        mapping_id = self.pool.get('external.mapping').search(
+            cr, uid,
+            [('model', '=', self._name),
+             ('referential_id', '=', referential_id)],
+            context=context)
+
+        context = dict(context)
+        # we will need the connection to set the flag to "imported" on magento after each order import
+        context['conn_obj'] = conn
+        # use the external log for the orders import
+        context['use_external_log'] = True
+        order_ids_filtred = []
+        unchanged_ids = []
+        for ext_order_id in external_ids:
+            existing_id = self.extid_to_existing_oeid(cr, uid, ext_order_id, referential_id, context=context)
+            if existing_id:
+                unchanged_ids.append(existing_id)
+                logger.info("the order %s already exist in OpenERP", ext_order_id)
+                self.ext_set_order_imported(cr, uid, ext_order_id, referential_id, context=context)
+            else:
+                order_ids_filtred.append({'increment_id' : ext_order_id})
+        result = self.mage_import_one_by_one(
+            cr, uid, conn, referential_id, mapping_id[0], order_ids_filtred, defaults, context)
+        result['unchanged_ids'] = unchanged_ids
+        return result
+
+    def _check_need_to_update_single(self, cr, uid, order, conn, context=None):
+>>>>>>> MERGE-SOURCE
         """
         For one order, check on Magento if it has been paid since last
         check. If so, it will launch the defined flow based on the
@@ -535,6 +1116,7 @@
 
         return created
 
+<<<<<<< TREE
 ########################################################################################################################
 #
 #           CODE THAT CLEAN MAGENTO DATA BEFORE IMPORTING IT THE BEST WILL BE TO REFACTOR MAGENTO API
@@ -632,6 +1214,18 @@
                 resource['shipping_address']['customer_id'] = resource['customer_id']
         return resource
 
+=======
+    def retry_import(self, cr, uid, id, ext_id, external_referential_id, defaults=None, context=None):
+        """ When we import again a previously failed import"""
+        conn = self.pool.get('external.referential').external_connection(
+            cr, uid, external_referential_id)
+        res =  self._import_orders(
+            cr, uid, conn, [ext_id], external_referential_id, defaults=defaults, context=context)
+        if any(res.values()):
+            return True
+        return False
+
+>>>>>>> MERGE-SOURCE
 sale_order()
 
 
 
=== modified file 'magentoerpconnect/sale_view.xml'
--- magentoerpconnect/sale_view.xml	2012-05-11 15:14:05 +0000
+++ magentoerpconnect/sale_view.xml	2012-07-06 14:53:18 +0000
@@ -55,6 +55,25 @@
 			</field>
 		</record>
 
+<<<<<<< TREE
+=======
+		<record id="magerp_view_shop_auto_import_form" model="ir.ui.view">
+			<field name="name">magerp_view_shop_auto_import_form</field>
+			<field name="model">sale.shop</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="base_sale_multichannels.base_sale_multichannels_view_shop_form"/>
+			<field name="arch" type="xml">
+				<xpath expr="/form/notebook" position="inside">
+					<page string="Magento Information" attrs="{'invisible': [('magento_shop','=',False)]}">
+						<field name="magento_shop" />
+						<field name="allow_magento_order_status_push" />
+						<field name="allow_magento_notification"/>
+					</page>
+				</xpath>
+			</field>
+		</record>
+
+>>>>>>> MERGE-SOURCE
         <record id="base_sale_multichannel_view_order_form_magento" model="ir.ui.view">
             <field name="name">base_sale_multichannel_view_order_form.magento</field>
             <field name="model">sale.order</field>
 
=== modified file 'magentoerpconnect/settings/1.3.2.4/external.mapping.template.csv'
--- magentoerpconnect/settings/1.3.2.4/external.mapping.template.csv	2012-03-27 09:52:57 +0000
+++ magentoerpconnect/settings/1.3.2.4/external.mapping.template.csv	2012-07-06 14:53:18 +0000
@@ -10,5 +10,5 @@
 "magento_1324_attr","magento1324","model_magerp_product_attributes","ol_catalog_product_attribute.list",,,,,"attribute_id"
 "magento_1324_prd","magento1324","product.model_product_product","catalog_product.list","catalog_product.info","ol_catalog_product.update","ol_catalog_product.create",,"product_id"
 "magento_1324_cst_grp","magento1324","base.model_res_partner_category","ol_customer_groups.list",,,,,"customer_group_id"
-"magento_1324_prt_adr","magento1324","base.model_res_partner_address","ol_customer_address.list","ol_customer_address.info",,,,"customer_address_id"
+"magento_1324_prt_adr","magento1324","base.model_res_partner_address","ol_customer_address.list","ol_customer_address.info",,,,"entity_id"
 "magento_1324_prt","magento1324","base.model_res_partner","customer.list","customer.info","customer.update",,,"customer_id"
 
=== modified file 'magentoerpconnect/settings/1.3.2.4/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.3.2.4/external.mappinglines.template.csv	2012-05-24 19:50:22 +0000
+++ magentoerpconnect/settings/1.3.2.4/external.mappinglines.template.csv	2012-07-06 14:53:18 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 "id","version_id:id","model_id:id","external_field","field_id:id","type","evaluation_type","external_type","child_mapping_id:id","in_function","out_function"
 "mag_1324_erp_s_name","magento1324","base_sale_multichannels.model_external_shop_group","name",,"in_out","function","unicode",,"result=[('name',ifield)]","result=[('name',record['name'])]"
 "mag_1324_erp_s_code","magento1324","base_sale_multichannels.model_external_shop_group","code",,"in_out","function","unicode",,"result=[('code',ifield)]",
@@ -19,6 +20,29 @@
 "mag_1324_erp_so_total_amount","magento1324","sale.model_sale_order","grand_total",,"in_out","function","float",,"result=[('ext_total_amount',str(ifield))]",
 "mag_1324_erp_so_name","magento1324","sale.model_sale_order","increment_id",,"in_out","function","unicode",,"result=[('magento_incrementid',str(ifield)), ('name','mag_' + str(ifield))]",
 "mag_1324_erp_so_carrier_id","magento1324","sale.model_sale_order","shipping_method",,"in_out","function","unicode",,"if ifield:
+=======
+id,type_id:id,model_id:id,external_field,field_id:id,type,evaluation_type,external_type,child_mapping_id:id,in_function,out_function
+mag_1324_erp_s_name,magento1324,base_sale_multichannels.model_external_shop_group,name,,in_out,function,unicode,,"result=[('name',ifield)]","result=[('name',record['name'])]"
+mag_1324_erp_s_code,magento1324,base_sale_multichannels.model_external_shop_group,code,,in_out,function,unicode,,"result=[('code',ifield)]",
+mag_1324_erp_s_web,magento1324,base_sale_multichannels.model_external_shop_group,website_id,,in_out,function,int,,"result=[('website_id',ifield)]",
+mag_1324_erp_s_isa,magento1324,base_sale_multichannels.model_external_shop_group,is_default,,in_out,function,unicode,,"result=[('is_default',bool(eval(ifield)))]",
+mag_1324_erp_s_stord,magento1324,base_sale_multichannels.model_external_shop_group,sort_order,,in_out,function,int,,"result=[('sort_order',ifield)]",
+mag_1324_erp_s_gpid,magento1324,base_sale_multichannels.model_external_shop_group,default_group_id,,in_out,function,int,,"result=[('default_shop_integer_id',ifield)]",
+mag_1324_erp_sv_name,magento1324,model_magerp_storeviews,name,,in_out,function,unicode,,"result=[('name',ifield)]","result=[('name',record['name'])]"
+mag_1324_erp_sv_code,magento1324,model_magerp_storeviews,code,,in_out,function,unicode,,"result=[('code',ifield)]",
+mag_1324_erp_sv_sg,magento1324,model_magerp_storeviews,website_id,,in_out,function,int,,"result=[('website_id',self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1324_erp_sv_isa,magento1324,model_magerp_storeviews,is_active,,in_out,function,unicode,,"result=[('is_active',bool(eval(ifield)))]",
+mag_1324_erp_sv_stord,magento1324,model_magerp_storeviews,sort_order,,in_out,function,int,,"result=[('sort_order',ifield)]",
+mag_1324_erp_sv_gpid,magento1324,model_magerp_storeviews,group_id,,in_out,function,int,,"result=[('shop_id',self.pool.get('sale.shop').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1324_erp_st_name,magento1324,sale.model_sale_shop,name,,in_out,function,unicode,,"result=[('name',ifield)]","result=[('name',record['name'])]"
+mag_1324_erp_st_gpid,magento1324,sale.model_sale_shop,group_id,,in_out,function,int,,"result=[('group_id',ifield)]",
+mag_1324_erp_st_grp,magento1324,sale.model_sale_shop,website_id,,in_out,function,int,,"result=[('shop_group_id',self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1324_erp_st_default_st,magento1324,sale.model_sale_shop,default_store_id,,in_out,function,int,,"result=[('default_storeview_integer_id',ifield)]",
+mag_1324_erp_st_root_categ,magento1324,sale.model_sale_shop,root_category_id,,in_out,function,int,,"result=[('root_category_id',ifield)]",
+mag_1324_erp_so_total_amount,magento1324,sale.model_sale_order,grand_total,,in_out,function,float,,"result=[('ext_total_amount',str(ifield))]",
+mag_1324_erp_so_name,magento1324,sale.model_sale_order,increment_id,,in_out,function,unicode,,"result=[('magento_incrementid',str(ifield)), ('name','mag_' + str(ifield))]",
+mag_1324_erp_so_carrier_id,magento1324,sale.model_sale_order,shipping_method,,in_out,function,unicode,,"if ifield:
+>>>>>>> MERGE-SOURCE
     carrier_ids = self.pool.get('delivery.carrier').search(cr, uid, [('magento_code', '=', ifield)])
     if carrier_ids:
         result=[('carrier_id', carrier_ids[0])]
@@ -41,16 +65,24 @@
     clean = re.sub('\w:\w:|\w:\w+;', '', ifield)
     for each in clean.split('{'):
         if each.startswith('""label""'):
-            split_info = each.split(';')	
+            split_info = each.split(';')
             options_label.append('%s: %s [%s]' % (split_info[1], split_info[3], data['sku']))
-	
+
     result=[('notes',  """".join(options_label).replace('""""', '\n').replace('""', ''))]
 ",
+<<<<<<< TREE
 "mag_1324_erp_soline_pid","magento1324","sale.model_sale_order_line","product_id",,"in_out","function","unicode",,"context['alternative_key'] = data['sku']
 result=[('product_id',self.pool.get('product.product').extid_to_oeid(cr, uid, external_session, ifield, referential_id))]",
 "mag_1324_erp_soline_uomqty","magento1324","sale.model_sale_order_line","qty_ordered",,"in_out","function","unicode",,"result=[('product_uom_qty',ifield)]",
 "mag_1324_erp_soline_uosqty","magento1324","sale.model_sale_order_line","qty_ordered",,"in","function","unicode",,"result=[('product_uos_qty',ifield)]",
 "mag_1324_erp_soline_price","magento1324","sale.model_sale_order_line","price",,"in","function","unicode",,"if context.get('price_is_tax_included', False):             
+=======
+mag_1324_erp_soline_pid,magento1324,sale.model_sale_order_line,product_id,,in_out,function,unicode,,"context['alternative_key'] = data['sku']
+result=[('product_id',self.pool.get('product.product').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1324_erp_soline_uomqty,magento1324,sale.model_sale_order_line,qty_ordered,,in_out,function,unicode,,"result=[('product_uom_qty',ifield)]",
+mag_1324_erp_soline_uosqty,magento1324,sale.model_sale_order_line,qty_ordered,,in,function,unicode,,"result=[('product_uos_qty',ifield)]",
+mag_1324_erp_soline_price,magento1324,sale.model_sale_order_line,price,,in,function,unicode,,"if context.get('price_is_tax_included', False):
+>>>>>>> MERGE-SOURCE
     result=[('price_unit', (float(data['row_total']) + float(data['tax_amount']))/float(data['qty_ordered']))]
 else:
     result=[('price_unit', float(data['row_total'])/float(data['qty_ordered']))]",
@@ -60,15 +92,23 @@
 "mag_1324_erp_procat_3","magento1324","product.model_product_category","parent_id",,"in_out","function","int",,"record_id = self.pool.get('ir.model.data').search(cr, uid, [('model', '=', self._name), ('name', '=', self.prefixed_id(ifield))])
 parent_id = False
 if record_id:
-	parent_rec = self.pool.get('ir.model.data').read(cr,uid,record_id[0],[])
-	parent_id=parent_rec.get('res_id',False)
+    parent_rec = self.pool.get('ir.model.data').read(cr,uid,record_id[0],[])
+    parent_id=parent_rec.get('res_id',False)
 result=[('magento_parent_id',ifield),('parent_id',parent_id)]","magento_parent_id = False
 if record.get('parent_id',False):
+<<<<<<< TREE
 	magento_parent_id = self.oeid_to_extid(cr, uid, record.get('parent_id')[0], referential_id)
 	if not magento_parent_id:
 		self.ext_export(cr,uid,[record.get('parent_id',[False])[0]],[referential_id],{},context=context)
 		magento_parent_id = self.oeid_to_extid(cr, uid, record.get('parent_id')[0], referential_id)
+=======
+    magento_parent_id = self.oeid_to_extid(cr, uid, record.get('parent_id')[0], external_referential_id)
+    if not magento_parent_id:
+        self.ext_export(cr,uid,[record.get('parent_id',[False])[0]],[external_referential_id],{},context=context)
+        magento_parent_id = self.oeid_to_extid(cr, uid, record.get('parent_id')[0], external_referential_id)
+>>>>>>> MERGE-SOURCE
 if magento_parent_id:
+<<<<<<< TREE
 	result = [('parent_id',magento_parent_id)]"
 "mag_1324_erp_procat_4","magento1324","product.model_product_category","is_active",,"in_out","function","unicode",,"result=[('is_active',ifield and (eval(ifield)) or False)]","result=[('is_active',record['is_active'])]"
 "mag_1324_erp_procat_5","magento1324","product.model_product_category","description",,"in_out","function","unicode",,"result=[('description',ifield)]","result=[('description',record['description'])]"
@@ -76,6 +116,15 @@
 "mag_1324_erp_procat_7","magento1324","product.model_product_category","meta_keywords",,"in_out","function","unicode",,"result=[('meta_keywords',ifield)]","result=[('meta_keywords',record['meta_keywords'])]"
 "mag_1324_erp_procat_8","magento1324","product.model_product_category","meta_description",,"in_out","function","unicode",,"result=[('meta_description',ifield)]","result=[('meta_description',record['meta_description'])]"
 "mag_1324_erp_procat_9","magento1324","product.model_product_category","url_key",,"in_out","function","unicode",,"result=[('url_key',ifield)]","if context.get('export_url', False) :
+=======
+    result = [('parent_id',magento_parent_id)]"
+mag_1324_erp_procat_4,magento1324,product.model_product_category,is_active,,in_out,function,unicode,,"result=[('is_active',ifield and (eval(ifield)) or False)]","result=[('is_active',record['is_active'])]"
+mag_1324_erp_procat_5,magento1324,product.model_product_category,description,,in_out,function,unicode,,"result=[('description',ifield)]","result=[('description',record['description'])]"
+mag_1324_erp_procat_6,magento1324,product.model_product_category,meta_title,,in_out,function,unicode,,"result=[('meta_title',ifield)]","result=[('meta_title',record['meta_title'])]"
+mag_1324_erp_procat_7,magento1324,product.model_product_category,meta_keywords,,in_out,function,unicode,,"result=[('meta_keywords',ifield)]","result=[('meta_keywords',record['meta_keywords'])]"
+mag_1324_erp_procat_8,magento1324,product.model_product_category,meta_description,,in_out,function,unicode,,"result=[('meta_description',ifield)]","result=[('meta_description',record['meta_description'])]"
+mag_1324_erp_procat_9,magento1324,product.model_product_category,url_key,,in_out,function,unicode,,"result=[('url_key',ifield)]","if context.get('export_url', False) :
+>>>>>>> MERGE-SOURCE
     result=[('url_key',record['url_key'])]"
 "mag_1324_erp_procat_10","magento1324","product.model_product_category","name",,"in_out","function","unicode",,"result=[('name',ifield or 'UNDEFINED'),('magento_exportable',True)]","result=[('name',record['name'])]"
 "mag_1324_erp_procat_11","magento1324","product.model_product_category","is_anchor",,"in_out","function","unicode",,"result=[('is_anchor',ifield and bool(eval(ifield)) or False)]","result=[('is_anchor',record['is_anchor'])]"
@@ -97,30 +146,44 @@
     att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, ifield,'sort_by', context=context)
 else:
     att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, 'None','sort_by', context=context)
-result=[('default_sort_by',att_id)]","cat_attr_option = self.pool.get('magerp.product_category_attribute_options').browse(cr, uid, record['default_sort_by'][0], context=context)
+result=[('default_sort_by',att_id)]","options_obj = self.pool.get('magerp.product_category_attribute_options')
+cat_attr_option_id = record['default_sort_by']
+if cat_attr_option_id:
+    cat_attr_option_id = cat_attr_option_id[0]
+else:
+    cat_attr_option_id = options_obj._get_default_option(cr, uid, 'sort_by', 'None', context=context)
+
+cat_attr_option = options_obj.browse(cr, uid, cat_attr_option_id, context=context)
 result=[('default_sort_by', cat_attr_option.value)]"
 "mag_1324_erp_procat_14","magento1324","product.model_product_category","updated_at",,"in","function","unicode",,"result=[('magerp_stamp',ifield)]",
 "mag_1324_erp_procat_15","magento1324","product.model_product_category","image",,"in_out","function","unicode",,"image_binary = False
 if ifield and not ifield=='None':
-	try:
-		image_binary = conn.call('ol_catalog_category_media.info', [int(data['category_id'])])
-	except Exception, e:
-		print e
-		pass
-	if image_binary:
-		image_binary = base64.encodestring(base64.urlsafe_b64decode(image_binary[0]['image_data']))
+    try:
+        image_binary = conn.call('ol_catalog_category_media.info', [int(data['category_id'])])
+    except Exception, e:
+        print e
+        pass
+    if image_binary:
+        image_binary = base64.encodestring(base64.urlsafe_b64decode(image_binary[0]['image_data']))
 result=[('image_name',ifield),('image',image_binary)]","if record['image']:
-	img = base64.decodestring(record['image'])
-        img_bin_enc = base64.encodestring(img) 
-        conn.call('ol_catalog_category_media.create', [record['image_name'], img_bin_enc])
-	result = [('image',record['image_name'])]
+    img = base64.decodestring(record['image'])
+    img_bin_enc = base64.encodestring(img)
+    conn.call('ol_catalog_category_media.create', [record['image_name'], img_bin_enc])
+    result = [('image',record['image_name'])]
 else:
+<<<<<<< TREE
 	result=[]"
 "mag_1324_erp_procat_16","magento1324","product.model_product_category","include_in_menu",,"in_out","function","unicode",,"result=[('include_in_menu', ifield and (eval(ifield)) or False)]","result=[('include_in_menu',record['include_in_menu'])]"
 "mag_1324_erp_procat_17","magento1324","product.model_product_category","page_layout",,"in_out","function","unicode",,"if ifield:
+=======
+    result=[]"
+mag_1324_erp_procat_16,magento1324,product.model_product_category,include_in_menu,,in_out,function,unicode,,"result=[('include_in_menu', ifield and (eval(ifield)) or False)]","result=[('include_in_menu',record['include_in_menu'])]"
+mag_1324_erp_procat_17,magento1324,product.model_product_category,page_layout,,in_out,function,unicode,,"if ifield:
+>>>>>>> MERGE-SOURCE
     att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, ifield,'page_layout', context=context)
 else:
     att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, 'None','page_layout', context=context)
+<<<<<<< TREE
 result=[('page_layout',att_id)]","result=[('page_layout', record['page_layout'][1] or '')]"
 "mag_1324_erp_attrgrp_2","magento1324","model_magerp_product_attribute_groups","attribute_set_id",,"in_out","function","int",,"result=[('attribute_set_id', ifield)]","result=[('attribute_set_id', record['attribute_set_id'])]"
 "mag_1324_erp_attrgrp_3","magento1324","model_magerp_product_attribute_groups","attribute_group_name",,"in_out","function","unicode",,"result=[('attribute_group_name', ifield)]","result=[('attribute_group_name', record['attribute_group_name'])]"
@@ -155,6 +218,43 @@
 "mag_1324_erp_attr_24","magento1324","model_magerp_product_attributes","entity_type_id",,"in_out","function","int",,"result=[('entity_type_id', ifield)]","result=[('entity_type_id', record['entity_type_id'])]"
 "mag_1324_erp_attr_25","magento1324","model_magerp_product_attributes","apply_to",,"in_out","function","unicode",,"result=[('apply_to', str(ifield))]","result=[('apply_to', eval(record['%s']))]"
 "mag_1324_erp_prd_1","magento1324","product.model_product_product","url_key",,"in_out","function","unicode",,"result=[('x_magerp_url_key',ifield)]","if context.get('export_url', False) :
+=======
+result=[('page_layout',att_id)]","page_layout = record['page_layout'] and record['page_layout'][1] or ''
+result=[('page_layout', page_layout)]"
+mag_1324_erp_attrgrp_2,magento1324,model_magerp_product_attribute_groups,attribute_set_id,,in_out,function,int,,"result=[('attribute_set_id', ifield)]","result=[('attribute_set_id', record['attribute_set_id'])]"
+mag_1324_erp_attrgrp_3,magento1324,model_magerp_product_attribute_groups,attribute_group_name,,in_out,function,unicode,,"result=[('attribute_group_name', ifield)]","result=[('attribute_group_name', record['attribute_group_name'])]"
+mag_1324_erp_attrgrp_4,magento1324,model_magerp_product_attribute_groups,sort_order,,in_out,function,int,,"result=[('sort_order', ifield)]","result=[('sort_order', record['sort_order'])]"
+mag_1324_erp_attrgrp_5,magento1324,model_magerp_product_attribute_groups,default_id,,in_out,function,int,,"result=[('default_id', ifield)]","result=[('default_id', record['default_id'])]"
+mag_1324_erp_attrset_1,magento1324,model_magerp_product_attribute_set,attribute_set_id,,in_out,function,int,,"result=[('magento_id', ifield)]","result=[('attribute_set_id', record['magento_id'])]"
+mag_1324_erp_attrset_2,magento1324,model_magerp_product_attribute_set,sort_order,,in_out,function,int,,"result=[('sort_order', ifield)]","result=[('sort_order', record['sort_order'])]"
+mag_1324_erp_attrset_3,magento1324,model_magerp_product_attribute_set,attribute_set_name,,in_out,function,unicode,,"result=[('attribute_set_name', ifield)]","result=[('attribute_set_name', record['attribute_set_name'])]"
+mag_1324_erp_attr_1,magento1324,model_magerp_product_attributes,attribute_code,,in_out,function,unicode,,"result=[('attribute_code', ifield)]","result=[('code', record['attribute_code'])]"
+mag_1324_erp_attr_2,magento1324,model_magerp_product_attributes,attribute_id,,in_out,function,int,,"result=[('magento_id', ifield)]",
+mag_1324_erp_attr_3,magento1324,model_magerp_product_attributes,frontend_input,,in_out,function,unicode,,"result=[('frontend_input', ifield)]","result=[('frontend_input', record['frontend_input'])]"
+mag_1324_erp_attr_4,magento1324,model_magerp_product_attributes,frontend_class,,in_out,function,unicode,,"result=[('frontend_class', ifield)]","result=[('frontend_class', record['frontend_class'])]"
+mag_1324_erp_attr_5,magento1324,model_magerp_product_attributes,backend_model,,in_out,function,unicode,,"result=[('backend_model', ifield)]","result=[('backend_model', record['backend_model'])]"
+mag_1324_erp_attr_6,magento1324,model_magerp_product_attributes,backend_type,,in_out,function,unicode,,"result=[('backend_type', ifield)]","result=[('backend_type', record['backend_type'])]"
+mag_1324_erp_attr_7,magento1324,model_magerp_product_attributes,frontend_label,,in_out,function,unicode,,"result=[('frontend_label', ifield)]","result=[('frontend_label', record['frontend_label'])]"
+mag_1324_erp_attr_8,magento1324,model_magerp_product_attributes,is_visible_in_advanced_search,,in_out,function,unicode,,"result=[('is_visible_in_advanced_search', bool(eval(ifield)))]","result=[('is_visible_in_advanced_search', record['is_visible_in_advanced_search'])]"
+mag_1324_erp_attr_9,magento1324,model_magerp_product_attributes,is_global,,in_out,function,unicode,,"result=[('is_global', bool(eval(ifield)))]","result=[('is_global', record['is_global'])]"
+mag_1324_erp_attr_10,magento1324,model_magerp_product_attributes,is_filterable,,in_out,function,unicode,,"result=[('is_filterable', bool(eval(ifield)))]","result=[('is_filterable', record['is_filterable'])]"
+mag_1324_erp_attr_11,magento1324,model_magerp_product_attributes,is_comparable,,in_out,function,unicode,,"result=[('is_comparable', bool(eval(ifield)))]","result=[('is_comparable', record['is_comparable'])]"
+mag_1324_erp_attr_12,magento1324,model_magerp_product_attributes,is_visible,,in_out,function,unicode,,"result=[('is_visible', bool(eval(ifield)))]","result=[('is_visible', record['is_visible'])]"
+mag_1324_erp_attr_13,magento1324,model_magerp_product_attributes,is_searchable,,in_out,function,unicode,,"result=[('is_searchable', bool(eval(ifield)))]","result=[('is_searchable', record['is_searchable'])]"
+mag_1324_erp_attr_14,magento1324,model_magerp_product_attributes,is_user_defined,,in_out,function,unicode,,"result=[('is_user_defined', bool(eval(ifield)))]","result=[('is_user_defined', record['is_user_defined'])]"
+mag_1324_erp_attr_15,magento1324,model_magerp_product_attributes,is_configurable,,in_out,function,unicode,,"result=[('is_configurable', bool(eval(ifield)))]","result=[('is_configurable', record['is_configurable'])]"
+mag_1324_erp_attr_16,magento1324,model_magerp_product_attributes,is_visible_on_front,,in_out,function,unicode,,"result=[('is_visible_on_front', bool(eval(ifield)))]","result=[('is_visible_on_front', record['is_visible_on_front'])]"
+mag_1324_erp_attr_17,magento1324,model_magerp_product_attributes,is_used_for_price_rules,,in_out,function,unicode,,"result=[('is_used_for_price_rules', bool(eval(ifield)))]","result=[('is_used_for_price_rules', record['is_used_for_price_rules'])]"
+mag_1324_erp_attr_18,magento1324,model_magerp_product_attributes,is_unique,,in_out,function,unicode,,"result=[('is_unique', bool(eval(ifield)))]","result=[('is_unique', record['is_unique'])]"
+mag_1324_erp_attr_19,magento1324,model_magerp_product_attributes,is_required,,in_out,function,unicode,,"result=[('is_required', bool(eval(ifield)))]","result=[('is_required', record['is_required'])]"
+mag_1324_erp_attr_20,magento1324,model_magerp_product_attributes,position,,in_out,function,int,,"result=[('position', ifield)]","result=[('position', record['position'])]"
+mag_1324_erp_attr_21,magento1324,model_magerp_product_attributes,attribute_set_info,,in_out,function,unicode,,"result=[('attribute_set_info', ifield)]","result=[('attribute_set_info', record['attribute_set_info'])]"
+mag_1324_erp_attr_22,magento1324,model_magerp_product_attributes,default_value,,in_out,function,unicode,,"result=[('default_value', ifield)]","result=[('default_value', record['default_value'])]"
+mag_1324_erp_attr_23,magento1324,model_magerp_product_attributes,note,,in_out,function,unicode,,"result=[('note', ifield)]","result=[('note', record['note'])]"
+mag_1324_erp_attr_24,magento1324,model_magerp_product_attributes,entity_type_id,,in_out,function,int,,"result=[('entity_type_id', ifield)]","result=[('entity_type_id', record['entity_type_id'])]"
+mag_1324_erp_attr_25,magento1324,model_magerp_product_attributes,apply_to,,in_out,function,unicode,,"result=[('apply_to', str(ifield))]","result=[('apply_to', eval(record['%s']))]"
+mag_1324_erp_prd_1,magento1324,product.model_product_product,url_key,,in_out,function,unicode,,"result=[('x_magerp_url_key',ifield)]","if context.get('export_url', False) :
+>>>>>>> MERGE-SOURCE
     result=[('url_key',record['x_magerp_url_key'])]"
 "mag_1324_erp_prd_2","magento1324","product.model_product_product","name",,"in_out","function","unicode",,"result = [('name',ifield)]","result = [('name',record['name'])]"
 "mag_1324_erp_prd_3","magento1324","product.model_product_product","description",,"in_out","function","unicode",,"result = [('description',ifield)]",
@@ -164,13 +264,18 @@
 "mag_1324_erp_prd_7","magento1324","product.model_product_product","category_ids",,"in_out","function","list",,"categ_ids =[]
 if ifield and len(ifield) > 0:
     for category_ids in ifield:
+<<<<<<< TREE
         categ_ids.append(self.pool.get('product.category').extid_to_oeid(cr, uid, external_session, category_ids, referential_id))
+=======
+        categ_ids.append(self.pool.get('product.category').extid_to_oeid(cr, uid, category_ids, external_referential_id, context=context))
+>>>>>>> MERGE-SOURCE
     categ_id = categ_ids.pop()
 else:
     categ_id = self.pool.get('external.referential').browse(cr, uid, referential_id).default_pro_cat.id
 result = [('categ_id', categ_id), ('categ_ids',[(6, 0, categ_ids)])]","
 cat_obj = self.pool.get('product.category')
 product = self.browse(cr, uid, record['id'])
+<<<<<<< TREE
 categ_ids = [product.categ_id.id] + [categ.id for categ in product.categ_ids]
 mag_categ_ids = []
 for categ_id in categ_ids:
@@ -186,6 +291,23 @@
 "mag_1324_erp_prd_11","magento1324","product.model_product_product","special_price",,"in_out","function","float",,"result = [('x_magerp_special_price',ifield)]",
 "mag_1324_erp_prd_12","magento1324","product.model_product_product","tier_price",,"in_out","function","unicode",,"result=[]#no mapping by default","result=[]#no mapping by default"
 "mag_1324_erp_prd_13","magento1324","product.model_product_product","minimal_price",,"in_out","function","float",,"result = [('x_magerp_minimal_price',ifield)]","
+=======
+categ_ids = [categ.id for categ in ([product.categ_id] + product.categ_ids) if categ.magento_exportable]
+mag_categ_ids = []
+for categ_id in categ_ids:
+    mag_categ_id = cat_obj.oeid_to_extid(cr, uid, categ_id, external_referential_id)
+    if not mag_categ_id:
+        cat_obj.ext_export(cr, uid, [categ_id], [external_referential_id], context=context)
+        mag_categ_id = cat_obj.oeid_to_extid(cr, uid, categ_id, external_referential_id)
+    mag_categ_ids.append(mag_categ_id)
+result=[('category_ids', mag_categ_ids)]"
+mag_1324_erp_prd_8,magento1324,product.model_product_product,price,,in_out,function,float,,"result=[('list_price',ifield)]",result=[]#map later
+mag_1324_erp_prd_9,magento1324,product.model_product_product,cost,,in_out,function,float,,"result=[('standard_price',ifield)]","result = [('cost',record['standard_price'] or 0)]"
+mag_1324_erp_prd_10,magento1324,product.model_product_product,set,,in_out,function,unicode,,"result=[('set',self.pool.get('magerp.product_attribute_set').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1324_erp_prd_11,magento1324,product.model_product_product,special_price,,in_out,function,float,,"result = [('x_magerp_special_price',ifield)]",
+mag_1324_erp_prd_12,magento1324,product.model_product_product,tier_price,,in_out,function,unicode,,result=[]#no mapping by default,result=[]#no mapping by default
+mag_1324_erp_prd_13,magento1324,product.model_product_product,minimal_price,,in_out,function,float,,"result = [('x_magerp_minimal_price',ifield)]","
+>>>>>>> MERGE-SOURCE
 if record['x_magerp_minimal_price'] and record['x_magerp_minimal_price'] != 0:
     result = [('minimal_price',record['x_magerp_minimal_price'])]
 else:
@@ -199,7 +321,11 @@
     result = [('type_id','simple')]"
 "mag_1324_erp_prd_15","magento1324","product.model_product_product","websites",,"in_out","function","list",,"websites_ids = []
 for ext_id in ifield:
+<<<<<<< TREE
     websites_ids.append(self.pool.get('external.shop.group').extid_to_oeid(cr, uid, external_session, ext_id, context=context))
+=======
+    websites_ids.append(self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ext_id, external_referential_id, context=context))
+>>>>>>> MERGE-SOURCE
 
 ##### OPTION START, with this if the field websites of the product is empty the product is exported on every website
 all_oe_websites_ids = self.pool.get('external.shop.group').search(cr,uid,[('referential_id', '=', referential_id)])
@@ -217,6 +343,7 @@
     ext_websites_ids.append(self.pool.get('external.shop.group').oeid_to_extid(cr, uid, oe_id, referential_id))
 
 result=[('websites', ext_websites_ids)]"
+<<<<<<< TREE
 "mag_1324_erp_prd_16","magento1324","product.model_product_product","has_options",,"in","function","unicode",,"result =[('x_magerp_has_options',ifield)]",
 "magento_1324_cst_grp_1","magento1324","base.model_res_partner_category","customer_group_code",,"in","function","unicode",,"result=[('name',ifield)]",
 "magento_1324_cst_grp_3","magento1324","base.model_res_partner_category","tax_class_id",,"in","function","int",,"result=[('tax_class_id',ifield)]",
@@ -225,17 +352,39 @@
 "magento_1324_prt_adr_4","magento1324","base.model_res_partner_address","firstname",,"in_out","function","unicode",,"result = [('name', (data.get('company', False) and (data['company'] + ' ; ') or '') + ifield + ' ' + (data['lastname'] or '')), ('firstname', ifield), ('lastname', (data['lastname'] or ''))]",
 "magento_1324_prt_adr_6","magento1324","base.model_res_partner_address","is_active",,"in_out","function","unicode",,"result=[('active',bool(eval(ifield)))]",
 "magento_1324_prt_adr_7","magento1324","base.model_res_partner_address","country_id",,"in_out","function","unicode",,"result = self.pool.get('res.country').search(cr,uid,[('code','=',ifield)])
+=======
+mag_1324_erp_prd_16,magento1324,product.model_product_product,has_options,,in,function,unicode,,"result =[('x_magerp_has_options',ifield)]",
+magento_1324_cst_grp_1,magento1324,base.model_res_partner_category,customer_group_code,,in,function,unicode,,"result=[('name',ifield)]",
+magento_1324_cst_grp_3,magento1324,base.model_res_partner_category,tax_class_id,,in,function,int,,"result=[('tax_class_id',ifield)]",
+magento_1324_prt_adr_2,magento1324,base.model_res_partner_address,city,,in_out,function,unicode,,"result=[('city',ifield)]",
+magento_1324_prt_adr_3,magento1324,base.model_res_partner_address,fax,,in_out,function,unicode,,"result=[('fax',ifield)]",
+magento_1324_prt_adr_4,magento1324,base.model_res_partner_address,firstname,,in_out,function,unicode,,"name = ' '.join([ f for f in (data['firstname'], data['lastname']) if f])
+if data.get('company'):
+    name = ""%s ; %s"" % (data['company'], name)
+result = [('name', name), ('firstname', ifield), ('lastname', data['lastname'])]",
+magento_1324_prt_adr_6,magento1324,base.model_res_partner_address,is_active,,in_out,function,unicode,,"result=[('active',bool(eval(ifield)))]",
+magento_1324_prt_adr_7,magento1324,base.model_res_partner_address,country_id,,in_out,function,unicode,,"result = self.pool.get('res.country').search(cr,uid,[('code','=',ifield)])
+>>>>>>> MERGE-SOURCE
 if result and len(result)==1:
-	result=[('country_id',result[0])]
+    result=[('country_id',result[0])]
 else:
-	result=[]
+    result=[]
 ",
+<<<<<<< TREE
 "magento_1324_prt_adr_8","magento1324","base.model_res_partner_address","street",,"in_out","function","unicode",,"if ifield:
 	if len(ifield.split('\n')) ==2 :
 		result = [('street', ifield.split('\n')[0]) , ('street2', ifield.split('\n')[1])]
 	else :
 		result = [('street',ifield.replace('\\n',','))]
+=======
+magento_1324_prt_adr_8,magento1324,base.model_res_partner_address,street,,in_out,function,unicode,,"if ifield:
+    if len(ifield.split('\n')) ==2 :
+        result = [('street', ifield.split('\n')[0]) , ('street2', ifield.split('\n')[1])]
+    else :
+        result = [('street',ifield.replace('\\n',','))]
+>>>>>>> MERGE-SOURCE
 else:
+<<<<<<< TREE
 	result = []",
 "magento_1324_prt_adr_9","magento1324","base.model_res_partner_address","postcode",,"in_out","function","unicode",,"result=[('zip',ifield)]",
 "magento_1324_prt_adr_10","magento1324","base.model_res_partner_address","telephone",,"in_out","function","unicode",,"result=[('phone',ifield)]",
@@ -245,16 +394,39 @@
 		result = [('state_id',result[0])]
 	else:
 		result=[]
+=======
+    result = []",
+magento_1324_prt_adr_9,magento1324,base.model_res_partner_address,postcode,,in_out,function,unicode,,"result=[('zip',ifield)]",
+magento_1324_prt_adr_10,magento1324,base.model_res_partner_address,telephone,,in_out,function,unicode,,"result=[('phone',ifield)]",
+magento_1324_prt_adr_11,magento1324,base.model_res_partner_address,region,,in_out,function,unicode,,"if ifield:
+    result = self.pool.get('res.country.state').search(cr,uid,[('name','=ilike',ifield)])
+    if result and len(result)==1:
+        result = [('state_id',result[0])]
+    else:
+        result=[]
+>>>>>>> MERGE-SOURCE
 else:
+<<<<<<< TREE
 	result=[]",
 "magento_1324_prt_adr_13","magento1324","base.model_res_partner_address","customer_id",,"in_out","function","int",,"result=self.pool.get('res.partner').extid_to_oeid(cr,uid,ifield,referential_id)
+=======
+    result=[]",
+magento_1324_prt_adr_13,magento1324,base.model_res_partner_address,customer_id,,in_out,function,int,,"result=self.pool.get('res.partner').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+>>>>>>> MERGE-SOURCE
 if result:
-	result=[('partner_id',result)]
+    result=[('partner_id',result)]
 else:
+<<<<<<< TREE
 	result=[('partner_id',False)]",
 "magento_1324_prt_adr_14","magento1324","base.model_res_partner_address","address_type",,"in_out","function","unicode",,"if ifield=='billing':
 	result=[('type','invoice')]
+=======
+    result=[('partner_id',False)]",
+magento_1324_prt_adr_14,magento1324,base.model_res_partner_address,address_type,,in_out,function,unicode,,"if ifield=='billing':
+    result=[('type','invoice')]
+>>>>>>> MERGE-SOURCE
 elif ifield=='shipping':
+<<<<<<< TREE
 	result=[('type','delivery')]
 else:
 	result=[]",
@@ -276,15 +448,67 @@
 "magento_1324_prt_6","magento1324","base.model_res_partner","created_at",,"in_out","function","unicode",,"result=[('created_at',ifield)]",
 "magento_1324_prt_7","magento1324","base.model_res_partner","updated_at",,"in_out","function","unicode",,"result=[('updated_at',ifield)]",
 "magento_1324_prt_8","magento1324","base.model_res_partner","firstname",,"in_out","function","unicode",,"result = [('name', ifield + ' ' + data['lastname'])]","add_id = self.browse(cr, uid, record['id'])
+=======
+    result=[('type','delivery')]
+else:
+    result=[]",
+magento_1324_prt_adr_15,magento1324,base.model_res_partner_address,email,,in_out,function,unicode,,"result = [('email', False)]
+if ifield:
+    result = [('email', ifield)]
+else:
+    partner_obj = self.pool.get('res.partner')
+    partner_id = partner_obj.extid_to_existing_oeid(cr, uid, data['customer_id'] ,external_referential_id)
+    if partner_id:
+        result = [('email', partner_obj.browse(cr, uid, partner_id).emailid)]",
+magento_1324_prt_adr_17,magento1324,base.model_res_partner_address,default_billing,,in_out,function,unicode,,"result = [('type', 'other')]
+if data.get('default_billing') and data.get('default_shipping'):
+    result = [('type', 'default')]
+elif data.get('default_billing'):
+    result = [('type', 'invoice')]
+elif data.get('default_shipping'):
+    result = [('type', 'delivery')]",
+magento_1324_prt_2,magento1324,base.model_res_partner,group_id,,in_out,function,int,,"if ifield:
+    result=self.pool.get('res.partner.category').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+    if result:
+        result=[('group_id',result)]",
+magento_1324_prt_3,magento1324,base.model_res_partner,store_id,,in_out,function,int,,"if ifield:
+    result=self.pool.get('magerp.storeviews').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+    if result:
+        store = self.pool.get('magerp.storeviews').browse(cr, uid, result)
+        lang = store.lang_id
+        result=[('store_id',result),('lang',lang and lang.code or False)]
+        if not data.get('website_id'):
+            result.append(('website_id', store.website_id.id))",
+magento_1324_prt_4,magento1324,base.model_res_partner,website_id,,in_out,function,int,,"if ifield:
+    result=self.pool.get('external.shop.group').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+    if result:
+        result=[('website_id',result)]",
+magento_1324_prt_5,magento1324,base.model_res_partner,created_in,,in_out,function,unicode,,"result=[('created_in',ifield)]",
+magento_1324_prt_6,magento1324,base.model_res_partner,created_at,,in_out,function,unicode,,"result=[('created_at',ifield)]",
+magento_1324_prt_7,magento1324,base.model_res_partner,updated_at,,in_out,function,unicode,,"result=[('updated_at',ifield)]",
+magento_1324_prt_8,magento1324,base.model_res_partner,firstname,,in_out,function,unicode,,"result = [('name', ifield + ' ' + data['lastname'])]","add_id = self.browse(cr, uid, record['id'])
+>>>>>>> MERGE-SOURCE
 fn = add_id.address[0].firstname
 ln = add_id.address[0].lastname
 result=[('firstname', fn), ('lastname', ln)]"
+<<<<<<< TREE
 "magento_1324_prt_10","magento1324","base.model_res_partner","email",,"in_out","function","unicode",,"result=[('emailid',ifield)]",
 "magento_1324_prt_11","magento1324","base.model_res_partner","taxvat",,"in_out","function","unicode",,"if ifield:
 	result=[('mag_vat',ifield)]
+=======
+magento_1324_prt_10,magento1324,base.model_res_partner,email,,in_out,function,unicode,,"result=[('emailid',ifield)]",
+magento_1324_prt_11,magento1324,base.model_res_partner,taxvat,,in_out,function,unicode,,"if ifield:
+    result=[('mag_vat',ifield)]
+>>>>>>> MERGE-SOURCE
 else:
+<<<<<<< TREE
 	result=[]",
 "magento_1324_prt_12","magento1324","base.model_res_partner","dob",,"in_out","function","unicode",,"if ifield:
 	result =[('mag_birthday',ifield[:10])]
+=======
+    result=[]",
+magento_1324_prt_12,magento1324,base.model_res_partner,dob,,in_out,function,unicode,,"if ifield:
+    result =[('mag_birthday',ifield[:10])]
+>>>>>>> MERGE-SOURCE
 else:
-	result=[]",
+    result=[]",
 
=== added directory 'magentoerpconnect/settings/1.4.0.0'
=== added file 'magentoerpconnect/settings/1.4.0.0/external.mapping.template.csv'
--- magentoerpconnect/settings/1.4.0.0/external.mapping.template.csv	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/settings/1.4.0.0/external.mapping.template.csv	2012-07-06 14:53:18 +0000
@@ -0,0 +1,14 @@
+"id","type_id:id","model_id:id","external_list_method","external_get_method","external_update_method","external_create_method","external_delete_method","external_key_name"
+"magento_1400_website","magento1400","base_sale_multichannels.model_external_shop_group","ol_websites.list",,,,,"website_id"
+"magento_1400_storeview","magento1400","model_magerp_storeviews","ol_storeviews.list",,,,,"store_id"
+"magento_1400_store","magento1400","sale.model_sale_shop","ol_groups.list",,,,,"group_id"
+"magento_1400_order","magento1400","sale.model_sale_order","sales_order.list","sales_order.info",,,,"increment_id"
+"magento_1400_order_line","magento1400","sale.model_sale_order_line",,,,,,"item_id"
+"magento_1400_pro_cat","magento1400","product.model_product_category","category.list","category.info","catalog_category.update","catalog_category.create",,"category_id"
+"magento_1400_attr_grp","magento1400","model_magerp_product_attribute_groups","ol_catalog_product_attribute_group.list","ol_catalog_product_attribute_group.list",,,,"attribute_group_id"
+"magento_1400_attr_set","magento1400","model_magerp_product_attribute_set","ol_catalog_product_attributeset.list",,,,,"attribute_set_id"
+"magento_1400_attr","magento1400","model_magerp_product_attributes","ol_catalog_product_attribute.list",,,,,"attribute_id"
+"magento_1400_prd","magento1400","product.model_product_product","catalog_product.list","catalog_product.info","ol_catalog_product.update","ol_catalog_product.create",,"product_id"
+"magento_1400_cst_grp","magento1400","base.model_res_partner_category","ol_customer_groups.list",,,,,"customer_group_id"
+"magento_1400_prt_adr","magento1400","base.model_res_partner_address","ol_customer_address.list","ol_customer_address.info",,,,"entity_id"
+"magento_1400_prt","magento1400","base.model_res_partner","customer.list","customer.info","customer.update",,,"customer_id"
 
=== added file 'magentoerpconnect/settings/1.4.0.0/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.4.0.0/external.mappinglines.template.csv	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/settings/1.4.0.0/external.mappinglines.template.csv	2012-07-06 14:53:18 +0000
@@ -0,0 +1,321 @@
+id,type_id:id,model_id:id,external_field,field_id:id,type,evaluation_type,external_type,child_mapping_id:id,in_function,out_function
+mag_1400_erp_s_name,magento1400,base_sale_multichannels.model_external_shop_group,name,,in_out,function,unicode,,"result=[('name',ifield)]","result=[('name',record['name'])]"
+mag_1400_erp_s_code,magento1400,base_sale_multichannels.model_external_shop_group,code,,in_out,function,unicode,,"result=[('code',ifield)]",
+mag_1400_erp_s_web,magento1400,base_sale_multichannels.model_external_shop_group,website_id,,in_out,function,int,,"result=[('website_id',ifield)]",
+mag_1400_erp_s_isa,magento1400,base_sale_multichannels.model_external_shop_group,is_default,,in_out,function,unicode,,"result=[('is_default',bool(eval(ifield)))]",
+mag_1400_erp_s_stord,magento1400,base_sale_multichannels.model_external_shop_group,sort_order,,in_out,function,int,,"result=[('sort_order',ifield)]",
+mag_1400_erp_s_gpid,magento1400,base_sale_multichannels.model_external_shop_group,default_group_id,,in_out,function,int,,"result=[('default_shop_integer_id',ifield)]",
+mag_1400_erp_sv_name,magento1400,model_magerp_storeviews,name,,in_out,function,unicode,,"result=[('name',ifield)]","result=[('name',record['name'])]"
+mag_1400_erp_sv_code,magento1400,model_magerp_storeviews,code,,in_out,function,unicode,,"result=[('code',ifield)]",
+mag_1400_erp_sv_sg,magento1400,model_magerp_storeviews,website_id,,in_out,function,int,,"result=[('website_id',self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1400_erp_sv_isa,magento1400,model_magerp_storeviews,is_active,,in_out,function,unicode,,"result=[('is_active',bool(eval(ifield)))]",
+mag_1400_erp_sv_stord,magento1400,model_magerp_storeviews,sort_order,,in_out,function,int,,"result=[('sort_order',ifield)]",
+mag_1400_erp_sv_gpid,magento1400,model_magerp_storeviews,group_id,,in_out,function,int,,"result=[('shop_id',self.pool.get('sale.shop').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1400_erp_st_name,magento1400,sale.model_sale_shop,name,,in_out,function,unicode,,"result=[('name',ifield)]","result=[('name',record['name'])]"
+mag_1400_erp_st_gpid,magento1400,sale.model_sale_shop,group_id,,in_out,function,int,,"result=[('group_id',ifield)]",
+mag_1400_erp_st_grp,magento1400,sale.model_sale_shop,website_id,,in_out,function,int,,"result=[('shop_group_id',self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1400_erp_st_default_st,magento1400,sale.model_sale_shop,default_store_id,,in_out,function,int,,"result=[('default_storeview_integer_id',ifield)]",
+mag_1400_erp_st_root_categ,magento1400,sale.model_sale_shop,root_category_id,,in_out,function,int,,"result=[('root_category_id',ifield)]",
+mag_1400_erp_so_total_amount,magento1400,sale.model_sale_order,grand_total,,in_out,function,float,,"result=[('ext_total_amount',str(ifield))]",
+mag_1400_erp_so_name,magento1400,sale.model_sale_order,increment_id,,in_out,function,unicode,,"result=[('magento_incrementid',str(ifield)), ('name','mag_' + str(ifield))]",
+mag_1400_erp_so_carrier_id,magento1400,sale.model_sale_order,shipping_method,,in_out,function,unicode,,"if ifield:
+    carrier_ids = self.pool.get('delivery.carrier').search(cr, uid, [('magento_code', '=', ifield)])
+    if carrier_ids:
+        result=[('carrier_id', carrier_ids[0])]
+    else:
+        fake_partner_id = self.pool.get('res.partner').search(cr, uid, [])[0]
+        model_data_obj = self.pool.get('ir.model.data')
+        model, product_id = model_data_obj.get_object_reference(cr, uid, 'base_sale_multichannels', 'product_product_shipping')
+        carrier_id = self.pool.get('delivery.carrier').create(cr, uid, {'partner_id' : fake_partner_id, 'product_id' : product_id, 'name' : ifield, 'magento_code' : ifield})
+        result=[('carrier_id', carrier_id)]",
+mag_1400_erp_so_pay,magento1400,sale.model_sale_order,payment,,in_out,function,unicode,,"
+payments_mapping = {'checkmo': 'manual', 'ccsave': 'prepaid', 'free':'prepaid','googlecheckout':'prepaid','paypayl_express':'prepaid', 'paybox_system': 'prepaid', 'paypal_standard': 'prepaid', 'cashondelivery': 'manual', 'servired_standard': 'prepaid', 'bbva': 'prepaid', 'cofidis': 'prepaid'}
+ifield=eval(ifield)
+result=[('order_policy', ifield['method'] in payments_mapping and payments_mapping[ifield['method']] or 'prepaid'), ('ext_payment_method', ifield['method'])]",
+mag_1400_erp_so_item,magento1400,sale.model_sale_order,items,sale.field_sale_order_order_line,in,sub-mapping,dict,magento_1400_order_line,,
+"mag_1400_erp_soline_name","magento1400","sale.model_sale_order_line","name",,"in_out","function","unicode",,"result=[('name', ifield)]
+",
+"mag_1400_erp_soline_note","magento1400","sale.model_sale_order_line","product_options",,"in","function","unicode",,"if ifield:
+    import re
+    options_label = []
+    clean = re.sub('\w:\w:|\w:\w+;', '', ifield)
+    for each in clean.split('{'):
+        if each.startswith('""label""'):
+            split_info = each.split(';')
+            options_label.append('%s: %s [%s]' % (split_info[1], split_info[3], data['sku']))
+
+    result=[('notes',  """".join(options_label).replace('""""', '\n').replace('""', ''))]
+",
+mag_1400_erp_soline_pid,magento1400,sale.model_sale_order_line,product_id,,in_out,function,unicode,,"context['alternative_key'] = data['sku']
+result=[('product_id',self.pool.get('product.product').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1400_erp_soline_uomqty,magento1400,sale.model_sale_order_line,qty_ordered,,in_out,function,unicode,,"result=[('product_uom_qty',ifield)]",
+mag_1400_erp_soline_uosqty,magento1400,sale.model_sale_order_line,qty_ordered,,in,function,unicode,,"result=[('product_uos_qty',ifield)]",
+mag_1400_erp_soline_price,magento1400,sale.model_sale_order_line,price,,in,function,unicode,,"if context.get('price_is_tax_included', False):
+    result=[('price_unit', (float(data['row_total']) + float(data['tax_amount']))/float(data['qty_ordered']))]
+else:
+    result=[('price_unit', float(data['row_total'])/float(data['qty_ordered']))]",
+mag_1400_erp_soline_disc,magento1400,sale.model_sale_order_line,discount_amount,,in,function,float,,"if ifield:
+    result=[('discount', float(data['price']) != 0 and float(data['qty_ordered']) != 0 and float(100*ifield)/(float(data['price'])*float(data['qty_ordered'])) or 0)]",
+mag_1400_erp_procat_2,magento1400,product.model_product_category,level,,in,function,int,,"result=[('sequence',ifield),('level',ifield)]",
+mag_1400_erp_procat_3,magento1400,product.model_product_category,parent_id,,in_out,function,int,,"record_id = self.pool.get('ir.model.data').search(cr, uid, [('model', '=', self._name), ('name', '=', self.prefixed_id(ifield))])
+parent_id = False
+if record_id:
+    parent_rec = self.pool.get('ir.model.data').read(cr,uid,record_id[0],[])
+    parent_id=parent_rec.get('res_id',False)
+result=[('magento_parent_id',ifield),('parent_id',parent_id)]","magento_parent_id = False
+if record.get('parent_id',False):
+    magento_parent_id = self.oeid_to_extid(cr, uid, record.get('parent_id')[0], external_referential_id)
+    if not magento_parent_id:
+        self.ext_export(cr,uid,[record.get('parent_id',[False])[0]],[external_referential_id],{},context=context)
+        magento_parent_id = self.oeid_to_extid(cr, uid, record.get('parent_id')[0], external_referential_id)
+if magento_parent_id:
+    result = [('parent_id',magento_parent_id)]"
+mag_1400_erp_procat_4,magento1400,product.model_product_category,is_active,,in_out,function,unicode,,"result=[('is_active',ifield and (eval(ifield)) or False)]","result=[('is_active',record['is_active'])]"
+mag_1400_erp_procat_5,magento1400,product.model_product_category,description,,in_out,function,unicode,,"result=[('description',ifield)]","result=[('description',record['description'])]"
+mag_1400_erp_procat_6,magento1400,product.model_product_category,meta_title,,in_out,function,unicode,,"result=[('meta_title',ifield)]","result=[('meta_title',record['meta_title'])]"
+mag_1400_erp_procat_7,magento1400,product.model_product_category,meta_keywords,,in_out,function,unicode,,"result=[('meta_keywords',ifield)]","result=[('meta_keywords',record['meta_keywords'])]"
+mag_1400_erp_procat_8,magento1400,product.model_product_category,meta_description,,in_out,function,unicode,,"result=[('meta_description',ifield)]","result=[('meta_description',record['meta_description'])]"
+mag_1400_erp_procat_9,magento1400,product.model_product_category,url_key,,in_out,function,unicode,,"result=[('url_key',ifield)]","if context.get('export_url', False) :
+    result=[('url_key',record['url_key'])]"
+mag_1400_erp_procat_10,magento1400,product.model_product_category,name,,in_out,function,unicode,,"result=[('name',ifield or 'UNDEFINED'),('magento_exportable',True)]","result=[('name',record['name'])]"
+mag_1400_erp_procat_11,magento1400,product.model_product_category,is_anchor,,in_out,function,unicode,,"result=[('is_anchor',ifield and bool(eval(ifield)) or False)]","result=[('is_anchor',record['is_anchor'])]"
+mag_1400_erp_procat_12,magento1400,product.model_product_category,available_sort_by,,in_out,function,list,,"attr_ids = []
+cat_attr_obj = self.pool.get('magerp.product_category_attribute_options')
+if ifield:
+    for val in ifield:
+        attr_ids.append(cat_attr_obj.get_create_option_id(cr, uid, val,'sort_by', context=context))
+    result=[('available_sort_by', [(6, 0, attr_ids)]), ('use_default_available_sort_by', False)]
+else:
+    result=[('use_default_available_sort_by', True)]","if record['use_default_available_sort_by']:
+    res = u''
+else:
+    res = []
+    for cat_attr_option in self.pool.get('magerp.product_category_attribute_options').browse(cr, uid, record['available_sort_by'], context=context):
+        res.append(cat_attr_option.value)
+    # comment out the following line if you can run the following SQL query on the Magento database:
+    #      update eav_attribute set is_required = 0 where attribute_code = 'available_sort_by';
+    res = u''
+result=[('available_sort_by', res)]"
+mag_1400_erp_procat_13,magento1400,product.model_product_category,default_sort_by,,in_out,function,unicode,,"if ifield:
+    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, ifield,'sort_by', context=context)
+else:
+    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, '','sort_by', context=context)
+result=[('default_sort_by',att_id)]","options_obj = self.pool.get('magerp.product_category_attribute_options')
+cat_attr_option_id = record['default_sort_by']
+if cat_attr_option_id:
+    cat_attr_option_id = cat_attr_option_id[0]
+else:
+    cat_attr_option_id = options_obj._get_default_option(cr, uid, 'sort_by', '', context=context)
+
+cat_attr_option = options_obj.browse(cr, uid, cat_attr_option_id, context=context)
+result=[('default_sort_by', cat_attr_option.value)]"
+mag_1400_erp_procat_14,magento1400,product.model_product_category,updated_at,,in,function,unicode,,"result=[('magerp_stamp',ifield)]",
+mag_1400_erp_procat_15,magento1400,product.model_product_category,image,,in_out,function,unicode,,"image_binary = False
+if ifield and not ifield=='None':
+    try:
+        image_binary = conn.call('ol_catalog_category_media.info', [int(data['category_id'])])
+    except Exception, e:
+        print e
+        pass
+    if image_binary:
+        image_binary = base64.encodestring(base64.urlsafe_b64decode(image_binary[0]['image_data']))
+result=[('image_name',ifield),('image',image_binary)]","if record['image']:
+    img = base64.decodestring(record['image'])
+    img_bin_enc = base64.encodestring(img)
+    conn.call('ol_catalog_category_media.create', [record['image_name'], img_bin_enc])
+    result = [('image',record['image_name'])]
+else:
+    result=[]"
+mag_1400_erp_procat_16,magento1400,product.model_product_category,include_in_menu,,in_out,function,unicode,,"result=[('include_in_menu', ifield and (eval(ifield)) or False)]","result=[('include_in_menu',record['include_in_menu'])]"
+mag_1400_erp_procat_17,magento1400,product.model_product_category,page_layout,,in_out,function,unicode,,"if ifield:
+    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, ifield,'page_layout', context=context)
+else:
+    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, '','page_layout', context=context)
+result=[('page_layout',att_id)]","page_layout = record['page_layout'] and record['page_layout'][1] or ''
+result=[('page_layout', page_layout)]"
+mag_1400_erp_attrgrp_2,magento1400,model_magerp_product_attribute_groups,attribute_set_id,,in_out,function,int,,"result=[('attribute_set_id', ifield)]","result=[('attribute_set_id', record['attribute_set_id'])]"
+mag_1400_erp_attrgrp_3,magento1400,model_magerp_product_attribute_groups,attribute_group_name,,in_out,function,unicode,,"result=[('attribute_group_name', ifield)]","result=[('attribute_group_name', record['attribute_group_name'])]"
+mag_1400_erp_attrgrp_4,magento1400,model_magerp_product_attribute_groups,sort_order,,in_out,function,int,,"result=[('sort_order', ifield)]","result=[('sort_order', record['sort_order'])]"
+mag_1400_erp_attrgrp_5,magento1400,model_magerp_product_attribute_groups,default_id,,in_out,function,int,,"result=[('default_id', ifield)]","result=[('default_id', record['default_id'])]"
+mag_1400_erp_attrset_1,magento1400,model_magerp_product_attribute_set,attribute_set_id,,in_out,function,int,,"result=[('magento_id', ifield)]","result=[('attribute_set_id', record['magento_id'])]"
+mag_1400_erp_attrset_2,magento1400,model_magerp_product_attribute_set,sort_order,,in_out,function,int,,"result=[('sort_order', ifield)]","result=[('sort_order', record['sort_order'])]"
+mag_1400_erp_attrset_3,magento1400,model_magerp_product_attribute_set,attribute_set_name,,in_out,function,unicode,,"result=[('attribute_set_name', ifield)]","result=[('attribute_set_name', record['attribute_set_name'])]"
+mag_1400_erp_attr_1,magento1400,model_magerp_product_attributes,attribute_code,,in_out,function,unicode,,"result=[('attribute_code', ifield)]","result=[('code', record['attribute_code'])]"
+mag_1400_erp_attr_2,magento1400,model_magerp_product_attributes,attribute_id,,in_out,function,int,,"result=[('magento_id', ifield)]",
+mag_1400_erp_attr_3,magento1400,model_magerp_product_attributes,frontend_input,,in_out,function,unicode,,"result=[('frontend_input', ifield)]","result=[('frontend_input', record['frontend_input'])]"
+mag_1400_erp_attr_4,magento1400,model_magerp_product_attributes,frontend_class,,in_out,function,unicode,,"result=[('frontend_class', ifield)]","result=[('frontend_class', record['frontend_class'])]"
+mag_1400_erp_attr_5,magento1400,model_magerp_product_attributes,backend_model,,in_out,function,unicode,,"result=[('backend_model', ifield)]","result=[('backend_model', record['backend_model'])]"
+mag_1400_erp_attr_6,magento1400,model_magerp_product_attributes,backend_type,,in_out,function,unicode,,"result=[('backend_type', ifield)]","result=[('backend_type', record['backend_type'])]"
+mag_1400_erp_attr_7,magento1400,model_magerp_product_attributes,frontend_label,,in_out,function,unicode,,"result=[('frontend_label', ifield)]","result=[('frontend_label', record['frontend_label'])]"
+mag_1400_erp_attr_8,magento1400,model_magerp_product_attributes,is_visible_in_advanced_search,,in_out,function,unicode,,"result=[('is_visible_in_advanced_search', bool(eval(ifield)))]","result=[('is_visible_in_advanced_search', record['is_visible_in_advanced_search'])]"
+mag_1400_erp_attr_9,magento1400,model_magerp_product_attributes,is_global,,in_out,function,unicode,,"result=[('is_global', bool(eval(ifield)))]","result=[('is_global', record['is_global'])]"
+mag_1400_erp_attr_10,magento1400,model_magerp_product_attributes,is_filterable,,in_out,function,unicode,,"result=[('is_filterable', bool(eval(ifield)))]","result=[('is_filterable', record['is_filterable'])]"
+mag_1400_erp_attr_11,magento1400,model_magerp_product_attributes,is_comparable,,in_out,function,unicode,,"result=[('is_comparable', bool(eval(ifield)))]","result=[('is_comparable', record['is_comparable'])]"
+mag_1400_erp_attr_12,magento1400,model_magerp_product_attributes,is_visible,,in_out,function,unicode,,"result=[('is_visible', bool(eval(ifield)))]","result=[('is_visible', record['is_visible'])]"
+mag_1400_erp_attr_13,magento1400,model_magerp_product_attributes,is_searchable,,in_out,function,unicode,,"result=[('is_searchable', bool(eval(ifield)))]","result=[('is_searchable', record['is_searchable'])]"
+mag_1400_erp_attr_14,magento1400,model_magerp_product_attributes,is_user_defined,,in_out,function,unicode,,"result=[('is_user_defined', bool(eval(ifield)))]","result=[('is_user_defined', record['is_user_defined'])]"
+mag_1400_erp_attr_15,magento1400,model_magerp_product_attributes,is_configurable,,in_out,function,unicode,,"result=[('is_configurable', bool(eval(ifield)))]","result=[('is_configurable', record['is_configurable'])]"
+mag_1400_erp_attr_16,magento1400,model_magerp_product_attributes,is_visible_on_front,,in_out,function,unicode,,"result=[('is_visible_on_front', bool(eval(ifield)))]","result=[('is_visible_on_front', record['is_visible_on_front'])]"
+mag_1400_erp_attr_17,magento1400,model_magerp_product_attributes,is_used_for_price_rules,,in_out,function,unicode,,"result=[('is_used_for_price_rules', bool(eval(ifield)))]","result=[('is_used_for_price_rules', record['is_used_for_price_rules'])]"
+mag_1400_erp_attr_18,magento1400,model_magerp_product_attributes,is_unique,,in_out,function,unicode,,"result=[('is_unique', bool(eval(ifield)))]","result=[('is_unique', record['is_unique'])]"
+mag_1400_erp_attr_19,magento1400,model_magerp_product_attributes,is_required,,in_out,function,unicode,,"result=[('is_required', bool(eval(ifield)))]","result=[('is_required', record['is_required'])]"
+mag_1400_erp_attr_20,magento1400,model_magerp_product_attributes,position,,in_out,function,int,,"result=[('position', ifield)]","result=[('position', record['position'])]"
+mag_1400_erp_attr_21,magento1400,model_magerp_product_attributes,attribute_set_info,,in_out,function,unicode,,"result=[('attribute_set_info', ifield)]","result=[('attribute_set_info', record['attribute_set_info'])]"
+mag_1400_erp_attr_22,magento1400,model_magerp_product_attributes,default_value,,in_out,function,unicode,,"result=[('default_value', ifield)]","result=[('default_value', record['default_value'])]"
+mag_1400_erp_attr_23,magento1400,model_magerp_product_attributes,note,,in_out,function,unicode,,"result=[('note', ifield)]","result=[('note', record['note'])]"
+mag_1400_erp_attr_24,magento1400,model_magerp_product_attributes,entity_type_id,,in_out,function,int,,"result=[('entity_type_id', ifield)]","result=[('entity_type_id', record['entity_type_id'])]"
+mag_1400_erp_attr_25,magento1400,model_magerp_product_attributes,apply_to,,in_out,function,unicode,,"result=[('apply_to', str(ifield))]","result=[('apply_to', eval(record['%s']))]"
+mag_1400_erp_prd_1,magento1400,product.model_product_product,url_key,,in_out,function,unicode,,"result=[('x_magerp_url_key',ifield)]","if context.get('export_url', False) :
+    result=[('url_key',record['x_magerp_url_key'])]"
+mag_1400_erp_prd_2,magento1400,product.model_product_product,name,,in_out,function,unicode,,"result = [('name',ifield)]","result = [('name',record['name'])]"
+mag_1400_erp_prd_3,magento1400,product.model_product_product,description,,in_out,function,unicode,,"result = [('description',ifield)]",
+mag_1400_erp_prd_4,magento1400,product.model_product_product,short_description,,in_out,function,unicode,,"result = [('description_sale',ifield)]",
+mag_1400_erp_prd_5,magento1400,product.model_product_product,sku,,in_out,function,unicode,,"result = [('magento_sku',ifield), ('default_code',ifield)]",
+mag_1400_erp_prd_6,magento1400,product.model_product_product,weight,,in_out,function,float,,"result = [('weight',ifield)]","result = [('weight',record['weight'] or 0)]"
+mag_1400_erp_prd_7,magento1400,product.model_product_product,category_ids,,in_out,function,list,,"categ_ids =[]
+if ifield and len(ifield) > 0:
+    for category_ids in ifield:
+        categ_ids.append(self.pool.get('product.category').extid_to_oeid(cr, uid, category_ids, external_referential_id, context=context))
+    categ_id = categ_ids.pop()
+else:
+    categ_id = self.pool.get('external.referential').browse(cr, uid, external_referential_id).default_pro_cat.id
+result = [('categ_id', categ_id), ('categ_ids',[(6, 0, categ_ids)])]","
+cat_obj = self.pool.get('product.category')
+product = self.browse(cr, uid, record['id'])
+categ_ids = [categ.id for categ in ([product.categ_id] + product.categ_ids) if categ.magento_exportable]
+mag_categ_ids = []
+for categ_id in categ_ids:
+    mag_categ_id = cat_obj.oeid_to_extid(cr, uid, categ_id, external_referential_id)
+    if not mag_categ_id:
+        cat_obj.ext_export(cr, uid, [categ_id], [external_referential_id], context=context)
+        mag_categ_id = cat_obj.oeid_to_extid(cr, uid, categ_id, external_referential_id)
+    mag_categ_ids.append(mag_categ_id)
+result=[('category_ids', mag_categ_ids)]"
+mag_1400_erp_prd_8,magento1400,product.model_product_product,price,,in_out,function,float,,"result=[('list_price',ifield)]",result=[]#map later
+mag_1400_erp_prd_9,magento1400,product.model_product_product,cost,,in_out,function,float,,"result=[('standard_price',ifield)]","result = [('cost',record['standard_price'] or 0)]"
+mag_1400_erp_prd_10,magento1400,product.model_product_product,set,,in_out,function,unicode,,"result=[('set',self.pool.get('magerp.product_attribute_set').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1400_erp_prd_11,magento1400,product.model_product_product,special_price,,in_out,function,float,,"result = [('x_magerp_special_price',ifield)]",
+mag_1400_erp_prd_12,magento1400,product.model_product_product,tier_price,,in_out,function,unicode,,result=[]#no mapping by default,result=[]#no mapping by default
+mag_1400_erp_prd_13,magento1400,product.model_product_product,minimal_price,,in_out,function,float,,"result = [('x_magerp_minimal_price',ifield)]","
+if record['x_magerp_minimal_price'] and record['x_magerp_minimal_price'] != 0:
+    result = [('minimal_price',record['x_magerp_minimal_price'])]
+else:
+    result = [('minimal_price',False)]"
+mag_1400_erp_prd_14,magento1400,product.model_product_product,type_id,,in_out,function,unicode,,"if ifield:
+    product_type_ids  = self.pool.get('magerp.product_product_type').search(cr,uid,[('product_type','=',ifield)])
+    if product_type_ids:
+        result = [('product_type',ifield)]","if 'product_type' in record and record['product_type']:
+    result = [('type_id',record['product_type'])]
+else:
+    result = [('type_id','simple')]"
+mag_1400_erp_prd_15,magento1400,product.model_product_product,websites,,in_out,function,list,,"websites_ids = []
+for ext_id in ifield:
+    websites_ids.append(self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ext_id, external_referential_id, context=context))
+
+##### OPTION START, with this if the field websites of the product is empty the product is exported on every website
+all_oe_websites_ids = self.pool.get('external.shop.group').search(cr,uid,[('referential_id', '=', external_referential_id)])
+if set(websites_ids) == set(all_oe_websites_ids):
+    websites_ids =[]
+##### OPTION END
+
+result=[('websites_ids', [(6,0, websites_ids)])]","##### OPTION START, with this if the field websites of the product is empty the product is exported on every website
+if not record['websites_ids']:
+    record['websites_ids'] = self.pool.get('external.shop.group').search(cr,uid,[('referential_id', '=', external_referential_id)])
+##### OPTION END
+
+ext_websites_ids = []
+for oe_id in record['websites_ids']:
+    ext_websites_ids.append(self.pool.get('external.shop.group').oeid_to_extid(cr, uid, oe_id, external_referential_id))
+
+result=[('websites', ext_websites_ids)]"
+mag_1400_erp_prd_16,magento1400,product.model_product_product,has_options,,in,function,unicode,,"result =[('x_magerp_has_options',ifield)]",
+magento_1400_cst_grp_1,magento1400,base.model_res_partner_category,customer_group_code,,in,function,unicode,,"result=[('name',ifield)]",
+magento_1400_cst_grp_3,magento1400,base.model_res_partner_category,tax_class_id,,in,function,int,,"result=[('tax_class_id',ifield)]",
+magento_1400_prt_adr_2,magento1400,base.model_res_partner_address,city,,in_out,function,unicode,,"result=[('city',ifield)]",
+magento_1400_prt_adr_3,magento1400,base.model_res_partner_address,fax,,in_out,function,unicode,,"result=[('fax',ifield)]",
+magento_1400_prt_adr_4,magento1400,base.model_res_partner_address,firstname,,in_out,function,unicode,,"name = ' '.join([ f for f in (data['firstname'], data['lastname']) if f])
+if data.get('company'):
+    name = ""%s ; %s"" % (data['company'], name)
+result = [('name', name), ('firstname', ifield), ('lastname', data['lastname'])]",
+magento_1400_prt_adr_6,magento1400,base.model_res_partner_address,is_active,,in_out,function,unicode,,"result=[('active',bool(eval(ifield)))]",
+magento_1400_prt_adr_7,magento1400,base.model_res_partner_address,country_id,,in_out,function,unicode,,"result = self.pool.get('res.country').search(cr,uid,[('code','=',ifield)])
+if result and len(result)==1:
+    result=[('country_id',result[0])]
+else:
+    result=[]
+",
+magento_1400_prt_adr_8,magento1400,base.model_res_partner_address,street,,in_out,function,unicode,,"if ifield:
+    if len(ifield.split('\n')) ==2 :
+        result = [('street', ifield.split('\n')[0]) , ('street2', ifield.split('\n')[1])]
+    else :
+        result = [('street',ifield.replace('\\n',','))]
+else:
+    result = []",
+magento_1400_prt_adr_9,magento1400,base.model_res_partner_address,postcode,,in_out,function,unicode,,"result=[('zip',ifield)]",
+magento_1400_prt_adr_10,magento1400,base.model_res_partner_address,telephone,,in_out,function,unicode,,"result=[('phone',ifield)]",
+magento_1400_prt_adr_11,magento1400,base.model_res_partner_address,region,,in_out,function,unicode,,"if ifield:
+    result = self.pool.get('res.country.state').search(cr,uid,[('name','=ilike',ifield)])
+    if result and len(result)==1:
+        result = [('state_id',result[0])]
+    else:
+        result=[]
+else:
+    result=[]",
+magento_1400_prt_adr_13,magento1400,base.model_res_partner_address,customer_id,,in_out,function,int,,"result=self.pool.get('res.partner').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+if result:
+    result=[('partner_id',result)]
+else:
+    result=[('partner_id',False)]",
+magento_1400_prt_adr_14,magento1400,base.model_res_partner_address,address_type,,in_out,function,unicode,,"if ifield=='billing':
+    result=[('type','invoice')]
+elif ifield=='shipping':
+    result=[('type','delivery')]
+else:
+    result=[]",
+magento_1400_prt_adr_15,magento1400,base.model_res_partner_address,email,,in_out,function,unicode,,"result = [('email', False)]
+if ifield:
+    result = [('email', ifield)]
+else:
+    partner_obj = self.pool.get('res.partner')
+    partner_id = partner_obj.extid_to_existing_oeid(cr, uid, data['customer_id'] ,external_referential_id)
+    if partner_id:
+        result = [('email', partner_obj.browse(cr, uid, partner_id).emailid)]",
+magento_1400_prt_adr_17,magento1400,base.model_res_partner_address,default_billing,,in_out,function,unicode,,"result = [('type', 'other')]
+if data.get('default_billing') and data.get('default_shipping'):
+    result = [('type', 'default')]
+elif data.get('default_billing'):
+    result = [('type', 'invoice')]
+elif data.get('default_shipping'):
+    result = [('type', 'delivery')]",
+magento_1400_prt_2,magento1400,base.model_res_partner,group_id,,in_out,function,int,,"if ifield:
+    result=self.pool.get('res.partner.category').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+    if result:
+        result=[('group_id',result)]",
+magento_1400_prt_3,magento1400,base.model_res_partner,store_id,,in_out,function,int,,"if ifield:
+    result=self.pool.get('magerp.storeviews').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+    if result:
+        store = self.pool.get('magerp.storeviews').browse(cr, uid, result)
+        lang = store.lang_id
+        result=[('store_id',result),('lang',lang and lang.code or False)]
+        if not data.get('website_id'):
+            result.append(('website_id', store.website_id.id))",
+magento_1400_prt_4,magento1400,base.model_res_partner,website_id,,in_out,function,int,,"if ifield:
+    result=self.pool.get('external.shop.group').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+    if result:
+        result=[('website_id',result)]",
+magento_1400_prt_5,magento1400,base.model_res_partner,created_in,,in_out,function,unicode,,"result=[('created_in',ifield)]",
+magento_1400_prt_6,magento1400,base.model_res_partner,created_at,,in_out,function,unicode,,"result=[('created_at',ifield)]",
+magento_1400_prt_7,magento1400,base.model_res_partner,updated_at,,in_out,function,unicode,,"result=[('updated_at',ifield)]",
+magento_1400_prt_8,magento1400,base.model_res_partner,firstname,,in_out,function,unicode,,"result = [('name', ifield + ' ' + data['lastname'])]","add_id = self.browse(cr, uid, record['id'])
+fn = add_id.address[0].firstname
+ln = add_id.address[0].lastname
+result=[('firstname', fn), ('lastname', ln)]"
+magento_1400_prt_10,magento1400,base.model_res_partner,email,,in_out,function,unicode,,"result=[('emailid',ifield)]",
+magento_1400_prt_11,magento1400,base.model_res_partner,taxvat,,in_out,function,unicode,,"if ifield:
+    result=[('mag_vat',ifield)]
+else:
+    result=[]",
+magento_1400_prt_12,magento1400,base.model_res_partner,dob,,in_out,function,unicode,,"if ifield:
+    result =[('mag_birthday',ifield[:10])]
+else:
+    result=[]",
 
=== added file 'magentoerpconnect/settings/1.4.0.0/external.referential.type.csv'
--- magentoerpconnect/settings/1.4.0.0/external.referential.type.csv	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/settings/1.4.0.0/external.referential.type.csv	2012-07-06 14:53:18 +0000
@@ -0,0 +1,2 @@
+"id","name"
+"magento1400","Magento Version 1.4.0.0+"
 
=== added directory 'magentoerpconnect/settings/1.4.2.0'
=== added file 'magentoerpconnect/settings/1.4.2.0/external.mapping.template.csv'
--- magentoerpconnect/settings/1.4.2.0/external.mapping.template.csv	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/settings/1.4.2.0/external.mapping.template.csv	2012-07-06 14:53:18 +0000
@@ -0,0 +1,14 @@
+"id","type_id:id","model_id:id","external_list_method","external_get_method","external_update_method","external_create_method","external_delete_method","external_key_name"
+"magento_1420_website","magento1420","base_sale_multichannels.model_external_shop_group","ol_websites.list",,,,,"website_id"
+"magento_1420_storeview","magento1420","model_magerp_storeviews","ol_storeviews.list",,,,,"store_id"
+"magento_1420_store","magento1420","sale.model_sale_shop","ol_groups.list",,,,,"group_id"
+"magento_1420_order","magento1420","sale.model_sale_order","sales_order.list","sales_order.info",,,,"increment_id"
+"magento_1420_order_line","magento1420","sale.model_sale_order_line",,,,,,"item_id"
+"magento_1420_pro_cat","magento1420","product.model_product_category","category.list","category.info","catalog_category.update","catalog_category.create",,"category_id"
+"magento_1420_attr_grp","magento1420","model_magerp_product_attribute_groups","ol_catalog_product_attribute_group.list","ol_catalog_product_attribute_group.list",,,,"attribute_group_id"
+"magento_1420_attr_set","magento1420","model_magerp_product_attribute_set","ol_catalog_product_attributeset.list",,,,,"attribute_set_id"
+"magento_1420_attr","magento1420","model_magerp_product_attributes","ol_catalog_product_attribute.list",,,,,"attribute_id"
+"magento_1420_prd","magento1420","product.model_product_product","catalog_product.list","catalog_product.info","ol_catalog_product.update","ol_catalog_product.create",,"product_id"
+"magento_1420_cst_grp","magento1420","base.model_res_partner_category","ol_customer_groups.list",,,,,"customer_group_id"
+"magento_1420_prt_adr","magento1420","base.model_res_partner_address","ol_customer_address.list","ol_customer_address.info",,,,"entity_id"
+"magento_1420_prt","magento1420","base.model_res_partner","customer.list","customer.info","customer.update",,,"customer_id"
 
=== added file 'magentoerpconnect/settings/1.4.2.0/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.4.2.0/external.mappinglines.template.csv	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/settings/1.4.2.0/external.mappinglines.template.csv	2012-07-06 14:53:18 +0000
@@ -0,0 +1,318 @@
+id,type_id:id,model_id:id,external_field,field_id:id,type,evaluation_type,external_type,child_mapping_id:id,in_function,out_function
+mag_1420_erp_s_name,magento1420,base_sale_multichannels.model_external_shop_group,name,,in_out,function,unicode,,"result=[('name',ifield)]","result=[('name',record['name'])]"
+mag_1420_erp_s_code,magento1420,base_sale_multichannels.model_external_shop_group,code,,in_out,function,unicode,,"result=[('code',ifield)]",
+mag_1420_erp_s_web,magento1420,base_sale_multichannels.model_external_shop_group,website_id,,in_out,function,int,,"result=[('website_id',ifield)]",
+mag_1420_erp_s_isa,magento1420,base_sale_multichannels.model_external_shop_group,is_default,,in_out,function,unicode,,"result=[('is_default',bool(eval(ifield)))]",
+mag_1420_erp_s_stord,magento1420,base_sale_multichannels.model_external_shop_group,sort_order,,in_out,function,int,,"result=[('sort_order',ifield)]",
+mag_1420_erp_s_gpid,magento1420,base_sale_multichannels.model_external_shop_group,default_group_id,,in_out,function,int,,"result=[('default_shop_integer_id',ifield)]",
+mag_1420_erp_sv_name,magento1420,model_magerp_storeviews,name,,in_out,function,unicode,,"result=[('name',ifield)]","result=[('name',record['name'])]"
+mag_1420_erp_sv_code,magento1420,model_magerp_storeviews,code,,in_out,function,unicode,,"result=[('code',ifield)]",
+mag_1420_erp_sv_sg,magento1420,model_magerp_storeviews,website_id,,in_out,function,int,,"result=[('website_id',self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1420_erp_sv_isa,magento1420,model_magerp_storeviews,is_active,,in_out,function,unicode,,"result=[('is_active',bool(eval(ifield)))]",
+mag_1420_erp_sv_stord,magento1420,model_magerp_storeviews,sort_order,,in_out,function,int,,"result=[('sort_order',ifield)]",
+mag_1420_erp_sv_gpid,magento1420,model_magerp_storeviews,group_id,,in_out,function,int,,"result=[('shop_id',self.pool.get('sale.shop').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1420_erp_st_name,magento1420,sale.model_sale_shop,name,,in_out,function,unicode,,"result=[('name',ifield)]","result=[('name',record['name'])]"
+mag_1420_erp_st_gpid,magento1420,sale.model_sale_shop,group_id,,in_out,function,int,,"result=[('group_id',ifield)]",
+mag_1420_erp_st_grp,magento1420,sale.model_sale_shop,website_id,,in_out,function,int,,"result=[('shop_group_id',self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1420_erp_st_default_st,magento1420,sale.model_sale_shop,default_store_id,,in_out,function,int,,"result=[('default_storeview_integer_id',ifield)]",
+mag_1420_erp_st_root_categ,magento1420,sale.model_sale_shop,root_category_id,,in_out,function,int,,"result=[('root_category_id',ifield)]",
+mag_1420_erp_so_total_amount,magento1420,sale.model_sale_order,grand_total,,in_out,function,float,,"result=[('ext_total_amount',str(ifield))]",
+mag_1420_erp_so_name,magento1420,sale.model_sale_order,increment_id,,in_out,function,unicode,,"result=[('magento_incrementid',str(ifield)), ('name','mag_' + str(ifield))]",
+mag_1420_erp_so_carrier_id,magento1420,sale.model_sale_order,shipping_method,,in_out,function,unicode,,"if ifield:
+    carrier_ids = self.pool.get('delivery.carrier').search(cr, uid, [('magento_code', '=', ifield)])
+    if carrier_ids:
+        result=[('carrier_id', carrier_ids[0])]
+    else:
+        fake_partner_id = self.pool.get('res.partner').search(cr, uid, [])[0]
+        model_data_obj = self.pool.get('ir.model.data')
+        model, product_id = model_data_obj.get_object_reference(cr, uid, 'base_sale_multichannels', 'product_product_shipping')
+        carrier_id = self.pool.get('delivery.carrier').create(cr, uid, {'partner_id' : fake_partner_id, 'product_id' : product_id, 'name' : ifield, 'magento_code' : ifield})
+        result=[('carrier_id', carrier_id)]",
+mag_1420_erp_so_pay,magento1420,sale.model_sale_order,payment,,in_out,function,unicode,,"
+payments_mapping = {'checkmo': 'manual', 'ccsave': 'prepaid', 'free':'prepaid','googlecheckout':'prepaid','paypayl_express':'prepaid', 'paybox_system': 'prepaid', 'paypal_standard': 'prepaid', 'cashondelivery': 'manual', 'servired_standard': 'prepaid', 'bbva': 'prepaid', 'cofidis': 'prepaid'}
+ifield=eval(ifield)
+result=[('order_policy', ifield['method'] in payments_mapping and payments_mapping[ifield['method']] or 'prepaid'), ('ext_payment_method', ifield['method'])]",
+mag_1420_erp_so_item,magento1420,sale.model_sale_order,items,sale.field_sale_order_order_line,in,sub-mapping,dict,magento_1420_order_line,,
+"mag_1420_erp_soline_name","magento1420","sale.model_sale_order_line","name",,"in_out","function","unicode",,"result=[('name', ifield)]
+",
+"mag_1420_erp_soline_note","magento1420","sale.model_sale_order_line","product_options",,"in","function","unicode",,"if ifield:
+    import re
+    options_label = []
+    clean = re.sub('\w:\w:|\w:\w+;', '', ifield)
+    for each in clean.split('{'):
+        if each.startswith('""label""'):
+            split_info = each.split(';')
+            options_label.append('%s: %s [%s]' % (split_info[1], split_info[3], data['sku']))
+
+    result=[('notes',  """".join(options_label).replace('""""', '\n').replace('""', ''))]
+",
+mag_1420_erp_soline_pid,magento1420,sale.model_sale_order_line,product_id,,in_out,function,unicode,,"context['alternative_key'] = data['sku']
+result=[('product_id',self.pool.get('product.product').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1420_erp_soline_uomqty,magento1420,sale.model_sale_order_line,qty_ordered,,in_out,function,unicode,,"result=[('product_uom_qty',ifield)]",
+mag_1420_erp_soline_uosqty,magento1420,sale.model_sale_order_line,qty_ordered,,in,function,unicode,,"result=[('product_uos_qty',ifield)]",
+mag_1420_erp_soline_price,magento1420,sale.model_sale_order_line,price,,in,function,unicode,,"if context.get('price_is_tax_included', False):
+    result=[('price_unit', (float(data['row_total']) + float(data['tax_amount']))/float(data['qty_ordered']))]
+else:
+    result=[('price_unit', float(data['row_total'])/float(data['qty_ordered']))]",
+mag_1420_erp_soline_disc,magento1420,sale.model_sale_order_line,discount_amount,,in,function,float,,"if ifield:
+    result=[('discount', float(data['price']) != 0 and float(data['qty_ordered']) != 0 and float(100*ifield)/(float(data['price'])*float(data['qty_ordered'])) or 0)]",
+mag_1420_erp_procat_2,magento1420,product.model_product_category,level,,in,function,int,,"result=[('sequence',ifield),('level',ifield)]",
+mag_1420_erp_procat_3,magento1420,product.model_product_category,parent_id,,in_out,function,int,,"record_id = self.pool.get('ir.model.data').search(cr, uid, [('model', '=', self._name), ('name', '=', self.prefixed_id(ifield))])
+parent_id = False
+if record_id:
+    parent_rec = self.pool.get('ir.model.data').read(cr,uid,record_id[0],[])
+    parent_id=parent_rec.get('res_id',False)
+result=[('magento_parent_id',ifield),('parent_id',parent_id)]","magento_parent_id = False
+if record.get('parent_id',False):
+    magento_parent_id = self.oeid_to_extid(cr, uid, record.get('parent_id')[0], external_referential_id)
+    if not magento_parent_id:
+        self.ext_export(cr,uid,[record.get('parent_id',[False])[0]],[external_referential_id],{},context=context)
+        magento_parent_id = self.oeid_to_extid(cr, uid, record.get('parent_id')[0], external_referential_id)
+if magento_parent_id:
+    result = [('parent_id',magento_parent_id)]"
+mag_1420_erp_procat_4,magento1420,product.model_product_category,is_active,,in_out,function,unicode,,"result=[('is_active',ifield and (eval(ifield)) or False)]","result=[('is_active',record['is_active'])]"
+mag_1420_erp_procat_5,magento1420,product.model_product_category,description,,in_out,function,unicode,,"result=[('description',ifield)]","result=[('description',record['description'])]"
+mag_1420_erp_procat_6,magento1420,product.model_product_category,meta_title,,in_out,function,unicode,,"result=[('meta_title',ifield)]","result=[('meta_title',record['meta_title'])]"
+mag_1420_erp_procat_7,magento1420,product.model_product_category,meta_keywords,,in_out,function,unicode,,"result=[('meta_keywords',ifield)]","result=[('meta_keywords',record['meta_keywords'])]"
+mag_1420_erp_procat_8,magento1420,product.model_product_category,meta_description,,in_out,function,unicode,,"result=[('meta_description',ifield)]","result=[('meta_description',record['meta_description'])]"
+mag_1420_erp_procat_9,magento1420,product.model_product_category,url_key,,in_out,function,unicode,,"result=[('url_key',ifield)]","if context.get('export_url', False) :
+    result=[('url_key',record['url_key'])]"
+mag_1420_erp_procat_10,magento1420,product.model_product_category,name,,in_out,function,unicode,,"result=[('name',ifield or 'UNDEFINED'),('magento_exportable',True)]","result=[('name',record['name'])]"
+mag_1420_erp_procat_11,magento1420,product.model_product_category,is_anchor,,in_out,function,unicode,,"result=[('is_anchor',ifield and bool(eval(ifield)) or False)]","result=[('is_anchor',record['is_anchor'])]"
+mag_1420_erp_procat_12,magento1420,product.model_product_category,available_sort_by,,in_out,function,list,,"attr_ids = []
+cat_attr_obj = self.pool.get('magerp.product_category_attribute_options')
+if ifield:
+    for val in ifield:
+        attr_ids.append(cat_attr_obj.get_create_option_id(cr, uid, val,'sort_by', context=context))
+    result=[('available_sort_by', [(6, 0, attr_ids)]), ('use_default_available_sort_by', False)]
+else:
+    result=[('use_default_available_sort_by', True)]","if record['use_default_available_sort_by']:
+    res = u''
+else:
+    res = []
+    for cat_attr_option in self.pool.get('magerp.product_category_attribute_options').browse(cr, uid, record['available_sort_by'], context=context):
+        res.append(cat_attr_option.value)
+result=[('available_sort_by', res)]"
+mag_1420_erp_procat_13,magento1420,product.model_product_category,default_sort_by,,in_out,function,unicode,,"if ifield:
+    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, ifield,'sort_by', context=context)
+else:
+    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, '','sort_by', context=context)
+result=[('default_sort_by',att_id)]","options_obj = self.pool.get('magerp.product_category_attribute_options')
+cat_attr_option_id = record['default_sort_by']
+if cat_attr_option_id:
+    cat_attr_option_id = cat_attr_option_id[0]
+else:
+    cat_attr_option_id = options_obj._get_default_option(cr, uid, 'sort_by', '', context=context)
+
+cat_attr_option = options_obj.browse(cr, uid, cat_attr_option_id, context=context)
+result=[('default_sort_by', cat_attr_option.value)]"
+mag_1420_erp_procat_14,magento1420,product.model_product_category,updated_at,,in,function,unicode,,"result=[('magerp_stamp',ifield)]",
+mag_1420_erp_procat_15,magento1420,product.model_product_category,image,,in_out,function,unicode,,"image_binary = False
+if ifield and not ifield=='None':
+    try:
+        image_binary = conn.call('ol_catalog_category_media.info', [int(data['category_id'])])
+    except Exception, e:
+        print e
+        pass
+    if image_binary:
+        image_binary = base64.encodestring(base64.urlsafe_b64decode(image_binary[0]['image_data']))
+result=[('image_name',ifield),('image',image_binary)]","if record['image']:
+    img = base64.decodestring(record['image'])
+    img_bin_enc = base64.encodestring(img)
+    conn.call('ol_catalog_category_media.create', [record['image_name'], img_bin_enc])
+    result = [('image',record['image_name'])]
+else:
+    result=[]"
+mag_1420_erp_procat_16,magento1420,product.model_product_category,include_in_menu,,in_out,function,unicode,,"result=[('include_in_menu', ifield and (eval(ifield)) or False)]","result=[('include_in_menu',record['include_in_menu'])]"
+mag_1420_erp_procat_17,magento1420,product.model_product_category,page_layout,,in_out,function,unicode,,"if ifield:
+    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, ifield,'page_layout', context=context)
+else:
+    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, '','page_layout', context=context)
+result=[('page_layout',att_id)]","page_layout = record['page_layout'] and record['page_layout'][1] or ''
+result=[('page_layout', page_layout)]"
+mag_1420_erp_attrgrp_2,magento1420,model_magerp_product_attribute_groups,attribute_set_id,,in_out,function,int,,"result=[('attribute_set_id', ifield)]","result=[('attribute_set_id', record['attribute_set_id'])]"
+mag_1420_erp_attrgrp_3,magento1420,model_magerp_product_attribute_groups,attribute_group_name,,in_out,function,unicode,,"result=[('attribute_group_name', ifield)]","result=[('attribute_group_name', record['attribute_group_name'])]"
+mag_1420_erp_attrgrp_4,magento1420,model_magerp_product_attribute_groups,sort_order,,in_out,function,int,,"result=[('sort_order', ifield)]","result=[('sort_order', record['sort_order'])]"
+mag_1420_erp_attrgrp_5,magento1420,model_magerp_product_attribute_groups,default_id,,in_out,function,int,,"result=[('default_id', ifield)]","result=[('default_id', record['default_id'])]"
+mag_1420_erp_attrset_1,magento1420,model_magerp_product_attribute_set,attribute_set_id,,in_out,function,int,,"result=[('magento_id', ifield)]","result=[('attribute_set_id', record['magento_id'])]"
+mag_1420_erp_attrset_2,magento1420,model_magerp_product_attribute_set,sort_order,,in_out,function,int,,"result=[('sort_order', ifield)]","result=[('sort_order', record['sort_order'])]"
+mag_1420_erp_attrset_3,magento1420,model_magerp_product_attribute_set,attribute_set_name,,in_out,function,unicode,,"result=[('attribute_set_name', ifield)]","result=[('attribute_set_name', record['attribute_set_name'])]"
+mag_1420_erp_attr_1,magento1420,model_magerp_product_attributes,attribute_code,,in_out,function,unicode,,"result=[('attribute_code', ifield)]","result=[('code', record['attribute_code'])]"
+mag_1420_erp_attr_2,magento1420,model_magerp_product_attributes,attribute_id,,in_out,function,int,,"result=[('magento_id', ifield)]",
+mag_1420_erp_attr_3,magento1420,model_magerp_product_attributes,frontend_input,,in_out,function,unicode,,"result=[('frontend_input', ifield)]","result=[('frontend_input', record['frontend_input'])]"
+mag_1420_erp_attr_4,magento1420,model_magerp_product_attributes,frontend_class,,in_out,function,unicode,,"result=[('frontend_class', ifield)]","result=[('frontend_class', record['frontend_class'])]"
+mag_1420_erp_attr_5,magento1420,model_magerp_product_attributes,backend_model,,in_out,function,unicode,,"result=[('backend_model', ifield)]","result=[('backend_model', record['backend_model'])]"
+mag_1420_erp_attr_6,magento1420,model_magerp_product_attributes,backend_type,,in_out,function,unicode,,"result=[('backend_type', ifield)]","result=[('backend_type', record['backend_type'])]"
+mag_1420_erp_attr_7,magento1420,model_magerp_product_attributes,frontend_label,,in_out,function,unicode,,"result=[('frontend_label', ifield)]","result=[('frontend_label', record['frontend_label'])]"
+mag_1420_erp_attr_8,magento1420,model_magerp_product_attributes,is_visible_in_advanced_search,,in_out,function,unicode,,"result=[('is_visible_in_advanced_search', bool(eval(ifield)))]","result=[('is_visible_in_advanced_search', record['is_visible_in_advanced_search'])]"
+mag_1420_erp_attr_9,magento1420,model_magerp_product_attributes,is_global,,in_out,function,unicode,,"result=[('is_global', bool(eval(ifield)))]","result=[('is_global', record['is_global'])]"
+mag_1420_erp_attr_10,magento1420,model_magerp_product_attributes,is_filterable,,in_out,function,unicode,,"result=[('is_filterable', bool(eval(ifield)))]","result=[('is_filterable', record['is_filterable'])]"
+mag_1420_erp_attr_11,magento1420,model_magerp_product_attributes,is_comparable,,in_out,function,unicode,,"result=[('is_comparable', bool(eval(ifield)))]","result=[('is_comparable', record['is_comparable'])]"
+mag_1420_erp_attr_12,magento1420,model_magerp_product_attributes,is_visible,,in_out,function,unicode,,"result=[('is_visible', bool(eval(ifield)))]","result=[('is_visible', record['is_visible'])]"
+mag_1420_erp_attr_13,magento1420,model_magerp_product_attributes,is_searchable,,in_out,function,unicode,,"result=[('is_searchable', bool(eval(ifield)))]","result=[('is_searchable', record['is_searchable'])]"
+mag_1420_erp_attr_14,magento1420,model_magerp_product_attributes,is_user_defined,,in_out,function,unicode,,"result=[('is_user_defined', bool(eval(ifield)))]","result=[('is_user_defined', record['is_user_defined'])]"
+mag_1420_erp_attr_15,magento1420,model_magerp_product_attributes,is_configurable,,in_out,function,unicode,,"result=[('is_configurable', bool(eval(ifield)))]","result=[('is_configurable', record['is_configurable'])]"
+mag_1420_erp_attr_16,magento1420,model_magerp_product_attributes,is_visible_on_front,,in_out,function,unicode,,"result=[('is_visible_on_front', bool(eval(ifield)))]","result=[('is_visible_on_front', record['is_visible_on_front'])]"
+mag_1420_erp_attr_17,magento1420,model_magerp_product_attributes,is_used_for_price_rules,,in_out,function,unicode,,"result=[('is_used_for_price_rules', bool(eval(ifield)))]","result=[('is_used_for_price_rules', record['is_used_for_price_rules'])]"
+mag_1420_erp_attr_18,magento1420,model_magerp_product_attributes,is_unique,,in_out,function,unicode,,"result=[('is_unique', bool(eval(ifield)))]","result=[('is_unique', record['is_unique'])]"
+mag_1420_erp_attr_19,magento1420,model_magerp_product_attributes,is_required,,in_out,function,unicode,,"result=[('is_required', bool(eval(ifield)))]","result=[('is_required', record['is_required'])]"
+mag_1420_erp_attr_20,magento1420,model_magerp_product_attributes,position,,in_out,function,int,,"result=[('position', ifield)]","result=[('position', record['position'])]"
+mag_1420_erp_attr_21,magento1420,model_magerp_product_attributes,attribute_set_info,,in_out,function,unicode,,"result=[('attribute_set_info', ifield)]","result=[('attribute_set_info', record['attribute_set_info'])]"
+mag_1420_erp_attr_22,magento1420,model_magerp_product_attributes,default_value,,in_out,function,unicode,,"result=[('default_value', ifield)]","result=[('default_value', record['default_value'])]"
+mag_1420_erp_attr_23,magento1420,model_magerp_product_attributes,note,,in_out,function,unicode,,"result=[('note', ifield)]","result=[('note', record['note'])]"
+mag_1420_erp_attr_24,magento1420,model_magerp_product_attributes,entity_type_id,,in_out,function,int,,"result=[('entity_type_id', ifield)]","result=[('entity_type_id', record['entity_type_id'])]"
+mag_1420_erp_attr_25,magento1420,model_magerp_product_attributes,apply_to,,in_out,function,unicode,,"result=[('apply_to', str(ifield))]","result=[('apply_to', eval(record['%s']))]"
+mag_1420_erp_prd_1,magento1420,product.model_product_product,url_key,,in_out,function,unicode,,"result=[('x_magerp_url_key',ifield)]","if context.get('export_url', False) :
+    result=[('url_key',record['x_magerp_url_key'])]"
+mag_1420_erp_prd_2,magento1420,product.model_product_product,name,,in_out,function,unicode,,"result = [('name',ifield)]","result = [('name',record['name'])]"
+mag_1420_erp_prd_3,magento1420,product.model_product_product,description,,in_out,function,unicode,,"result = [('description',ifield)]",
+mag_1420_erp_prd_4,magento1420,product.model_product_product,short_description,,in_out,function,unicode,,"result = [('description_sale',ifield)]",
+mag_1420_erp_prd_5,magento1420,product.model_product_product,sku,,in_out,function,unicode,,"result = [('magento_sku',ifield), ('default_code',ifield)]",
+mag_1420_erp_prd_6,magento1420,product.model_product_product,weight,,in_out,function,float,,"result = [('weight',ifield)]","result = [('weight',record['weight'] or 0)]"
+mag_1420_erp_prd_7,magento1420,product.model_product_product,category_ids,,in_out,function,list,,"categ_ids =[]
+if ifield and len(ifield) > 0:
+    for category_ids in ifield:
+        categ_ids.append(self.pool.get('product.category').extid_to_oeid(cr, uid, category_ids, external_referential_id, context=context))
+    categ_id = categ_ids.pop()
+else:
+    categ_id = self.pool.get('external.referential').browse(cr, uid, external_referential_id).default_pro_cat.id
+result = [('categ_id', categ_id), ('categ_ids',[(6, 0, categ_ids)])]","
+cat_obj = self.pool.get('product.category')
+product = self.browse(cr, uid, record['id'])
+categ_ids = [categ.id for categ in ([product.categ_id] + product.categ_ids) if categ.magento_exportable]
+mag_categ_ids = []
+for categ_id in categ_ids:
+    mag_categ_id = cat_obj.oeid_to_extid(cr, uid, categ_id, external_referential_id)
+    if not mag_categ_id:
+        cat_obj.ext_export(cr, uid, [categ_id], [external_referential_id], context=context)
+        mag_categ_id = cat_obj.oeid_to_extid(cr, uid, categ_id, external_referential_id)
+    mag_categ_ids.append(mag_categ_id)
+result=[('category_ids', mag_categ_ids)]"
+mag_1420_erp_prd_8,magento1420,product.model_product_product,price,,in_out,function,float,,"result=[('list_price',ifield)]",result=[]#map later
+mag_1420_erp_prd_9,magento1420,product.model_product_product,cost,,in_out,function,float,,"result=[('standard_price',ifield)]","result = [('cost',record['standard_price'] or 0)]"
+mag_1420_erp_prd_10,magento1420,product.model_product_product,set,,in_out,function,unicode,,"result=[('set',self.pool.get('magerp.product_attribute_set').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1420_erp_prd_11,magento1420,product.model_product_product,special_price,,in_out,function,float,,"result = [('x_magerp_special_price',ifield)]",
+mag_1420_erp_prd_12,magento1420,product.model_product_product,tier_price,,in_out,function,unicode,,result=[]#no mapping by default,result=[]#no mapping by default
+mag_1420_erp_prd_13,magento1420,product.model_product_product,minimal_price,,in_out,function,float,,"result = [('x_magerp_minimal_price',ifield)]","
+if record['x_magerp_minimal_price'] and record['x_magerp_minimal_price'] != 0:
+    result = [('minimal_price',record['x_magerp_minimal_price'])]
+else:
+    result = [('minimal_price',False)]"
+mag_1420_erp_prd_14,magento1420,product.model_product_product,type_id,,in_out,function,unicode,,"if ifield:
+    product_type_ids  = self.pool.get('magerp.product_product_type').search(cr,uid,[('product_type','=',ifield)])
+    if product_type_ids:
+        result = [('product_type',ifield)]","if 'product_type' in record and record['product_type']:
+    result = [('type_id',record['product_type'])]
+else:
+    result = [('type_id','simple')]"
+mag_1420_erp_prd_15,magento1420,product.model_product_product,websites,,in_out,function,list,,"websites_ids = []
+for ext_id in ifield:
+    websites_ids.append(self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ext_id, external_referential_id, context=context))
+
+##### OPTION START, with this if the field websites of the product is empty the product is exported on every website
+all_oe_websites_ids = self.pool.get('external.shop.group').search(cr,uid,[('referential_id', '=', external_referential_id)])
+if set(websites_ids) == set(all_oe_websites_ids):
+    websites_ids =[]
+##### OPTION END
+
+result=[('websites_ids', [(6,0, websites_ids)])]","##### OPTION START, with this if the field websites of the product is empty the product is exported on every website
+if not record['websites_ids']:
+    record['websites_ids'] = self.pool.get('external.shop.group').search(cr,uid,[('referential_id', '=', external_referential_id)])
+##### OPTION END
+
+ext_websites_ids = []
+for oe_id in record['websites_ids']:
+    ext_websites_ids.append(self.pool.get('external.shop.group').oeid_to_extid(cr, uid, oe_id, external_referential_id))
+
+result=[('websites', ext_websites_ids)]"
+mag_1420_erp_prd_16,magento1420,product.model_product_product,has_options,,in,function,unicode,,"result =[('x_magerp_has_options',ifield)]",
+magento_1420_cst_grp_1,magento1420,base.model_res_partner_category,customer_group_code,,in,function,unicode,,"result=[('name',ifield)]",
+magento_1420_cst_grp_3,magento1420,base.model_res_partner_category,tax_class_id,,in,function,int,,"result=[('tax_class_id',ifield)]",
+magento_1420_prt_adr_2,magento1420,base.model_res_partner_address,city,,in_out,function,unicode,,"result=[('city',ifield)]",
+magento_1420_prt_adr_3,magento1420,base.model_res_partner_address,fax,,in_out,function,unicode,,"result=[('fax',ifield)]",
+magento_1420_prt_adr_4,magento1420,base.model_res_partner_address,firstname,,in_out,function,unicode,,"name = ' '.join([ f for f in (data['firstname'], data['lastname']) if f])
+if data.get('company'):
+    name = ""%s ; %s"" % (data['company'], name)
+result = [('name', name), ('firstname', ifield), ('lastname', data['lastname'])]",
+magento_1420_prt_adr_6,magento1420,base.model_res_partner_address,is_active,,in_out,function,unicode,,"result=[('active',bool(eval(ifield)))]",
+magento_1420_prt_adr_7,magento1420,base.model_res_partner_address,country_id,,in_out,function,unicode,,"result = self.pool.get('res.country').search(cr,uid,[('code','=',ifield)])
+if result and len(result)==1:
+    result=[('country_id',result[0])]
+else:
+    result=[]
+",
+magento_1420_prt_adr_8,magento1420,base.model_res_partner_address,street,,in_out,function,unicode,,"if ifield:
+    if len(ifield.split('\n')) ==2 :
+        result = [('street', ifield.split('\n')[0]) , ('street2', ifield.split('\n')[1])]
+    else :
+        result = [('street',ifield.replace('\\n',','))]
+else:
+    result = []",
+magento_1420_prt_adr_9,magento1420,base.model_res_partner_address,postcode,,in_out,function,unicode,,"result=[('zip',ifield)]",
+magento_1420_prt_adr_10,magento1420,base.model_res_partner_address,telephone,,in_out,function,unicode,,"result=[('phone',ifield)]",
+magento_1420_prt_adr_11,magento1420,base.model_res_partner_address,region,,in_out,function,unicode,,"if ifield:
+    result = self.pool.get('res.country.state').search(cr,uid,[('name','=ilike',ifield)])
+    if result and len(result)==1:
+        result = [('state_id',result[0])]
+    else:
+        result=[]
+else:
+    result=[]",
+magento_1420_prt_adr_13,magento1420,base.model_res_partner_address,customer_id,,in_out,function,int,,"result=self.pool.get('res.partner').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+if result:
+    result=[('partner_id',result)]
+else:
+    result=[('partner_id',False)]",
+magento_1420_prt_adr_14,magento1420,base.model_res_partner_address,address_type,,in_out,function,unicode,,"if ifield=='billing':
+    result=[('type','invoice')]
+elif ifield=='shipping':
+    result=[('type','delivery')]
+else:
+    result=[]",
+magento_1420_prt_adr_15,magento1420,base.model_res_partner_address,email,,in_out,function,unicode,,"result = [('email', False)]
+if ifield:
+    result = [('email', ifield)]
+else:
+    partner_obj = self.pool.get('res.partner')
+    partner_id = partner_obj.extid_to_existing_oeid(cr, uid, data['customer_id'] ,external_referential_id)
+    if partner_id:
+        result = [('email', partner_obj.browse(cr, uid, partner_id).emailid)]",
+magento_1420_prt_adr_17,magento1420,base.model_res_partner_address,default_billing,,in_out,function,unicode,,"result = [('type', 'other')]
+if data.get('default_billing') and data.get('default_shipping'):
+    result = [('type', 'default')]
+elif data.get('default_billing'):
+    result = [('type', 'invoice')]
+elif data.get('default_shipping'):
+    result = [('type', 'delivery')]",
+magento_1420_prt_2,magento1420,base.model_res_partner,group_id,,in_out,function,int,,"if ifield:
+    result=self.pool.get('res.partner.category').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+    if result:
+        result=[('group_id',result)]",
+magento_1420_prt_3,magento1420,base.model_res_partner,store_id,,in_out,function,int,,"if ifield:
+    result=self.pool.get('magerp.storeviews').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+    if result:
+        store = self.pool.get('magerp.storeviews').browse(cr, uid, result)
+        lang = store.lang_id
+        result=[('store_id',result),('lang',lang and lang.code or False)]
+        if not data.get('website_id'):
+            result.append(('website_id', store.website_id.id))",
+magento_1420_prt_4,magento1420,base.model_res_partner,website_id,,in_out,function,int,,"if ifield:
+    result=self.pool.get('external.shop.group').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+    if result:
+        result=[('website_id',result)]",
+magento_1420_prt_5,magento1420,base.model_res_partner,created_in,,in_out,function,unicode,,"result=[('created_in',ifield)]",
+magento_1420_prt_6,magento1420,base.model_res_partner,created_at,,in_out,function,unicode,,"result=[('created_at',ifield)]",
+magento_1420_prt_7,magento1420,base.model_res_partner,updated_at,,in_out,function,unicode,,"result=[('updated_at',ifield)]",
+magento_1420_prt_8,magento1420,base.model_res_partner,firstname,,in_out,function,unicode,,"result = [('name', ifield + ' ' + data['lastname'])]","add_id = self.browse(cr, uid, record['id'])
+fn = add_id.address[0].firstname
+ln = add_id.address[0].lastname
+result=[('firstname', fn), ('lastname', ln)]"
+magento_1420_prt_10,magento1420,base.model_res_partner,email,,in_out,function,unicode,,"result=[('emailid',ifield)]",
+magento_1420_prt_11,magento1420,base.model_res_partner,taxvat,,in_out,function,unicode,,"if ifield:
+    result=[('mag_vat',ifield)]
+else:
+    result=[]",
+magento_1420_prt_12,magento1420,base.model_res_partner,dob,,in_out,function,unicode,,"if ifield:
+    result =[('mag_birthday',ifield[:10])]
+else:
+    result=[]",
 
=== added file 'magentoerpconnect/settings/1.4.2.0/external.referential.type.csv'
--- magentoerpconnect/settings/1.4.2.0/external.referential.type.csv	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/settings/1.4.2.0/external.referential.type.csv	2012-07-06 14:53:18 +0000
@@ -0,0 +1,2 @@
+"id","name"
+"magento1420","Magento Version 1.4.2.0+"
 
=== modified file 'magentoerpconnect/settings/1.5.0.0/external.mapping.template.csv'
--- magentoerpconnect/settings/1.5.0.0/external.mapping.template.csv	2012-05-19 11:35:11 +0000
+++ magentoerpconnect/settings/1.5.0.0/external.mapping.template.csv	2012-07-06 14:53:18 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 id,extra_name,version_id:id,model_id:id,external_list_method,external_get_method,external_update_method,external_create_method,external_delete_method,external_search_method,external_done_method,key_for_external_id,external_resource_name
 mag1500_external_shop_group,,magentoerpconnect.magento1500,base_sale_multichannels.model_external_shop_group,ol_websites.list,,,,,,,website_id,
 mag1500_magerp_storeviews,,magentoerpconnect.magento1500,magentoerpconnect.model_magerp_storeviews,ol_storeviews.list,,,,,,,store_id,
@@ -14,3 +15,19 @@
 mag1500_sale_order,,magentoerpconnect.magento1500,base_sale_multichannels.model_sale_order,sales_order.list,sales_order.info,,,,sales_order.search,sales_order.done,increment_id,
 mag1500_account_invoice,,magentoerpconnect.magento1500,account.model_account_invoice,,,,,,,,,
 mag1500_product_link,,magentoerpconnect.magento1500,magentoerpconnect.model_product_link,,,,,,,,,
+=======
+"id","type_id:id","model_id:id","external_list_method","external_get_method","external_update_method","external_create_method","external_delete_method","external_key_name"
+"magento_1500_website","magento1500","base_sale_multichannels.model_external_shop_group","ol_websites.list",,,,,"website_id"
+"magento_1500_storeview","magento1500","model_magerp_storeviews","ol_storeviews.list",,,,,"store_id"
+"magento_1500_store","magento1500","sale.model_sale_shop","ol_groups.list",,,,,"group_id"
+"magento_1500_order","magento1500","sale.model_sale_order","sales_order.list","sales_order.info",,,,"increment_id"
+"magento_1500_order_line","magento1500","sale.model_sale_order_line",,,,,,"item_id"
+"magento_1500_pro_cat","magento1500","product.model_product_category","category.list","category.info","catalog_category.update","catalog_category.create",,"category_id"
+"magento_1500_attr_grp","magento1500","model_magerp_product_attribute_groups","ol_catalog_product_attribute_group.list","ol_catalog_product_attribute_group.list",,,,"attribute_group_id"
+"magento_1500_attr_set","magento1500","model_magerp_product_attribute_set","ol_catalog_product_attributeset.list",,,,,"attribute_set_id"
+"magento_1500_attr","magento1500","model_magerp_product_attributes","ol_catalog_product_attribute.list",,,,,"attribute_id"
+"magento_1500_prd","magento1500","product.model_product_product","catalog_product.list","catalog_product.info","ol_catalog_product.update","ol_catalog_product.create",,"product_id"
+"magento_1500_cst_grp","magento1500","base.model_res_partner_category","ol_customer_groups.list",,,,,"customer_group_id"
+"magento_1500_prt_adr","magento1500","base.model_res_partner_address","ol_customer_address.list","ol_customer_address.info",,,,"entity_id"
+"magento_1500_prt","magento1500","base.model_res_partner","customer.list","customer.info","customer.update",,,"customer_id"
+>>>>>>> MERGE-SOURCE
 
=== added file 'magentoerpconnect/settings/1.5.0.0/external.mappinglines.template.csv.OTHER'
--- magentoerpconnect/settings/1.5.0.0/external.mappinglines.template.csv.OTHER	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/settings/1.5.0.0/external.mappinglines.template.csv.OTHER	2012-07-06 14:53:18 +0000
@@ -0,0 +1,330 @@
+id,type_id:id,model_id:id,external_field,field_id:id,type,evaluation_type,external_type,child_mapping_id:id,in_function,out_function
+mag_1500_erp_s_name,magento1500,base_sale_multichannels.model_external_shop_group,name,,in_out,function,unicode,,"result=[('name',ifield)]","result=[('name',record['name'])]"
+mag_1500_erp_s_code,magento1500,base_sale_multichannels.model_external_shop_group,code,,in_out,function,unicode,,"result=[('code',ifield)]",
+mag_1500_erp_s_web,magento1500,base_sale_multichannels.model_external_shop_group,website_id,,in_out,function,int,,"result=[('website_id',ifield)]",
+mag_1500_erp_s_isa,magento1500,base_sale_multichannels.model_external_shop_group,is_default,,in_out,function,unicode,,"result=[('is_default',bool(eval(ifield)))]",
+mag_1500_erp_s_stord,magento1500,base_sale_multichannels.model_external_shop_group,sort_order,,in_out,function,int,,"result=[('sort_order',ifield)]",
+mag_1500_erp_s_gpid,magento1500,base_sale_multichannels.model_external_shop_group,default_group_id,,in_out,function,int,,"result=[('default_shop_integer_id',ifield)]",
+mag_1500_erp_sv_name,magento1500,model_magerp_storeviews,name,,in_out,function,unicode,,"result=[('name',ifield)]","result=[('name',record['name'])]"
+mag_1500_erp_sv_code,magento1500,model_magerp_storeviews,code,,in_out,function,unicode,,"result=[('code',ifield)]",
+mag_1500_erp_sv_sg,magento1500,model_magerp_storeviews,website_id,,in_out,function,int,,"result=[('website_id',self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1500_erp_sv_isa,magento1500,model_magerp_storeviews,is_active,,in_out,function,unicode,,"result=[('is_active',bool(eval(ifield)))]",
+mag_1500_erp_sv_stord,magento1500,model_magerp_storeviews,sort_order,,in_out,function,int,,"result=[('sort_order',ifield)]",
+mag_1500_erp_sv_gpid,magento1500,model_magerp_storeviews,group_id,,in_out,function,int,,"result=[('shop_id',self.pool.get('sale.shop').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1500_erp_st_name,magento1500,sale.model_sale_shop,name,,in_out,function,unicode,,"result=[('name',ifield)]","result=[('name',record['name'])]"
+mag_1500_erp_st_gpid,magento1500,sale.model_sale_shop,group_id,,in_out,function,int,,"result=[('group_id',ifield)]",
+mag_1500_erp_st_grp,magento1500,sale.model_sale_shop,website_id,,in_out,function,int,,"result=[('shop_group_id',self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1500_erp_st_default_st,magento1500,sale.model_sale_shop,default_store_id,,in_out,function,int,,"result=[('default_storeview_integer_id',ifield)]",
+mag_1500_erp_st_root_categ,magento1500,sale.model_sale_shop,root_category_id,,in_out,function,int,,"result=[('root_category_id',ifield)]",
+mag_1500_erp_so_name,magento1500,sale.model_sale_order,increment_id,,in_out,function,unicode,,"result=[('magento_incrementid',str(ifield)), ('name','mag_' + str(ifield))]",
+mag_1500_erp_so_total_amount,magento1500,sale.model_sale_order,grand_total,,in_out,function,float,,"result=[('ext_total_amount',str(ifield))]",
+mag_1500_erp_so_carrier_id,magento1500,sale.model_sale_order,shipping_method,,in_out,function,unicode,,"if ifield:
+    carrier_ids = self.pool.get('delivery.carrier').search(cr, uid, [('magento_code', '=', ifield)])
+    if carrier_ids:
+        result=[('carrier_id', carrier_ids[0])]
+    else:
+        fake_partner_id = self.pool.get('res.partner').search(cr, uid, [])[0]
+        model_data_obj = self.pool.get('ir.model.data')
+        model, product_id = model_data_obj.get_object_reference(cr, uid, 'base_sale_multichannels', 'product_product_shipping')
+        carrier_id = self.pool.get('delivery.carrier').create(cr, uid, {'partner_id' : fake_partner_id, 'product_id' : product_id, 'name' : ifield, 'magento_code' : ifield})
+        result=[('carrier_id', carrier_id)]",
+mag_1500_erp_so_pay,magento1500,sale.model_sale_order,payment,,in_out,function,unicode,,"
+payments_mapping = {'checkmo': 'manual', 'ccsave': 'prepaid', 'free':'prepaid','googlecheckout':'prepaid','paypayl_express':'prepaid', 'paybox_system': 'prepaid', 'paypal_standard': 'prepaid', 'cashondelivery': 'manual', 'servired_standard': 'prepaid', 'bbva': 'prepaid', 'cofidis': 'prepaid'}
+ifield=eval(ifield)
+result=[('order_policy', ifield['method'] in payments_mapping and payments_mapping[ifield['method']] or 'prepaid'), ('ext_payment_method', ifield['method'])]",
+
+mag_1500_erp_so_item,magento1500,sale.model_sale_order,items,sale.field_sale_order_order_line,in,sub-mapping,dict,magento_1500_order_line,,
+"mag_1500_erp_soline_name","magento1500","sale.model_sale_order_line","name",,"in_out","function","unicode",,"result=[('name', ifield)]
+",
+"Mag_1500_erp_soline_note","magento1500","sale.model_sale_order_line","product_options",,"in","function","unicode",,"if ifield:
+    import re
+    options_label = []
+    clean = re.sub('\w:\w:|\w:\w+;', '', ifield)
+    for each in clean.split('{'):
+        if each.startswith('""label""'):
+            split_info = each.split(';')	
+            options_label.append('%s: %s [%s]' % (split_info[1], split_info[3], data['sku']))
+	
+    result=[('notes',  """".join(options_label).replace('""""', '\n').replace('""', ''))]
+",
+mag_1500_erp_soline_pid,magento1500,sale.model_sale_order_line,product_id,,in_out,function,unicode,,"context['alternative_key'] = data['sku']
+result=[('product_id',self.pool.get('product.product').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1500_erp_soline_uomqty,magento1500,sale.model_sale_order_line,qty_ordered,,in_out,function,unicode,,"result=[('product_uom_qty',ifield)]",
+mag_1500_erp_soline_uosqty,magento1500,sale.model_sale_order_line,qty_ordered,,in,function,unicode,,"result=[('product_uos_qty',ifield)]",
+mag_1500_erp_soline_price,magento1500,sale.model_sale_order_line,price,,in,function,unicode,,"if context.get('price_is_tax_included', False):             
+    result=[('price_unit', (float(data['row_total']) + float(data['tax_amount']))/float(data['qty_ordered']))]
+else:
+    result=[('price_unit', float(data['row_total'])/float(data['qty_ordered']))]",
+mag_1500_erp_soline_disc,magento1500,sale.model_sale_order_line,discount_amount,,in,function,float,,"if ifield:
+    result=[('discount', float(data['price']) != 0 and float(data['qty_ordered']) != 0 and float(100*ifield)/(float(data['price'])*float(data['qty_ordered'])) or 0)]",
+mag_1500_erp_procat_2,magento1500,product.model_product_category,level,,in,function,int,,"result=[('sequence',ifield),('level',ifield)]",
+mag_1500_erp_procat_3,magento1500,product.model_product_category,parent_id,,in_out,function,int,,"record_id = self.pool.get('ir.model.data').search(cr, uid, [('model', '=', self._name), ('name', '=', self.prefixed_id(ifield))])
+parent_id = False
+if record_id:
+	parent_rec = self.pool.get('ir.model.data').read(cr,uid,record_id[0],[])
+	parent_id=parent_rec.get('res_id',False)
+result=[('magento_parent_id',ifield),('parent_id',parent_id)]","magento_parent_id = False
+if record.get('parent_id',False):
+	magento_parent_id = self.oeid_to_extid(cr, uid, record.get('parent_id')[0], external_referential_id)
+	if not magento_parent_id:
+		self.ext_export(cr,uid,[record.get('parent_id',[False])[0]],[external_referential_id],{},context=context)
+		magento_parent_id = self.oeid_to_extid(cr, uid, record.get('parent_id')[0], external_referential_id)
+if magento_parent_id:
+	result = [('parent_id',magento_parent_id)]"
+mag_1500_erp_procat_4,magento1500,product.model_product_category,is_active,,in_out,function,unicode,,"result=[('is_active',ifield and (eval(ifield)) or False)]","result=[('is_active',record['is_active'])]"
+mag_1500_erp_procat_5,magento1500,product.model_product_category,description,,in_out,function,unicode,,"result=[('description',ifield)]","result=[('description',record['description'])]"
+mag_1500_erp_procat_6,magento1500,product.model_product_category,meta_title,,in_out,function,unicode,,"result=[('meta_title',ifield)]","result=[('meta_title',record['meta_title'])]"
+mag_1500_erp_procat_7,magento1500,product.model_product_category,meta_keywords,,in_out,function,unicode,,"result=[('meta_keywords',ifield)]","result=[('meta_keywords',record['meta_keywords'])]"
+mag_1500_erp_procat_8,magento1500,product.model_product_category,meta_description,,in_out,function,unicode,,"result=[('meta_description',ifield)]","result=[('meta_description',record['meta_description'])]"
+mag_1500_erp_procat_9,magento1500,product.model_product_category,url_key,,in_out,function,unicode,,"result=[('url_key',ifield)]","if context.get('export_url', False) :
+    result=[('url_key',record['url_key'])]"
+mag_1500_erp_procat_10,magento1500,product.model_product_category,name,,in_out,function,unicode,,"result=[('name',ifield or 'UNDEFINED'),('magento_exportable',True)]","result=[('name',record['name'])]"
+mag_1500_erp_procat_11,magento1500,product.model_product_category,is_anchor,,in_out,function,unicode,,"result=[('is_anchor',ifield and bool(eval(ifield)) or False)]","result=[('is_anchor',record['is_anchor'])]"
+mag_1500_erp_procat_12,magento1500,product.model_product_category,available_sort_by,,in_out,function,unicode,,"attr_ids = []
+cat_attr_obj = self.pool.get('magerp.product_category_attribute_options')
+if ifield:
+    for val in ifield:
+        attr_ids.append(cat_attr_obj.get_create_option_id(cr, uid, val,'sort_by', context=context))
+    result=[('available_sort_by', [(6, 0, attr_ids)]), ('use_default_available_sort_by', False)]
+else:
+    result=[('use_default_available_sort_by', True)]","if record['use_default_available_sort_by']:
+    res = u''
+else:
+    res = []
+    for cat_attr_option in self.pool.get('magerp.product_category_attribute_options').browse(cr, uid, record['available_sort_by'], context=context):
+        res.append(cat_attr_option.value)
+result=[('available_sort_by', res)]"
+mag_1500_erp_procat_13,magento1500,product.model_product_category,default_sort_by,,in_out,function,unicode,,"if ifield:
+    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, ifield,'sort_by', context=context)
+else:
+    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, '','sort_by', context=context)
+result=[('default_sort_by',att_id)]","options_obj = self.pool.get('magerp.product_category_attribute_options')
+cat_attr_option_id = record['default_sort_by']
+if cat_attr_option_id:
+    cat_attr_option_id = cat_attr_option_id[0]
+else:
+    cat_attr_option_id = options_obj._get_default_option(cr, uid, 'sort_by', '', context=context)[0]
+
+cat_attr_option = options_obj.browse(cr, uid, cat_attr_option_id, context=context)
+result=[('default_sort_by', cat_attr_option.value)]"
+mag_1500_erp_procat_14,magento1500,product.model_product_category,updated_at,,in,function,unicode,,"result=[('magerp_stamp',ifield)]",
+mag_1500_erp_procat_15,magento1500,product.model_product_category,image,,in_out,function,unicode,,"image_binary = False
+if ifield and not ifield=='None':
+	try:
+		image_binary = conn.call('ol_catalog_category_media.info', [int(data['category_id'])])
+	except Exception, e:
+		print e
+		pass
+	if image_binary:
+		image_binary = base64.encodestring(base64.urlsafe_b64decode(image_binary[0]['image_data']))
+result=[('image_name',ifield),('image',image_binary)]","if record['image']:
+	img = base64.decodestring(record['image'])
+        img_bin_enc = base64.encodestring(img) 
+        conn.call('ol_catalog_category_media.create', [record['image_name'], img_bin_enc])
+	result = [('image',record['image_name'])]
+else:
+	result=[]"
+mag_1500_erp_procat_16,magento1500,product.model_product_category,include_in_menu,,in_out,function,unicode,,"result=[('include_in_menu', ifield and (eval(ifield)) or False)]","result=[('include_in_menu',record['include_in_menu'])]"
+mag_1500_erp_procat_17,magento1500,product.model_product_category,page_layout,,in_out,function,unicode,,"if ifield:
+    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, ifield,'page_layout', context=context)
+else:
+    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, '','page_layout', context=context)
+result=[('page_layout',att_id)]","page_layout = record['page_layout'] and record['page_layout'][1] or ''
+result=[('page_layout', page_layout)]"
+mag_1500_erp_attrgrp_2,magento1500,model_magerp_product_attribute_groups,attribute_set_id,,in_out,function,int,,"result=[('attribute_set_id', ifield)]","result=[('attribute_set_id', record['attribute_set_id'])]"
+mag_1500_erp_attrgrp_3,magento1500,model_magerp_product_attribute_groups,attribute_group_name,,in_out,function,unicode,,"result=[('attribute_group_name', ifield)]","result=[('attribute_group_name', record['attribute_group_name'])]"
+mag_1500_erp_attrgrp_4,magento1500,model_magerp_product_attribute_groups,sort_order,,in_out,function,int,,"result=[('sort_order', ifield)]","result=[('sort_order', record['sort_order'])]"
+mag_1500_erp_attrgrp_5,magento1500,model_magerp_product_attribute_groups,default_id,,in_out,function,int,,"result=[('default_id', ifield)]","result=[('default_id', record['default_id'])]"
+mag_1500_erp_attrset_1,magento1500,model_magerp_product_attribute_set,attribute_set_id,,in_out,function,int,,"result=[('magento_id', ifield)]","result=[('attribute_set_id', record['magento_id'])]"
+mag_1500_erp_attrset_2,magento1500,model_magerp_product_attribute_set,sort_order,,in_out,function,int,,"result=[('sort_order', ifield)]","result=[('sort_order', record['sort_order'])]"
+mag_1500_erp_attrset_3,magento1500,model_magerp_product_attribute_set,attribute_set_name,,in_out,function,unicode,,"result=[('attribute_set_name', ifield)]","result=[('attribute_set_name', record['attribute_set_name'])]"
+mag_1500_erp_attr_1,magento1500,model_magerp_product_attributes,attribute_code,,in_out,function,unicode,,"result=[('attribute_code', ifield)]","result=[('code', record['attribute_code'])]"
+mag_1500_erp_attr_2,magento1500,model_magerp_product_attributes,attribute_id,,in_out,function,int,,"result=[('magento_id', ifield)]",
+mag_1500_erp_attr_3,magento1500,model_magerp_product_attributes,frontend_input,,in_out,function,unicode,,"result=[('frontend_input', ifield)]","result=[('frontend_input', record['frontend_input'])]"
+mag_1500_erp_attr_4,magento1500,model_magerp_product_attributes,frontend_class,,in_out,function,unicode,,"result=[('frontend_class', ifield)]","result=[('frontend_class', record['frontend_class'])]"
+mag_1500_erp_attr_5,magento1500,model_magerp_product_attributes,backend_model,,in_out,function,unicode,,"result=[('backend_model', ifield)]","result=[('backend_model', record['backend_model'])]"
+mag_1500_erp_attr_6,magento1500,model_magerp_product_attributes,backend_type,,in_out,function,unicode,,"result=[('backend_type', ifield)]","result=[('backend_type', record['backend_type'])]"
+mag_1500_erp_attr_7,magento1500,model_magerp_product_attributes,frontend_label,,in_out,function,unicode,,"result=[('frontend_label', ifield)]","result=[('frontend_label', record['frontend_label'])]"
+mag_1500_erp_attr_8,magento1500,model_magerp_product_attributes,is_visible_in_advanced_search,,in_out,function,unicode,,"result=[('is_visible_in_advanced_search', bool(eval(ifield)))]","result=[('is_visible_in_advanced_search', record['is_visible_in_advanced_search'])]"
+mag_1500_erp_attr_9,magento1500,model_magerp_product_attributes,is_global,,in_out,function,unicode,,"result=[('is_global', bool(eval(ifield)))]","result=[('is_global', record['is_global'])]"
+mag_1500_erp_attr_10,magento1500,model_magerp_product_attributes,is_filterable,,in_out,function,unicode,,"result=[('is_filterable', bool(eval(ifield)))]","result=[('is_filterable', record['is_filterable'])]"
+mag_1500_erp_attr_11,magento1500,model_magerp_product_attributes,is_comparable,,in_out,function,unicode,,"result=[('is_comparable', bool(eval(ifield)))]","result=[('is_comparable', record['is_comparable'])]"
+mag_1500_erp_attr_12,magento1500,model_magerp_product_attributes,is_visible,,in_out,function,unicode,,"result=[('is_visible', bool(eval(ifield)))]","result=[('is_visible', record['is_visible'])]"
+mag_1500_erp_attr_13,magento1500,model_magerp_product_attributes,is_searchable,,in_out,function,unicode,,"result=[('is_searchable', bool(eval(ifield)))]","result=[('is_searchable', record['is_searchable'])]"
+mag_1500_erp_attr_14,magento1500,model_magerp_product_attributes,is_user_defined,,in_out,function,unicode,,"result=[('is_user_defined', bool(eval(ifield)))]","result=[('is_user_defined', record['is_user_defined'])]"
+mag_1500_erp_attr_15,magento1500,model_magerp_product_attributes,is_configurable,,in_out,function,unicode,,"result=[('is_configurable', bool(eval(ifield)))]","result=[('is_configurable', record['is_configurable'])]"
+mag_1500_erp_attr_16,magento1500,model_magerp_product_attributes,is_visible_on_front,,in_out,function,unicode,,"result=[('is_visible_on_front', bool(eval(ifield)))]","result=[('is_visible_on_front', record['is_visible_on_front'])]"
+mag_1500_erp_attr_17,magento1500,model_magerp_product_attributes,is_used_for_price_rules,,in_out,function,unicode,,"result=[('is_used_for_price_rules', bool(eval(ifield)))]","result=[('is_used_for_price_rules', record['is_used_for_price_rules'])]"
+mag_1500_erp_attr_18,magento1500,model_magerp_product_attributes,is_unique,,in_out,function,unicode,,"result=[('is_unique', bool(eval(ifield)))]","result=[('is_unique', record['is_unique'])]"
+mag_1500_erp_attr_19,magento1500,model_magerp_product_attributes,is_required,,in_out,function,unicode,,"result=[('is_required', bool(eval(ifield)))]","result=[('is_required', record['is_required'])]"
+mag_1500_erp_attr_20,magento1500,model_magerp_product_attributes,position,,in_out,function,int,,"result=[('position', ifield)]","result=[('position', record['position'])]"
+mag_1500_erp_attr_21,magento1500,model_magerp_product_attributes,attribute_set_info,,in_out,function,unicode,,"result=[('attribute_set_info', ifield)]","result=[('attribute_set_info', record['attribute_set_info'])]"
+mag_1500_erp_attr_22,magento1500,model_magerp_product_attributes,default_value,,in_out,function,unicode,,"result=[('default_value', ifield)]","result=[('default_value', record['default_value'])]"
+mag_1500_erp_attr_23,magento1500,model_magerp_product_attributes,note,,in_out,function,unicode,,"result=[('note', ifield)]","result=[('note', record['note'])]"
+mag_1500_erp_attr_24,magento1500,model_magerp_product_attributes,entity_type_id,,in_out,function,int,,"result=[('entity_type_id', ifield)]","result=[('entity_type_id', record['entity_type_id'])]"
+mag_1500_erp_attr_25,magento1500,model_magerp_product_attributes,apply_to,,in_out,function,unicode,,"result=[('apply_to', str(ifield))]","result=[('apply_to', eval(record['%s']))]"
+mag_1500_erp_prd_1,magento1500,product.model_product_product,url_key,,in_out,function,unicode,,"result=[('x_magerp_url_key',ifield)]","if context.get('export_url', False) :
+    result=[('url_key',record['x_magerp_url_key'])]"
+mag_1500_erp_prd_2,magento1500,product.model_product_product,name,,in_out,function,unicode,,"result = [('name',ifield)]","result = [('name',record['name'])]"
+mag_1500_erp_prd_3,magento1500,product.model_product_product,description,,in_out,function,unicode,,"result = [('description',ifield)]",
+mag_1500_erp_prd_4,magento1500,product.model_product_product,short_description,,in_out,function,unicode,,"result = [('description_sale',ifield)]",
+mag_1500_erp_prd_5,magento1500,product.model_product_product,sku,,in_out,function,unicode,,"result = [('magento_sku',ifield), ('default_code',ifield)]",
+mag_1500_erp_prd_6,magento1500,product.model_product_product,weight,,in_out,function,float,,"result = [('weight',ifield)]","result = [('weight',record['weight'] or 0)]"
+mag_1500_erp_prd_7,magento1500,product.model_product_product,categories,,in_out,function,list,,"categ_ids =[]
+if ifield:
+    for category_id in ifield:
+        categ_ids.append(self.pool.get('product.category').extid_to_oeid(cr, uid, category_id, external_referential_id, context=context))
+    main_categ_id = categ_ids.pop()
+else:
+    main_categ_id = self.pool.get('external.referential').browse(cr, uid, external_referential_id).default_pro_cat.id
+result = [('categ_id', main_categ_id), ('categ_ids',[(6, 0, categ_ids)])]","
+cat_obj = self.pool.get('product.category')
+product = self.browse(cr, uid, record['id'])
+categ_ids = [categ.id for categ in ([product.categ_id] + product.categ_ids) if categ.magento_exportable]
+mag_categ_ids = []
+for categ_id in categ_ids:
+    mag_categ_id = cat_obj.oeid_to_extid(cr, uid, categ_id, external_referential_id)
+    if not mag_categ_id:
+        ctx = dict(context, force_export=True)
+        cat_obj.ext_export(cr, uid, [categ_id], [external_referential_id], context=ctx)
+        mag_categ_id = cat_obj.oeid_to_extid(cr, uid, categ_id, external_referential_id)
+    mag_categ_ids.append(mag_categ_id)
+result=[('category_ids', mag_categ_ids)]"
+mag_1500_erp_prd_8,magento1500,product.model_product_product,price,,in_out,function,float,,"result=[('list_price',ifield)]",result=[]#map later
+mag_1500_erp_prd_9,magento1500,product.model_product_product,cost,,in_out,function,float,,"result=[('standard_price',ifield)]","result = [('cost',record['standard_price'] or 0)]"
+mag_1500_erp_prd_10,magento1500,product.model_product_product,set,,in_out,function,unicode,,"result=[('set',self.pool.get('magerp.product_attribute_set').extid_to_oeid(cr, uid, ifield, external_referential_id, context=context))]",
+mag_1500_erp_prd_11,magento1500,product.model_product_product,special_price,,in_out,function,float,,"result = [('x_magerp_special_price',ifield)]",
+mag_1500_erp_prd_12,magento1500,product.model_product_product,tier_price,,in_out,function,unicode,,result=[]#no mapping by default,result=[]#no mapping by default
+mag_1500_erp_prd_13,magento1500,product.model_product_product,minimal_price,,in_out,function,float,,"result = [('x_magerp_minimal_price',ifield)]","
+if record['x_magerp_minimal_price'] and record['x_magerp_minimal_price'] != 0:
+    result = [('minimal_price',record['x_magerp_minimal_price'])]
+else:
+    result = [('minimal_price',False)]"
+mag_1500_erp_prd_14,magento1500,product.model_product_product,type_id,,in_out,function,unicode,,"if ifield:
+    product_type_ids  = self.pool.get('magerp.product_product_type').search(cr,uid,[('product_type','=',ifield)])
+    if product_type_ids:
+        result = [('product_type',ifield)]","if 'product_type' in record and record['product_type']:
+    result = [('type_id',record['product_type'])]
+else:
+    result = [('type_id','simple')]"
+mag_1500_erp_prd_15,magento1500,product.model_product_product,websites,,in_out,function,list,,"websites_ids = []
+for ext_id in ifield:
+    websites_ids.append(self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ext_id, external_referential_id, context=context))
+
+##### OPTION START, with this if the field websites of the product is empty the product is exported on every website
+all_oe_websites_ids = self.pool.get('external.shop.group').search(cr,uid,[('referential_id', '=', external_referential_id)])
+if set(websites_ids) == set(all_oe_websites_ids):
+    websites_ids =[]
+##### OPTION END
+
+result=[('websites_ids', [(6,0, websites_ids)])]","##### OPTION START, with this if the field websites of the product is empty the product is exported on every website
+if not record['websites_ids']:
+    record['websites_ids'] = self.pool.get('external.shop.group').search(cr,uid,[('referential_id', '=', external_referential_id)])
+##### OPTION END
+
+ext_websites_ids = []
+for oe_id in record['websites_ids']:
+    ext_websites_ids.append(self.pool.get('external.shop.group').oeid_to_extid(cr, uid, oe_id, external_referential_id))
+
+result=[('websites', ext_websites_ids)]"
+mag_1500_erp_prd_16,magento1500,product.model_product_product,has_options,,in,function,unicode,,"result =[('x_magerp_has_options',ifield)]",
+magento_1500_cst_grp_1,magento1500,base.model_res_partner_category,customer_group_code,,in,function,unicode,,"result=[('name',ifield)]",
+magento_1500_cst_grp_3,magento1500,base.model_res_partner_category,tax_class_id,,in,function,int,,"result=[('tax_class_id',ifield)]",
+magento_1500_prt_adr_2,magento1500,base.model_res_partner_address,city,,in_out,function,unicode,,"result=[('city',ifield)]",
+magento_1500_prt_adr_3,magento1500,base.model_res_partner_address,fax,,in_out,function,unicode,,"result=[('fax',ifield)]",
+magento_1500_prt_adr_4,magento1500,base.model_res_partner_address,firstname,,in_out,function,unicode,,"name = ' '.join([ f for f in (data['firstname'], data['lastname']) if f])
+if data.get('company'):
+    name = ""%s ; %s"" % (data['company'], name)
+result = [('name', name), ('firstname', ifield), ('lastname', data['lastname'])]",
+magento_1500_prt_adr_6,magento1500,base.model_res_partner_address,is_active,,in_out,function,unicode,,"result=[('active',bool(eval(ifield)))]",
+magento_1500_prt_adr_7,magento1500,base.model_res_partner_address,country_id,,in_out,function,unicode,,"result = self.pool.get('res.country').search(cr,uid,[('code','=',ifield)])
+if result and len(result)==1:
+	result=[('country_id',result[0])]
+else:
+	result=[]
+",
+magento_1500_prt_adr_8,magento1500,base.model_res_partner_address,street,,in_out,function,unicode,,"if ifield:
+	if len(ifield.split('\n')) ==2 :
+		result = [('street', ifield.split('\n')[0]) , ('street2', ifield.split('\n')[1])]
+	else :
+		result = [('street',ifield.replace('\\n',','))]
+else:
+	result = []",
+magento_1500_prt_adr_9,magento1500,base.model_res_partner_address,postcode,,in_out,function,unicode,,"result=[('zip',ifield)]",
+magento_1500_prt_adr_10,magento1500,base.model_res_partner_address,telephone,,in_out,function,unicode,,"result=[('phone',ifield)]",
+magento_1500_prt_adr_11,magento1500,base.model_res_partner_address,region,,in_out,function,unicode,,"if ifield:
+	result = self.pool.get('res.country.state').search(cr,uid,[('name','=ilike',ifield)])
+	if result and len(result)==1:
+		result = [('state_id',result[0])]
+	else:
+		result=[]
+else:
+	result=[]",
+magento_1500_prt_adr_13,magento1500,base.model_res_partner_address,customer_id,,in_out,function,int,,"
+if ifield:
+    result=self.pool.get('res.partner').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+    if result:
+	    result=[('partner_id', result)]
+    else:
+	    result=[('partner_id', False)]",
+magento_1500_prt_adr_14,magento1500,base.model_res_partner_address,address_type,,in_out,function,unicode,,"if ifield=='billing':
+	result=[('type','invoice')]
+elif ifield=='shipping':
+	result=[('type','delivery')]
+else:
+	result=[]",
+magento_1500_prt_adr_15,magento1500,base.model_res_partner_address,email,,in_out,function,unicode,,"result = [('email', False)]
+if ifield:
+    result = [('email', ifield)]
+else:
+    if data.get('customer_id'):
+        partner_obj = self.pool.get('res.partner')
+        partner_id = partner_obj.extid_to_existing_oeid(cr, uid, data['customer_id'] ,external_referential_id)
+        if partner_id:
+            result = [('email', partner_obj.browse(cr, uid, partner_id).emailid)] ",
+magento_1500_prt_adr_16,magento1500,base.model_res_partner_address,prefix,,in_out,function,unicode,,"if ifield:
+    title_ids = self.pool.get('res.partner.title').search(cr, uid, [('domain', '=', 'contact'), ('shortcut', '=', ifield)])
+    if title_ids:
+        title_id = title_ids[0]
+    else:
+        title_id = self.pool.get('res.partner.title').create(cr, uid, {'domain': 'contact', 'shortcut': ifield, 'name' : ifield})
+    result=[('title', title_id)]",
+magento_1500_prt_adr_17,magento1500,base.model_res_partner_address,default_billing,,in_out,function,unicode,,"result = [('type', 'other')]
+if data.get('default_billing') and data.get('default_shipping'):
+    result = [('type', 'default')]
+elif data.get('default_billing'):
+    result = [('type', 'invoice')]
+elif data.get('default_shipping'):
+    result = [('type', 'delivery')]",
+magento_1500_prt_2,magento1500,base.model_res_partner,group_id,,in_out,function,int,,"if ifield:
+	result=self.pool.get('res.partner.category').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+	if result:
+		result=[('group_id',result)]",
+magento_1500_prt_3,magento1500,base.model_res_partner,store_id,,in_out,function,int,,"if ifield:
+    result=self.pool.get('magerp.storeviews').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+    if result:
+        store = self.pool.get('magerp.storeviews').browse(cr, uid, result)
+        lang = store.lang_id
+        result=[('store_id',result),('lang',lang and lang.code or False)]
+        if not data.get('website_id'):
+            result.append(('website_id', store.website_id.id))",
+magento_1500_prt_4,magento1500,base.model_res_partner,website_id,,in_out,function,int,,"if ifield:
+	result=self.pool.get('external.shop.group').extid_to_oeid(cr,uid,ifield,external_referential_id, context=context)
+	if result:
+		result=[('website_id',result)]",
+magento_1500_prt_5,magento1500,base.model_res_partner,created_in,,in_out,function,unicode,,"result=[('created_in',ifield)]",
+magento_1500_prt_6,magento1500,base.model_res_partner,created_at,,in_out,function,unicode,,"result=[('created_at',ifield)]",
+magento_1500_prt_7,magento1500,base.model_res_partner,updated_at,,in_out,function,unicode,,"result=[('updated_at',ifield)]",
+magento_1500_prt_8,magento1500,base.model_res_partner,firstname,,in_out,function,unicode,,"result = [('name', ifield + ' ' + data['lastname'])]","add_id = self.browse(cr, uid, record['id'])
+fn = add_id.address[0].firstname
+ln = add_id.address[0].lastname
+result=[('firstname', fn), ('lastname', ln)]"
+magento_1500_prt_10,magento1500,base.model_res_partner,email,,in_out,function,unicode,,"result=[('emailid',ifield)]",
+magento_1500_prt_11,magento1500,base.model_res_partner,taxvat,,in_out,function,unicode,,"if ifield:
+	result=[('mag_vat',ifield)]
+else:
+	result=[]",
+magento_1500_prt_12,magento1500,base.model_res_partner,dob,,in_out,function,unicode,,"if ifield:
+	result =[('mag_birthday',ifield[:10])]
+else:
+	result=[]",
 
=== added directory 'magentoerpconnect/settings/update'
=== added file 'magentoerpconnect/settings/update/fix_product_categories.sql'
--- magentoerpconnect/settings/update/fix_product_categories.sql	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/settings/update/fix_product_categories.sql	2012-07-06 14:53:18 +0000
@@ -0,0 +1,7 @@
+UPDATE product_category
+SET  default_sort_by=(SELECT id FROM magerp_product_category_attribute_options WHERE value='' and attribute_name='sort_by')
+WHERE default_sort_by in (SELECT id FROM magerp_product_category_attribute_options WHERE value='None' and attribute_name='sort_by');
+
+UPDATE product_category
+SET  page_layout=(SELECT id FROM magerp_product_category_attribute_options WHERE value='' and attribute_name='page_layout')
+WHERE page_layout in (SELECT id FROM magerp_product_category_attribute_options WHERE value='None' and attribute_name='page_layout');
 
=== added file 'magentoerpconnect/settings/update/magerp.product_category_attribute_options.xml'
--- magentoerpconnect/settings/update/magerp.product_category_attribute_options.xml	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/settings/update/magerp.product_category_attribute_options.xml	2012-07-06 14:53:18 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record model='magerp.product_category_attribute_options' id='mag_product_category_attribute_1_1400'>
+      <field name="attribute_name">page_layout</field>
+      <field name="label">No layout updates</field>
+      <field name="value" eval='""' />
+    </record>
+
+    <record model='magerp.product_category_attribute_options' id='mag_product_category_attribute_7_1400'>
+      <field name="attribute_name">sort_by</field>
+      <field name="label">Use Config Settings</field>
+      <field name="value" eval='""' />
+    </record>
+  </data>
+</openerp>
 
=== modified file 'magentoerpconnect/stock.py'
--- magentoerpconnect/stock.py	2012-05-25 15:37:26 +0000
+++ magentoerpconnect/stock.py	2012-07-06 14:53:18 +0000
@@ -20,6 +20,10 @@
 #########################################################################
 
 import xmlrpclib
+<<<<<<< TREE
+=======
+import logging
+>>>>>>> MERGE-SOURCE
 
 from osv import fields,osv
 from tools.translate import _
@@ -69,8 +73,13 @@
             else:
                 item_qty.update({product_2_item[line['product_id']]: line['product_qty']})
 
+<<<<<<< TREE
             ext_shipping_id = conn.call('sales_order_shipment.create', [magento_incrementid, item_qty, _("Shipping Created"), mail_notification, True])
         return ext_shipping_id
+=======
+        ext_shipping_id = conn.call('sales_order_shipment.create', [magento_incrementid, item_qty, _("Shipping Created"), mail_notification, True])
+        return ext_shipping_id
+>>>>>>> MERGE-SOURCE
 
     def create_ext_shipping(self, cr, uid, id, picking_type, external_referential_id, context=None):
         """
@@ -103,6 +112,8 @@
             # in order to exclude it from the future exports
             if e.faultCode == 102:
                 raise ExternalShippingCreateError(e)
+            else:
+                raise
 
         if ext_shipping_id and carrier_id:
             self.add_ext_tracking_reference(cr, uid, id, carrier_id, ext_shipping_id, context)
@@ -110,6 +121,10 @@
 
     def add_ext_tracking_reference(self, cr, uid, id, carrier_id, ext_shipping_id, context=None):
         if context is None: context = {}
+<<<<<<< TREE
+=======
+        logger = logging.getLogger('ext synchro')
+>>>>>>> MERGE-SOURCE
         conn = context.get('conn_obj', False)
         carrier = self.pool.get('delivery.carrier').read(cr, uid, carrier_id, ['magento_carrier_code', 'magento_tracking_title'], context)
 
@@ -120,7 +135,11 @@
 
         res = conn.call('sales_order_shipment.addTrack', [ext_shipping_id, carrier['magento_carrier_code'], carrier['magento_tracking_title'] or '', carrier_tracking_ref or ''])
         if res:
+<<<<<<< TREE
             _logger.info("Successfully adding a tracking reference to the shipping with OpenERP id %s and ext id %s in external sale system", id, ext_shipping_id)
+=======
+            logger.info("Successfully adding a tracking reference to the shipping with OpenERP id %s and ext id %s in external sale system", id, ext_shipping_id)
+>>>>>>> MERGE-SOURCE
         return True
 
 stock_picking()
 
=== modified file 'magentoerpconnect_payment/sale.py'
--- magentoerpconnect_payment/sale.py	2012-03-27 09:40:33 +0000
+++ magentoerpconnect_payment/sale.py	2012-07-06 14:53:18 +0000
@@ -101,6 +101,89 @@
         self._magento_create_invoice(cr, uid, order, context=context)
         return True
 
+    def _call_magento_invoice(self, cr, uid, order, order_external_data=None, context=None):
+        """Return the Magento data for all invoices
+        of an order
+
+        :param browse_record order: browsable record of sale order
+        :param dict order_external_data: magento data of the order, optional,
+        a call to magento will be done to get the data if None
+        :return: list of magento invoices as dict
+        """
+        if context is None:
+            context = {}
+
+        referential = order.shop_id.referential_id
+        connection = context.get('conn_obj') or \
+            referential.external_connection()
+
+        # Filter on order_increment_id does not work
+        # on magento.
+        # So we need first to get the order id
+        # and filter the invoice on this order id
+        if not order_external_data:
+            order_ext_id = self.oeid_to_extid(
+                cr, uid, order.id, referential.id, context=context)
+            order_external_data = connection.call(
+                'sales_order.info', [order_ext_id])
+
+        mag_order_id = order_external_data['order_id']
+        return connection.call(
+            'sales_order_invoice.list', [{'order_id': {'eq': mag_order_id}}])
+
+    def _get_missing_magento_invoice_number(self, cr, uid, order, external_data, context=None):
+        """Get the first invoice number for a magento order
+        and assign it to magento_ref fields
+        so we can later push it on the invoice
+
+        :param browse_record order: browsable record of sale order
+        :param dict external_data: magento data of the order
+        :return: invoice number of magento
+        """
+        invoice_number = False
+        mag_invoices = self._call_magento_invoice(
+            cr, uid, order, order_external_data=external_data, context=context)
+        if mag_invoices:
+            invoice_number = mag_invoices[0].get('increment_id')
+
+        if invoice_number:
+            self.write(
+                cr, uid, order.id,
+                {'magento_ref': invoice_number},
+                context=context)
+            # propagate on invoice if some exists
+            # don't care of multiplue invoice because we
+            # don't know which invoice would have
+            # which magento number, 1 invoice on magento
+            # and 1 invoice on openerp expected, otherwise
+            # it has to be manually filled
+            if order.invoice_ids:
+                inv_ids = [inv.id for inv in order.invoice_ids]
+                self.pool.get('account.invoice').write(
+                    cr, uid, inv_ids,
+                    {'magento_ref': invoice_number},
+                    context=context)
+        return invoice_number
+
+    def create_payments(self, cr, uid, order_id, data_record, context=None):
+        """Inherited to get the magento invoice number.
+        With Magento, we are sure that when we have a payment,
+        we have an invoice, so we get its number to have it
+        on the openerp invoice
+        """
+        paid = super(sale_order, self).create_payments(
+            cr, uid, order_id, data_record, context=context)
+
+        if 'Magento' in context.get('external_referential_type', ''):
+            order = self.browse(cr, uid, order_id, context=context)
+
+            if paid and not order.magento_ref:
+                # get the invoice number
+                self._get_missing_magento_invoice_number(
+                    cr, uid, order, data_record, context=context)
+
+        return paid
+
     def _prepare_invoice(self, cr, uid, order, lines, context=None):
         """Prepare the dict of values to create the new invoice for a
            sale order. This method may be overridden to implement custom
@@ -123,4 +206,16 @@
             vals['magento_ref'] = order.magento_ref
         return vals
 
+    def _apply_payment_settings(self, cr, uid, order, paid, context=None):
+        """We should deactivate need_to_update to avoid to query magento
+        on each import of orders and not to mislead the users if they use
+        a filter on need_to_update.
+        """
+        res = super(sale_order, self)._apply_payment_settings(cr, uid, order,
+            paid, context=context)
+        payment_settings = order.base_payment_type_id
+        if payment_settings and payment_settings.allow_magento_manual_invoice:
+            self.write(cr, uid, order.id, {'need_to_update': False}, context=context)
+        return res
+
 sale_order()
 
=== modified file 'magentoerpconnect_product_variant/product.py'
--- magentoerpconnect_product_variant/product.py	2012-04-26 21:59:20 +0000
+++ magentoerpconnect_product_variant/product.py	2012-07-06 14:53:18 +0000
@@ -86,6 +86,95 @@
             else:
                 vals['product_type'] = 'simple'
         return super(product_product, self).create(cr, uid, vals, context)
+<<<<<<< TREE
+=======
+
+    def action_before_exporting(self, cr, uid, id, product_type, external_referential_ids, defaults, context):
+        #When the export of a configurable product is forced we should check if all variant are already exported
+        if context.get('force_export', False) and product_type == 'configurable':
+            conn = context.get('conn_obj', False)
+            shop = self.pool.get('sale.shop').browse(cr, uid, context['shop_id'])
+            variant_ids = self.read(cr, uid, id, ['variant_ids'], context)['variant_ids']
+            variant_ids.remove(id)
+            for variant in self.browse(cr, uid, variant_ids, context=context):
+                if variant.magento_exportable:
+                    if not self.oeid_to_extid(cr, uid, variant.id, shop.referential_id.id):
+                        conn.logger.info("Force the export of the product %s as it was not exported before", id)
+                        self.ext_export(cr, uid, [variant.id], external_referential_ids, defaults, context)
+        return True
+
+    def add_data_to_create_configurable_product(self, cr, uid, oe_id, data, context=None):
+        shop = self.pool.get('sale.shop').browse(cr, uid, context['shop_id'])
+        # check if not already created
+        products_data = {} # values of the attributes used on the element products
+        attributes_data = {} # params of the attributes to use on the configurable product
+
+        variant_ids = self.read(cr, uid, oe_id, ['variant_ids'], context=context)['variant_ids']
+        variant_ids.remove(oe_id)
+        if variant_ids:
+            associated_skus = []
+            # create a dict with all values used on the configurable products
+            for product in self.browse(cr, uid, variant_ids):
+                if product.magento_exportable:
+                    associated_skus += [product.magento_sku]
+                    attr_list = set()
+                    # get values for each attribute of the product
+                    mag_prod_id = str(self.oeid_to_extid(cr, uid, product.id, shop.referential_id.id))
+                    products_data[mag_prod_id] = {}
+                    index=0
+                    for value in product.dimension_value_ids:
+                        # get the option selected on the product
+                        option = value.option_id.magento_attribut_option
+                        attr = option.attribute_id
+                        attr_list = attr_list.union(set([attr]))
+                        prod_data = {
+                            'attribute_id': attr.magento_id, # id of the attribute
+                            'label': option.label, # label of the option
+                            'value_index': int(option.value), # id of the option
+                            'is_percent': 0, # modification of the price
+                            'pricing_value': '', # modification of the price
+                        }
+                        #products_data[mag_prod_id][str(attribute_set.configurable_attributes.index(attr))] = prod_data
+                        products_data[mag_prod_id][str(index)] = prod_data
+                        index += 1
+
+            # create a dict with attributes used on the configurable product
+            index=-1
+            for attr in attr_list:
+                index += 1
+                attr_data = {
+                             #'id': False,
+                             'label': '',
+                             #'position': False,
+                             'values': [],
+                             'attribute_id': attr.magento_id, # id of the attribute on magento
+                             'attribute_code': attr.attribute_code, # code of the attribute on magento
+                             'frontend_label': attr.frontend_label, # label of the attribute on magento
+                             'html_id': "config_super_product__attribute_%s" % index, # must be config_super_product__attribute_ with an increment
+                }
+                attr_values = []
+                for prod_id in products_data:
+                    [attr_values.append(products_data[prod_id][key]) for key in products_data[prod_id] if products_data[prod_id][key]['attribute_id'] == attr.magento_id]
+                attr_data.update({'values': attr_values})
+                attributes_data.update({str(index): attr_data})
+        data.update({'configurable_products_data': products_data, 'configurable_attributes_data': attributes_data, 'associated_skus':associated_skus})
+        return data
+
+
+    def ext_create(self, cr, uid, data, conn, method, oe_id, context):
+        if data.get('type_id', False) == 'configurable':
+            data = self.add_data_to_create_configurable_product(cr, uid, oe_id, data, context)
+        return super(product_product, self).ext_create(cr, uid, data, conn, method, oe_id, context)
+
+    def extdata_from_oevals(self, cr, uid, external_referential_id, data_record, mapping_lines, defaults, context=None):
+        #TODO maybe this mapping can be in the mapping template but the problem is that this mapping have to be apply at the end
+        #because they will overwrite other mapping result. Maybe adding a sequence on the mapping will be the solution
+        res = super(product_product, self).extdata_from_oevals(cr, uid, external_referential_id, data_record, mapping_lines, defaults, context)
+        if data_record.get('is_multi_variants', False):
+            for dim_value in self.pool.get('product.variant.dimension.value').browse(cr, uid, data_record['dimension_value_ids'], context=context):
+                res[dim_value.dimension_id.magento_attribut.attribute_code] = dim_value.option_id.magento_attribut_option.value
+        return res
+>>>>>>> MERGE-SOURCE
     
     def _filter_fields_to_return(self, cr, uid, field_names, context):
         #In the cas that the magento view is open from the button 'open magento fields', we can give a very customize view because only on for one product