Merge lp:~sebastien.beau/magentoerpconnect/oerp6.1-cleanning into lp:magentoerpconnect/oerp6.1-stable

[Sébastien BEAU - http://www.akretion.com]

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hi,

Some minor things:

Line 200:
The method ``map_magento_order`` is public (accessible from XMR/RPC) but may return a None value if they are zero or many invoices.

Line 1133
You've put an unused local variable ``first_install``.

Lines 1138-1149, I would rather use only one UPDATE with a CASE, it should something like:
UPDATE res_partner_address
SET name = CASE
  WHEN firstname IS NOT NULL AND lastname IS NOT NULL THEN (firstname || ' ' || lastname)
  WHEN firstname IS NOT NULL AND lastname IS NULL THEN firstname
  WHEN firstname IS NULL AND lastname IS NOT NULL THEN lastname
  ELSE '';

Otherwise, it seems good.
Thanks

review: Needs Fixing (no test, review)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

invoice.py
==========

map_magento_order is puzzling to me : it can return True or an invoice id, and there's a case where no id is mapped and nothing is logged (case when len(invoice_ids) != 1). This is probably something which should not happen, but I'd rather have a trace of the event.

in create_magento_invoice: s/synchronise/synchronize/ + remove spaces before ':' in english

magerp_core.py
===============

one leftover TODO (non blocking for the review)

product.py
==========

in _get_oe_resources, use iteritems rather than items (avoid generating a useless python list)

product_images.py
=================

not your fault, I could not understand the meaning of the comments at the beginning of the file. If you have a clearer idea of what is meant, clarification is welcome.

These are minor points, no need to resubmit before merging.

Thanks for your work.

review: Approve (code review, no test)

[lp:~sebastien.beau/magentoerpconnect/oerp6.1-cleanning]

678. By Sébastien BEAU - http://www.akretion.com on 2012-12-07

[MERGE] merge with cleaning branch, please do not forget to update dependency, product-extra-addons, openobject-extention, e-commerce-adddons.

magentoerpconnect :
- REFACTOR
    - refactor the invoice syncronisation
        2 modules are available, 1 for using Magento Invoice, one for using OpenERP invoice
        moreover if invoice syncronisation failed try to map if an existing one already exist : fonction => map_magento_order
    - refactor view for compatibility in multi-e-commerce solution
    - NAME REFACTOR : by default use only name if you need to use the lastname and firstname please first update magentoerpconnect and them install magentoerpconnect_partner_surname. DO IT ON A DATABASE TEST BEFORE. If you have any trouble please open a bug on lp
    - use new api for moving the category and updating the stock information

    ADD
        - add reporting when exporting stock level

=== modified file 'magento_product_auto_sku/__openerp__.py'
--- magento_product_auto_sku/__openerp__.py	2012-03-15 09:47:04 +0000
+++ magento_product_auto_sku/__openerp__.py	2012-12-03 15:22:20 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 {
     'name' : 'magento_product_auto_sku',
-    'version' : '1.0',
+    'version' : '6.1.0',
     'depends' : ['base', 'product', 'magentoerpconnect'],
     'author' : 'Camptocamp',
     'license': 'AGPL-3',

=== modified file 'magento_product_auto_sku/data.xml'
--- magento_product_auto_sku/data.xml	2011-06-07 14:51:43 +0000
+++ magento_product_auto_sku/data.xml	2012-12-03 15:22:20 +0000
@@ -11,8 +11,8 @@
             <field name="name">Product Magento SKU</field>
             <field name="code">product.magento.sku</field>
             <field name="prefix">%(year)s/</field>
-            <field name="padding">5</field>            
-        </record>        
-        
+            <field name="padding">5</field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'magento_product_auto_sku/product.py'
--- magento_product_auto_sku/product.py	2012-03-15 09:47:04 +0000
+++ magento_product_auto_sku/product.py	2012-12-03 15:22:20 +0000
@@ -17,25 +17,19 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-############################################################################## 
-from osv import osv, fields
-
-
-class Product(osv.osv):
+##############################################################################
+from openerp.osv.orm import Model
+from openerp.osv import fields
+
+class Product(Model):
     " Inherit product to add the sequence on the Magento SKU field"
     _inherit = 'product.product'
-
-    _columns = {
-                'magento_sku':fields.char('Magento SKU', size=64, readonly=True),
-                }
-
-    _defaults = {
-                 'magento_sku':lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'product.magento.sku'),
-                }
+    _columns = {'magento_sku':fields.char('Magento SKU', size=64, readonly=True),
+                }
+    _defaults = {'magento_sku':lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'product.magento.sku'),
+                 }
 
     def copy(self, cr, uid, id, default=None, context=None):
         default['magento_sku'] = self.pool.get('ir.sequence').get(cr, uid, 'product.magento.sku')
         return super(Product, self).copy(cr, uid, id, default=default, context=context)
 
-Product()
-

=== removed directory 'magento_sku_is_code'
=== removed file 'magento_sku_is_code/__init__.py'
--- magento_sku_is_code/__init__.py	2012-03-15 09:47:04 +0000
+++ magento_sku_is_code/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Guewen Baconnier
-#    Copyright 2011-2012 Camptocamp SA
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import product

=== removed file 'magento_sku_is_code/__openerp__.py'
--- magento_sku_is_code/__openerp__.py	2012-03-15 09:47:04 +0000
+++ magento_sku_is_code/__openerp__.py	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Guewen Baconnier
-#    Copyright 2011-2012 Camptocamp SA
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{
-    "name" : "Magento sku is product's code",
-    "version" : "1.0",
-    "depends" : ["base",
-                 "product",
-                 "magentoerpconnect",],
-    "author" : "Camptocamp",
-    "license": 'AGPL-3',
-    "description": """Use product's code as SKU for Magento.
-    Once exported to Magento, the Magento SKU is not changed, even if you change the product's code.
-""",
-    "website" : "http://www.camptocamp.com",
-    "category" : "Generic Modules",
-    "init_xml" : [],
-    "demo_xml" : [],
-    "update_xml" : ['product_view.xml'],
-    "active": False,
-    "installable": True,
-
-}

=== removed directory 'magento_sku_is_code/i18n'
=== removed 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	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Guewen Baconnier
-#    Copyright 2011-2012 Camptocamp SA
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-
-
-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.product'
-
-    _columns = {'magento_sku':fields.char('Magento SKU', size=64, readonly=True),}
-
-    _sql_constraints = [('code_uniq', 'unique(default_code)', 'The code must be unique')]
-
-    def _get_sku(self, cr, uid, vals, product=None, context=None):
-        """
-        Returns the SKU value.
-        @param vals: vals to be created / modified
-        @param product: optional browse instance of the product (when writing)
-        """
-        return vals['default_code']
-
-    def create(self, cr, uid, vals, context=None):
-        if vals.get('default_code'):
-            vals['magento_sku'] = self._get_sku(cr, uid, vals, context=context)
-        return super(Product, self).create(cr, uid, vals, context)
-
-    def write(self, cr, uid, ids, vals, context=None):
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        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
-                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)
-                    ids_to_write.remove(product.id)
-
-        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)
-
-Product()

=== removed file 'magento_sku_is_code/product_view.xml'
--- magento_sku_is_code/product_view.xml	2011-11-28 10:01:34 +0000
+++ magento_sku_is_code/product_view.xml	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record model="ir.ui.view" id="product_product_form_view_magerp_sku">
-            <field name="name">product.normal.form_magerp.sku</field>
-            <field name="model">product.product</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="magentoerpconnect.product_product_form_view_magerp"/>
-            <field name="arch" type="xml">
-                <data>
-                    <field name="default_code" position="attributes">
-                        <attribute name="attrs">{'required':[('magento_exportable','=',True)]}</attribute>
-                    </field>
-                    <field name="magento_sku" position="attributes">
-                        <attribute name="attrs"/>
-                    </field>
-                    <field name="magento_sku" position="attributes">
-                        <attribute name="readonly">True</attribute>
-                    </field>
-                </data>
-            </field>
-        </record>
-    </data>
-</openerp>

=== removed directory 'magento_sku_is_code/security'
=== modified file 'magentoerpconnect/__openerp__.py'
--- magentoerpconnect/__openerp__.py	2012-05-16 08:01:05 +0000
+++ magentoerpconnect/__openerp__.py	2012-12-03 15:22:20 +0000
@@ -18,14 +18,14 @@
 #########################################################################
 {
     "name" : "Magento e-commerce",
-    "version" : "1.0",
+    "version" : "6.1.1",
     "depends" : ["base",
                  "product",
                  "product_m2mcategories",
                  'delivery',
                  "base_sale_multichannels",
                  "product_images_olbs",
-                 "product_links",
+                 "product_links_sync",
                 ],
     "author" : "MagentoERPconnect Core Editors",
     "description": """Magento E-commerce management

=== modified file 'magentoerpconnect/delivery.py'
--- magentoerpconnect/delivery.py	2012-03-27 09:52:57 +0000
+++ magentoerpconnect/delivery.py	2012-12-03 15:22:20 +0000
@@ -19,10 +19,12 @@
 #along with this program.  If not, see <http://www.gnu.org/licenses/>.  #
 #########################################################################
 
-from osv import fields,osv
-from tools.translate import _
+from openerp.osv.orm import Model
+from openerp.osv import fields
+from openerp.osv.osv import except_osv
+from openerp.tools.translate import _
 
-class delivery_carrier(osv.osv):
+class delivery_carrier(Model):
     _inherit = "delivery.carrier"
 
     def _carrier_code(self, cr, uid, ids, name, args, context=None):
@@ -57,7 +59,7 @@
         carrier = self.read(
             cr, uid, id, ['magento_carrier_code', 'name'], context=context)
         if not carrier['magento_carrier_code'] in mag_carrier.keys():
-            raise osv.except_osv(
+            raise except_osv(
                 _("Error"),
                 _("The carrier %s doesn't have a magento_code valid !"
                   "The value %s is not in the carrier list %s "

=== modified file 'magentoerpconnect/delivery_view.xml'
--- magentoerpconnect/delivery_view.xml	2011-06-07 14:33:14 +0000
+++ magentoerpconnect/delivery_view.xml	2012-12-03 15:22:20 +0000
@@ -10,8 +10,8 @@
             <field name="arch" type="xml">
                  <data>
                     <field name="product_id" select="1" position="after">
-                    	<field name="magento_code"/>
-                    	<field name="magento_tracking_title"/>
+                        <field name="magento_code"/>
+                        <field name="magento_tracking_title"/>
                     </field>
                 </data>
             </field>

=== modified file 'magentoerpconnect/invoice.py'
--- magentoerpconnect/invoice.py	2012-06-01 17:48:14 +0000
+++ magentoerpconnect/invoice.py	2012-12-03 15:22:20 +0000
@@ -21,26 +21,27 @@
 #along with this program.  If not, see <http://www.gnu.org/licenses/>.  #
 #########################################################################
 
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv.orm import Model
+from openerp.osv import fields
+from openerp.tools.translate import _
+from base_external_referentials.external_osv import ExternalSession
+from openerp.osv.osv import except_osv
 
-class account_invoice(osv.osv):
+class account_invoice(Model):
     _inherit = "account.invoice"
-
     _columns = {
         'magento_ref':fields.char('Magento REF', size=32),
-    }
-
-
-#TODO instead of calling again the sale order information 
-# it will be better to store the ext_id of each sale order line
-#Moreover some code should be share between the partial export of picking and invoice
-
+        }
+
+
+    #TODO instead of calling again the sale order information
+    # it will be better to store the ext_id of each sale order line
+    #Moreover some code should be share between the partial export of picking and invoice
     def add_invoice_line(self, cr, uid, lines, line, context=None):
         """ A line to add in the invoice is a dict with : product_id and product_qty keys."""
         line_info = {'product_id': line.product_id.id,
                      'product_qty': line.quantity,
-        }
+                     }
         lines.append(line_info)
         return lines
 
@@ -55,7 +56,7 @@
             for item in order_items:
                 product_2_item.update({self.pool.get('product.product').get_oeid(cr, uid, item['product_id'],
                                         external_session.referential_id.id, context={}): item['item_id']})
-            
+
             lines = []
             # get product and quantities to invoice from the invoice
             for line in invoice.invoice_line:
@@ -70,31 +71,80 @@
                         item_qty.update({product_2_item[line['product_id']]: line['product_qty']})
         return item_qty
 
+    def map_magento_order(self, cr, uid, external_session, invoice_id, order_increment_id, context=None):
+        #TODO Error should be catch by the external report system (need some improvement before)
+        #For now error are just logged into the OpenERP log file
+        try:
+            external_session.logger.warning('Try to map the invoice with an existing order')
+            invoice_ids = external_session.connection.call('sales_order.get_invoice_ids', [order_increment_id])
+            #TODO support mapping for partiel invoice if needed
+            if len(invoice_ids) == 1:
+                external_session.logger.info(
+                    'Success to map the invoice %s with an existing order for the order %s.'
+                    %(invoice_ids[0], order_increment_id))
+                return invoice_ids[0]
+            else:
+                external_session.logger.error(
+                    'Failed to map the invoice %s with an existing order for the order %s. Too many invoice found'
+                    %(invoice_ids[0], order_increment_id))
+                return False
+        except Exception, e:
+            external_session.logger.error(
+                'Failed to map the invoice with an existing order for the order %s. Error : %s'
+                %(order_increment_id, e))
+        return False
+
     def create_magento_invoice(self, cr, uid, external_session, invoice_id, order_increment_id, context=None):
         item_qty = self.get_invoice_items(cr, uid, external_session, invoice_id, order_increment_id, context=context)
         try:
             return external_session.connection.call('sales_order_invoice.create', [order_increment_id,
                                                      item_qty, _('Invoice Created'), False, False])
         except Exception, e:
-            external_session.logger.warning(_('Can not create the invoice for the order %s in the external system. Error : %s')%(order_increment_id, e))
-        return False
+            external_session.logger.warning(
+                'Can not create the invoice for the order %s in the external system. Error : %s'
+                %(order_increment_id, e))
+            invoice_id = self.map_magento_order(cr, uid, external_session, invoice_id, order_increment_id, context=context)
+            if invoice_id:
+                return invoice_id
+            else:
+                raise except_osv(_('Magento Error'), _('Failed to synchronize Magento invoice with OpenERP invoice'))
 
     def ext_create(self, cr, uid, external_session, resources, mapping=None, mapping_id=None, context=None):
         ext_create_ids={}
         for resource_id, resource in resources.items():
-            resource = resource[resource.keys()[0]]
-            if resource['type'] == 'out_invoice':
-                ext_create_ids[resource_id] = self.create_magento_invoice(cr, uid,  external_session,
-                                    resource_id, resource['order_increment_id'], context=context)
+            res = self.ext_create_one_invoice(cr, uid, external_session, resource_id, resource, context=context)
+            if res:
+                ext_create_ids[resource_id] = res
         return ext_create_ids
 
-account_invoice()
-
-
-class account_invoice_line(osv.osv):
-
+    def ext_create_one_invoice(self, cr, uid, external_session, resource_id, resource, context=None):
+        resource = resource[resource.keys()[0]]
+        if resource['type'] == 'out_invoice':
+            return self.create_magento_invoice(cr, uid, external_session,
+                                resource_id, resource['order_increment_id'], context=context)
+        return False
+
+    def _export_one_invoice(self, cr, uid, invoice, context=None):
+        if invoice.sale_ids:
+            sale = invoice.sale_ids[0]
+            referential = sale.shop_id.referential_id
+            if referential and referential.type_name == 'Magento':
+                ext_id = invoice.get_extid(referential.id)
+                if ext_id:
+                    return ext_id
+                else:
+                    external_session = ExternalSession(referential, sale.shop_id)
+                    return self._export_one_resource(cr, uid, external_session, invoice.id,
+                                                     context=context)
+
+    def export_invoice(self, cr, uid, ids, context=None):
+        for invoice in self .browse(cr, uid, ids, context=context):
+            self._export_one_invoice(cr, uid, invoice, context=context)
+        return True
+
+
+class account_invoice_line(Model):
     _inherit = 'account.invoice.line'
-
     _columns = {
         # Forced the precision of the account.invoice.line discount field
         # to 3 digits in order to be able to have the same amount as Magento.
@@ -103,5 +153,4 @@
         # With a 2 digits precision, we can have 50.17 % => 148.99 or 50.16% => 149.02.
         # Force the digits to 3 allows to have 50.167% => 149€
         'discount': fields.float('Discount (%)', digits=(16, 3)),
-    }
-account_invoice_line()
+        }

=== modified file 'magentoerpconnect/magerp_core.py'
--- magentoerpconnect/magerp_core.py	2012-05-25 15:37:26 +0000
+++ magentoerpconnect/magerp_core.py	2012-12-03 15:22:20 +0000
@@ -22,24 +22,30 @@
 #along with this program.  If not, see <http://www.gnu.org/licenses/>.  #
 #########################################################################
 
-from osv import osv, fields
-import magerp_osv
-import pooler
-import base64, urllib
-from magerp_osv import Connection
-import tools
-from tools.translate import _
 import os
+import logging
+
+from openerp.osv import fields
+from openerp.osv.osv import except_osv
+from openerp import pooler
+from openerp import tools
+from openerp.tools.translate import _
+
+from .magerp_osv import MagerpModel, Connection
 from base_external_referentials.decorator import only_for_referential
 from base_external_referentials.external_osv import ExternalSession
 
-import logging
+from base_external_referentials.external_referentials import REF_VISIBLE_FIELDS
+
+REF_VISIBLE_FIELDS['Magento'] = ['location', 'apiusername', 'apipass']
+
+
 _logger = logging.getLogger(__name__)
 
 DEBUG = True
 TIMEOUT = 2
 
-class external_referential(magerp_osv.magerp_osv):
+class external_referential(MagerpModel):
     #This class stores instances of magento to which the ERP will connect, so you can connect OpenERP to multiple Magento installations (eg different Magento databases)
     _inherit = "external.referential"
 
@@ -209,7 +215,7 @@
                 if lang_id:
                     lang = lang_id.code
                 else:
-                    osv.except_osv(_('Warning!'), _('The storeviews have no language defined'))
+                    except_osv(_('Warning!'), _('The storeviews have no language defined')) #TODO needed?
                     lang = referential.default_lang_id.code
                 if not lang_2_storeview.get(lang, False):
                     lang_2_storeview[lang] = storeview
@@ -282,6 +288,7 @@
                 shop.export_products(cr, uid, shop, context)
         return True
 
+    #TODO refactor me
     def sync_partner(self, cr, uid, ids, context=None):
         def next_partners(connection, start, step):
             filters = {'customer_id': {'in': range(start, start + step)}}
@@ -308,11 +315,10 @@
                             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)
+                        external_session = ExternalSession(referential, referential)
+                        self.pool.get('res.partner')._record_one_external_resource(import_cr, uid, external_session, customer_info, context=context)
                         if address_info:
-                            self.pool.get('res.partner.address').ext_import(import_cr, uid, [address_info], referential.id, context=context)
-
+                            self.pool.get('res.partner.address')._record_one_external_resource(import_cr, uid, external_session, address_info, 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)
                         import_cr.commit()
@@ -382,10 +388,8 @@
         if DEBUG:
             print "run_import_newsletter_unsubscriber_scheduler: %s" % referential_ids
 
-external_referential()
-
-
-class external_shop_group(magerp_osv.magerp_osv):
+
+class external_shop_group(MagerpModel):
     _inherit = "external.shop.group"
     #Return format of API:{'code': 'base', 'name': 'Main', 'website_id': '1', 'is_default': '1', 'sort_order': '0', 'default_group_id': '1'}
     # default_group_id is the default shop of the external_shop_group (external_shop_group = website)
@@ -407,12 +411,10 @@
         'default_shop_integer_id':fields.integer('Default Store'), #This field can't be a many2one because shop_group field will be mapped before creating Shop (Shop = Store, shop_group = website)
         'default_shop_id':fields.function(_get_default_shop_id, type="many2one", relation="sale.shop", method=True, string="Default Store"),
         'referential_type' : fields.related('referential_id', 'type_id', type='many2one', relation='external.referential.type', string='External Referential Type'),
-    }
-
-external_shop_group()
-
-
-class magerp_storeviews(magerp_osv.magerp_osv):
+        }
+
+
+class magerp_storeviews(MagerpModel):
     _name = "magerp.storeviews"
     _description = "The magento store views information"
 
@@ -427,5 +429,3 @@
     }
 
     #Return format of API:{'code': 'default', 'store_id': '1', 'website_id': '1', 'is_active': '1', 'sort_order': '0', 'group_id': '1', 'name': 'Default Store View'}
-
-magerp_storeviews()

=== modified file 'magentoerpconnect/magerp_core_view.xml'
--- magentoerpconnect/magerp_core_view.xml	2012-05-19 12:23:36 +0000
+++ magentoerpconnect/magerp_core_view.xml	2012-12-03 15:22:20 +0000
@@ -1,172 +1,168 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<!--Magento Instances Tree/Form view  -->
+    <data>
+        <!--Magento Instances Tree/Form view  -->
 
-		<record model="ir.ui.view" id="magerp_instances_form">
-			<field name="name">External Referentials</field>
-			<field name="model">external.referential</field>
-			<field name="inherit_id" ref="base_external_referentials.external_referential_form_view" />
-			<field name="type">form</field>
-			<field name="priority">30</field>
-			<field name="arch" type="xml">
-			    <xpath expr="/form/group[2]/notebook/page[@string='Referential Actions']" position="replace">
-					<page string="Referential Actions">
-			        	<separator string="Compulsory" colspan="4" />
-			            <button name="refresh_mapping" string="1 - Reload Referential Mapping Templates" colspan="2" type="object" />
-        				<button name="import_referentials" string="2 - Synchronize Referential Settings" colspan="2" type="object" attrs="{'readonly':[('mapping_ids','=',[])]}"/>
-        				<separator string="Optional - Initial import only" colspan="4" />
-						<button name="import_customer_groups" string="1 - Import Customer Groups (Partner Categories)" colspan="2" type="object" />
-						<group colspan="2" col="12">
-						    <button name="sync_attribs" string="5 - Import Product Attributes" colspan="10" type="object" />
-							<field name="import_all_attributs"/>
-						</group>
-						<button name="import_product_categories" string="2 - Import Product Categories" colspan="2" type="object" />
-						<group colspan="2" col="14">
+        <record model="ir.ui.view" id="magerp_instances_form">
+            <field name="name">External Referentials</field>
+            <field name="model">external.referential</field>
+            <field name="inherit_id" ref="base_external_referentials.external_referential_form_view" />
+            <field name="type">form</field>
+            <field name="priority">30</field>
+            <field name="arch" type="xml">
+                <group name="compulsory" position="after">
+                    <group name="magento" col="4" colspan="4" attrs="{'invisible': [['type_name', '!=', 'Magento']]}">
+                        <separator string="Optional - Initial import only" colspan="4" />
+                        <button name="import_customer_groups" string="1 - Import Customer Groups (Partner Categories)" colspan="2" type="object" />
+                        <group colspan="2" col="12">
+                            <button name="sync_attribs" string="5 - Import Product Attributes" colspan="10" type="object" />
+                            <field name="import_all_attributs"/>
+                        </group>
+                        <button name="import_product_categories" string="2 - Import Product Categories" colspan="2" type="object" />
+                        <group colspan="2" col="14">
                             <group colspan="8">
-							    <button name="sync_products" string="6 - Import Products" type="object" attrs="{'invisible':[('import_image_with_product','=',True)]}" />
+                                <button name="sync_products" string="6 - Import Products" type="object" attrs="{'invisible':[('import_image_with_product','=',True)]}" />
                                 <button name="sync_products" string="6 - Import Products And Images" type="object" attrs="{'invisible':[('import_image_with_product','=',False)]}" />
                             </group>
-							<field name="import_image_with_product"/>
+                            <field name="import_image_with_product"/>
                             <field name="import_links_with_product"/>
-							<field name="last_imported_product_id" string=""/>
-						</group>
-						<button name="sync_attrib_sets" string="3 - Import Product Attribute Sets" colspan="2" type="object" />
-						<button name="sync_images" string="7 - Import Images" colspan="2" type="object" attrs="{'invisible':[('import_image_with_product','=',True)]}"/>
-						<button name="sync_attrib_groups" string="4 - Import Attribute Groups" colspan="2" type="object" />
+                            <field name="last_imported_product_id" string=""/>
+                        </group>
+                        <button name="sync_attrib_sets" string="3 - Import Product Attribute Sets" colspan="2" type="object" />
+                        <button name="sync_images" string="7 - Import Images" colspan="2" type="object" attrs="{'invisible':[('import_image_with_product','=',True)]}"/>
+                        <button name="sync_attrib_groups" string="4 - Import Attribute Groups" colspan="2" type="object" />
                         <button name="sync_product_links" string="8 - Import Product Links" colspan="2" type="object" />
-        				<separator string="Default values" colspan="4" />
-						<field name="default_pro_cat" required="1"/>
-						<field name="default_lang_id" required="1"/>
-<!--							<button name="sync_customer_addresses" string="Sync Customer Addresses" colspan="2" type="object" />-->
-<!--							<button name="export_products" string="Export Products" colspan="2" type="object" />-->
-                    </page>
-				</xpath>
+                        <separator string="Default values" colspan="4" />
+                        <field name="default_pro_cat" attrs="{'required': [['type_name', '=', 'Magento']]}"/>
+                        <field name="default_lang_id" attrs="{'required': [['type_name', '=', 'Magento']]}"/>
+                    </group>
+                </group>
 
-			    <xpath expr="/form/group[2]/notebook" position="inside">
-					<page string="Websites">
-						<field name="shop_group_ids" nolabel="1" />
-					</page>
-					<!--							<page string="Store Views">
-						<field name="storeviews" nolabel="1" />
-					</page>
-					<page string="Groups (Stores)">
-							<field name="shop_ids" nolabel="1" />
-												</page>-->
-					<page string="Product Attributes / Sets">
-						<newline />
-						<field name="attribute_sets" nolabel="1" colspan="4"/>
-					</page>
-					<page string="Advanced">
+                <notebook position="inside">
+                    <page string="Websites" attrs="{'invisible': [['type_name', '!=', 'Magento']]}">
+                        <field name="shop_group_ids" nolabel="1" />
+                    </page>
+                    <!--                            <page string="Store Views">
+                        <field name="storeviews" nolabel="1" />
+                    </page>
+                    <page string="Groups (Stores)">
+                            <field name="shop_ids" nolabel="1" />
+                                                </page>-->
+                    <page string="Product Attributes / Sets" attrs="{'invisible': [['type_name', '!=', 'Magento']]}">
+                        <newline />
+                        <field name="attribute_sets" nolabel="1" colspan="4"/>
+                    </page>
+                    <page string="Advanced" attrs="{'invisible': [['type_name', '!=', 'Magento']]}">
                         <separator string="Partner" colspan="4"/>
                         <group colspan="2" col="12">
-						    <button name="sync_partner" string="Import All Partners" colspan="10" type="object" />
+                            <button name="sync_partner" string="Import All Partners" colspan="10" type="object" />
                             <field name="last_imported_partner_id" string=""/>
                         </group>
-						<button name="sync_newsletter" string="Import Newsletter Subscribers" colspan="2" type="object" />
-						<button name="sync_newsletter_unsubscriber" string="Export Newsletter UnSubscribers" colspan="2" type="object" />
+                        <button name="sync_newsletter" string="Import Newsletter Subscribers" colspan="2" type="object" />
+                        <button name="sync_newsletter_unsubscriber" string="Export Newsletter UnSubscribers" colspan="2" type="object" />
                         <separator string="Others" colspan="4"/>
                         <field name="active" select="2"/>
-					</page>
-				</xpath>
-			</field>
-		</record>
-		<record id="act_magerp_instances_form" model="ir.actions.act_window">
-			<field name="name">Magento Instances</field>
-			<field name="res_model">external.referential</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="base_external_referentials.external_referential_tree_view" />
-		</record>
-
-		<!--Magento Websites Tree/Form view  -->
-		<record model="ir.ui.view" id="magerp_websites_form">
-			<field name="name">external.shop.group.form</field>
-			<field name="model">external.shop.group</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Magento websites">
-					<group col="4" colspan="4">
-						<field name="name" readonly="1" />
-						<field name="code" readonly="1" />
-						<field name="is_default" readonly="1" />
-						<field name="sort_order" readonly="1" />
-						<field name="default_shop_id" readonly="1" />
-						<field name="referential_id" readonly="1" />
-					</group>
-					<group col="4" colspan="4">
-						<field name="shop_ids" readonly="1"/>
-					</group>
-				</form>
-			</field>
-		</record>
-		<record model="ir.ui.view" id="magerp_websites_tree">
-			<field name="name">external.shop.group.tree</field>
-			<field name="model">external.shop.group</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Magento websites">
-					<field name="name" readonly="1" select="1" />
-					<field name="code" readonly="1" select="1" />
-					<field name="is_default" readonly="1" select="2" />
-					<field name="sort_order" readonly="1" select="2" />
-					<field name="default_shop_id" readonly="1" select="2" />
-					<field name="shop_ids" readonly="1" />
-				</tree>
-			</field>
-		</record>
-		<record id="act_magerp_websites_form" model="ir.actions.act_window">
-			<field name="name">Magento websites</field>
-			<field name="res_model">external.shop.group</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="magerp_websites_tree" />
-		</record>
-
-		<!--Magento storeviews Tree/Form view  -->
-		<record model="ir.ui.view" id="magerp_storeviews_form">
-			<field name="name">magerp.storeviews.form</field>
-			<field name="model">magerp.storeviews</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Magento storeviews">
-					<group col="4" colspan="4">
-						<field name="name" readonly="1" />
-						<field name="code" readonly="1" />
-						<field name="shop_id" readonly="1" />
-						<field name="website_id" readonly="1" />
-						<field name="is_active" readonly="1" />
-						<field name="sort_order" readonly="1" />
-						<field name="lang_id" />
-					</group>
-				</form>
-			</field>
-		</record>
-		<record model="ir.ui.view" id="magerp_storeviews_tree">
-			<field name="name">magerp.storeviews.tree</field>
-			<field name="model">magerp.storeviews</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Magento storeviews">
-					<field name="name" readonly="1" select="1" />
-					<field name="code" readonly="1" select="1" />
-					<field name="shop_id" readonly="1" select="1" />
-					<field name="is_active" readonly="1" select="2" />
-					<field name="sort_order" readonly="1" select="2" />
-					<field name="lang_id" />
-				</tree>
-			</field>
-		</record>
-		<record id="act_magerp_storeviews_form" model="ir.actions.act_window">
-			<field name="name">Magento storeviews</field>
-			<field name="res_model">magerp.storeviews</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="magerp_storeviews_tree" />
-		</record>
-
-	</data>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+        <record id="act_magerp_instances_form" model="ir.actions.act_window">
+            <field name="name">Magento Instances</field>
+            <field name="res_model">external.referential</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="base_external_referentials.external_referential_tree_view" />
+            <field name="domain">[['type_name', '=', 'Magento']]</field>
+        </record>
+
+        <!--Magento Websites Tree/Form view  -->
+        <record model="ir.ui.view" id="magerp_websites_form">
+            <field name="name">external.shop.group.form</field>
+            <field name="model">external.shop.group</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Magento websites">
+                    <group col="4" colspan="4">
+                        <field name="name" readonly="1" />
+                        <field name="code" readonly="1" />
+                        <field name="is_default" readonly="1" />
+                        <field name="sort_order" readonly="1" />
+                        <field name="default_shop_id" readonly="1" />
+                        <field name="referential_id" readonly="1" />
+                    </group>
+                    <group col="4" colspan="4">
+                        <field name="shop_ids" readonly="1"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="magerp_websites_tree">
+            <field name="name">external.shop.group.tree</field>
+            <field name="model">external.shop.group</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Magento websites">
+                    <field name="name" readonly="1" select="1" />
+                    <field name="code" readonly="1" select="1" />
+                    <field name="is_default" readonly="1" select="2" />
+                    <field name="sort_order" readonly="1" select="2" />
+                    <field name="default_shop_id" readonly="1" select="2" />
+                    <field name="shop_ids" readonly="1" />
+                </tree>
+            </field>
+        </record>
+        <record id="act_magerp_websites_form" model="ir.actions.act_window">
+            <field name="name">Magento websites</field>
+            <field name="res_model">external.shop.group</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="magerp_websites_tree" />
+        </record>
+
+        <!--Magento storeviews Tree/Form view  -->
+        <record model="ir.ui.view" id="magerp_storeviews_form">
+            <field name="name">magerp.storeviews.form</field>
+            <field name="model">magerp.storeviews</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Magento storeviews">
+                    <group col="4" colspan="4">
+                        <field name="name" readonly="1" />
+                        <field name="code" readonly="1" />
+                        <field name="shop_id" readonly="1" />
+                        <field name="website_id" readonly="1" />
+                        <field name="is_active" readonly="1" />
+                        <field name="sort_order" readonly="1" />
+                        <field name="lang_id" />
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="magerp_storeviews_tree">
+            <field name="name">magerp.storeviews.tree</field>
+            <field name="model">magerp.storeviews</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Magento storeviews">
+                    <field name="name" readonly="1" select="1" />
+                    <field name="code" readonly="1" select="1" />
+                    <field name="shop_id" readonly="1" select="1" />
+                    <field name="is_active" readonly="1" select="2" />
+                    <field name="sort_order" readonly="1" select="2" />
+                    <field name="lang_id" />
+                </tree>
+            </field>
+        </record>
+        <record id="act_magerp_storeviews_form" model="ir.actions.act_window">
+            <field name="name">Magento storeviews</field>
+            <field name="res_model">magerp.storeviews</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="magerp_storeviews_tree" />
+        </record>
+
+    </data>
 </openerp>

=== modified file 'magentoerpconnect/magerp_data.xml'
--- magentoerpconnect/magerp_data.xml	2012-06-21 17:33:57 +0000
+++ magentoerpconnect/magerp_data.xml	2012-12-03 15:22:20 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">
-		
+    <data noupdate="1">
+
 
         <record forcecreate="True" id="ir_cron_import_orders_scheduler_action" model="ir.cron">
             <field name="name">Magento Import Orders</field>
@@ -122,15 +122,15 @@
 <!--
 
         <record id="payment_type1" model="base.sale.payment.type">
-			<field name="name">checkmo;cashondelivery</field>
-			<field name="order_policy">manual</field>
-		</record>
-		
+            <field name="name">checkmo;cashondelivery</field>
+            <field name="order_policy">manual</field>
+        </record>
+
         <record id="payment_type2" model="base.sale.payment.type">
-			<field name="name">ccsave;free;googlecheckout;paypayl_express;paybox_system;paypal_standard;servired_standard;bbva;cofidis</field>
-			<field name="order_policy">prepaid</field>
-		</record>
+            <field name="name">ccsave;free;googlecheckout;paypayl_express;paybox_system;paypal_standard;servired_standard;bbva;cofidis</field>
+            <field name="order_policy">prepaid</field>
+        </record>
 
 -->
-	</data>
+    </data>
 </openerp>

=== modified file 'magentoerpconnect/magerp_menu.xml'
--- magentoerpconnect/magerp_menu.xml	2012-07-13 11:39:38 +0000
+++ magentoerpconnect/magerp_menu.xml	2012-12-03 15:22:20 +0000
@@ -2,7 +2,7 @@
 <openerp>
   <data>
     <menuitem id="menu_magerp" name="MagentoERPconnect" icon="terp-sale"
-      web_icon="images/magento.png" 
+      web_icon="images/magento.png"
       web_icon_hover="images/magento-hover.png"/>
 
     <menuitem id="menu_magerp_core" name="Core Settings" parent="menu_magerp" />

=== modified file 'magentoerpconnect/magerp_osv.py'
--- magentoerpconnect/magerp_osv.py	2012-05-24 20:52:38 +0000
+++ magentoerpconnect/magerp_osv.py	2012-12-03 15:22:20 +0000
@@ -21,7 +21,6 @@
 #########################################################################
 
 import time
-import datetime
 import xmlrpclib
 import urllib2
 import base64
@@ -30,7 +29,9 @@
 
 #NEW FEATURE
 
-from osv import osv, fields
+from openerp.osv.orm import Model
+from openerp.osv.osv import except_osv
+from openerp import tools
 from base_external_referentials.decorator import only_for_referential
 from base_external_referentials.decorator import open_report
 from base_external_referentials.decorator import catch_error_in_report
@@ -38,42 +39,42 @@
 import logging
 _logger = logging.getLogger(__name__)
 
-osv.osv.mag_transform_and_send_one_resource = osv.osv._transform_and_send_one_resource
+Model.mag_transform_and_send_one_resource = Model._transform_and_send_one_resource
 
-@only_for_referential('magento', super_function = osv.osv.mag_transform_and_send_one_resource)
+@only_for_referential('magento', super_function = Model.mag_transform_and_send_one_resource)
 @catch_error_in_report
 def _transform_and_send_one_resource(self, cr, uid, external_session, *args, **kwargs):
     return self.mag_transform_and_send_one_resource(cr, uid, external_session, *args, **kwargs)
 
-osv.osv._transform_and_send_one_resource = _transform_and_send_one_resource
-
-
-osv.osv.mag_export_resources = osv.osv._export_resources
-
-@only_for_referential('magento', super_function = osv.osv.mag_export_resources)
+Model._transform_and_send_one_resource = _transform_and_send_one_resource
+
+
+Model.mag_export_resources = Model._export_resources
+
+@only_for_referential('magento', super_function = Model.mag_export_resources)
 @open_report
 def _export_resources(self, *args, **kwargs):
     return self.mag_export_resources( *args, **kwargs)
-osv.osv._export_resources = _export_resources
-
-
-osv.osv._mag_get_external_resource_ids = osv.osv._get_external_resource_ids
-
-@only_for_referential('magento', super_function = osv.osv._get_external_resource_ids)
+Model._export_resources = _export_resources
+
+
+Model._mag_get_external_resource_ids = Model._get_external_resource_ids
+
+@only_for_referential('magento', super_function = Model._get_external_resource_ids)
 def _get_external_resource_ids(self, cr, uid, external_session, resource_filter=None, mapping=None, mapping_id=None, context=None):
     mapping, mapping_id = self._init_mapping(cr, uid, external_session.referential_id.id, mapping=mapping, mapping_id=mapping_id, context=context)
     ext_resource = mapping[mapping_id]['external_resource_name']
     search_method = mapping[mapping_id]['external_search_method']
     if not search_method:
-        #TODO don't forget to replace model by nam ewhen name will be implemented
-        raise osv.except_osv(_('User Error'), _('There is not search method for the mapping %s')%(mapping[mapping_id]['model'],))
+        #TODO don't forget to replace model by name when name will be implemented
+        raise except_osv(_('User Error'), _('There is not search method for the mapping %s')%(mapping[mapping_id]['model'],))
     return external_session.connection.call(search_method, [resource_filter])
 
-osv.osv._get_external_resource_ids = _get_external_resource_ids
-
-osv.osv._mag_get_external_resources = osv.osv._get_external_resources
-
-@only_for_referential('magento', super_function = osv.osv._mag_get_external_resources)
+Model._get_external_resource_ids = _get_external_resource_ids
+
+Model._mag_get_external_resources = Model._get_external_resources
+
+@only_for_referential('magento', super_function = Model._mag_get_external_resources)
 def _get_external_resources(self, cr, uid, external_session, external_id=None, resource_filter=None, mapping=None, mapping_id=None, fields=None, context=None):
     mapping, mapping_id = self._init_mapping(cr, uid, external_session.referential_id.id, mapping=mapping, mapping_id=mapping_id, context=context)
     ext_resource = mapping[mapping_id]['external_resource_name']
@@ -81,7 +82,7 @@
         read_method = mapping[mapping_id]['external_get_method']
         if not read_method:
             #TODO don't forget to replace model by nam ewhen name will be implemented
-            raise osv.except_osv(_('User Error'),
+            raise except_osv(_('User Error'),
                 _('There is no "Get Method" configured on the mapping %s') %
                 mapping[mapping_id]['model'])
         return external_session.connection.call(read_method, [external_id])
@@ -89,16 +90,16 @@
         search_read_method = mapping[mapping_id]['external_list_method']
         if not search_read_method:
             #TODO don't forget to replace model by nam ewhen name will be implemented
-            raise osv.except_osv(_('User Error'),
+            raise except_osv(_('User Error'),
                 _('There is no "List Method" configured on the mapping %s') %
                 mapping[mapping_id]['model'])
         return external_session.connection.call(search_read_method, [resource_filter or {}])
 
-osv.osv._get_external_resources = _get_external_resources
-
-osv.osv._mag_ext_create = osv.osv.ext_create
-
-@only_for_referential('magento', super_function = osv.osv._mag_ext_create)
+Model._get_external_resources = _get_external_resources
+
+Model._mag_ext_create = Model.ext_create
+
+@only_for_referential('magento', super_function = Model._mag_ext_create)
 def ext_create(self, cr, uid, external_session, resources, mapping, mapping_id, context=None):
     ext_create_ids = {}
     main_lang = context['main_lang']
@@ -107,11 +108,11 @@
         ext_create_ids[resource_id] = ext_id
     return ext_create_ids
 
-osv.osv.ext_create = ext_create
-
-
-osv.osv._mag_ext_update= osv.osv.ext_update
-@only_for_referential('magento', super_function = osv.osv._mag_ext_update)
+Model.ext_create = ext_create
+
+
+Model._mag_ext_update= Model.ext_update
+@only_for_referential('magento', super_function = Model._mag_ext_update)
 def ext_update(self, cr, uid, external_session, resources, mapping=None, mapping_id=None, context=None):
     if not mapping[mapping_id]['external_update_method']:
         external_session.logger.warning(_("Not update method for mapping %s")%mapping[mapping_id]['model'])
@@ -124,9 +125,9 @@
                                                                     [ext_id, resource[main_lang]])
     return True
 
-osv.osv.ext_update = ext_update
+Model.ext_update = ext_update
 
-#@only_for_referential('magento', super_function = osv.osv.send_to_external)
+#@only_for_referential('magento', super_function = Model.send_to_external)
 #def send_to_external(self, cr, uid, external_session, resource, update_date, context=None):
 #    print 'send this data to the external system', update_date
 #    print 'data', resource
@@ -134,14 +135,14 @@
 #    import pdb; pdb.set_trace()
 #    return True
 
-#osv.osv.send_to_external = send_to_external
-
-
-#osv.osv.ori_mag_init_context_before_exporting_resource = osv.osv.init_context_before_exporting_resource
-
-#@only_for_referential('magento', super_function = osv.osv.init_context_before_exporting_resource)
+#Model.send_to_external = send_to_external
+
+
+#Model.ori_mag_init_context_before_exporting_resource = Model.init_context_before_exporting_resource
+
+#@only_for_referential('magento', super_function = Model.init_context_before_exporting_resource)
 #def init_context_before_exporting_resource(self, cr, uid, object_id, resource_name, context=None):
-#    context = osv.osv.ori_mag_init_context_before_exporting_resource(cr, uid, object_id, resource_name, context=context)
+#    context = Model.ori_mag_init_context_before_exporting_resource(cr, uid, object_id, resource_name, context=context)
 #    if self._name == 'external.referential':
 #        referential = self.browse(cr, uid, object_id, context=context)
 #    elif 'referential_id' in self._columns.keys():
@@ -155,7 +156,7 @@
 #                context['store_to_lang'][storeview.id] = storeview.lang_id.code
 #    return context
 
-#osv.osv.init_context_before_exporting_resource = osv.osv.init_context_before_exporting_resource
+#Model.init_context_before_exporting_resource = Model.init_context_before_exporting_resource
 
 
 def ext_set_resource_as_imported(self, cr, uid, external_session, external_id, mapping=None, mapping_id=None, context=None):
@@ -165,7 +166,7 @@
         return external_session.connection.call(done_method, [external_id])
     return False
 
-osv.osv.ext_set_resource_as_imported = ext_set_resource_as_imported
+Model.ext_set_resource_as_imported = ext_set_resource_as_imported
 
 #DEPRECATED FEATURE!! YES ALL FUNCTION UNDER HIS LINE ARE DEPRECATED
 
@@ -175,7 +176,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
@@ -186,7 +187,7 @@
         self.result = {}
         self.logger = logger or _logger
 
-    
+
     def connect(self):
         if not self.location[-1] == '/':
             self.location += '/'
@@ -206,11 +207,11 @@
             except Exception,e:
                 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)  
-        raise osv.except_osv(_('User Error'), _('Error when try to connect to magento, are your sure that your login is right? Did openerp can access to your magento?'))
-
-    
-    def call(self, method, *arguments): 
+                time.sleep(sleep_time)
+        raise except_osv(_('User Error'), _('Error when try to connect to magento, are your sure that your login is right? Did openerp can access to your magento?'))
+
+
+    def call(self, method, *arguments):
         if arguments:
             arguments = list(arguments)[0]
         else:
@@ -242,7 +243,7 @@
         except Exception, e:
             pass
 
-class magerp_osv(osv.osv):
+class MagerpModel(Model):
     _register = False # Set to false if the model shouldn't be automatically discovered.
 
     _MAGE_FIELD = 'magento_id'
@@ -254,7 +255,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 +280,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 +315,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():
@@ -353,7 +354,7 @@
                         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 +365,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 +375,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 +397,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)
@@ -437,8 +438,8 @@
             else:
                 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!"))
-    
+            raise 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 +452,6 @@
         for each in reads:
             mageids.append(each[self._MAGE_FIELD])
         return mageids
-        
+
+# deprecated, bw compat
+magerp_osv = MagerpModel

=== modified file 'magentoerpconnect/partner.py'
--- magentoerpconnect/partner.py	2012-06-01 18:21:53 +0000
+++ magentoerpconnect/partner.py	2012-12-03 15:22:20 +0000
@@ -22,47 +22,51 @@
 #along with this program.  If not, see <http://www.gnu.org/licenses/>.  #
 #########################################################################
 
-from osv import osv, fields
-from tools.translate import _
-import magerp_osv
+import hashlib
+
+from openerp.osv import fields
+from .magerp_osv import MagerpModel
 from base_external_referentials.decorator import only_for_referential
-import hashlib
 
-class res_partner_category(magerp_osv.magerp_osv):
+class res_partner_category(MagerpModel):
     _inherit = "res.partner.category"
-
-    _columns = {
-                    'tax_class_id':fields.integer('Tax Class ID'),
+    _columns = {'tax_class_id':fields.integer('Tax Class ID'),
                 }
-res_partner_category()
 
-class res_partner_address(magerp_osv.magerp_osv):
+class res_partner_address(MagerpModel):
     _inherit = "res.partner.address"
 
-
-    #TODO maybe move the fields company, firstname, lastname in an extra module
-    #On v7 the partner address model will totaly change so maybe it's not worth
-    def _get_partner_name(self, cr, uid, ids, field_name, arg, context=None):
-        res ={}
-        for partner in self.browse(cr, uid, ids, context=context):
-            res[partner.id] = ((partner.company and partner.company + ' : ') or '') + \
-                              (partner.lastname and partner.lastname + ' ' or '') + \
-                              (partner.firstname or '')
-        return res
+    #Migration script for 6.1.0 to 6.1.1
+    def _auto_init(self, cr, context=None):
+        # recompute the field name with firstname + lastname
+        # in order to have the same data as the data of base_partner_surname
+        first_install=False
+        cr.execute("SELECT column_name FROM information_schema.columns "
+                   "WHERE table_name = 'res_partner_address' "
+                   "AND column_name = 'firstname'")
+        if cr.fetchone():
+            cr.execute(
+                "UPDATE res_partner_address "
+                "SET name = CASE "
+                  "WHEN firstname IS NOT NULL AND lastname IS NOT NULL THEN (firstname || ' ' || lastname) "
+                  "WHEN firstname IS NOT NULL AND lastname IS NULL THEN firstname "
+                  "WHEN firstname IS NULL AND lastname IS NOT NULL THEN lastname "
+                  "ELSE name "
+                "END"
+                  )
+            cr.execute("ALTER TABLE res_partner_address "
+                       "RENAME COLUMN firstname TO first_name")
+            cr.execute("ALTER TABLE res_partner_address "
+                       "RENAME COLUMN lastname TO last_name")
+        return super(res_partner_address, self)._auto_init(cr, context=context)
 
     _columns = {
-        'name': fields.function(_get_partner_name, obj="res.partner.address", type = 'char', size = 256, string='Name',
-                store = {
-                    'res.partner.address' : (lambda self, cr, uid, ids, c={}: ids,
-                                                    ['company', 'firstname', 'lastname'], 10)}),
         'company':fields.char('Company', size=100),
-        '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?
-                }
+        }
     _defaults = {
         'is_magento_order_address': lambda * a:False,
-                 }
+        }
 
     @only_for_referential('magento')
     def ext_create(self, cr, uid, external_session, resources, mapping, mapping_id, context=None):
@@ -74,9 +78,7 @@
             ext_create_ids[resource_id] = ext_id
         return ext_create_ids
 
-res_partner_address()
-
-class res_partner(magerp_osv.magerp_osv):
+class res_partner(MagerpModel):
     _inherit = "res.partner"
 
     def _is_magento_exported(self, cr, uid, ids, field_name, arg, context=None):
@@ -94,20 +96,20 @@
         return res
 
     _columns = {
-                    'group_id':fields.many2one('res.partner.category', 'Magento Group(Category)'),
-                    'store_id':fields.many2one('magerp.storeviews', 'Last Store View', help="Last store view where the customer has bought."),
-                    'store_ids':fields.many2many('magerp.storeviews', 'magerp_storeid_rel', 'partner_id', 'store_id', 'Store Views'),
-                    'website_id':fields.many2one('external.shop.group', 'Magento Website', help='Select a website for which the Magento customer will be bound.'),
-                    'created_in':fields.char('Created in', size=100),
-                    'created_at':fields.datetime('Created Date'),
-                    'updated_at':fields.datetime('Updated At'),
-                    'emailid':fields.char('Email Address', size=100, help="Magento uses this email ID to match the customer. If filled, if a Magento customer is imported from the selected website with the exact same email, he will be bound with this partner and this latter will be updated with Magento's values."),
-                    'mag_vat':fields.char('Magento VAT', size=50, help="To be able to receive customer VAT number you must set it in Magento Admin Panel, menu System / Configuration / Client Configuration / Name and Address Options."),
-                    '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"),
-                    'magento_pwd': fields.char('Magento Password', size=256),
-                }
+        'group_id':fields.many2one('res.partner.category', 'Magento Group(Category)'),
+        'store_id':fields.many2one('magerp.storeviews', 'Last Store View', help="Last store view where the customer has bought."),
+        'store_ids':fields.many2many('magerp.storeviews', 'magerp_storeid_rel', 'partner_id', 'store_id', 'Store Views'),
+        'website_id':fields.many2one('external.shop.group', 'Magento Website', help='Select a website for which the Magento customer will be bound.'),
+        'created_in':fields.char('Created in', size=100),
+        'created_at':fields.datetime('Created Date'),
+        'updated_at':fields.datetime('Updated At'),
+        'emailid':fields.char('Email Address', size=100, help="Magento uses this email ID to match the customer. If filled, if a Magento customer is imported from the selected website with the exact same email, he will be bound with this partner and this latter will be updated with Magento's values."),
+        'mag_vat':fields.char('Magento VAT', size=50, help="To be able to receive customer VAT number you must set it in Magento Admin Panel, menu System / Configuration / Client Configuration / Name and Address Options."),
+        '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"),
+        'magento_pwd': fields.char('Magento Password', size=256),
+        }
 
     _sql_constraints = [('emailid_uniq', 'unique(emailid, website_id)', 'A partner already exists with this email address on the selected website.')]
 
@@ -124,7 +126,7 @@
             AND ir_model_data.model = 'res.partner'
             AND ir_model_data.referential_id = %(ref_id)s
         WHERE ir_model_data.res_id IS NULL AND magerp_storeid_rel.store_id IN %(store_ids)s"""
-        params = {'ref_id': external_session.referential_id.id, 
+        params = {'ref_id': external_session.referential_id.id,
                   'store_ids': tuple(store_ids)}
         cr.execute(query,params)
         results = cr.dictfetchall()
@@ -134,7 +136,7 @@
     @only_for_referential('magento')
     def _transform_and_send_one_resource(self, cr, uid, external_session, resource, resource_id,
                             update_date, mapping, mapping_id, defaults=None, context=None):
-        res = super(res_partner, self)._transform_and_send_one_resource(cr, uid, external_session, 
+        res = super(res_partner, self)._transform_and_send_one_resource(cr, uid, external_session,
             resource, resource_id, update_date, mapping, mapping_id, defaults=defaults, context=context)
         if res:
             address_obj = self.pool.get('res.partner.address')
@@ -142,5 +144,3 @@
             for resource_id in resource_ids:
                 result = address_obj._export_one_resource(cr, uid, external_session, resource_id, context=context)
         return res
-
-res_partner()

=== modified file 'magentoerpconnect/partner_view.xml'
--- magentoerpconnect/partner_view.xml	2012-05-19 13:37:23 +0000
+++ magentoerpconnect/partner_view.xml	2012-12-03 15:22:20 +0000
@@ -7,10 +7,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form" />
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field/form/group/field[@name='name']" position="replace" >
+                <xpath expr="/form/notebook/page/field/form/group/field[@name='name']" position="after" >
                     <field name="company" />
-                    <field name="firstname" />
-                    <field name="lastname" />
                 </xpath>
                 <xpath expr="/form/notebook" position="inside">
                     <page string="Magento Information">
@@ -50,10 +48,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_address_form1" />
             <field name="arch" type="xml">
-                <field name="name" position="replace">
+                <field name="name" position="after">
                     <field name="company" />
-                    <field name="firstname" />
-                    <field name="lastname" />
                 </field>
             </field>
         </record>

=== modified file 'magentoerpconnect/product.py'
--- magentoerpconnect/product.py	2012-08-14 15:46:07 +0000
+++ magentoerpconnect/product.py	2012-12-03 15:22:20 +0000
@@ -22,26 +22,27 @@
 #along with this program.  If not, see <http://www.gnu.org/licenses/>.  #
 #########################################################################
 
-from osv import osv, orm, fields
-import datetime
 import time
-import pooler
-import magerp_osv
-from tools.translate import _
 import unicodedata
 import base64, urllib
 import os
+import xmlrpclib
 from lxml import etree
-import xmlrpclib
-
 import logging
+
+from openerp.osv.orm import Model, setup_modifiers
+from openerp.osv import fields
+from openerp.osv.osv import except_osv
+from openerp import pooler
+from openerp.tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+
+from .magerp_osv import MagerpModel
+from base_external_referentials.decorator import only_for_referential, catch_error_in_report
+from base_external_referentials.external_osv import ExternalSession
+
 _logger = logging.getLogger(__name__)
 
-from tools import DEFAULT_SERVER_DATETIME_FORMAT
-
-from base_external_referentials.decorator import only_for_referential
-from base_external_referentials.external_osv import ExternalSession
-
 #Enabling this to True will put all custom attributes into One page in
 #the products view
 GROUP_CUSTOM_ATTRS_TOGETHER = False
@@ -70,7 +71,7 @@
     else:
         return False
 
-class magerp_product_category_attribute_options(magerp_osv.magerp_osv):
+class magerp_product_category_attribute_options(MagerpModel):
     _name = "magerp.product_category_attribute_options"
     _description = "Option products category Attributes"
     _rec_name = "label"
@@ -98,13 +99,10 @@
         'value':fields.char('Value', size=200),
         #'ipcast':fields.char('Type cast', size=50),
         'label':fields.char('Label', size=100),
-    }
-
-
-magerp_product_category_attribute_options()
-
-
-class product_category(magerp_osv.magerp_osv):
+        }
+
+
+class product_category(MagerpModel):
     _inherit = "product.category"
 
     def _merge_with_default_values(self, cr, uid, external_session, ressource, vals, sub_mapping_list, defaults=None, context=None):
@@ -152,16 +150,13 @@
             parent_id = resource[main_lang]['parent_id']
             del resource[main_lang]['parent_id']
             external_session.connection.call('catalog_category.update', [ext_id, resource[main_lang], False])
-            external_session.connection.call('catalog_category.move', [ext_id, parent_id])
+            external_session.connection.call('oerp_catalog_category.move', [ext_id, parent_id])
             for storeview, lang in storeview_to_lang.items():
                 del resource[lang]['ext_id']
                 external_session.connection.call('catalog_category.update', [ext_id, resource[lang], storeview])
             ext_update_ids[resource_id] = ext_id
         return ext_update_ids
 
-
-
-
     _columns = {
         'magerp_fields' : fields.serialized('Magento Product Categories Extra Fields'),
         'create_date': fields.datetime('Created date', readonly=True),
@@ -194,8 +189,6 @@
         'page_layout': fields.many2one('magerp.product_category_attribute_options', 'Page Layout', domain="[('attribute_name', '=', 'page_layout')]"),
         }
 
-
-
     _defaults = {
         'display_mode':lambda * a:'PRODUCTS',
         'use_default_available_sort_by': lambda * a:True,
@@ -203,7 +196,7 @@
         'level':lambda * a:1,
         'include_in_menu': lambda * a:True,
         'page_layout': lambda self,cr,uid,c: self.pool.get('magerp.product_category_attribute_options')._get_default_option(cr, uid, 'page_layout', 'None', context=c),
-                 }
+        }
 
     def write(self, cr, uid, ids, vals, context=None):
         if not 'magerp_stamp' in vals.keys():
@@ -224,10 +217,8 @@
             ids = get_child_ids(categ_tree)
         return ids
 
-product_category()
-
-
-class magerp_product_attributes(magerp_osv.magerp_osv):
+
+class magerp_product_attributes(MagerpModel):
     _name = "magerp.product_attributes"
     _description = "Attributes of products"
     _rec_name = "attribute_code"
@@ -295,95 +286,84 @@
         'based_on':fields.selection([('product_product', 'Product Product'), ('product_template', 'Product Template')], 'Based On'),
         }
 
-    _defaults = {
-        'based_on': lambda*a: 'product_template',
-    }
-
+    _defaults = {'based_on': lambda*a: 'product_template',
+                 }
     #mapping magentofield:(openerpfield,typecast,)
     #have an entry for each mapped field
-    _no_create_list = [
-        'product_id',
-        'name',
-        'description',
-        'short_description',
-        'sku',
-        'weight',
-        'category_ids',
-        'price',
-        'cost',
-        'set',
-        'ean',
-    ]
-
-    _translatable_default_codes = [
-        'description',
-        'meta_description',
-        'meta_keyword',
-        'meta_title',
-        'name',
-        'short_description',
-        'url_key',
-    ]
-
-    _not_store_in_json = [
-        'minimal_price',
-        'special_price',
-        'description',
-        'meta_description',
-        'meta_keyword',
-        'meta_title',
-        'name',
-        'short_description',
-        'url_key',
-    ]
-
-    _type_conversion = {
-        '':'char',
-        'text':'char',
-        'textarea':'text',
-        'select':'many2one',
-        'date':'date',
-        'price':'float',
-        'media_image':'binary',
-        'gallery':'binary',
-        'multiselect':'many2many',
-        'boolean':'boolean',
-        'weee':'char',
-        False:'char',
-        'file':'char', #this option is not a magento native field it will be better to found a generic solutionto manage this kind of custom option
-    }
-
-    _type_casts = {
-        '':'unicode',
-        'text':'unicode',
-        'textarea':'unicode',
-        'select':'unicode',
-        'date':'unicode',
-        'price':'float',
-        'media_image':'False',
-        'gallery':'False',
-        'multiselect':'list',
-        'boolean':'int',
-        'weee':'unicode',
-        False:'unicode',
-        'file':'unicode', #this option is not a magento native field it will be better to found a generic solutionto manage this kind of custom option
-    }
-
-    _variant_fields = [
-        'color',
-        'dimension',
-        'visibility',
-        'special_price',
-        'special_price_from_date',
-        'special_price_to_date',
-    ]
-
-
-    #TODO check if this field have to be in only one way and if yes add this feature
-    _sync_way = {
-        'has_options' : 'in',
-        'special_price' : 'in',
-        }
+    _no_create_list = ['product_id',
+                       'name',
+                       'description',
+                       'short_description',
+                       'sku',
+                       'weight',
+                       'category_ids',
+                       'price',
+                       'cost',
+                       'set',
+                       'ean',
+                       ]
+    _translatable_default_codes = ['description',
+                                   'meta_description',
+                                   'meta_keyword',
+                                   'meta_title',
+                                   'name',
+                                   'short_description',
+                                   'url_key',
+                                   ]
+    _not_store_in_json = ['minimal_price',
+                          'special_price',
+                          'description',
+                          'meta_description',
+                          'meta_keyword',
+                          'meta_title',
+                          'name',
+                          'short_description',
+                          'url_key',
+                          ]
+    _type_conversion = {'':'char',
+                        'text':'char',
+                        'textarea':'text',
+                        'select':'many2one',
+                        'date':'date',
+                        'price':'float',
+                        'media_image':'binary',
+                        'gallery':'binary',
+                        'multiselect':'many2many',
+                        'boolean':'boolean',
+                        'weee':'char',
+                        False:'char',
+                        'file':'char', #this option is not a magento native field it will be better to found a generic solutionto manage this kind of custom option
+                        }
+    _type_casts = {'':'unicode',
+                   'text':'unicode',
+                   'textarea':'unicode',
+                   'select':'unicode',
+                   'date':'unicode',
+                   'price':'float',
+                   'media_image':'False',
+                   'gallery':'False',
+                   'multiselect':'list',
+                   'boolean':'int',
+                   'weee':'unicode',
+                   False:'unicode',
+                   'file':'unicode', #this option is not a magento native field it will be better to found a generic solutionto manage this kind of custom option
+                   }
+    _variant_fields = ['color',
+                       'dimension',
+                       'visibility',
+                       'special_price',
+                       'special_price_from_date',
+                       'special_price_to_date',
+                       ]
+
+
+    #For some field you can specify the syncronisation way
+    #in : Magento => OpenERP
+    #out : Magento <= OpenERP
+    #in_out (default_value) : Magento <=> OpenERP
+    _sync_way = {'has_options' : 'in',
+                 'tier_price': 'in',
+               }
 
     def _is_attribute_translatable(self, vals):
         """Tells if field associated to attribute should be translatable or not.
@@ -493,7 +473,6 @@
                             # mapping have to be based on product.product
                             model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'product.product')])[0]
                             self._create_mapping(cr, uid, field_vals['ttype'], field_id, field_name, referential_id, model_id, vals, crid)
-
         return crid
 
     def _default_mapping(self, cr, uid, ttype, field_name, vals, attribute_id, model_id, mapping_line, referential_id):
@@ -557,17 +536,16 @@
                 mapping_line = {'external_field': vals['attribute_code'],
                                 'sequence': 0,
                                 'mapping_id': mapping_id[0],
-                                'type': 'in_out',
+                                'type': self._sync_way.get(vals['attribute_code'], 'in_out'),
                                 'external_type': self._type_casts[vals.get('frontend_input', False)],
                                 '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)
         return True
 
-magerp_product_attributes()
 
 """Dont remove the code, we might need it --sharoon
-class magerp_product_attributes_set_info(osv.osv):
+class magerp_product_attributes_set_info(Model):
     _name="magerp.product_attributes.set_info"
     _description = "Attribute Set information for each attribute"
     _columns = {
@@ -579,7 +557,7 @@
                 }
 magerp_product_attributes_set_info()"""
 
-class magerp_product_attribute_options(magerp_osv.magerp_osv):
+class magerp_product_attribute_options(MagerpModel):
     _name = "magerp.product_attribute_options"
     _description = "Options  of selected attributes"
     _rec_name = "label"
@@ -635,9 +613,8 @@
         else:
             return False
 
-magerp_product_attribute_options()
 
-class magerp_product_attribute_set(magerp_osv.magerp_osv):
+class magerp_product_attribute_set(MagerpModel):
     _name = "magerp.product_attribute_set"
     _description = "Attribute sets in products"
     _rec_name = 'attribute_set_name'
@@ -649,8 +626,8 @@
         'referential_id':fields.many2one('external.referential', 'Magento Instance', readonly=True),
         'magento_id':fields.integer('Magento ID'),
         }
-        
-        
+
+
     def update_attribute(self, cr, uid, ids, context=None):
         ref_obj = self.pool.get('external.referential')
         mag_ref_ids = ref_obj.search(cr, uid, [('version_id','ilike', 'magento')], context=context)
@@ -735,9 +712,8 @@
             cr.execute(query)
         return True
 
-magerp_product_attribute_set()
 
-class magerp_product_attribute_groups(magerp_osv.magerp_osv):
+class magerp_product_attribute_groups(MagerpModel):
     _name = "magerp.product_attribute_groups"
     _description = "Attribute groups in Magento"
     _rec_name = 'attribute_group_name'
@@ -759,10 +735,9 @@
         'sort_order':fields.integer('Sort Order'),
         'default_id':fields.integer('Default'),
         'referential_id':fields.many2one('external.referential', 'Magento Instance', readonly=True),
-    }
-magerp_product_attribute_groups()
+        }
 
-class product_tierprice(osv.osv):
+class product_tierprice(Model):
     _name = "product.tierprice"
     _description = "Implements magento tier pricing"
 
@@ -782,7 +757,7 @@
         'price_qty':fields.float('Quantity Slab', digits=(10, 4), help="Slab & above eg.For 10 and above enter 10"),
         'product':fields.many2one('product.product', 'Product'),
         'referential_id':fields.many2one('external.referential', 'Magento Instance', readonly=True),
-    }
+        }
     _mapping = {
         'cust_group':(False, int, """result=self.pool.get('res.partner.category').mage_to_oe(cr,uid,cust_group,instance)\nif result:\n\tresult=[('cust_group',result[0])]\nelse:\n\tresult=[('cust_group',False)]"""),
         'all_groups':(False, str, """if all_groups=='1':\n\tresult=[('group_scope','1')]\nelse:\n\tresult=[('group_scope','1')]"""),
@@ -790,21 +765,18 @@
         'price':('price', float),
         'website_id':(False, int, """result=self.pool.get('external.shop.group').mage_to_oe(cr,uid,website_id,instance)\nif result:\n\tresult=[('website_id',result[0])]\nelse:\n\tresult=[('website_id',False)]"""),
         'price_qty':('price_qty', float),
-    }
-product_tierprice()
+        }
 
-class product_product_type(osv.osv):
+class product_product_type(Model):
     _name = 'magerp.product_product_type'
     _columns = {
         'name': fields.char('Name', size=100, required=True, translate=True),
         'product_type': fields.char('Type', size=100, required=True, help="Use the same name of Magento product type, for example 'simple'."),
         'default_type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Default Product Type', required=True, help="Default product's type (Procurement) when a product is imported from Magento."),
-    }
-product_product_type()
-
-
-
-class product_mag_osv(magerp_osv.magerp_osv):
+        }
+
+
+class product_mag_osv(MagerpModel):
     _register = False # Set to false if the model shouldn't be automatically discovered.
 
     #remember one thing in life: Magento lies: it tells attributes are required while they are awkward to fill
@@ -819,7 +791,7 @@
         set_id = self.read(cr, uid, ids, fields=['set'], context=context)[0]['set']
 
         if not set_id:
-            raise osv.except_osv(_('User Error'), _('Please chose an attribut set before'))
+            raise except_osv(_('User Error'), _('Please chose an attribute set before'))
 
         return {
             'name': 'Magento Fields',
@@ -948,17 +920,15 @@
                         f.set('nolabel', "1")
                         f.set('colspan', "4")
 
-                    orm.setup_modifiers(
-                        f, fields_get[attribute['field_name']],
-                        context=context)
+                    setup_modifiers(f, fields_get[attribute['field_name']],
+                                    context=context)
 
         if multiwebsites:
             website_page = etree.SubElement(
                 notebook, 'page', string=_('Websites'))
             wf = etree.SubElement(
                 website_page, 'field', name='websites_ids', nolabel="1")
-            orm.setup_modifiers(
-                wf, fields_get['websites_ids'], context=context)
+            setup_modifiers(wf, fields_get['websites_ids'], context=context)
 
         return notebook
 
@@ -1025,14 +995,13 @@
                         'page',
                         string=_('Magento Information'),
                         attrs=attrs_mag_notebook)
-                    orm.setup_modifiers(magento_page, context=context)
+                    setup_modifiers(magento_page, context=context)
                     f = etree.SubElement(
                         magento_page,
                         'field',
                         name='product_type',
                         attrs="{'required': [('magento_exportable', '=', True)]}")
-                    orm.setup_modifiers(
-                        f, field=result['fields']['product_type'], context=context)
+                    setup_modifiers(f, field=result['fields']['product_type'], context=context)
                     magento_page.append(attributes_notebook)
                     btn.getparent().remove(btn)
                 else:
@@ -1050,18 +1019,21 @@
                     type='object',
                     colspan='2',
                     attrs=attrs_mag_notebook)
-                orm.setup_modifiers(new_btn, context=context)
+                setup_modifiers(new_btn, context=context)
                 btn.getparent().replace(btn, new_btn)
                 if page_placeholder:
                     placeholder = page_placeholder[0]
                     placeholder.getparent().remove(placeholder)
 
             result['arch'] = etree.tostring(eview, pretty_print=True)
+            #TODO understand (and fix) why the orm fill the field size for the text field :S
+            for field in result['fields']:
+                if result['fields'][field]['type'] == 'text':
+                    if 'size' in result['fields'][field]: del result['fields'][field]['size']
         return result
 
 class product_template(product_mag_osv):
     _inherit = "product.template"
-
     _columns = {
         'magerp_tmpl' : fields.serialized('Magento Template Fields'),
         'set':fields.many2one('magerp.product_attribute_set', 'Attribute Set'),
@@ -1071,19 +1043,15 @@
                                 ('no', 'Do Not Manage Stock'),
                                 ('yes','Manage Stock')],
                                 'Manage Stock Level'),
-    }
-
+        }
     _defaults = {
         'mag_manage_stock': 'use_default',
-    }
-
-product_template()
+        }
 
 
 class product_product(product_mag_osv):
     _inherit = "product.product"
 
-
     def send_to_external(self, cr, uid, external_session, resources, mapping, mapping_id, update_date=None, context=None):
         product_ids = resources.keys()
         res = super(product_product, self).send_to_external(cr, uid, external_session, resources, mapping, mapping_id, update_date=update_date, context=context)
@@ -1096,7 +1064,7 @@
         ext_id = res['product_id']
         external_session.connection.call('ol_catalog_product.update', [ext_id, resource, False, 'id'])
         return ext_id
-    
+
     @only_for_referential('magento')
     def _get_external_resources(self, cr, uid, external_session, external_id=None, resource_filter=None,
                                          mapping=None, mapping_id=None, fields=None, context=None):
@@ -1110,8 +1078,8 @@
                                                                     mapping_id=mapping_id,
                                                                     fields=fields,
                                                                     context=context)
-        
-        
+
+
     #TODO reimplement the grouped product
     def ext_create(self, cr, uid, external_session, resources, mapping=None, mapping_id=None, context=None):
         ext_create_ids={}
@@ -1134,7 +1102,7 @@
                     try:
                         ext_id = self.map_and_update_product(cr, uid, external_session, resource[main_lang], sku, context=context)
                     except:
-                        raise osv.except_osv(_('Error!'), _("Product %s already exist in Magento. Failed to rebind it. Please do it manually")%(sku))
+                        raise except_osv(_('Error!'), _("Product %s already exist in Magento. Failed to rebind it. Please do it manually")%(sku))
                 else:
                     raise
 
@@ -1256,10 +1224,10 @@
                 set_to_product_ids[product.set.id] = [product.id]
             else:
                 set_to_product_ids[product.set.id].append(product.id)
-        for attribut_id in set_to_product_ids:
+        for attribut_id, product_ids in set_to_product_ids.iteritems():
             context['attribut_set_id'] = attribut_id
             resources.update(super(product_product, self)._get_oe_resources(
-                                                cr, uid, external_session, ids, langs,
+                                                cr, uid, external_session, product_ids, langs,
                                                 smart_export=smart_export,
                                                 last_exported_date=last_exported_date,
                                                 mapping=mapping,
@@ -1391,9 +1359,17 @@
                         break
         if not_delete:
             if len(ids) > 1:
-                raise osv.except_osv(_('Warning!'), _('They are some products related to Magento. They can not be deleted!\nYou can change their Magento status to "Disabled" and uncheck the active box to hide them from OpenERP.'))
+                raise except_osv(_('Warning!'),
+                                 _('They are some products related to Magento. '
+                                   'They can not be deleted!\n'
+                                   'You can change their Magento status to "Disabled" '
+                                   'and uncheck the active box to hide them from OpenERP.'))
             else:
-                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.'))
+                raise except_osv(_('Warning!'),
+                                 _('This product is related to Magento. '
+                                   'It can not be deleted!\n'
+                                   'You 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)
 
@@ -1433,29 +1409,20 @@
         #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 = {}
 
-        shop = external_session.sync_from_object
-
-        # exclude service products
-        stock_product_ids = self.search(
-            cr, uid,
-            [('id', 'in', ids),
-             ('type', '!=', 'service'),
-             ('magento_exportable', '=', True)],
-            context=context)
-
         # use the stock location defined on the sale shop
         # to compute the stock value
-        stock = shop.warehouse_id.lot_stock_id
+        stock = external_session.sync_from_object.warehouse_id.lot_stock_id
         location_ctx = context.copy()
         location_ctx['location'] = stock.id
-        products = self.browse(
-            cr, uid, stock_product_ids, context=location_ctx)
+        for product_id in ids:
+            self._export_inventory(cr, uid, external_session, product_id, context=location_ctx)
 
-        for product in products:
-            self._export_inventory(cr, uid, external_session, product, stock, context=location_ctx)
         return True
 
-    def _export_inventory(self, cr, uid, external_session, product, stock, context=None):
+    @catch_error_in_report
+    def _export_inventory(self, cr, uid, external_session, product_id, context=None):
+        product = self.browse(cr, uid, product_id, context=context)
+        stock = external_session.sync_from_object.warehouse_id.lot_stock_id
         mag_product_id = self.get_extid(
             cr, uid, product.id, external_session.referential_id.id, context=context)
         if not mag_product_id:
@@ -1463,7 +1430,7 @@
         inventory_vals = self._prepare_inventory_magento_vals(
             cr, uid, product, stock, external_session.sync_from_object, context=context)
 
-        external_session.connection.call('product_stock.update',
+        external_session.connection.call('oerp_cataloginventory_stock_item.update',
                         [mag_product_id, inventory_vals])
 
         external_session.logger.info(
@@ -1617,5 +1584,3 @@
         finally:
             local_cr.close()
         return True
-
-product_product()

=== modified file 'magentoerpconnect/product_images.py'
--- magentoerpconnect/product_images.py	2012-06-22 10:15:40 +0000
+++ magentoerpconnect/product_images.py	2012-12-03 15:22:20 +0000
@@ -20,22 +20,30 @@
 #You should have received a copy of the GNU General Public License      #
 #along with this program.  If not, see <http://www.gnu.org/licenses/>.  #
 #########################################################################
-from osv import osv, fields
-import magerp_osv
 import mimetypes
-import netsvc
-from tools.translate import _
-import base64
+
+from openerp.osv.orm import Model
+from openerp.osv import fields
+from openerp.tools.translate import _
+
+from .magerp_osv import MagerpModel
 from base_external_referentials.decorator import commit_now
 from base_external_referentials.decorator import only_for_referential
 
-#TODO the option small_image, thumbnail, exclude, base_image, should be store diferently indeed this is not compatible with mutli instance (maybe serialized will be a good solution)
-#Moreover when a small is selected the flag on other image should be remove as magento does
-
-#TODO refactor all of this code and use the generic function from base_external_referentials.
-#To must useless line of code
-
-class product_images(magerp_osv.magerp_osv):
+#TODO Option on image should be compatible with multi-referential
+#Indeed when you have two Magento maybe you do not want to use the
+#same image for the base_image, thumbnail ot small_image
+#Maybe the solution will to use a serialized field that store the
+#value for each referential
+
+#TODO As only one image can be a small_image, thumbnail or base_image
+#We should add some constraint or automatically remove the flag on the
+#other image of the product.
+
+#TODO refactor all of this code and use the generic function from
+#base_external_referentials.
+
+class product_images(MagerpModel):
     _inherit = "product.images"
     _columns = {
         'base_image':fields.boolean('Base Image'),
@@ -46,20 +54,20 @@
         'sync_status':fields.boolean('Sync Status', readonly=True),
         'create_date': fields.datetime('Created date', readonly=True),
         'write_date': fields.datetime('Updated date', readonly=True),
-    }
+        }
     _defaults = {
         'sync_status':lambda * a: False,
         'base_image':lambda * a:True,
         'small_image':lambda * a:True,
         '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')
@@ -129,7 +137,7 @@
             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:
@@ -185,5 +193,3 @@
             ids = ids[1000:]
             external_session.logger.info("still %s image to export" %len(ids))
         return True
-        
-product_images()

=== modified file 'magentoerpconnect/product_images_view.xml'
--- magentoerpconnect/product_images_view.xml	2011-11-27 15:12:39 +0000
+++ magentoerpconnect/product_images_view.xml	2012-12-03 15:22:20 +0000
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-	<data>
-		<record id="view_product_image_form" model="ir.ui.view">
-			<field name="name">product.images.form.inherit</field>
-			<field name="model">product.images</field>
-			<field name="inherit_id" ref="product_images_olbs.view_product_image_form" />
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<xpath expr="/form/notebook/page/field[@name='file']"
-					position="after">
-					<group col="4" colspan="2">
-						<field name="base_image" colspan="4" />
-						<field name="small_image" colspan="4" />
-					</group>
-					<group col="4" colspan="2">
-						<field name="thumbnail" colspan="4" />
-						<field name="exclude" colspan="4" />
-					</group>
-				</xpath>
-			</field>
-		</record>
-	</data>
+    <data>
+        <record id="view_product_image_form" model="ir.ui.view">
+            <field name="name">product.images.form.inherit</field>
+            <field name="model">product.images</field>
+            <field name="inherit_id" ref="product_images_olbs.view_product_image_form" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='file']"
+                    position="after">
+                    <group col="4" colspan="2">
+                        <field name="base_image" colspan="4" />
+                        <field name="small_image" colspan="4" />
+                    </group>
+                    <group col="4" colspan="2">
+                        <field name="thumbnail" colspan="4" />
+                        <field name="exclude" colspan="4" />
+                    </group>
+                </xpath>
+            </field>
+        </record>
+    </data>
 </openerp>

=== modified file 'magentoerpconnect/product_links.py'
--- magentoerpconnect/product_links.py	2011-06-07 14:33:14 +0000
+++ magentoerpconnect/product_links.py	2012-12-03 15:22:20 +0000
@@ -18,14 +18,10 @@
 #
 ##############################################################################
 
-from osv import fields, osv
-
-
-class product_link(osv.osv):
+from openerp.osv.orm import Model
+from openerp.osv import fields
+
+class product_link(Model):
     _inherit = 'product.link'
-
-    _columns = {
-        'sequence': fields.integer('Position'),
-    }
-
-product_link()
+    _columns = {'sequence': fields.integer('Position'),
+                }

=== modified file 'magentoerpconnect/product_view.xml'
--- magentoerpconnect/product_view.xml	2012-06-21 16:33:03 +0000
+++ magentoerpconnect/product_view.xml	2012-12-03 15:22:20 +0000
@@ -1,270 +1,270 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<!--Magento Product Category Tree/Form view  -->
+    <data>
+        <!--Magento Product Category Tree/Form view  -->
 
-		<record model="ir.ui.view" id="product_category_form_view_magerp2">
-			<field name="name">product.category.form_view_magerp2</field>
-			<field name="model">product.category</field>
-			<field name="inherit_id" ref="product.product_category_form_view" />
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<xpath expr="/form/field[@name='sequence']" position="after">
-					<group colspan="4" col="4" attrs="{'invisible':[('magento_exportable','!=',1)],'readonly':[('level','=',0)]}">
-						<separator string="Magento Information" colspan="4" />
-						<notebook attrs="{'invisible':[('magento_exportable','!=',1)]}" colspan="4">
-							<page string="General Information">
-								<group cols="2" colspan="4">
-									<group col="2" colspan="1">
-										<separator string="Meta Information" colspan="2" />
-										<field name="meta_title" colspan="2" />
-										<field name="meta_keywords" colspan="2" />
-										<field name="meta_description" colspan="2" />
-										<field name="url_key" colspan="2" />
-										<field name="level" colspan="2" />
+        <record model="ir.ui.view" id="product_category_form_view_magerp2">
+            <field name="name">product.category.form_view_magerp2</field>
+            <field name="model">product.category</field>
+            <field name="inherit_id" ref="product.product_category_form_view" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/field[@name='sequence']" position="after">
+                    <group colspan="4" col="4" attrs="{'invisible':[('magento_exportable','!=',1)],'readonly':[('level','=',0)]}">
+                        <separator string="Magento Information" colspan="4" />
+                        <notebook attrs="{'invisible':[('magento_exportable','!=',1)]}" colspan="4">
+                            <page string="General Information">
+                                <group cols="2" colspan="4">
+                                    <group col="2" colspan="1">
+                                        <separator string="Meta Information" colspan="2" />
+                                        <field name="meta_title" colspan="2" />
+                                        <field name="meta_keywords" colspan="2" />
+                                        <field name="meta_description" colspan="2" />
+                                        <field name="url_key" colspan="2" />
+                                        <field name="level" colspan="2" />
                                         <field name="include_in_menu" colspan="2" />
-									</group>
-									<group col="1" colspan="1">
-										<separator string="Category Image" />
-										<field name="image" nolabel="1" widget="image" />
-										<field name="image_name" colspan="1" nolabel="1" />
-										<separator string="Description" />
-										<field name="description" colspan="1" nolabel="1" />
-										<group col="4" colspan="1">
-											<field name="is_active" colspan="1" />
-											<field name="magento_parent_id" />
-										</group>
-									</group>
-								</group>
+                                    </group>
+                                    <group col="1" colspan="1">
+                                        <separator string="Category Image" />
+                                        <field name="image" nolabel="1" widget="image" />
+                                        <field name="image_name" colspan="1" nolabel="1" />
+                                        <separator string="Description" />
+                                        <field name="description" colspan="1" nolabel="1" />
+                                        <group col="4" colspan="1">
+                                            <field name="is_active" colspan="1" />
+                                            <field name="magento_parent_id" />
+                                        </group>
+                                    </group>
+                                </group>
 
-							</page>
-							<page string="Display Settings">
-								<group col="4" colspan="4">
-									<separator string="Display Mode" colspan="4" />
-									<field name="display_mode" colspan="1" nolabel="1" />
-									<label string="Products only means that the products associated to the category will display, but not any static blocks.Static block only means that the selected static block will display, but none of the products.Static block and products means that the static block will display with the products listed directly beneath it." colspan="3" />
-								</group>
-								<separator string="Use Anchor" colspan="4" />
-								<group col="4" colspan="4">
-									<field name="is_anchor" colspan="1" />
-									<label string="Anchored categories will display all products associated to all child categories (and child of child, and child of child of child,etc.) on that category's page, along with the products associated directly to the parent category." colspan="3" />
-								</group>
+                            </page>
+                            <page string="Display Settings">
+                                <group col="4" colspan="4">
+                                    <separator string="Display Mode" colspan="4" />
+                                    <field name="display_mode" colspan="1" nolabel="1" />
+                                    <label string="Products only means that the products associated to the category will display, but not any static blocks.Static block only means that the selected static block will display, but none of the products.Static block and products means that the static block will display with the products listed directly beneath it." colspan="3" />
+                                </group>
+                                <separator string="Use Anchor" colspan="4" />
+                                <group col="4" colspan="4">
+                                    <field name="is_anchor" colspan="1" />
+                                    <label string="Anchored categories will display all products associated to all child categories (and child of child, and child of child of child,etc.) on that category's page, along with the products associated directly to the parent category." colspan="3" />
+                                </group>
                                 <group col="4" colspan="4">
                                     <group col="10" colspan="2">
-								        <separator string="Available Sorting method" colspan="10" />
+                                        <separator string="Available Sorting method" colspan="10" />
                                         <field name="use_default_available_sort_by" string="Use Default Config"/>
-								        <field name="available_sort_by" colspan="10" nolabel="1" attrs="{'readonly':[('use_default_available_sort_by','=',True)],'required':[('use_default_available_sort_by','=',False)]}">
+                                        <field name="available_sort_by" colspan="10" nolabel="1" attrs="{'readonly':[('use_default_available_sort_by','=',True)],'required':[('use_default_available_sort_by','=',False)]}">
                                             <tree string="Available Sort By">
                                                 <field name="label"/>
                                             </tree>
                                         </field>
-								    </group>
+                                    </group>
                                     <group col="2" colspan="2">
-								        <separator string="Default Sorting method" colspan="2" />
-								        <field name="default_sort_by" widget="selection" nolabel="1" domain="[('attribute_name', '=', 'sort_by')]"/>
-								        <separator string="Page Layout" colspan="2" />
-								        <field name="page_layout" nolabel="1" widget="selection" domain="[('attribute_name', '=', 'page_layout')]"/>
+                                        <separator string="Default Sorting method" colspan="2" />
+                                        <field name="default_sort_by" widget="selection" nolabel="1" domain="[('attribute_name', '=', 'sort_by')]"/>
+                                        <separator string="Page Layout" colspan="2" />
+                                        <field name="page_layout" nolabel="1" widget="selection" domain="[('attribute_name', '=', 'page_layout')]"/>
                                     </group>
                                 </group>
-							</page>
-						</notebook>
-					</group>
-				</xpath>
-			</field>
-		</record>
-
-		<record model="ir.ui.view" id="product_category_form_view_magerp">
-			<field name="name">product.category.form_view_magerp</field>
-			<field name="model">product.category</field>
-			<field name="inherit_id" ref="product.product_category_form_view" />
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="sequence" position="after">
-					<field name="magento_exportable" />
-				</field>
-			</field>
-		</record>
-
-		<!--Magento product_attribute_set Tree/Form view  -->
-		<record model="ir.ui.view" id="magerp_product_attribute_set_form">
-			<field name="name">magerp.product_attribute_set.form</field>
-			<field name="model">magerp.product_attribute_set</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Magento Product Attribute Sets">
-					<group col="4" colspan="4">
-						<field name="sort_order" readonly="1" />
-						<field name="attribute_set_name" readonly="1" />
-						<button name="update_attribute" string="Update Attributes" colspan="2" type="object" />
-					</group>
-					<separator string="Attributes in Set" colspan="4" />
-					<field name="attributes" nolabel="1" readonly="1" />
-				</form>
-			</field>
-		</record>
-		<record model="ir.ui.view" id="magerp_product_attribute_set_tree">
-			<field name="name">magerp.product_attribute_set.tree</field>
-			<field name="model">magerp.product_attribute_set</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Magento Product Attribute Set">
-					<field name="sort_order" select="2" />
-					<field name="attribute_set_name" select="1" />
-				</tree>
-			</field>
-		</record>
-		<record id="act_magerp_product_attribute_set_form" model="ir.actions.act_window">
-			<field name="name">Magento Product Attribute Sets</field>
-			<field name="res_model">magerp.product_attribute_set</field>
-			<field name="src_model">magerp.product_attribute_set</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="magerp_product_attribute_set_tree" />
-		</record>
-
-		<!--Magento product_attributes Tree/Form view  -->
-		<record model="ir.ui.view" id="magerp_product_attributes_form">
-			<field name="name">magerp.product_attributes.form</field>
-			<field name="model">magerp.product_attributes</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Magento Product Attributes">
-					<group col="4" colspan="4">
-						<field name="attribute_code" />
-						<field name="frontend_input" select="2" />
-						<field name="frontend_class" />
-						<field name="backend_model" />
-						<field name="backend_type" select="2" />
-						<field name="frontend_label"/>
-
-						<field name="is_visible_in_advanced_search" select="2" />
-						<field name="is_global" />
-						<field name="is_filterable" />
-						<field name="is_comparable" />
-						<field name="is_visible" />
-						<field name="is_searchable" />
-						<field name="is_user_defined" />
-						<field name="is_configurable" />
-
-						<field name="is_visible_on_front" />
-						<field name="is_used_for_price_rules" />
-						<field name="is_unique" />
-						<field name="is_required" />
-						<field name="position" />
-
-						<field name="group" />
-						<field name="apply_to" select="2" />
-						<field name="default_value" />
-						<field name="note" />
-						<field name="entity_type_id" />
-						<field name="options" readonly="1" />
+                            </page>
+                        </notebook>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="product_category_form_view_magerp">
+            <field name="name">product.category.form_view_magerp</field>
+            <field name="model">product.category</field>
+            <field name="inherit_id" ref="product.product_category_form_view" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="sequence" position="after">
+                    <field name="magento_exportable" />
+                </field>
+            </field>
+        </record>
+
+        <!--Magento product_attribute_set Tree/Form view  -->
+        <record model="ir.ui.view" id="magerp_product_attribute_set_form">
+            <field name="name">magerp.product_attribute_set.form</field>
+            <field name="model">magerp.product_attribute_set</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Magento Product Attribute Sets">
+                    <group col="4" colspan="4">
+                        <field name="sort_order" readonly="1" />
+                        <field name="attribute_set_name" readonly="1" />
+                        <button name="update_attribute" string="Update Attributes" colspan="2" type="object" />
+                    </group>
+                    <separator string="Attributes in Set" colspan="4" />
+                    <field name="attributes" nolabel="1" readonly="1" />
+                </form>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="magerp_product_attribute_set_tree">
+            <field name="name">magerp.product_attribute_set.tree</field>
+            <field name="model">magerp.product_attribute_set</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Magento Product Attribute Set">
+                    <field name="sort_order" select="2" />
+                    <field name="attribute_set_name" select="1" />
+                </tree>
+            </field>
+        </record>
+        <record id="act_magerp_product_attribute_set_form" model="ir.actions.act_window">
+            <field name="name">Magento Product Attribute Sets</field>
+            <field name="res_model">magerp.product_attribute_set</field>
+            <field name="src_model">magerp.product_attribute_set</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="magerp_product_attribute_set_tree" />
+        </record>
+
+        <!--Magento product_attributes Tree/Form view  -->
+        <record model="ir.ui.view" id="magerp_product_attributes_form">
+            <field name="name">magerp.product_attributes.form</field>
+            <field name="model">magerp.product_attributes</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Magento Product Attributes">
+                    <group col="4" colspan="4">
+                        <field name="attribute_code" />
+                        <field name="frontend_input" select="2" />
+                        <field name="frontend_class" />
+                        <field name="backend_model" />
+                        <field name="backend_type" select="2" />
+                        <field name="frontend_label"/>
+
+                        <field name="is_visible_in_advanced_search" select="2" />
+                        <field name="is_global" />
+                        <field name="is_filterable" />
+                        <field name="is_comparable" />
+                        <field name="is_visible" />
+                        <field name="is_searchable" />
+                        <field name="is_user_defined" />
+                        <field name="is_configurable" />
+
+                        <field name="is_visible_on_front" />
+                        <field name="is_used_for_price_rules" />
+                        <field name="is_unique" />
+                        <field name="is_required" />
+                        <field name="position" />
+
+                        <field name="group" />
+                        <field name="apply_to" select="2" />
+                        <field name="default_value" />
+                        <field name="note" />
+                        <field name="entity_type_id" />
+                        <field name="options" readonly="1" />
                         <field name="field_name" />
                         <field name="based_on" />
-					</group>
-				</form>
-			</field>
-		</record>
-		<record model="ir.ui.view" id="magerp_product_attributes_tree">
-			<field name="name">magerp.product_attributes.tree</field>
-			<field name="model">magerp.product_attributes</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Magento Product Attributes">
-					<field name="attribute_code" select="1" />
-					<field name="frontend_label" select="1"/>
-					<field name="is_visible" select="1"/>
-					<field name="is_required" select="1"/>
-					<field name="is_searchable" select="1" />
-					<field name="is_comparable" select="1" />
-					<field name="entity_type_id" select="1" />
-					<field name="group" select="1" />
-				</tree>
-			</field>
-		</record>
-		<record id="act_magerp_product_attributes_form" model="ir.actions.act_window">
-			<field name="name">Magento Product Attributes</field>
-			<field name="res_model">magerp.product_attributes</field>
-			<field name="src_model">magerp.product_attributes</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="magerp_product_attributes_tree" />
-		</record>
-
-		<!--Magento product_attribute groups Tree/Form view  -->
-		<record model="ir.ui.view" id="magerp_product_attribute_groups_form">
-			<field name="name">magerp.product_attribute_groups.form</field>
-			<field name="model">magerp.product_attribute_groups</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Magento Product Attributes Groups">
-					<group col="4" colspan="4">
-						<field name="attribute_group_name" />
-						<field name="attribute_set" />
-						<field name="default_id" />
-						<field name="sort_order" />
-					</group>
-				</form>
-			</field>
-		</record>
-		<record model="ir.ui.view" id="magerp_product_attribute_groups_tree">
-			<field name="name">magerp.product_attribute_groups.tree</field>
-			<field name="model">magerp.product_attribute_groups</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Magento Product Attribute groups">
-					<field name="attribute_group_name" select="1" />
-					<field name="attribute_set" select="2" />
-					<field name="default_id" select="2" />
-					<field name="sort_order" select="2" />
-				</tree>
-			</field>
-		</record>
-		<record id="act_magerp_product_attribute_groups_form" model="ir.actions.act_window">
-			<field name="name">Magento Product Attribute Groups</field>
-			<field name="res_model">magerp.product_attribute_groups</field>
-			<field name="src_model">magerp.product_attribute_groups</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="magerp_product_attribute_groups_tree" />
-		</record>
-
-		<!-- This is a product inherited form that will be dynamically populated-->
-		<record model="ir.ui.view" id="product_product_form_view_magerp">
-			<field name="name">product.normal.form_magerp</field>
-			<field name="model">product.product</field>
-			<field name="inherit_id" ref="product.product_normal_form_view" />
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<data>
-					<xpath expr="/form/group/group/field[@name='ean13']" position="after">
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="magerp_product_attributes_tree">
+            <field name="name">magerp.product_attributes.tree</field>
+            <field name="model">magerp.product_attributes</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Magento Product Attributes">
+                    <field name="attribute_code" select="1" />
+                    <field name="frontend_label" select="1"/>
+                    <field name="is_visible" select="1"/>
+                    <field name="is_required" select="1"/>
+                    <field name="is_searchable" select="1" />
+                    <field name="is_comparable" select="1" />
+                    <field name="entity_type_id" select="1" />
+                    <field name="group" select="1" />
+                </tree>
+            </field>
+        </record>
+        <record id="act_magerp_product_attributes_form" model="ir.actions.act_window">
+            <field name="name">Magento Product Attributes</field>
+            <field name="res_model">magerp.product_attributes</field>
+            <field name="src_model">magerp.product_attributes</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="magerp_product_attributes_tree" />
+        </record>
+
+        <!--Magento product_attribute groups Tree/Form view  -->
+        <record model="ir.ui.view" id="magerp_product_attribute_groups_form">
+            <field name="name">magerp.product_attribute_groups.form</field>
+            <field name="model">magerp.product_attribute_groups</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Magento Product Attributes Groups">
+                    <group col="4" colspan="4">
+                        <field name="attribute_group_name" />
+                        <field name="attribute_set" />
+                        <field name="default_id" />
+                        <field name="sort_order" />
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="magerp_product_attribute_groups_tree">
+            <field name="name">magerp.product_attribute_groups.tree</field>
+            <field name="model">magerp.product_attribute_groups</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Magento Product Attribute groups">
+                    <field name="attribute_group_name" select="1" />
+                    <field name="attribute_set" select="2" />
+                    <field name="default_id" select="2" />
+                    <field name="sort_order" select="2" />
+                </tree>
+            </field>
+        </record>
+        <record id="act_magerp_product_attribute_groups_form" model="ir.actions.act_window">
+            <field name="name">Magento Product Attribute Groups</field>
+            <field name="res_model">magerp.product_attribute_groups</field>
+            <field name="src_model">magerp.product_attribute_groups</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="magerp_product_attribute_groups_tree" />
+        </record>
+
+        <!-- This is a product inherited form that will be dynamically populated-->
+        <record model="ir.ui.view" id="product_product_form_view_magerp">
+            <field name="name">product.normal.form_magerp</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/form/group/group/field[@name='ean13']" position="after">
                         <field name="magento_exported" invisible="True"/>
-					</xpath>
-					<xpath expr="/form/group/group/field[@name='variants']" position="after">
-						<field name="set" select="2" attrs="{'required':[('magento_exportable','==',True)], 'readonly': [('magento_exported', '=', True)]}"/>
-					</xpath>
-					<xpath expr="/form/group/group/field[@name='sale_ok']" position="before">
-						<button name="open_magento_fields"/>
-					</xpath>
-					<xpath expr="/form/notebook" position="before">
-						<field name="magento_exportable" select="2"/>
-					</xpath>
-				</data>
-			</field>
-		</record>
-		<record model="ir.ui.view" id="product_product_form_view_magerpdynamic">
-			<field name="name">product.normal.form_magerp_dynamic</field>
-			<field name="model">product.product</field>
-			<field name="inherit_id" ref="product.product_normal_form_view" />
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<xpath expr="/form/notebook" position="inside">
-					<page string="attributes_placeholder"/>
-				</xpath>
-			</field>
-		</record>
+                    </xpath>
+                    <xpath expr="/form/group/group/field[@name='variants']" position="after">
+                        <field name="set" select="2" attrs="{'required':[('magento_exportable','==',True)], 'readonly': [('magento_exported', '=', True)]}"/>
+                    </xpath>
+                    <xpath expr="/form/group/group/field[@name='sale_ok']" position="before">
+                        <button name="open_magento_fields"/>
+                    </xpath>
+                    <xpath expr="/form/notebook" position="before">
+                        <field name="magento_exportable" select="2"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="product_product_form_view_magerpdynamic">
+            <field name="name">product.normal.form_magerp_dynamic</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook" position="inside">
+                    <page string="attributes_placeholder"/>
+                </xpath>
+            </field>
+        </record>
 
         <!--Magento Product Product Wizard Form view-->
 
@@ -293,34 +293,34 @@
             </field>
         </record>
 
-		<!--Magento Product Type Tree/Form view  -->
-	    <record model="ir.ui.view" id="magerp_product_type_form">
-		    <field name="name">magerp.product_product_type.form</field>
-		    <field name="model">magerp.product_product_type</field>
-		    <field name="type">form</field>
-		    <field name="priority" eval="5"/>
-		    <field name="arch" type="xml">
-		    <form string="Product Type">
+        <!--Magento Product Type Tree/Form view  -->
+        <record model="ir.ui.view" id="magerp_product_type_form">
+            <field name="name">magerp.product_product_type.form</field>
+            <field name="model">magerp.product_product_type</field>
+            <field name="type">form</field>
+            <field name="priority" eval="5"/>
+            <field name="arch" type="xml">
+            <form string="Product Type">
                 <field name="product_type"/>
                 <field name="name"/>
                 <field name="default_type"/>
-		    </form>
-		    </field>
-	    </record>
-	
-	    <record model="ir.ui.view" id="magerp_product_type_tree">
-		    <field name="name">magerp.product_product_type.tree</field>
-		    <field name="model">magerp.product_product_type</field>
-		    <field name="type">tree</field>
-		    <field name="priority" eval="5"/>
-		    <field name="arch" type="xml">
-			    <tree string="Product Type" editable="top">
-				    <field name="name" select="1"/>
-				    <field name="product_type" select="1"/>
+            </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="magerp_product_type_tree">
+            <field name="name">magerp.product_product_type.tree</field>
+            <field name="model">magerp.product_product_type</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="5"/>
+            <field name="arch" type="xml">
+                <tree string="Product Type" editable="top">
+                    <field name="name" select="1"/>
+                    <field name="product_type" select="1"/>
                     <field name="default_type" select="1"/>
-			    </tree>
-		    </field>
-	    </record>
+                </tree>
+            </field>
+        </record>
 
         <record model="ir.actions.act_window" id="act_magerp_product_type_form">
             <field name="name">Product Types</field>
@@ -331,43 +331,43 @@
 
 
     <!--Magento product_category attribute_option Tree/Form view  -->
-		<record model="ir.ui.view" id="magerp_product_category_attribute_options_form">
-			<field name="name">magerp.product_category_attribute_options.form</field>
-			<field name="model">magerp.product_category_attribute_options</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Magento Product Category Attribute Option">
-					<group col="4" colspan="4">
-						<field name="attribute_name" />
-						<field name="label" />
-						<field name="value" />
-					</group>
-				</form>
-			</field>
-		</record>
-
-		<record model="ir.ui.view" id="magerp_product_category_attribute_options_tree">
-			<field name="name">magerp.product_category_attribute_options.tree</field>
-			<field name="model">magerp.product_category_attribute_options</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Magento Product Category Attribute Option">
-					<field name="attribute_name" />
-					<field name="label" />
-					<field name="value" />
-				</tree>
-			</field>
-		</record>
-
-		<record id="act_magerp_product_category_attribute_options_form" model="ir.actions.act_window">
-			<field name="name">Magento Product Category Attribute Options</field>
-			<field name="res_model">magerp.product_category_attribute_options</field>
+        <record model="ir.ui.view" id="magerp_product_category_attribute_options_form">
+            <field name="name">magerp.product_category_attribute_options.form</field>
+            <field name="model">magerp.product_category_attribute_options</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Magento Product Category Attribute Option">
+                    <group col="4" colspan="4">
+                        <field name="attribute_name" />
+                        <field name="label" />
+                        <field name="value" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="magerp_product_category_attribute_options_tree">
+            <field name="name">magerp.product_category_attribute_options.tree</field>
+            <field name="model">magerp.product_category_attribute_options</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Magento Product Category Attribute Option">
+                    <field name="attribute_name" />
+                    <field name="label" />
+                    <field name="value" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="act_magerp_product_category_attribute_options_form" model="ir.actions.act_window">
+            <field name="name">Magento Product Category Attribute Options</field>
+            <field name="res_model">magerp.product_category_attribute_options</field>
             <field name="src_model">magerp.product_category_attribute_options</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="magerp_product_category_attribute_options_tree" />
-		</record>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="magerp_product_category_attribute_options_tree" />
+        </record>
 
         <!--Magento attribute_option Search/Tree/Form view  -->
 
@@ -433,5 +433,5 @@
             <field name="search_view_id" ref="magerp_product_attribute_options_search"/>
         </record>
 
-	</data>
+    </data>
 </openerp>

=== modified file 'magentoerpconnect/sale.py'
--- magentoerpconnect/sale.py	2012-08-20 09:39:45 +0000
+++ magentoerpconnect/sale.py	2012-12-03 15:22:20 +0000
@@ -22,17 +22,16 @@
 #along with this program.  If not, see <http://www.gnu.org/licenses/>.  #
 #########################################################################
 
-from osv import osv, fields
-import pooler
-import magerp_osv
+from openerp.osv.orm import Model
+from openerp.osv import fields
+from openerp.osv.osv import except_osv
 import netsvc
 from tools.translate import _
-import string
-import tools
+from openerp import tools
 import time
 from tools import DEFAULT_SERVER_DATETIME_FORMAT
 from base_external_referentials.external_osv import ExternalSession
-from base_external_referentials.decorator import only_for_referential
+from base_external_referentials.decorator import only_for_referential, open_report
 
 #from base_external_referentials import report
 
@@ -54,7 +53,7 @@
     'waiting_date': 'holded'}
 SALE_ORDER_IMPORT_STEP = 200
 
-class sale_shop(osv.osv):
+class sale_shop(Model):
     _inherit = "sale.shop"
 
     @only_for_referential('magento')
@@ -71,14 +70,16 @@
                     context['lang_to_export'].append(storeview.lang_id.code)
         return context
 
-
-
     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:
             website_id =  self.read(cr, uid, shop_id, ['shop_group_id'])
             if website_id.get('shop_group_id', False):
-                res[shop_id] = self.pool.get('product.product').search(cr, uid, [('magento_exportable', '=', True), ('id', 'in', res[shop_id]), "|", ('websites_ids', 'in', [website_id['shop_group_id'][0]]) , ('websites_ids', '=', False)])
+                res[shop_id] = self.pool.get('product.product').search(cr, uid,
+                                                                       [('magento_exportable', '=', True),
+                                                                        ('id', 'in', res[shop_id]),
+                                                                        "|", ('websites_ids', 'in', [website_id['shop_group_id'][0]]),
+                                                                             ('websites_ids', '=', False)])
             else:
                 res[shop_id] = []
         return res
@@ -138,7 +139,10 @@
             if model_data_id:
                 ir_model_data_obj.write(cr, uid, model_data_id, {'res_id' : value}, context=context)
             else:
-                raise osv.except_osv(_('Warning!'), _('No external id found, are you sure that the referential are syncronized? Please contact your administrator. (more information in magentoerpconnect/sale.py)'))
+                raise except_osv(_('Warning!'),
+                                 _('No external id found, are you sure that the referential are syncronized? '
+                                   'Please contact your administrator. '
+                                   '(more information in magentoerpconnect/sale.py)'))
         return True
 
     def _get_exportable_root_category_ids(self, cr, uid, ids, prop, unknow_none, context=None):
@@ -155,6 +159,11 @@
         defaults.update({'magento_shop' : True})
         return defaults
 
+    @only_for_referential('magento')
+    @open_report
+    def _export_inventory(self, *args, **kwargs):
+        return super(sale_shop, self)._export_inventory(*args, **kwargs)
+
     _columns = {
         'default_storeview_integer_id':fields.integer('Magento default Storeview ID'), #This field can't be a many2one because store field will be mapped before creating storeviews
         'default_storeview_id':fields.function(_get_default_storeview_id, type="many2one", relation="magerp.storeviews", method=True, string="Default Storeview"),
@@ -234,12 +243,9 @@
     def run_import_check_need_to_update(self, cr, uid, context=None):
         self._sale_shop(cr, uid, self.check_need_to_update, context=context)
 
-sale_shop()
-
-
-class sale_order(osv.osv):
+
+class sale_order(Model):
     _inherit = "sale.order"
-
     _columns = {
         'magento_incrementid': fields.char('Magento Increment ID', size=32),
         'magento_storeview_id': fields.many2one('magerp.storeviews', 'Magento Store View'),
@@ -247,7 +253,7 @@
             'shop_id', 'referential_id', 'magento_referential',
             type='boolean',
             string='Is a Magento Sale Order')
-    }
+        }
 
     def _auto_init(self, cr, context=None):
         tools.drop_view_if_exists(cr, 'sale_report')
@@ -323,7 +329,7 @@
                     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,))
                     _logger.info("Order %s canceled when updated from external system because it has been replaced by a new one", canceled_order_id)
-                except osv.except_osv, e:
+                except 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
                     to_cancel_order_name = self.read(cr, uid, canceled_order_id, ['name'])['name']
@@ -384,7 +390,7 @@
         resource['lastname'] = resource['customer_lastname']
         resource['email'] = resource['customer_email']
 
-        shop = self.pool.get('sale.shop').browse(cr, uid, defaults['shop_id'], context=context)
+        shop = external_session.sync_from_object
         partner_defaults = {'website_id': shop.shop_group_id.id}
         res = self.pool.get('res.partner')._record_one_external_resource(cr, uid, external_session, resource,\
                                 mapping=mapping, defaults=partner_defaults, context=context)
@@ -401,14 +407,17 @@
                      mapping_line_filter_ids=None, parent_data=None, previous_result=None, defaults=None, context=None):
         resource = self.clean_magento_resource(cr, uid, resource, context=context)
         resource = self.clean_magento_items(cr, uid, resource, context=context)
-        if not resource['customer_id']:
-            #If there is not partner it's a guest order
-            #So we remove the useless information
-            #And create a partner on fly and set the data in the default value
-            del resource['customer_id']
-            del resource['billing_address']['customer_id']
-            del resource['shipping_address']['customer_id']
-            defaults = self.create_onfly_partner(cr, uid, external_session, resource, mapping, defaults, context=context)
+        for line in mapping[mapping_id]['mapping_lines']:
+            if line['name'] == 'customer_id' and not resource.get('customer_id'):
+                #If there is not partner it's a guest order
+                #So we remove the useless information
+                #And create a partner on fly and set the data in the default value
+                #We only do this if the customer_id is in the mapping line
+                #Indeed when we check if a sale order exist only the name is asked for convertion
+                resource.pop('customer_id', None)
+                resource['billing_address'].pop('customer_id', None)
+                resource['shipping_address'].pop('customer_id', None)
+                defaults = self.create_onfly_partner(cr, uid, external_session, resource, mapping, defaults, context=context)
 
         return super(sale_order, self)._transform_one_resource(cr, uid, external_session, convertion_type, resource,\
                  mapping, mapping_id,  mapping_line_filter_ids=mapping_line_filter_ids, parent_data=parent_data,\
@@ -624,7 +633,7 @@
         # in the sale order and sometime it's equal to NONE in the address but at least the
         # the information is correct in one of this field
         # So I make this ugly code to try to fix it.
-        if not resource['customer_id']:
+        if not resource.get('customer_id'):
             if resource['billing_address'].get('customer_id'):
                 resource['customer_id'] = resource['billing_address']['customer_id']
         else:
@@ -634,13 +643,9 @@
                 resource['shipping_address']['customer_id'] = resource['customer_id']
         return resource
 
-sale_order()
-
-
-class sale_order_line(osv.osv):
-
+
+class sale_order_line(Model):
     _inherit = 'sale.order.line'
-
     _columns = {
         # Rised the precision of the sale.order.line discount field
         # from 2 to 3 digits in order to be able to have the same amount as Magento.
@@ -649,7 +654,5 @@
         # With a 2 digits precision, we can have 50.17 % => 148.99 or 50.16% => 149.02.
         # Rise the digits to 3 allows to have 50.167% => 149€
         'discount': fields.float('Discount (%)', digits=(16, 3), readonly=True, states={'draft': [('readonly', False)]}),
-    }
-
-sale_order_line()
+        }
 

=== modified file 'magentoerpconnect/sale_view.xml'
--- magentoerpconnect/sale_view.xml	2012-08-14 09:18:30 +0000
+++ magentoerpconnect/sale_view.xml	2012-12-03 15:22:20 +0000
@@ -1,45 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-
-		<record model="ir.ui.view" id="magerp_view_shop_form">
-			<field name="name">magerp_view_shop_form</field>
-			<field name="model">sale.shop</field>
-			<field name="inherit_id"
-				ref="base_sale_multichannels.base_sale_multichannels_view_shop_form" />
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<data>
-					<field name="referential_id" position="replace">
-						<field name="referential_id" attrs="{'readonly': [('magento_shop','=',True)]}"/>	
-					</field>
-					<field name="shop_group_id" position="replace">
-						<field name="shop_group_id" readonly="True"/>
-						<field name="magento_root_category"/>
-						<field name="storeview_ids" nolabel="1" colspan="4"/>
-						<separator string="Magento Option" colspan="4"/>
-						<field name="magento_shop" />
-						<field name="allow_magento_order_status_push" />
-						<field name="allow_magento_notification"/>
-					</field>
-                    <button name="export_inventory" position="after">
-                        <button name="export_images" string="Export Images"	colspan="2" type="object" />
-                    </button>
-				    <field name="last_inventory_export_date" position="after">
-				    	<field name="last_images_export_date" />
-				    </field>
-				</data>
-			</field>
-		</record>
-
-		<record id="act_magerp_shop_form" model="ir.actions.act_window">
-			<field name="name">Magento Shops</field>
-			<field name="res_model">sale.shop</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="domain">[('magento_shop', '=', True)]</field>
-		</record>
+    <data>
+
+
+        <record model="ir.ui.view" id="magerp_view_shop_form">
+            <field name="name">magerp_view_shop_form</field>
+            <field name="model">sale.shop</field>
+            <field name="inherit_id"
+                ref="base_sale_multichannels.base_sale_multichannels_view_shop_form" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="referential_id" position="replace">
+                    <field name="referential_id" attrs="{'readonly': [('type_name', '=', 'Magento')]}"/>
+                </field>
+                <page string="External Shop Settings" position="before">
+                    <page string="Magento Actions" attrs="{'invisible': [('type_name', '!=', 'Magento')]}">
+                        <group col="6" colspan="4">
+                            <group col="3" colspan="3">
+                                <separator string="Catalog" colspan="3"/>
+                                <group col="1" colspan="1">
+                                <button name="export_catalog" string="Export Catalog" colspan="1" type="object"/>
+                                <button name="export_inventory" string="Export Stock Levels Only" colspan="1" type="object"/>
+                                <button name="export_images" string="Export Images"    colspan="2" type="object" />
+                            </group>
+                            <group col="2" colspan="2">
+                                <field name="last_products_export_date" colspan="2"/>
+                                <field name="last_special_products_export_date" colspan="2"/>
+                                <field name="last_category_export_date" colspan="2"/>
+                                <field name="last_inventory_export_date" colspan="2"/>
+                                <field name="last_images_export_date" />
+                            </group>
+                        </group>
+                        <group col="3" colspan="3">
+                            <separator string="Orders" colspan="3"/>
+                            <group col="4" colspan="3">
+                                <button name="import_orders" string="Import Orders" colspan="1" type="object"/>
+                                <button name="check_need_to_update" string="Check Payments from Channel" colspan="1" type="object"/>
+                                <field name="import_orders_from_date" colspan="2"/>
+                            </group>
+                            <button name="update_orders" string="Update Orders State on Channel" colspan="1" type="object"/>
+                            <field name="last_update_order_export_date" colspan="2"/>
+                            <button name="export_invoices" string="Export Invoices" colspan="1" type="object"/>
+                            <button name="export_shipping" string="Export Shippings" colspan="1" type="object"/>
+                            </group>
+                            <separator string="Partners" colspan="3"/>
+                            <newline/>
+                            <button name="export_shop_partners" string="Export Partners" colspan="1" type="object"/>
+                            <newline/>
+                        </group>
+                    </page>
+                </page>
+                <field name="shop_group_id" position="replace">
+                    <field name="shop_group_id" readonly="True"/>
+                    <field name="magento_root_category"/>
+                    <field name="storeview_ids" nolabel="1" colspan="4"/>
+                    <separator string="Magento Option" colspan="4"/>
+                    <field name="magento_shop" />
+                    <field name="allow_magento_order_status_push" />
+                    <field name="allow_magento_notification"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="act_magerp_shop_form" model="ir.actions.act_window">
+            <field name="name">Magento Shops</field>
+            <field name="res_model">sale.shop</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[['type_name', '=', 'Magento']]</field>
+        </record>
 
         <record id="base_sale_multichannel_view_order_form_magento" model="ir.ui.view">
             <field name="name">base_sale_multichannel_view_order_form.magento</field>
@@ -59,6 +89,6 @@
                 </data>
             </field>
         </record>
-        
-	</data>
+
+    </data>
 </openerp>

=== removed file 'magentoerpconnect/server_tmp.patch'
--- magentoerpconnect/server_tmp.patch	2011-07-08 07:34:47 +0000
+++ magentoerpconnect/server_tmp.patch	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-=== modified file 'bin/osv/orm.py'
---- bin/osv/orm.py	2011-05-24 10:18:10 +0000
-+++ bin/osv/orm.py	2011-06-07 20:17:29 +0000
-@@ -2449,6 +2450,9 @@
-                 if k.startswith('x_') and not update_custom_fields:
-                     continue
- 
-+                if k.startswith('x_js_'):
-+                    continue
-+                
-                 f = self._columns[k]
- 
-                 if isinstance(f, fields.one2many):
-

=== 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-12-03 15:22:20 +0000
@@ -41,16 +41,16 @@
     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('""', ''))]
 ",
 "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_price","magento1324","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']))]",
@@ -60,16 +60,16 @@
 "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):
-	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], 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)
 if magento_parent_id:
-	result = [('parent_id',magento_parent_id)]"
+    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'])]"
@@ -102,20 +102,20 @@
 "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) 
+    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'])]
+    result = [('image',record['image_name'])]
 else:
-	result=[]"
+    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:
     att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, ifield,'page_layout', context=context)
@@ -226,52 +226,52 @@
 "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)])
 if result and len(result)==1:
-	result=[('country_id',result[0])]
+    result=[('country_id',result[0])]
 else:
-	result=[]
+    result=[]
 ",
 "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',','))]
+    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 = []",
+    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=[]
+    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=[]",
+    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)
 if result:
-	result=[('partner_id',result)]
+    result=[('partner_id',result)]
 else:
-	result=[('partner_id',False)]",
+    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=[('type','invoice')]
 elif ifield=='shipping':
-	result=[('type','delivery')]
+    result=[('type','delivery')]
 else:
-	result=[]",
+    result=[]",
 "magento_1324_prt_adr_15","magento1324","base.model_res_partner_address","email",,"in_out","function","unicode",,"result=[('email',ifield)]",
 "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,referential_id)
-	if result:
-		result=[('group_id',result)]",
+    result=self.pool.get('res.partner.category').extid_to_oeid(cr,uid,ifield,referential_id)
+    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,referential_id)
-	if result:
-		lang = self.pool.get('magerp.storeviews').browse(cr, uid, result).lang_id
-		result=[('store_id',result),('lang',lang and lang.code or False)]",
+    result=self.pool.get('magerp.storeviews').extid_to_oeid(cr,uid,ifield,referential_id)
+    if result:
+        lang = self.pool.get('magerp.storeviews').browse(cr, uid, result).lang_id
+        result=[('store_id',result),('lang',lang and lang.code or False)]",
 "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,referential_id)
-	if result:
-		result=[('website_id',result)]",
+    result=self.pool.get('external.shop.group').extid_to_oeid(cr,uid,ifield,referential_id)
+    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)]",
@@ -281,10 +281,10 @@
 result=[('firstname', fn), ('lastname', ln)]"
 "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)]
+    result=[('mag_vat',ifield)]
 else:
-	result=[]",
+    result=[]",
 "magento_1324_prt_12","magento1324","base.model_res_partner","dob",,"in_out","function","unicode",,"if ifield:
-	result =[('mag_birthday',ifield[:10])]
+    result =[('mag_birthday',ifield[:10])]
 else:
-	result=[]",
+    result=[]",

=== modified file 'magentoerpconnect/settings/1.5.0.0/product.category/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.5.0.0/product.category/external.mappinglines.template.csv	2012-05-07 20:54:47 +0000
+++ magentoerpconnect/settings/1.5.0.0/product.category/external.mappinglines.template.csv	2012-12-03 15:22:20 +0000
@@ -43,17 +43,17 @@
 magentoerpconnect.mag1500_product_category_is_anchor,magentoerpconnect.mag1500_product_category,is_anchor,magentoerpconnect.field_product_category_is_anchor,in_out,direct,int,,False,,
 magentoerpconnect.mag1500_product_category_image,magentoerpconnect.mag1500_product_category,image,,in_out,function,unicode,,False,"image_binary = False
 if resource['image'] and not resource['image']=='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 'image' in resource:
     if resource['image']:
         img = base64.decodestring(record['image'])
-        img_bin_enc = base64.encodestring(img) 
+        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:

=== modified file 'magentoerpconnect/settings/1.5.0.0/product/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.5.0.0/product/external.mappinglines.template.csv	2012-06-21 16:17:58 +0000
+++ magentoerpconnect/settings/1.5.0.0/product/external.mappinglines.template.csv	2012-12-03 15:22:20 +0000
@@ -59,7 +59,7 @@
         mag_categ_id = cat_obj.get_or_create_extid(cr, uid, external_session, categ_id, context=context)
         mag_categ_ids.append(mag_categ_id)
     result=[('categories', mag_categ_ids)]",,
-"mag1500_product_product_special_price",,"in_out","function","special_price",,"float","False","magentoerpconnect.mag1500_product_product","special_price","if 'x_magerp_special_price' in resource: result = [('x_magerp_special_price', ifield)]","if 'x_magerp_special_price' in resource: 
+"mag1500_product_product_special_price",,"in_out","function","special_price",,"float","False","magentoerpconnect.mag1500_product_product","special_price","if 'x_magerp_special_price' in resource: result = [('x_magerp_special_price', ifield)]","if 'x_magerp_special_price' in resource:
     if resource['x_magerp_special_price']:
         result = [('special_price', resource['x_magerp_special_price'])]
     else:

=== modified file 'magentoerpconnect/settings/1.5.0.0/res.partner.address/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.5.0.0/res.partner.address/external.mappinglines.template.csv	2012-05-19 17:26:11 +0000
+++ magentoerpconnect/settings/1.5.0.0/res.partner.address/external.mappinglines.template.csv	2012-12-03 15:22:20 +0000
@@ -1,5 +1,17 @@
 id,sequence,type,evaluation_type,external_field,field_id:id,external_type,alternative_key,mapping_id:id,function_name,in_function,out_function,child_mapping_id:id,datetime_format
-magentoerpconnect.mag1500_res_partner_address_name,,in_out,direct,firstname,magentoerpconnect.field_res_partner_address_firstname,unicode,True,magentoerpconnect.mag1500_res_partner_address,name,,,,
+magentoerpconnect.mag1500_res_partner_address_name,,in_out,function,firstname,base.field_res_partner_address_name,unicode,True,magentoerpconnect.mag1500_res_partner_address,name,"if 'firstname' in resource or 'lastname' in resource:
+    result = [('name', (resource.get('firstname') or '') + (resource.get('firstname') and ' ' or '') + (resource.get('lastname') or ''))]","if 'name' in resource:
+    name_split = name.split(' ')
+    if len(name_split) >= 2:
+        firstname = name_split[0]
+        lastname = name.replace(firstname, '').strip()
+    else:
+        firstname = '-'
+        lastname = name
+else:
+    firstname = ''
+    lastname = ''
+result = [('firstname', firstname), ('lastname', lastname)]",,
 magentoerpconnect.mag1500_res_partner_address_telephone,,in_out,direct,telephone,base.field_res_partner_address_phone,unicode,False,magentoerpconnect.mag1500_res_partner_address,,,,,
 magentoerpconnect.mag1500_res_partner_address_region,,in_out,function,region,,unicode,False,magentoerpconnect.mag1500_res_partner_address,region,"if ifield:
     result = self.pool.get('res.country.state').search(cr,uid,[('name','ilike',ifield)])
@@ -42,7 +54,6 @@
     result = [('prefix',resource['title'][1])]",,
 magentoerpconnect.mag1500_res_partner_address_city,,in_out,direct,city,base.field_res_partner_address_city,unicode,True,magentoerpconnect.mag1500_res_partner_address,,"result=[('city',ifield)]",,,
 magentoerpconnect.mag1500_res_partner_address_fax,,in_out,direct,fax,base.field_res_partner_address_fax,unicode,False,magentoerpconnect.mag1500_res_partner_address,,,,,
-magentoerpconnect.mag1500_res_partner_address_lastname,,in_out,direct,lastname,magentoerpconnect.field_res_partner_address_lastname,unicode,False,magentoerpconnect.mag1500_res_partner_address,,,,,
 mag1500_res_partner_address_email,,in_out,direct,email,base.field_res_partner_address_email,unicode,False,magentoerpconnect.mag1500_res_partner_address,,,,,
 mag1500_res_partner_address_company,,in_out,direct,company,magentoerpconnect.field_res_partner_address_company,unicode,True,magentoerpconnect.mag1500_res_partner_address,,,,,
 magentoerpconnect.mag1500_res_partner_address_zip,,in_out,direct,postcode,base.field_res_partner_address_zip,unicode,True,magentoerpconnect.mag1500_res_partner_address,,"result=[('zip',ifield)]",,,

=== modified file 'magentoerpconnect/settings/1.5.0.0/res.partner/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.5.0.0/res.partner/external.mappinglines.template.csv	2012-08-14 14:53:28 +0000
+++ magentoerpconnect/settings/1.5.0.0/res.partner/external.mappinglines.template.csv	2012-12-03 15:22:20 +0000
@@ -11,7 +11,8 @@
 mag1500_res_partner_created_in,,in_out,direct,created_in,magentoerpconnect.field_res_partner_created_in,unicode,False,magentoerpconnect.mag1500_res_partner,,,,,
 mag1500_res_partner_created_at,,in_out,direct,created_at,magentoerpconnect.field_res_partner_created_at,unicode,False,magentoerpconnect.mag1500_res_partner,,,,,
 mag1500_res_partner_updated_at,,in_out,direct,updated_at,magentoerpconnect.field_res_partner_updated_at,unicode,False,magentoerpconnect.mag1500_res_partner,,,,,%Y-%m-%d %H:%M:%S
-mag1500_res_partner_name,,in_out,function,firstname,,unicode,False,magentoerpconnect.mag1500_res_partner,name,"result = [('name',resource['firstname'] + ' ' + resource['lastname'])]","add_id = self.browse(cr, uid, resource['id'])
+mag1500_res_partner_name,,in_out,function,firstname,,unicode,False,magentoerpconnect.mag1500_res_partner,name,"if 'firstname' in resource or 'lastname' in resource:
+    result = [('name', (resource.get('firstname') or '') + (resource.get('firstname') and ' ' or '') + (resource.get('lastname') or ''))]","add_id = self.browse(cr, uid, resource['id'])
 fn = add_id.address[0].firstname
 ln = add_id.address[0].lastname
 result=[('firstname', fn), ('lastname', ln)]",,

=== modified file 'magentoerpconnect/settings/1.5.0.0/sale.order.line/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.5.0.0/sale.order.line/external.mappinglines.template.csv	2012-08-20 21:52:00 +0000
+++ magentoerpconnect/settings/1.5.0.0/sale.order.line/external.mappinglines.template.csv	2012-12-03 15:22:20 +0000
@@ -9,9 +9,9 @@
     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('""', ''))]
 ",,,
 mag1500_sale_order_line_product_id=>,,in,direct,product_id,sale.field_sale_order_line_product_id,int,False,mag1500_sale_order_line,,,,,
@@ -21,3 +21,4 @@
 ('price_unit_tax_excluded', (float(resource['base_row_total']))/float(resource['qty_ordered'])),
 ('tax_rate', float(resource['base_row_total']) and (float(resource['base_row_total_incl_tax'])/float(resource['base_row_total'])-1)),
 ]",,,
+mag1500_sale_order_line_id,,in,direct,item_id,base_sale_multichannels.field_sale_order_line_ext_ref_line,int,False,mag1500_sale_order_line,,,,,

=== modified file 'magentoerpconnect/settings/1.5.0.0/sale.order/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.5.0.0/sale.order/external.mappinglines.template.csv	2012-08-14 14:53:28 +0000
+++ magentoerpconnect/settings/1.5.0.0/sale.order/external.mappinglines.template.csv	2012-12-03 15:22:20 +0000
@@ -16,7 +16,6 @@
 mag1500_sale_order_cod_fee=>,,in,function,cod_fee,,float,False,mag1500_sale_order,cod_fee,"#TODO map me
 ",,,
 mag1500_sale_order_gift_certificates_amount=>,,in,function,giftcert_amount,,float,False,mag1500_sale_order,gift_certificates_amount,"result=[('gift_certificates_amount', ifield)]",,,
-mag1500_sale_order_shipping_amount_tax_excluded=>,,in,function,shipping_amount,,float,False,mag1500_sale_order,shipping_amount_tax_excluded,"result=[('shipping_amount_tax_excluded', ifield)]",,,
 mag1500_sale_order_gift_certificates_code=>,,in,function,giftcert_code,,unicode,False,mag1500_sale_order,gift_certificates_code,"result = [('gift_certificates_code', ifield)]",,,
 mag1500_sale_order_carrier_id=>,,in,function,shipping_method,,unicode,False,mag1500_sale_order,carrier_id,"if ifield:
     carrier_ids = self.pool.get('delivery.carrier').search(cr, uid, [('magento_code', '=', ifield)])
@@ -28,5 +27,17 @@
         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)]",,,
-mag1500_sale_order_shipping_amount_tax_included=>,,in,function,base_shipping_incl_tax,,float,False,mag1500_sale_order,shipping_amount_tax_included,"result=[('shipping_amount_tax_included', ifield), ('shipping_tax_rate', ifield and (ifield/float(data['shipping_amount'])-1)) or 0]",,,
-mag1500_s   ale_order_date,,in,direct,created_at,sale.field_sale_order_date_order,datetime,False,mag1500_sale_order,,,,,%Y-%m-%d %H:%M:%S
+mag1500_sale_order_shipping_amount_tax_included=>,,in,function,base_shipping_incl_tax,,float,False,mag1500_sale_order,shipping_amount_tax_included,"amount_tax_inc = float(resource.get('base_shipping_incl_tax', 0.0)) - float(resource.get('shipping_discount_amount', 0.0))
+amount_tax_exc = float(resource.get('shipping_amount', 0))
+
+if amount_tax_exc:
+    tax_rate = amount_tax_inc/amount_tax_exc -1
+else:
+    tax_rate = 0
+
+result=[
+    ('shipping_amount_tax_included', amount_tax_inc),
+    ('shipping_amount_tax_excluded', amount_tax_exc),
+    ('shipping_tax_rate', tax_rate),
+]",,,
+mag1500_sale_order_date,,in,direct,created_at,sale.field_sale_order_date_order,datetime,False,mag1500_sale_order,,,,,%Y-%m-%d %H:%M:%S

=== modified file 'magentoerpconnect/stock.py'
--- magentoerpconnect/stock.py	2012-05-25 15:37:26 +0000
+++ magentoerpconnect/stock.py	2012-12-03 15:22:20 +0000
@@ -21,15 +21,14 @@
 
 import xmlrpclib
 
-from osv import fields,osv
-from tools.translate import _
-from openerp.addons.base_sale_multichannels.sale import \
-    ExternalShippingCreateError
+from openerp.osv.orm import Model
+from openerp.tools.translate import _
+from base_sale_multichannels.sale import ExternalShippingCreateError
 
 import logging
 _logger = logging.getLogger(__name__)
 
-class stock_picking(osv.osv):
+class stock_picking(Model):
 
     _inherit = "stock.picking"
 
@@ -122,5 +121,3 @@
         if res:
             _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)
         return True
-
-stock_picking()

=== modified file 'magentoerpconnect/wizard/open_product_by_attribut_set.py'
--- magentoerpconnect/wizard/open_product_by_attribut_set.py	2011-12-17 20:57:57 +0000
+++ magentoerpconnect/wizard/open_product_by_attribut_set.py	2012-12-03 15:22:20 +0000
@@ -19,13 +19,13 @@
 #                                                                               #
 #################################################################################
 
-from osv import fields,osv
-
-
-class open_product_by_attribut_set(osv.osv_memory):
+from openerp.osv.orm import TransientModel
+from openerp.osv import fields
+
+
+class open_product_by_attribut_set(TransientModel):
     _name = 'open.product.by.attribut.set'
     _description = 'Wizard to open product by attributs set'
-
     _columns = {
         'attributs_set':fields.many2one('magerp.product_attribute_set', 'Attributs Set'),
         }
@@ -51,5 +51,3 @@
         result['domain'] = "[('set', '=', %s)]" % attribute_set.id
         result['name'] = attribute_set.attribute_set_name
         return result
-
-open_product_by_attribut_set()

=== modified file 'magentoerpconnect_bundle/__openerp__.py'
--- magentoerpconnect_bundle/__openerp__.py	2012-03-15 09:47:04 +0000
+++ magentoerpconnect_bundle/__openerp__.py	2012-12-03 15:22:20 +0000
@@ -22,7 +22,7 @@
 
 {
     'name': 'magentoerpconnect_bundle',
-    'version': '0.1',
+    'version': '6.1.0',
     'category': 'Generic Modules',
     'license': 'AGPL-3',
     'description': """Module to extend the module magentoerpconnect, with it you will be able to create bundle product in magento directly from Openerp.
@@ -41,9 +41,9 @@
         'images/magentoerpconnect.png',
     ],
     "website" : "https://launchpad.net/magentoerpconnect",
-    'depends': ['magentoerpconnect','sale_bundle_product'], 
+    'depends': ['magentoerpconnect','sale_bundle_product'],
     'init_xml': [],
-    'update_xml': [ 
+    'update_xml': [
            'sale_bundle_product_view.xml',
            'product_view.xml',
            'settings/1.3.2.4/external.mappinglines.template.csv',

=== modified file 'magentoerpconnect_bundle/product.py'
--- magentoerpconnect_bundle/product.py	2012-03-28 09:49:00 +0000
+++ magentoerpconnect_bundle/product.py	2012-12-03 15:22:20 +0000
@@ -19,13 +19,11 @@
 #                                                                               #
 #################################################################################
 
-from osv import osv, fields
-import netsvc
-
-
-class product_product(osv.osv):
+from openerp.osv.orm import Model
+
+class product_product(Model):
     _inherit = "product.product"
-    
+
     def get_bundle_component(self, cr, uid, ids, context):
         res = {}
         for product in self.browse(cr, uid, ids, context=context):
@@ -34,7 +32,7 @@
                 for product_item_set_line in product_item_set.item_set_line_ids:
                     res[product.id].append(product_item_set_line.product_id.id)
         return res
-    
+
     def action_before_exporting(self, cr, uid, id, product_type, external_referential_ids, defaults, context=None):
         #When the export of a bundle product is forced we should check if all variant are already exported
         if context.get('force_export', False) and product_type == 'bundle':
@@ -44,24 +42,19 @@
                 if not self.oeid_to_extid(cr, uid, id, shop.referential_id.id):
                     self.ext_export(cr, uid, [id], external_referential_ids, defaults, context)
         return super(product_product, self).action_before_exporting(cr, uid, id, product_type, external_referential_ids, defaults, context=context)
-    
+
 
     def add_data_to_create_bundle_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
-
-
         #TODO add the data
-        
-        data.update({'configurable_products_data': products_data, 'configurable_attributes_data': attributes_data, 'associated_skus':associated_skus})
+        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) == 'bundle':
             data = self.add_data_to_create_bundle_product(cr, uid, oe_id, data, context)
         return super(product_product, self).ext_create(cr, uid, data, conn, method, oe_id, context)
-    
-
-product_product()
 

=== modified file 'magentoerpconnect_bundle/product_view.xml'
--- magentoerpconnect_bundle/product_view.xml	2011-07-06 19:15:30 +0000
+++ magentoerpconnect_bundle/product_view.xml	2012-12-03 15:22:20 +0000
@@ -7,37 +7,37 @@
 
 <openerp>
     <data>
-    
-        <!-- INHERITED VIEW FOR THE OBJECT : product_product 
-
-		<record id="product_view_form" model="ir.ui.view">
-			<field name="name">magentoerpconnect_bundle.product_product.view_form</field>
-			<field name="model">product.product</field>
-			<field name="inherit_id" ref="module_name_to_inherit.view_id" />
-            <field eval="16" name="priority"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<data>
-					<field name="field_reference" position="after">
-					</field>
-				</data>
-			</field>
-		</record>
-
-		<record id="product_view_tree" model="ir.ui.view">
-			<field name="name">magentoerpconnect_bundle.product_product.view_tree</field>
-			<field name="model">product.product</field>
-			<field name="inherit_id" ref="module_name_to_inherit.view_id" />
-            <field eval="16" name="priority"/>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<data>
-					<field name="field_reference" position="after">
-					</field>
-				</data>
-			</field>
-		</record>
-    
+
+        <!-- INHERITED VIEW FOR THE OBJECT : product_product
+
+        <record id="product_view_form" model="ir.ui.view">
+            <field name="name">magentoerpconnect_bundle.product_product.view_form</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="module_name_to_inherit.view_id" />
+            <field eval="16" name="priority"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <data>
+                    <field name="field_reference" position="after">
+                    </field>
+                </data>
+            </field>
+        </record>
+
+        <record id="product_view_tree" model="ir.ui.view">
+            <field name="name">magentoerpconnect_bundle.product_product.view_tree</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="module_name_to_inherit.view_id" />
+            <field eval="16" name="priority"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <data>
+                    <field name="field_reference" position="after">
+                    </field>
+                </data>
+            </field>
+        </record>
+
 -->
 
 

=== modified file 'magentoerpconnect_bundle/sale.py'
--- magentoerpconnect_bundle/sale.py	2012-03-15 09:47:04 +0000
+++ magentoerpconnect_bundle/sale.py	2012-12-03 15:22:20 +0000
@@ -19,10 +19,10 @@
 #                                                                               #
 #################################################################################
 
-from osv import osv
-
-
-class sale_order(osv.osv):
+from openerp.osv.orm import Model
+
+
+class sale_order(Model):
     _inherit = "sale.order"
 
     def _merge_sub_items(self, cr, uid, product_type, top_item, child_items, context=None):
@@ -37,5 +37,3 @@
         else:
             return super(sale_order, self)._merge_sub_items(cr, uid, product_type,
                                             top_item, child_items, context=context)
-    
-sale_order()

=== modified file 'magentoerpconnect_bundle/sale_bundle_product.py'
--- magentoerpconnect_bundle/sale_bundle_product.py	2011-10-30 20:09:37 +0000
+++ magentoerpconnect_bundle/sale_bundle_product.py	2012-12-03 15:22:20 +0000
@@ -19,24 +19,14 @@
 #                                                                               #
 #################################################################################
 
-from osv import osv, fields
-import netsvc
-
-
-class product_item_set_line(osv.osv):
-    
+from openerp.osv.orm import Model
+from openerp.osv import fields
+
+
+class product_item_set_line(Model):
     _inherit = "product.item.set"
-    
-
     _columns = {
         'magento_render_type': fields.selection((('list','List'), ('c','Check Box')), 'Magento Render'),
-
-    }
-
-    _defaults = {
-
-    }
-
-product_item_set_line()
+        }
 
 

=== modified file 'magentoerpconnect_bundle/sale_bundle_product_view.xml'
--- magentoerpconnect_bundle/sale_bundle_product_view.xml	2011-10-30 20:09:37 +0000
+++ magentoerpconnect_bundle/sale_bundle_product_view.xml	2012-12-03 15:22:20 +0000
@@ -7,23 +7,23 @@
 
 <openerp>
     <data>
-    
+
         <!-- INHERITED VIEW FOR THE OBJECT : product_item_set_line -->
 
-		<record id="product_item_set_view_form" model="ir.ui.view">
-			<field name="name">magentoerpconnect_bundle.product_item_set.view_form</field>
-			<field name="model">product.item.set</field>
-			<field name="inherit_id" ref="sale_bundle_product.product_item_set_view_form" />
+        <record id="product_item_set_view_form" model="ir.ui.view">
+            <field name="name">magentoerpconnect_bundle.product_item_set.view_form</field>
+            <field name="model">product.item.set</field>
+            <field name="inherit_id" ref="sale_bundle_product.product_item_set_view_form" />
             <field eval="16" name="priority"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<data>
-					<field name="required" position="after">
-						<field name="magento_render_type" />
-					</field>
-				</data>
-			</field>
-		</record>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <data>
+                    <field name="required" position="after">
+                        <field name="magento_render_type" />
+                    </field>
+                </data>
+            </field>
+        </record>
 
     </data>
 </openerp>

=== modified file 'magentoerpconnect_bundle_split/__openerp__.py'
--- magentoerpconnect_bundle_split/__openerp__.py	2012-05-18 13:38:51 +0000
+++ magentoerpconnect_bundle_split/__openerp__.py	2012-12-03 15:22:20 +0000
@@ -21,7 +21,7 @@
 
 {
     'name': 'Magentoerpconnect Bundle Split',
-    'version': '1.0',
+    'version': '6.1.0',
     'category': 'Generic Modules',
     "author" : "Camptocamp",
     'license': 'AGPL-3',

=== modified file 'magentoerpconnect_bundle_split/sale.py'
--- magentoerpconnect_bundle_split/sale.py	2012-05-23 17:38:35 +0000
+++ magentoerpconnect_bundle_split/sale.py	2012-12-03 15:22:20 +0000
@@ -19,10 +19,11 @@
 #
 ##############################################################################
 
-from osv import osv, fields
-
-
-class sale_order(osv.osv):
+from openerp.osv.orm import Model
+from openerp.osv import fields
+
+
+class sale_order(Model):
     _inherit = "sale.order"
 
     def _merge_sub_items(self, cr, uid, product_type, top_item, child_items, context=None):
@@ -47,15 +48,15 @@
         else:
             return super(sale_order, self)._merge_sub_items(cr, uid, product_type,
                                             top_item, child_items, context=context)
-    def oe_create(self, cr, uid, 
-		  external_session, vals, resource, defaults, context):
+    def oe_create(self, cr, uid,
+          external_session, vals, resource, defaults, context):
 
-	order_id = super(sale_order, self).\
-	    oe_create(cr, uid, external_session,
-		      vals, 
-		      resource, 
-		      defaults=defaults, 
-		      context=context)
+    order_id = super(sale_order, self).\
+        oe_create(cr, uid, external_session,
+              vals,
+              resource,
+              defaults=defaults,
+              context=context)
 
         order_line_obj = self.pool.get('sale.order.line')
         order = self.browse(cr, uid, order_id, context=context)
@@ -86,17 +87,11 @@
             res['sale_line_bundle_id'] = line.bundle_parent_id.id
         return res
 
-sale_order()
-
-
-class sale_order_line(osv.osv):
-
+
+class sale_order_line(Model):
     _inherit = 'sale.order.line'
-
     _columns = {
         'bundle_parent_id': fields.many2one('sale.order.line', 'Bundle Line'),
         'magento_item_id': fields.integer('Magento Item ID'),
         'magento_parent_item_id': fields.integer('Magento Item ID'),
-    }
-
-sale_order_line()
+        }

=== modified file 'magentoerpconnect_bundle_split/stock.py'
--- magentoerpconnect_bundle_split/stock.py	2012-05-23 17:38:35 +0000
+++ magentoerpconnect_bundle_split/stock.py	2012-12-03 15:22:20 +0000
@@ -19,11 +19,11 @@
 #
 ##############################################################################
 
-from osv import osv, fields
-
-
-class stock_picking(osv.osv):
-
+from openerp.osv.orm import Model
+from openerp.osv import fields
+
+
+class stock_picking(Model):
     _inherit = 'stock.picking'
 
     def create_ext_shipping(self, cr, uid, id, picking_type,
@@ -56,16 +56,10 @@
             cr, uid, id, picking_type,
             external_referential_id, context)
 
-stock_picking()
-
-
-class stock_move(osv.osv):
-
+
+class stock_move(Model):
     _inherit = 'stock.move'
-
     _columns = {
         'sale_line_bundle_id': fields.many2one('sale.order.line',
                                                string='Sale Order Line Bundle')
-    }
-
-stock_move()
+        }

=== renamed directory 'magentoerpconnect_partner_fiscal_category' => 'magentoerpconnect_customer_fiscal_category'
=== modified file 'magentoerpconnect_customer_fiscal_category/__openerp__.py'
--- magentoerpconnect_partner_fiscal_category/__openerp__.py	2012-03-27 09:51:08 +0000
+++ magentoerpconnect_customer_fiscal_category/__openerp__.py	2012-12-03 15:22:20 +0000
@@ -21,7 +21,7 @@
 
 {
     'name': 'Magentoerpconnect Partner Fiscal Category',
-    'version': '1.0',
+    'version': '6.1.0',
     'category': 'Generic Modules',
     "author" : "Camptocamp",
     'license': 'AGPL-3',
@@ -46,7 +46,7 @@
     'depends': ['magentoerpconnect',
                 'account_fiscal_rules_partner_category', ],
     'init_xml': [],
-    'update_xml': ['settings/1.3.2.4/external.mappinglines.template.csv',
+    'update_xml': [#'settings/1.3.2.4/external.mappinglines.template.csv',
                    'settings/1.5.0.0/external.mappinglines.template.csv', ],
     'demo_xml': [],
     'installable': True,

=== modified file 'magentoerpconnect_customer_fiscal_category/settings/1.5.0.0/external.mappinglines.template.csv'
--- magentoerpconnect_partner_fiscal_category/settings/1.5.0.0/external.mappinglines.template.csv	2012-05-09 12:54:07 +0000
+++ magentoerpconnect_customer_fiscal_category/settings/1.5.0.0/external.mappinglines.template.csv	2012-12-03 15:22:20 +0000
@@ -1,7 +1,2 @@
-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
-magento_1500_prt_tax_class_id,magentoerpconnect.magento1500,base.model_res_partner,tax_class_id,,in_out,function,int,,"result = [('fiscal_category_id', False)]
-if ifield:
-    category_obj = self.pool.get('res.partner.category')
-    category_ids = category_obj.search(cr, uid, [('tax_class_id', '=', ifield)])
-    if category_ids:
-        result = [('fiscal_category_id', category_ids[0])]",
+id,sequence,type,evaluation_type,external_field,field_id:id,external_type,alternative_key,mapping_id:id,function_name,in_function,out_function,child_mapping_id:id,datetime_format
+mag1500_res_partner_group_id,,in_out,direct,group_id,account_fiscal_rules_partner_category.field_res_partner_fiscal_category_id,int,False,magentoerpconnect.mag1500_res_partner,,,,,

=== modified file 'magentoerpconnect_init_stock/__openerp__.py'
--- magentoerpconnect_init_stock/__openerp__.py	2012-03-21 11:09:29 +0000
+++ magentoerpconnect_init_stock/__openerp__.py	2012-12-03 15:22:20 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {'name' : 'Magentoerpconnect Initialize Stock',
- 'version' : '1.0',
+ 'version' : '6.1.0',
  'author' : 'Camptocamp',
  'maintainer': 'Camptocamp',
  'license': 'AGPL-3',

=== modified file 'magentoerpconnect_init_stock/product.py'
--- magentoerpconnect_init_stock/product.py	2012-03-21 11:09:29 +0000
+++ magentoerpconnect_init_stock/product.py	2012-12-03 15:22:20 +0000
@@ -20,12 +20,11 @@
 ##############################################################################
 
 import logging
-from osv import osv
+from openerp.osv.orm import Model
 
 _logger = logging.getLogger(__name__)
 
-
-class product_product(osv.osv):
+class product_product(Model):
 
     _inherit = 'product.product'
 
@@ -52,5 +51,3 @@
         self._magento_init_stock(cr, uid, oe_id, magento_product_id,
                                  conn, context=context)
         return magento_product_id
-
-product_product()

=== added directory 'magentoerpconnect_magento_invoice'
=== added file 'magentoerpconnect_magento_invoice/__init__.py'
--- magentoerpconnect_magento_invoice/__init__.py	1970-01-01 00:00:00 +0000
+++ magentoerpconnect_magento_invoice/__init__.py	2012-12-03 15:22:20 +0000
@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#
+#   magentoerpconnect_magento_invoice for OpenERP
+#   Copyright (C) 2012-TODAY Akretion <http://www.akretion.com>. All Rights Reserved
+#   @author Sébastien BEAU <[e-mail]>
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+###############################################################################
+
+
+
+import account
+
+
+
+

=== added file 'magentoerpconnect_magento_invoice/__openerp__.py'
--- magentoerpconnect_magento_invoice/__openerp__.py	1970-01-01 00:00:00 +0000
+++ magentoerpconnect_magento_invoice/__openerp__.py	2012-12-03 15:22:20 +0000
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#
+#   magentoerpconnect_magento_invoice for OpenERP
+#   Copyright (C) 2012-TODAY Akretion <http://www.akretion.com>. All Rights Reserved
+#   @author Sébastien BEAU <[e-mail]>
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+###############################################################################
+
+
+
+
+{
+    'name': 'magentoerpconnect_magento_invoice',
+    'version': '6.1.1',
+    'category': 'Generic Modules',
+    'license': 'AGPL-3',
+    'description': """This module will use the Magento invoice number for the OpenERP Invoice.
+    Be carefull if your Magento is not available you can not validade an invoice in OpenERP
+    TODO refactor MagentoERPconnect in order to extract the other way to synchronise order
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com/',
+    'depends': ['magentoerpconnect'],
+    'init_xml': [],
+    'update_xml': [
+    ],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+

=== added file 'magentoerpconnect_magento_invoice/account.py'
--- magentoerpconnect_magento_invoice/account.py	1970-01-01 00:00:00 +0000
+++ magentoerpconnect_magento_invoice/account.py	2012-12-03 15:22:20 +0000
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#
+#   magentoerpconnect_magento_invoice for OpenERP
+#   Copyright (C) 2012-TODAY Akretion <http://www.akretion.com>. All Rights Reserved
+#   @author Sébastien BEAU <[e-mail]>
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+###############################################################################
+
+
+from openerp.osv.orm import Model
+
+class account_invoice(Model):
+    _inherit = "account.invoice"
+
+    def action_move_create(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {'lang': 'en_US'}
+        for invoice in self.browse(cr, uid, ids, context=context):
+            ext_invoice_id = self._export_one_invoice(cr, uid, invoice, context=context)
+            invoice.write({'internal_number': ext_invoice_id}, context=context)
+        return super(account_invoice, self).action_move_create(cr, uid, ids, context=context)
+

=== renamed directory 'magentoerpconnect_report_synchronizer' => 'magentoerpconnect_openerp_invoice'
=== modified file 'magentoerpconnect_openerp_invoice/__init__.py'
--- magentoerpconnect_report_synchronizer/__init__.py	2012-06-01 17:48:36 +0000
+++ magentoerpconnect_openerp_invoice/__init__.py	2012-12-03 15:22:20 +0000
@@ -20,9 +20,5 @@
 ###############################################################################
 
 
-
 import invoice
-
-
-
-
+import external_referential

=== modified file 'magentoerpconnect_openerp_invoice/__openerp__.py'
--- magentoerpconnect_report_synchronizer/__openerp__.py	2012-06-01 17:48:36 +0000
+++ magentoerpconnect_openerp_invoice/__openerp__.py	2012-12-03 15:22:20 +0000
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ###############################################################################
 #                                                                             #
-#   magentoerpconnect_report_synchronizer for OpenERP                         #
+#   magentoerpconnect_openerp_invoice for OpenERP                             #
 #   Copyright (C) 2012 Akretion Sébastien BEAU <[e-mail]>  #
 #                                                                             #
 #   This program is free software: you can redistribute it and/or modify      #
@@ -22,8 +22,8 @@
 
 
 {
-    'name': 'magentoerpconnect_report_synchronizer',
-    'version': '0.1',
+    'name': 'magentoerpconnect_openerp_invoice',
+    'version': '6.1.1',
     'category': 'Generic Modules/Others',
     'license': 'AGPL-3',
     'description': """
@@ -32,9 +32,13 @@
     """,
     'author': 'Akretion',
     'website': 'http://www.akretion.com/',
-    'depends': ['base_sale_report_synchronizer'], 
+    'depends': [
+        'base_sale_report_synchronizer',
+        'magentoerpconnect',
+        ],
     'init_xml': [],
-    'update_xml': [ 
+    'update_xml': [
+        'external_referential_view.xml',
     ],
     'demo_xml': [],
     'installable': True,

=== added file 'magentoerpconnect_openerp_invoice/external_referential.py'
--- magentoerpconnect_openerp_invoice/external_referential.py	1970-01-01 00:00:00 +0000
+++ magentoerpconnect_openerp_invoice/external_referential.py	2012-12-03 15:22:20 +0000
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#                                                                             #
+#   base_sale_report_synchronizer for OpenERP                                 #
+#   Copyright (C) 2012 Akretion Sébastien BEAU <[e-mail]>  #
+#                                                                             #
+#   This program is free software: you can redistribute it and/or modify      #
+#   it under the terms of the GNU Affero General Public License as            #
+#   published by the Free Software Foundation, either version 3 of the        #
+#   License, or (at your option) any later version.                           #
+#                                                                             #
+#   This program is distributed in the hope that it will be useful,           #
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of            #
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             #
+#   GNU Affero General Public License for more details.                       #
+#                                                                             #
+#   You should have received a copy of the GNU Affero General Public License  #
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.     #
+#                                                                             #
+###############################################################################
+
+from openerp.osv.orm import Model
+from openerp.osv import fields
+import netsvc
+
+class external_referential(Model):
+    _inherit = "external.referential"
+
+    _columns = {
+        'ext_file_referential_id': fields.many2one('external.referential', 'External Referential File',
+                    help='Referential file where the OpenERP report will be push'),
+        }
+    

=== added file 'magentoerpconnect_openerp_invoice/external_referential_view.xml'
--- magentoerpconnect_openerp_invoice/external_referential_view.xml	1970-01-01 00:00:00 +0000
+++ magentoerpconnect_openerp_invoice/external_referential_view.xml	2012-12-03 15:22:20 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  base_sale_report_synchronizer for OpenERP
+  Copyright (C) 2012 Akretion Sébastien BEAU <[e-mail]>
+  The licence is in the file __openerp__.py
+-->
+
+<openerp>
+    <data>
+        <record id="external_referential_form_view" model="ir.ui.view">
+            <field name="name">base_sale_report_synchronizer.external_referential_form_view</field>
+            <field name="model">external.referential</field>
+            <field name="inherit_id" ref="base_external_referentials.external_referential_form_view" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="location" position="after">
+                    <field name="ext_file_referential_id"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== modified file 'magentoerpconnect_openerp_invoice/invoice.py'
--- magentoerpconnect_report_synchronizer/invoice.py	2012-06-01 17:48:36 +0000
+++ magentoerpconnect_openerp_invoice/invoice.py	2012-12-03 15:22:20 +0000
@@ -19,30 +19,63 @@
 #                                                                             #
 ###############################################################################
 
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv.orm import Model
+from openerp.osv import fields
+from base_external_referentials.external_osv import ExternalSession
+import os
 
-class account_invoice(osv.osv):
+class account_invoice(Model):
     _inherit = "account.invoice"
 
-    def ext_create(self, cr, uid, external_session, resources, mapping=None, mapping_id=None, context=None):
-        ext_create_ids={}
-        for resource_id, resource in resources.items():
-            resource = resource[resource.keys()[0]]
-            if resource['type'] == 'out_refund':
-                method = "synoopenerpadapter_creditmemo.addInfo"
-            elif resource['type'] == 'out_invoice':
-                method = "synoopenerpadapter_invoice.addInfo"
-            resource['reference'] = context.get('report_name')
-            ext_create_ids[resource_id] = external_session.connection.call(method, 
-                        [
-                            resource['customer_id'],
-                            resource['order_increment_id'],
-                            resource['reference'],
-                            resource['amount'],
-                            resource['date'],
-                            resource['customer_name'],
-                        ])
-            super(account_invoice, self).ext_create(cr, uid, external_session, resources, 
-                                                    mapping=mapping, mapping_id=mapping_id, context=context)
-        return ext_create_ids   
+    def _export_one_resource(self, cr, uid, external_session, invoice_id, context=None):
+        #TODO think about a better solution to pass the report_name
+        context['report_name'] = self._send_invoice_report(cr, uid, external_session,
+                                                             invoice_id, context=context)
+        return super(account_invoice, self)._export_one_resource(cr, uid, external_session, 
+                                                                    invoice_id, context=context)
+
+    def _send_invoice_report(self, cr, uid, external_session, invoice_id, context=None):
+        invoice = self.browse(cr, uid, invoice_id, context=context)
+        invoice_number = invoice.number.replace('/', '-')
+        invoice_path = self._get_invoice_path(cr, uid, external_session, invoice, context=context)
+        if not external_session.sync_from_object.invoice_report:
+            raise except_osv(_("User Error"), _("You must define a report for the invoice for your sale shop"))
+        report_name = "report.%s"%external_session.sync_from_object.invoice_report.report_name
+        #Init the connection with the sftp/ftp/... referential
+        if not hasattr(external_session, 'file_session'):
+            external_session.file_session = ExternalSession(
+                                external_session.referential_id.ext_file_referential_id,
+                                external_session.sync_from_object,
+                                )
+        return self.send_report(cr, uid, external_session.file_session, [invoice.id], report_name, 
+                                                    invoice_number, invoice_path, add_extension=False, context=context)
+
+    def _get_invoice_path(self, cr, uid, external_session, invoice, context=None):
+        ref_id = external_session.referential_id.id
+        ext_partner_id = invoice.partner_id.get_extid(ref_id, context=context)
+        ext_sale_id = invoice.sale_ids[0].get_extid(ref_id, context=context)
+        if invoice.type == 'out_invoice':
+            basepath = 'invoice'
+        elif invoice.type == 'out_refund':
+            basepath = 'creditmemo'
+        return os.path.join(basepath, str(ext_partner_id), str(ext_sale_id))
+
+    def ext_create_one_invoice(self, cr, uid, external_session, resource_id, resource, context=None):
+        data = resource[resource.keys()[0]]
+        if data['type'] == 'out_refund':
+            method = "synoopenerpadapter_creditmemo.addInfo"
+        elif data['type'] == 'out_invoice':
+            method = "synoopenerpadapter_invoice.addInfo"
+        data['reference'] = context.get('report_name')
+        res = external_session.connection.call(method,
+                    [
+                        data['customer_id'],
+                        data['order_increment_id'],
+                        data['reference'],
+                        data['amount'],
+                        data['date'],
+                        data['customer_name'],
+                    ])
+        super(account_invoice, self).ext_create_one_invoice(cr, uid, external_session,
+                                                    resource_id, resource, context=context)
+        return res

=== added directory 'magentoerpconnect_partner_surname'
=== added file 'magentoerpconnect_partner_surname/__init__.py'
--- magentoerpconnect_partner_surname/__init__.py	1970-01-01 00:00:00 +0000
+++ magentoerpconnect_partner_surname/__init__.py	2012-12-03 15:22:20 +0000
@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#
+#   magentoerpconnect_partner_surname for OpenERP
+#   Copyright (C) 2012-TODAY Akretion <http://www.akretion.com>.
+#     All Rights Reserved
+#     @author Sébastien BEAU <[e-mail]>
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+###############################################################################

=== added file 'magentoerpconnect_partner_surname/__openerp__.py'
--- magentoerpconnect_partner_surname/__openerp__.py	1970-01-01 00:00:00 +0000
+++ magentoerpconnect_partner_surname/__openerp__.py	2012-12-03 15:22:20 +0000
@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#
+#   magentoerpconnect_partner_surname for OpenERP
+#   Copyright (C) 2012-TODAY Akretion <http://www.akretion.com>.
+#     All Rights Reserved
+#     @author Sébastien BEAU <[e-mail]>
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+###############################################################################
+
+{
+    'name': 'magentoerpconnect_partner_surname',
+    'version': '6.1.0',
+    'category': 'Generic Modules/Others',
+    'license': 'AGPL-3',
+    'description': """
+    This module with the dependency base_partner_surname add the 
+    posibility to manage the fistname and the last name in a separated field
+    instead of having only one field 'name'
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com/',
+    'depends': ['magentoerpconnect', 'base_partner_surname'], 
+    'init_xml': [],
+    'update_xml': [ 
+           'settings/1.5.0.0/res.partner.address/external.mappinglines.template.csv',
+    ],
+    'demo_xml': [],
+    'installable': True,
+    'auto_install': True,
+}

=== added directory 'magentoerpconnect_partner_surname/settings'
=== added directory 'magentoerpconnect_partner_surname/settings/1.5.0.0'
=== added directory 'magentoerpconnect_partner_surname/settings/1.5.0.0/res.partner.address'
=== added file 'magentoerpconnect_partner_surname/settings/1.5.0.0/res.partner.address/external.mappinglines.template.csv'
--- magentoerpconnect_partner_surname/settings/1.5.0.0/res.partner.address/external.mappinglines.template.csv	1970-01-01 00:00:00 +0000
+++ magentoerpconnect_partner_surname/settings/1.5.0.0/res.partner.address/external.mappinglines.template.csv	2012-12-03 15:22:20 +0000
@@ -0,0 +1,3 @@
+id,sequence,type,evaluation_type,external_field,field_id:id,external_type,alternative_key,mapping_id:id,function_name,in_function,out_function,child_mapping_id:id,datetime_format
+magentoerpconnect.mag1500_res_partner_address_name,,in_out,direct,firstname,base_partner_surname.field_res_partner_address_first_name,unicode,True,magentoerpconnect.mag1500_res_partner_address,,,,,
+mag1500_res_partner_address_lastname,,in_out,direct,lastname,base_partner_surname.field_res_partner_address_last_name,unicode,True,magentoerpconnect.mag1500_res_partner_address,,,,,

=== modified file 'magentoerpconnect_payment/__openerp__.py'
--- magentoerpconnect_payment/__openerp__.py	2012-03-27 09:40:33 +0000
+++ magentoerpconnect_payment/__openerp__.py	2012-12-03 15:22:20 +0000
@@ -21,7 +21,7 @@
 
 
 {'name': 'Magentoerpconnect Payment',
- 'version': '1.0',
+ 'version': '6.1.0',
  'category': 'Generic Modules',
  'author': "Camptocamp",
  'license': 'AGPL-3',

=== modified file 'magentoerpconnect_payment/payment_type.py'
--- magentoerpconnect_payment/payment_type.py	2012-03-27 09:40:33 +0000
+++ magentoerpconnect_payment/payment_type.py	2012-12-03 15:22:20 +0000
@@ -19,16 +19,14 @@
 #
 ##############################################################################
 
-from osv import osv, fields
-
-
-class base_sale_payment_type(osv.osv):
-
+from openerp.osv.orm import Model
+from openerp.osv import fields
+
+
+class base_sale_payment_type(Model):
     _inherit = 'base.sale.payment.type'
-
     _columns = {
         'allow_magento_manual_invoice':
             fields.boolean('Allow Manual Creation of Magento Invoice')
-    }
+        }
 
-base_sale_payment_type()

=== modified file 'magentoerpconnect_payment/sale.py'
--- magentoerpconnect_payment/sale.py	2012-03-27 09:40:33 +0000
+++ magentoerpconnect_payment/sale.py	2012-12-03 15:22:20 +0000
@@ -20,11 +20,13 @@
 ##############################################################################
 import xmlrpclib
 
-from osv import osv, fields
+from openerp.osv.orm import Model
+from openerp.osv import fields
+from openerp.osv.osv import except_osv
 from tools.translate import _
 
 
-class sale_order(osv.osv):
+class sale_order(Model):
 
     _inherit = 'sale.order'
 
@@ -52,10 +54,9 @@
             # TODO: in case of error on Magento because the invoice has
             # already been created, get the invoice number
             # and store it in magento_ref
-            raise osv.except_osv(
-                _('Error'), _("Error on Magento on the invoice creation "
-                              "for order %s :\n" \
-                              "%s" % (order.name, magento_error)))
+            raise except_osv(_('Error'),
+                             _("Error on Magento on the invoice creation "
+                              "for order %s :\n%s") % (order.name, magento_error))
         self.write(
             cr, uid, order.id,
             {'magento_ref': external_invoice},
@@ -69,24 +70,23 @@
     def button_magento_create_invoice(self, cr, uid, ids, context=None):
         order = self.browse(cr, uid, ids[0], context=context)
         if order.state != 'draft':
-            raise osv.except_osv(
-                _('Error'), _('This order is not a quotation.'))
+            raise except_osv(_('Error'),
+                             _('This order is not a quotation.'))
 
         if not order.is_magento:
-            raise osv.except_osv(
-                _('Error'), _('This is not a Magento sale order.'))
+            raise except_osv(_('Error'),
+                             _('This is not a Magento sale order.'))
 
         if not order.base_payment_type_id:
-            raise osv.except_osv(
-                _('Error'), _('This order has no external '
-                              'payment type settings.'))
+            raise except_osv(_('Error'),
+                             _('This order has no external '
+                               'payment type settings.'))
 
         if not order.base_payment_type_id.allow_magento_manual_invoice:
-            raise osv.except_osv(
-                _('Error'), _(
-                    "Manual creation of the invoice on Magento "
-                    "is forbidden for external payment : %s" %
-                    order.ext_payment_method))
+            raise except_osv(_('Error'),
+                             _("Manual creation of the invoice on Magento "
+                               "is forbidden for external payment : %s") %
+                               order.ext_payment_method)
 
         # sale_exceptions module methods
         # in order to check if the order is valid
@@ -122,5 +122,3 @@
         if order.magento_ref:
             vals['magento_ref'] = order.magento_ref
         return vals
-
-sale_order()

=== modified file 'magentoerpconnect_product_variant/__openerp__.py'
--- magentoerpconnect_product_variant/__openerp__.py	2012-04-24 12:36:18 +0000
+++ magentoerpconnect_product_variant/__openerp__.py	2012-12-03 15:22:20 +0000
@@ -22,7 +22,7 @@
 
 {
     'name': 'magentoerpconnect_configurable_product',
-    'version': '0.1',
+    'version': '6.1.0',
     'category': 'Generic Modules',
     'license': 'AGPL-3',
     'description': """Module to extend the module magentoerpconnect, with it you will be able to create variant of product in magento directly from Openerp. Enjoy it !
@@ -36,9 +36,9 @@
         'images/magentoerpconnect.png',
     ],
     "website" : "https://launchpad.net/magentoerpconnect",
-    'depends': ['magentoerpconnect', 'product_variant_multi'], 
+    'depends': ['magentoerpconnect', 'product_variant_multi'],
     'init_xml': [],
-    'update_xml': [ 
+    'update_xml': [
             'product_view.xml',
 #            'settings/1.3.2.4/external.mappinglines.template.csv',
             'settings/1.5.0.0/external.mappinglines.template.csv',

=== modified file 'magentoerpconnect_product_variant/product.py'
--- magentoerpconnect_product_variant/product.py	2012-08-20 21:52:00 +0000
+++ magentoerpconnect_product_variant/product.py	2012-12-03 15:22:20 +0000
@@ -19,42 +19,30 @@
 #                                                                               #
 #################################################################################
 
-from osv import osv, fields
+from openerp.osv.orm import Model
+from openerp.osv import fields
 import netsvc
 
-class product_variant_dimension_type(osv.osv):
-    
+class product_variant_dimension_type(Model):
     _inherit = "product.variant.dimension.type"
-    
-
     _columns = {
-        'magento_attribut': fields.many2one('magerp.product_attributes', 'magento_attributs', domain = "[('frontend_input', '=', 'select'), ('is_global', '=', True), ('is_configurable', '=', True)]"),
-    }
-
-product_variant_dimension_type()
-
-
-class product_variant_dimension_option(osv.osv):
-    
+        'magento_attribut': fields.many2one('magerp.product_attributes', 'magento_attributs',
+                                            domain="[('frontend_input', '=', 'select'), ('is_global', '=', True), ('is_configurable', '=', True)]"),
+        }
+
+
+class product_variant_dimension_option(Model):
     _inherit = "product.variant.dimension.option"
-    
-
     _columns = {
-        #'magento_attribut': fields.related('dimension_id', 'magento_attribut', type="many2one", relation="magerp.product_attributes", string="Magento attributs", readonly=True),
-        'magento_attribut_option': fields.many2one('magerp.product_attribute_options', 'magento_attributs_option', domain = "[('attribute_id', '=', parent.magento_attribut)]"),
-
-    }
-
-
-product_variant_dimension_option()
-
-class product_product(osv.osv):
-    
+        'magento_attribut_option': fields.many2one('magerp.product_attribute_options', 'magento_attributs_option',
+                                                   domain="[('attribute_id', '=', parent.magento_attribut)]"),
+        }
+
+
+class product_product(Model):
     _inherit = "product.product"
 
-
-#TODO for update A configurable product have to be updated if a variant is added
-
+    #TODO for update A configurable product have to be updated if a variant is added
     def build_product_code_and_properties(self, cr, uid, ids, context=None):
         super(product_product, self).build_product_code_and_properties(cr, uid, ids, context=context)
         magento_product_exportable_ids = []
@@ -68,7 +56,7 @@
 #            vals['x_magerp_visibility'] = option_id
         self.write(cr, uid, magento_product_exportable_ids, vals, context=context)
         return True
-    
+
     def generate_variant_name(self, cr, uid, product_id, context=None):
         res = super(product_product, self).generate_variant_name(cr, uid, product_id, context)
         if res == '':
@@ -86,7 +74,7 @@
             else:
                 vals['product_type'] = 'simple'
         return super(product_product, self).create(cr, uid, vals, context)
-    
+
     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
         field_names = super(product_product, self)._filter_fields_to_return(cr, uid, field_names, context)
@@ -145,15 +133,11 @@
         return ext_update_ids
 
 
-product_product()
-
-class product_template(osv.osv):
-
+class product_template(Model):
     _inherit = "product.template"
-
     _columns = {
         'magento_exportable':fields.boolean('Exported all variant to Magento?'),
-    }
+        }
 
 
     #TODO improve me, it will be great to have the posibility to create various configurable per template
@@ -162,7 +146,5 @@
         res = res + [[]]
         return res
 
-product_template()
-
 
 

=== modified file 'magentoerpconnect_product_variant/product_view.xml'
--- magentoerpconnect_product_variant/product_view.xml	2012-05-23 14:01:19 +0000
+++ magentoerpconnect_product_variant/product_view.xml	2012-12-03 15:22:20 +0000
@@ -7,88 +7,88 @@
 
 <openerp>
     <data>
-    
+
         <!-- INHERITED VIEW FOR THE OBJECT : product_variant_dimension_option -->
 
-		<record id="magentoerpconnect_cp_product_variant_dimension_option_view_form" model="ir.ui.view">
-			<field name="name">magentoerpconnect_cp.product_variant_dimension_option.view_form</field>
-			<field name="model">product.variant.dimension.option</field>
-			<field name="inherit_id" ref="product_variant_multi.product_variant_multi_dimension_option_form" />
+        <record id="magentoerpconnect_cp_product_variant_dimension_option_view_form" model="ir.ui.view">
+            <field name="name">magentoerpconnect_cp.product_variant_dimension_option.view_form</field>
+            <field name="model">product.variant.dimension.option</field>
+            <field name="inherit_id" ref="product_variant_multi.product_variant_multi_dimension_option_form" />
             <field eval="16" name="priority"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<data>
-					<field name="sequence" position="after">
-						<field name="magento_attribut_option" />
-					</field>
-				</data>
-			</field>
-		</record>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <data>
+                    <field name="sequence" position="after">
+                        <field name="magento_attribut_option" />
+                    </field>
+                </data>
+            </field>
+        </record>
 
-		<record id="magentoerpconnect_cp_product_variant_dimension_option_view_tree" model="ir.ui.view">
-			<field name="name">magentoerpconnect_cp.product_variant_dimension_option.view_tree</field>
-			<field name="model">product.variant.dimension.option</field>
-			<field name="inherit_id" ref="product_variant_multi.product_variant_multi_dimension_option_tree" />
+        <record id="magentoerpconnect_cp_product_variant_dimension_option_view_tree" model="ir.ui.view">
+            <field name="name">magentoerpconnect_cp.product_variant_dimension_option.view_tree</field>
+            <field name="model">product.variant.dimension.option</field>
+            <field name="inherit_id" ref="product_variant_multi.product_variant_multi_dimension_option_tree" />
             <field eval="16" name="priority"/>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<data>
-					<field name="sequence" position="after">
-						<field name="magento_attribut_option" />
-					</field>
-				</data>
-			</field>
-		</record>    
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <data>
+                    <field name="sequence" position="after">
+                        <field name="magento_attribut_option" />
+                    </field>
+                </data>
+            </field>
+        </record>
 
 
         <!-- INHERITED VIEW FOR THE OBJECT : product_variant_dimension_type -->
 
-		<record id="magentoerpconnect_cp_product_variant_dimension_type_view_form" model="ir.ui.view">
-			<field name="name">magentoerpconnect_cp.product_variant_dimension_type.view_form</field>
-			<field name="model">product.variant.dimension.type</field>
-			<field name="inherit_id" ref="product_variant_multi.product_variant_multi_dimension_type_form" />
-            <field eval="16" name="priority"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<data>
-					<field name="description" position="after">
-						<field name="magento_attribut" />
-					</field>
-				</data>
-			</field>
-		</record>
-
-		<record id="magentoerpconnect_cp_product_variant_dimension_type_view_tree" model="ir.ui.view">
-			<field name="name">magentoerpconnect_cp.product_variant_dimension_type.view_tree</field>
-			<field name="model">product.variant.dimension.type</field>
-			<field name="inherit_id" ref="product_variant_multi.product_variant_multi_dimension_type_tree" />
-            <field eval="16" name="priority"/>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<data>
-					<field name="description" position="after">
-						<field name="magento_attribut" />
-					</field>
-				</data>
-			</field>
-		</record>
-    
+        <record id="magentoerpconnect_cp_product_variant_dimension_type_view_form" model="ir.ui.view">
+            <field name="name">magentoerpconnect_cp.product_variant_dimension_type.view_form</field>
+            <field name="model">product.variant.dimension.type</field>
+            <field name="inherit_id" ref="product_variant_multi.product_variant_multi_dimension_type_form" />
+            <field eval="16" name="priority"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <data>
+                    <field name="description" position="after">
+                        <field name="magento_attribut" />
+                    </field>
+                </data>
+            </field>
+        </record>
+
+        <record id="magentoerpconnect_cp_product_variant_dimension_type_view_tree" model="ir.ui.view">
+            <field name="name">magentoerpconnect_cp.product_variant_dimension_type.view_tree</field>
+            <field name="model">product.variant.dimension.type</field>
+            <field name="inherit_id" ref="product_variant_multi.product_variant_multi_dimension_type_tree" />
+            <field eval="16" name="priority"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <data>
+                    <field name="description" position="after">
+                        <field name="magento_attribut" />
+                    </field>
+                </data>
+            </field>
+        </record>
+
         <!-- INHERITED VIEW FOR THE OBJECT : product_template -->
 
-		<record id="magentoerpconnect_cp_product_template_view_form" model="ir.ui.view">
-			<field name="name">magentoerpconnect_cp.product_template.view_form</field>
-			<field name="model">product.template</field>
-			<field name="inherit_id" ref="product_variant_multi.product_variant_multi_product_template_form_view" />
+        <record id="magentoerpconnect_cp_product_template_view_form" model="ir.ui.view">
+            <field name="name">magentoerpconnect_cp.product_template.view_form</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product_variant_multi.product_variant_multi_product_template_form_view" />
             <field eval="16" name="priority"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<data>
-					<field name="is_multi_variants" position="after">
-						<field name="set" />
-					</field>
-					<field name="variants" position="after">
-						<field name="product_type" />
-					</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <data>
+                    <field name="is_multi_variants" position="after">
+                        <field name="set" />
+                    </field>
+                    <field name="variants" position="after">
+                        <field name="product_type" />
+                    </field>
 
                     <xpath expr="/form/notebook" position="before">
                         <group colsan="1">
@@ -98,12 +98,12 @@
                     <xpath expr="/form/notebook" position="inside">
                         <page string="attributes_placeholder"/>
                     </xpath>
-					<field name="variant_track_outgoing" position="after">
-						<field name="magento_exportable"/>
-					</field>
-				</data>
-			</field>
-		</record>
+                    <field name="variant_track_outgoing" position="after">
+                        <field name="magento_exportable"/>
+                    </field>
+                </data>
+            </field>
+        </record>
 
         <!--Magento Product Template Wizard Form view  -->