Merge lp:~akretion-team/openerp-connector-magento/openerp-connector-magento-bundle-split into lp:~openerp-connector-core-editors/openerp-connector-magento/7.0

[Chafique DELLI]

Add module for importing sale order with bundle

[lp:~akretion-team/openerp-connector-magento/openerp-connector-magento-bundle-split]

985. By Chafique DELLI on 2014-04-08

[REF]:refactoring import sale order with product bundle

986. By Chafique DELLI on 2014-04-22

[IMP] cleaning code

987. By Chafique DELLI on 2014-04-22

[MERGE] merge with next release branch

Unmerged revisions

987. By Chafique DELLI on 2014-04-22

[MERGE] merge with next release branch

986. By Chafique DELLI on 2014-04-22

[IMP] cleaning code

985. By Chafique DELLI on 2014-04-08

[REF]:refactoring import sale order with product bundle

984. By Chafique DELLI on 2014-04-03

[IMP]: modify export mapping for status and add default value for display_price_bundle_parent

983. By Chafique DELLI on 2014-03-31

[ADD]: add module for manage product bundle

982. By Sébastien BEAU - http://www.akretion.com on 2014-04-02

[PEP] pep-8 clean up

981. By Sébastien BEAU - http://www.akretion.com on 2014-04-02

[REF] refactor code, the subject should be build in the mapping

980. By Sébastien BEAU - http://www.akretion.com on 2014-04-02

[REF] refactor code, use @on_record_create and read directly the option on the store as I can access to the storeview from the sale order

979. By Sébastien BEAU - http://www.akretion.com on 2014-04-02

[IMP] add the storeview_id on the sale order. This simplify the access on the object magento storeview and store

978. By Sébastien BEAU - http://www.akretion.com on 2014-04-02

[REF] refactor code in order to not replace the sale.SaleOrderImport connector_unit. Thanks to Guewen for the idea

=== modified file 'magentoerpconnect/AUTHORS'
--- magentoerpconnect/AUTHORS	2014-01-14 14:18:48 +0000
+++ magentoerpconnect/AUTHORS	2014-04-22 13:40:24 +0000
@@ -13,3 +13,4 @@
 * Alexis de Lattre at Akretion (tiny change)
 * Olivier Distexhe at Akilon (tiny change)
 * Romain Deheele at Camptocamp
+* Jan-Philipp Fischer at Greencoding

=== modified file 'magentoerpconnect/CHANGES.rst'
--- magentoerpconnect/CHANGES.rst	2014-01-23 08:14:03 +0000
+++ magentoerpconnect/CHANGES.rst	2014-04-22 13:40:24 +0000
@@ -1,6 +1,17 @@
 Changelog
 ---------
 
+2.3.1.dev0 (unreleased)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* New helper in importer to import dependencies
+* allow to customize the available versions without overriding the 'version' field
+* Products deactivated on Magento are imported as not sellable / purchasable
+* New option 'Create Invoice On' on payment methods with options 'on paid', 'on validate'
+* Using Magento on PHP 5.4 without using the compatibility patch would
+  break syncs'. Correct solution is to install the patch on Magento
+  though! http://magento.com/blog/magento-news/magento-now-supports-php-54
+
 
 2.3.1 (2014-01-23)
 ~~~~~~~~~~~~~~~~~~

=== modified file 'magentoerpconnect/__init__.py'
--- magentoerpconnect/__init__.py	2013-05-02 12:30:40 +0000
+++ magentoerpconnect/__init__.py	2014-04-22 13:40:24 +0000
@@ -13,5 +13,6 @@
 import delivery
 import stock_picking
 import stock_tracking
+import payment_invoice
 
 import consumer

=== modified file 'magentoerpconnect/__openerp__.py'
--- magentoerpconnect/__openerp__.py	2014-01-23 08:14:03 +0000
+++ magentoerpconnect/__openerp__.py	2014-04-22 13:40:24 +0000
@@ -132,6 +132,7 @@
           'delivery_view.xml',
           'stock_view.xml',
           'security/ir.model.access.csv',
+	  'payment_invoice.xml',
           ],
  'installable': True,
  'application': True,

=== modified file 'magentoerpconnect/doc/guides/tutorial_customize.rst'
--- magentoerpconnect/doc/guides/tutorial_customize.rst	2014-01-14 13:47:28 +0000
+++ magentoerpconnect/doc/guides/tutorial_customize.rst	2014-04-22 13:40:24 +0000
@@ -130,19 +130,15 @@
     class magento_backend(orm.Model):
         _inherit = 'magento.backend'
 
-        def _select_versions(self, cr, uid, context=None):
-            """ Available versions
+        def select_versions(self, cr, uid, context=None):
+            """ Available versions in the backend.
 
             Can be inherited to add custom versions.
             """
-            versions = super(magento_backend, self)._select_versions(cr, uid, context=context)
+            versions = super(magento_backend, self).select_versions(cr, uid, context=context)
             versions.append(('1.7-myversion', '1.7 - My Version'))
             return versions
 
-        _columns = {
-            'version': fields.selection(_select_versions, string='Version', required=True),
-        }
-
 Things to note:
 
 * The ``parent`` argument of my version is the 1.7 version. You have to

=== modified file 'magentoerpconnect/invoice.py'
--- magentoerpconnect/invoice.py	2013-10-09 19:41:58 +0000
+++ magentoerpconnect/invoice.py	2014-04-22 13:40:24 +0000
@@ -222,7 +222,12 @@
                                   if store.backend_id.id == magento_sale.backend_id.id),
                                  None)
             assert magento_store
-            create_invoice = magento_store.create_invoice_on
+
+            payment_method = sale.payment_method_id
+            if payment_method and payment_method.create_invoice_on:
+                create_invoice = payment_method.create_invoice_on
+            else:
+                create_invoice = magento_store.create_invoice_on
 
             if create_invoice == invoice.state:
                 session.create('magento.account.invoice',

=== modified file 'magentoerpconnect/magento_model.py'
--- magentoerpconnect/magento_model.py	2013-08-15 08:01:46 +0000
+++ magentoerpconnect/magento_model.py	2014-04-22 13:40:24 +0000
@@ -52,12 +52,22 @@
 
     _backend_type = 'magento'
 
+    def select_versions(self, cr, uid, context=None):
+        """ Available versions in the backend.
+
+        Can be inherited to add custom versions.  Using this method
+        to add a version from an ``_inherit`` does not constrain
+        to redefine the ``version`` field in the ``_inherit`` model.
+        """
+        return [('1.7', '1.7')]
+
     def _select_versions(self, cr, uid, context=None):
-        """ Available versions
+        """ Available versions in the backend.
 
-        Can be inherited to add custom versions.
+        If you want to add a version, do not override this
+        method, but ``select_version``.
         """
-        return [('1.7', '1.7')]
+        return self.select_versions(cr, uid, context=context)
 
     def _get_stock_field_id(self, cr, uid, context=None):
         stock_field = 'virtual_available'
@@ -382,7 +392,10 @@
             'Create invoice on action',
             required=True,
             help="Should the invoice be created in Magento "
-                 "when it is validated or when it is paid in OpenERP?"),
+                 "when it is validated or when it is paid in OpenERP?\n"
+                  "This only takes effect if the sales order's related "
+                  "payment method is not giving an option for this by "
+                  "itself. (See Payment Methods)"),
     }
 
     _defaults = {

=== modified file 'magentoerpconnect/partner.py'
--- magentoerpconnect/partner.py	2014-01-14 11:00:20 +0000
+++ magentoerpconnect/partner.py	2014-04-22 13:40:24 +0000
@@ -266,13 +266,8 @@
     def _import_dependencies(self):
         """ Import the dependencies for the record"""
         record = self.magento_record
-
-        # import customer groups
-        binder = self.get_binder_for_model('magento.res.partner.category')
-        if binder.to_openerp(record['group_id']) is None:
-            importer = self.get_connector_unit_for_model(MagentoImportSynchronizer,
-                                                         'magento.res.partner.category')
-            importer.run(record['group_id'])
+        self._import_dependency(record['group_id'],
+                                'magento.res.partner.category')
 
     @property
     def mapper(self):
@@ -349,10 +344,6 @@
         return {'website_id': website_id}
 
     @mapping
-    def backend_id(self, record):
-        return {'backend_id': self.backend_record.id}
-
-    @mapping
     def lang(self, record):
         binder = self.get_binder_for_model('magento.storeview')
         binding_id = binder.to_openerp(record['store_id'])
@@ -641,10 +632,6 @@
         return {'name': ' '.join(parts)}
 
     @mapping
-    def backend_id(self, record):
-        return {'backend_id': self.backend_record.id}
-
-    @mapping
     def use_parent_address(self, record):
         return {'use_parent_address': False}
 

=== added file 'magentoerpconnect/payment_invoice.py'
--- magentoerpconnect/payment_invoice.py	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/payment_invoice.py	2014-04-22 13:40:24 +0000
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+from openerp.osv import orm, fields
+
+
+class payment_invoice(orm.Model):
+    _inherit = "payment.method"
+
+    _columns = {
+        'create_invoice_on': fields.selection(
+            [('open', 'Validate'),
+             ('paid', 'Paid')],
+            'Create invoice on action',
+            help="Should the invoice be created in Magento "
+                 "when it is validated or when it is paid in OpenERP?\n"
+                 "If nothing is set, the option falls back to the same option "
+                 "on the Magento store related to the sales order."),
+    }

=== added file 'magentoerpconnect/payment_invoice.xml'
--- magentoerpconnect/payment_invoice.xml	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/payment_invoice.xml	2014-04-22 13:40:24 +0000
@@ -0,0 +1,21 @@
+<?xml version ="1.0" encoding="utf-8"?>
+
+<openerp>
+  <data>
+
+    <record id="payment_method_view_form" model="ir.ui.view">
+      <field name="model">payment.method</field>
+      <field name="inherit_id" ref="connector_ecommerce.payment_method_view_form"/>
+      <field name="arch" type="xml">
+
+        <group name="import_rule" position="after">
+          <group name="magento" string="Magento">
+            <field name="create_invoice_on" string="Create invoice on"/>
+          </group>
+        </group>
+
+      </field>
+    </record>
+
+  </data>
+</openerp>

=== modified file 'magentoerpconnect/product.py'
--- magentoerpconnect/product.py	2014-01-14 10:41:05 +0000
+++ magentoerpconnect/product.py	2014-04-22 13:40:24 +0000
@@ -41,6 +41,7 @@
                                                   ImportMapper,
                                                   )
 from .unit.backend_adapter import GenericAdapter
+from .unit.mapper import normalize_datetime
 from .unit.import_synchronizer import (DelayedBatchImport,
                                        MagentoImportSynchronizer,
                                        TranslationImporter,
@@ -280,7 +281,7 @@
         return sorted(images, key=priority)
 
     def _get_binary_image(self, image_data):
-        url = image_data['url']
+        url = image_data['url'].encode('utf8')
         try:
             binary = urllib2.urlopen(url)
         except urllib2.HTTPError as err:
@@ -318,13 +319,9 @@
         """ Import the dependencies for the record"""
         record = self.magento_record
         # import related categories
-        binder = self.get_binder_for_model('magento.product.category')
         for mag_category_id in record['categories']:
-            if binder.to_openerp(mag_category_id) is None:
-                importer = self.get_connector_unit_for_model(
-                    MagentoImportSynchronizer,
-                    model='magento.product.category')
-                importer.run(mag_category_id)
+            self._import_dependency(mag_category_id,
+                                    'magento.product.category')
 
     def _validate_product_type(self, data):
         """ Check if the product type is in the selection (so we can
@@ -395,11 +392,23 @@
               ('short_description', 'description_sale'),
               ('sku', 'default_code'),
               ('type_id', 'product_type'),
-              ('created_at', 'created_at'),
-              ('updated_at', 'updated_at'),
+              (normalize_datetime('created_at'), 'created_at'),
+              (normalize_datetime('updated_at'), 'updated_at'),
               ]
 
     @mapping
+    def is_active(self, record):
+        """ If the product is not active in Magento, it sets
+        sale_ok and purchase_ok to False.
+
+        '1' is a constant value in Magento, which means that the product
+        is active
+        """
+        if record.get('status') != '1':
+            return {'sale_ok': False,
+                    'purchase_ok': False}
+
+    @mapping
     def price(self, record):
         """ The price is imported at the creation of
         the product, then it is only modified and exported

=== modified file 'magentoerpconnect/product_view.xml'
--- magentoerpconnect/product_view.xml	2013-10-14 09:29:39 +0000
+++ magentoerpconnect/product_view.xml	2014-04-22 13:40:24 +0000
@@ -49,7 +49,7 @@
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.product.form</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="connector_ecommerce.product_normal_form_view"/>
+            <field name="inherit_id" ref="connector_base_product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <page name="connector" position="attributes">
                     <attribute name="invisible">0</attribute>

=== modified file 'magentoerpconnect/sale.py'
--- magentoerpconnect/sale.py	2014-04-22 13:40:24 +0000
+++ magentoerpconnect/sale.py	2014-04-22 13:40:24 +0000
@@ -680,13 +680,11 @@
 
         self._import_addresses()
 
-        prod_binder = self.get_binder_for_model('magento.product.product')
-        prod_importer = self.get_connector_unit_for_model(MagentoImportSynchronizer,
-                                                          'magento.product.product')
         for line in record.get('items', []):
-            _logger.info('line: %s', line)
-            if 'product_id' in line and prod_binder.to_openerp(line['product_id']) is None:
-                prod_importer.run(line['product_id'])
+            _logger.debug('line: %s', line)
+            if 'product_id' in line:
+                self._import_dependency(line['product_id'],
+                                        'magento.product.product')
 
 
 @magento

=== modified file 'magentoerpconnect/tests/__init__.py'
--- magentoerpconnect/tests/__init__.py	2013-09-03 09:55:45 +0000
+++ magentoerpconnect/tests/__init__.py	2014-04-22 13:40:24 +0000
@@ -23,7 +23,6 @@
 import test_address_book
 import test_export_invoice
 import test_import_product_image
-
 fast_suite = [
 ]
 

=== modified file 'magentoerpconnect/tests/test_data.py'
--- magentoerpconnect/tests/test_data.py	2014-04-22 13:40:24 +0000
+++ magentoerpconnect/tests/test_data.py	2014-04-22 13:40:24 +0000
@@ -22134,7 +22134,7 @@
                                                'sku': 'HTC Touch Diamond',
                                                'type': 'simple',
                                                'website_ids': ['1']}],
- ('customer.info', (1, None)): {'confirmation': None,
+ ('customer.info', (1,)): {'confirmation': None,
                                 'created_at': '2007-08-30 23:23:13',
                                 'created_in': None,
                                 'customer_id': '1',
@@ -22161,19 +22161,19 @@
  ('customer_address.list', (frozenset([('customer_id', frozenset([('eq', '1')]))]),)): [],
  ('ol_customer.search', (frozenset([('website_id', frozenset([('in', (u'0',))]))]),)): [],
  ('ol_customer.search', (frozenset([('website_id', frozenset([('in', (u'1',))]))]),)): ['1'],
- ('ol_customer_groups.info', (0, None)): {'customer_group_code': 'NOT LOGGED IN',
+ ('ol_customer_groups.info', (0,)): {'customer_group_code': 'NOT LOGGED IN',
                                           'customer_group_id': '0',
                                           'tax_class_id': '3'},
- ('ol_customer_groups.info', (1, None)): {'customer_group_code': 'General',
+ ('ol_customer_groups.info', (1,)): {'customer_group_code': 'General',
                                           'customer_group_id': '1',
                                           'tax_class_id': '3'},
- ('ol_customer_groups.info', (2, None)): {'customer_group_code': 'Wholesale',
+ ('ol_customer_groups.info', (2,)): {'customer_group_code': 'Wholesale',
                                           'customer_group_id': '2',
                                           'tax_class_id': '3'},
- ('ol_customer_groups.info', (3, None)): {'customer_group_code': 'Retailer',
+ ('ol_customer_groups.info', (3,)): {'customer_group_code': 'Retailer',
                                           'customer_group_id': '3',
                                           'tax_class_id': '3'},
- ('ol_customer_groups.info', (4, None)): {'customer_group_code': 'QAAAA',
+ ('ol_customer_groups.info', (4,)): {'customer_group_code': 'QAAAA',
                                           'customer_group_id': '4',
                                           'tax_class_id': '3'},
  ('ol_customer_groups.list', (frozenset([]),)): [{'customer_group_code': 'NOT LOGGED IN',
@@ -22191,39 +22191,39 @@
                                                  {'customer_group_code': 'QAAAA',
                                                   'customer_group_id': '4',
                                                   'tax_class_id': '3'}],
- ('ol_groups.info', (0, None)): {'default_store_id': '0',
+ ('ol_groups.info', (0,)): {'default_store_id': '0',
                                  'group_id': '0',
                                  'name': 'Default',
                                  'root_category_id': '0',
                                  'website_id': '0'},
- ('ol_groups.info', (1, None)): {'default_store_id': '1',
+ ('ol_groups.info', (1,)): {'default_store_id': '1',
                                  'group_id': '1',
                                  'name': 'Main Store',
                                  'root_category_id': '3',
                                  'website_id': '1'},
  ('ol_groups.search', (frozenset([]),)): ['0', '1'],
- ('ol_storeviews.info', (0, None)): {'code': 'admin',
+ ('ol_storeviews.info', (0,)): {'code': 'admin',
                                      'group_id': '0',
                                      'is_active': '1',
                                      'name': 'Admin',
                                      'sort_order': '0',
                                      'store_id': '0',
                                      'website_id': '0'},
- ('ol_storeviews.info', (1, None)): {'code': 'default',
+ ('ol_storeviews.info', (1,)): {'code': 'default',
                                      'group_id': '1',
                                      'is_active': '1',
                                      'name': 'English',
                                      'sort_order': '0',
                                      'store_id': '1',
                                      'website_id': '1'},
- ('ol_storeviews.info', (2, None)): {'code': 'german',
+ ('ol_storeviews.info', (2,)): {'code': 'german',
                                      'group_id': '1',
                                      'is_active': '1',
                                      'name': 'German',
                                      'sort_order': '0',
                                      'store_id': '2',
                                      'website_id': '1'},
- ('ol_storeviews.info', (3, None)): {'code': 'french',
+ ('ol_storeviews.info', (3,)): {'code': 'french',
                                      'group_id': '1',
                                      'is_active': '1',
                                      'name': 'French',
@@ -22231,13 +22231,13 @@
                                      'store_id': '3',
                                      'website_id': '1'},
  ('ol_storeviews.search', (frozenset([]),)): ['0', '1', '2', '3'],
- ('ol_websites.info', (0, None)): {'code': 'admin',
+ ('ol_websites.info', (0,)): {'code': 'admin',
                                    'default_group_id': '0',
                                    'is_default': '0',
                                    'name': 'Admin',
                                    'sort_order': '0',
                                    'website_id': '0'},
- ('ol_websites.info', (1, None)): {'code': 'base',
+ ('ol_websites.info', (1,)): {'code': 'base',
                                    'default_group_id': '1',
                                    'is_default': '1',
                                    'name': 'Main Website',
@@ -25473,7 +25473,7 @@
 		                                        'can_ship_partially_item': None,
 		                                        'coupon_code': None,
 		                                        'coupon_rule_name': None,
-		                                        'created_at': '2013-10-14 13:20:56',
+		                                        'created_at': time.strftime(FMT),
 		                                        'customer_dob': None,
 		                                        'customer_email': '[e-mail]',
 		                                        'customer_firstname': 'John',
@@ -25511,7 +25511,7 @@
 		                                        'hold_before_state': None,
 		                                        'hold_before_status': None,
 		                                        'imported': '0',
-		                                        'increment_id': '100005281',
+		                                        'increment_id': '900000695',
 		                                        'is_virtual': '0',
 		                                        'items': [{'additional_data': None,
 		                                                   'amount_refunded': '0.0000',
@@ -25539,7 +25539,7 @@
 		                                                   'base_weee_tax_applied_row_amount': '0.0000',
 		                                                   'base_weee_tax_disposition': '0.0000',
 		                                                   'base_weee_tax_row_disposition': '0.0000',
-		                                                   'created_at': '2013-10-14 13:20:56',
+		                                                   'created_at': time.strftime(FMT),
 		                                                   'description': None,
 		                                                   'discount_amount': '0.0000',
 		                                                   'discount_invoiced': '0.0000',
@@ -25594,7 +25594,7 @@
 		                                                   'tax_invoiced': '6.5900',
 		                                                   'tax_percent': '8.0000',
 		                                                   'tax_refunded': None,
-		                                                   'updated_at': '2013-10-14 13:22:00',
+		                                                   'updated_at': time.strftime(FMT),
 		                                                   'weee_tax_applied': 'a:0:{}',
 		                                                   'weee_tax_applied_amount': '0.0000',
 		                                                   'weee_tax_applied_row_amount': '0.0000',
@@ -25767,7 +25767,7 @@
 		                                        'total_paid': '97.5000',
 		                                        'total_qty_ordered': '1.0000',
 		                                        'total_refunded': None,
-		                                        'updated_at': '2013-10-14 13:22:00',
+		                                        'updated_at': time.strftime(FMT),
 		                                        'website_id': u'1',
 		                                        'weight': '0.0000',
 		                                        'x_forwarded_for': None},

=== modified file 'magentoerpconnect/tests/test_data_address_book.py'
--- magentoerpconnect/tests/test_data_address_book.py	2013-06-28 15:27:26 +0000
+++ magentoerpconnect/tests/test_data_address_book.py	2014-04-22 13:40:24 +0000
@@ -34,7 +34,7 @@
 
 # customer without address
 no_address = {
-    ('customer.info', (9999253, None)): {'confirmation': None,
+    ('customer.info', (9999253,)): {'confirmation': None,
                                      'created_at': '2013-06-28 12:35:33',
                                      'created_in': 'English',
                                      'customer_id': '9999253',
@@ -64,7 +64,7 @@
 
 # individual customer with 1 address
 individual_1_address = \
-{ ('customer.info', (9999254, None)): {'confirmation': None,
+{ ('customer.info', (9999254,)): {'confirmation': None,
                                   'created_at': '2013-06-28 12:43:49',
                                   'created_in': 'English',
                                   'customer_id': '9999254',
@@ -88,7 +88,7 @@
                                   'taxvat': None,
                                   'updated_at': '2013-06-28 12:43:49',
                                   'website_id': '1'},
- ('customer_address.info', (9999253, None)): {'city': u'Boutin-la-Forêt',
+ ('customer_address.info', (9999253,)): {'city': u'Boutin-la-Forêt',
                                           'company': None,
                                           'country_id': 'FR',
                                           'created_at': '2013-06-28 12:43:49',
@@ -134,7 +134,7 @@
 
 # individual customer with 2 addresses
 individual_2_addresses = \
-{('customer.info', (9999255, None)): {'confirmation': None,
+{('customer.info', (9999255,)): {'confirmation': None,
                                   'created_at': '2013-06-28 12:56:40',
                                   'created_in': 'English',
                                   'customer_id': '9999255',
@@ -158,7 +158,7 @@
                                   'taxvat': None,
                                   'updated_at': '2013-06-28 13:00:23',
                                   'website_id': '1'},
- ('customer_address.info', (9999254, None)): {'city': 'Perez',
+ ('customer_address.info', (9999254,)): {'city': 'Perez',
                                           'company': None,
                                           'country_id': 'FR',
                                           'created_at': '2013-06-28 12:56:43',
@@ -183,7 +183,7 @@
                                           'vat_request_date': None,
                                           'vat_request_id': None,
                                           'vat_request_success': None},
- ('customer_address.info', (9999255, None)): {'city': 'Bugarach',
+ ('customer_address.info', (9999255,)): {'city': 'Bugarach',
                                           'company': None,
                                           'country_id': 'FR',
                                           'created_at': '2013-06-28 13:00:23',
@@ -243,7 +243,7 @@
 
 # company with 1 address
 company_1_address = \
-{('customer.info', (9999256, None)): {'confirmation': None,
+{('customer.info', (9999256,)): {'confirmation': None,
                                   'created_at': '2013-06-28 13:10:21',
                                   'created_in': 'English',
                                   'customer_id': '9999256',
@@ -267,7 +267,7 @@
                                   'taxvat': None,
                                   'updated_at': '2013-06-28 13:10:22',
                                   'website_id': '1'},
- ('customer_address.info', (9999256, None)): {'city': 'Launaynec',
+ ('customer_address.info', (9999256,)): {'city': 'Launaynec',
                                           'company': 'Marechal',
                                           'country_id': 'FR',
                                           'created_at': '2013-06-28 13:10:22',
@@ -313,7 +313,7 @@
 
 # company with 2 addresses
 company_2_addresses = \
-{('customer.info', (9999257, None)): {'confirmation': None,
+{('customer.info', (9999257,)): {'confirmation': None,
                                   'created_at': '2013-06-28 13:23:01',
                                   'created_in': 'English',
                                   'customer_id': '9999257',
@@ -337,7 +337,7 @@
                                   'taxvat': None,
                                   'updated_at': '2013-06-28 13:25:28',
                                   'website_id': '1'},
- ('customer_address.info', (9999257, None)): {'city': 'Raynauddan',
+ ('customer_address.info', (9999257,)): {'city': 'Raynauddan',
                                           'company': 'Bertin',
                                           'country_id': 'FR',
                                           'created_at': '2013-06-28 13:23:01',
@@ -362,7 +362,7 @@
                                           'vat_request_date': None,
                                           'vat_request_id': None,
                                           'vat_request_success': None},
- ('customer_address.info', (9999258, None)): {'city': 'Cailla',
+ ('customer_address.info', (9999258,)): {'city': 'Cailla',
                                           'company': None,
                                           'country_id': 'FR',
                                           'created_at': '2013-06-28 13:25:28',

=== modified file 'magentoerpconnect/tests/test_export_invoice.py'
--- magentoerpconnect/tests/test_export_invoice.py	2013-08-09 21:14:23 +0000
+++ magentoerpconnect/tests/test_export_invoice.py	2014-04-22 13:40:24 +0000
@@ -64,12 +64,13 @@
                                        'manual_validation')
         __, journal_id = self.get_ref('account',
                                       'check_journal')
-        self.registry('payment.method').create(
+        self.payment_method_id = self.registry('payment.method').create(
             cr, uid,
             {'name': 'checkmo',
-                'workflow_process_id': workflow_id,
-                'import_rule': 'always',
-                'journal_id': journal_id})
+             'create_invoice_on': False,
+             'workflow_process_id': workflow_id,
+             'import_rule': 'always',
+             'journal_id': journal_id})
         __, self.journal_id = self.get_ref('account', 'bank_journal')
         __, self.pay_account_id = self.get_ref('account', 'cash')
         __, self.period_id = self.get_ref('account', 'period_10')
@@ -149,6 +150,63 @@
                 mock.ANY, 'magento.account.invoice',
                 self.invoice.magento_bind_ids[0].id)
 
+    def test_export_invoice_on_payment_method_validate(self):
+        """ Exporting an invoice: when it is validated with payment method """
+        cr, uid = self.cr, self.uid
+        store_ids = [store.id for website in self.backend.website_ids
+                     for store in website.store_ids]
+        # we setup the stores so they export the invoices as soon
+        # as they are validated (open)
+        self.registry('payment.method').write(
+            cr, uid, self.payment_method_id, {'create_invoice_on': 'open'})
+        # ensure we use the option of the payment method, not store
+        self.registry('magento.store').write(
+           cr, uid, store_ids, {'create_invoice_on': 'paid'})
+        # this is the consumer called when a 'magento.account.invoice'
+        # is created, it delay a job to export the invoice
+        patched = 'openerp.addons.magentoerpconnect.invoice.export_invoice'
+        with mock.patch(patched) as export_invoice:  # prevent to create the job
+            self._invoice_open()
+
+            assert len(self.invoice.magento_bind_ids) == 1
+            export_invoice.delay.assert_called_with(mock.ANY,
+                                                    'magento.account.invoice',
+                                                    self.invoice.magento_bind_ids[0].id)
+
+        # pay and verify it is NOT called
+        with mock.patch(patched) as export_invoice:  # prevent to create the job
+            self._pay_and_reconcile()
+            self.assertEqual(self.invoice.state, 'paid')
+            assert not export_invoice.delay.called
+
+    def test_export_invoice_on_payment_method_paid(self):
+        """ Exporting an invoice: when it is paid on payment method """
+        cr, uid = self.cr, self.uid
+        store_ids = [store.id for website in self.backend.website_ids
+                     for store in website.store_ids]
+        # we setup the stores so they export the invoices as soon
+        # as they are validated (open)
+        self.registry('payment.method').write(
+            cr, uid, self.payment_method_id, {'create_invoice_on': 'paid'})
+        # ensure we use the option of the payment method, not store
+        self.registry('magento.store').write(
+            cr, uid, store_ids, {'create_invoice_on': 'open'})
+        # this is the consumer called when a 'magento.account.invoice'
+        # is created, it delay a job to export the invoice
+        patched = 'openerp.addons.magentoerpconnect.invoice.export_invoice'
+        with mock.patch(patched) as export_invoice:  # prevent to create the job
+            self._invoice_open()
+            assert not export_invoice.delay.called
+
+        # pay and verify it is NOT called
+        with mock.patch(patched) as export_invoice:  # prevent to create the job
+            self._pay_and_reconcile()
+            self.assertEqual(self.invoice.state, 'paid')
+            assert len(self.invoice.magento_bind_ids) == 1
+            export_invoice.delay.assert_called_with(
+                mock.ANY, 'magento.account.invoice',
+                self.invoice.magento_bind_ids[0].id)
+
     def _invoice_open(self):
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(self.uid, 'account.invoice',

=== modified file 'magentoerpconnect/unit/backend_adapter.py'
--- magentoerpconnect/unit/backend_adapter.py	2013-06-26 06:36:58 +0000
+++ magentoerpconnect/unit/backend_adapter.py	2014-04-22 13:40:24 +0000
@@ -128,7 +128,7 @@
                                 self.magento.password) as api:
                 result = api.call(method, arguments)
                 # Uncomment to record requests/responses in ``recorder``
-                # record(method, arguments, result)
+                #record(method, arguments, result)
                 _logger.debug("api.call(%s, %s) returned %s",
                               method, arguments, result)
                 return result
@@ -168,8 +168,19 @@
 
         :rtype: dict
         """
+        arguments = [int(id)]
+        if attributes:
+            # Avoid to pass Null values in attributes. Workaround for
+            # https://bugs.launchpad.net/openerp-connector-magento/+bug/1210775
+            # When Magento is installed on PHP 5.4 and the compatibility patch
+            # (http://magento.com/blog/magento-news/magento-now-supports-php-54)
+            # is not installed, calling info() with None in attributes
+            # would return a wrong result (almost empty list of
+            # attributes). The right correction is to install the
+            # compatibility patch on Magento.
+            arguments.append(attributes)
         return self._call('%s.info' % self._magento_model,
-                          [int(id), attributes])
+                          arguments)
 
     def search_read(self, filters=None):
         """ Search records according to some criterias

=== modified file 'magentoerpconnect/unit/export_synchronizer.py'
--- magentoerpconnect/unit/export_synchronizer.py	2013-11-12 08:43:40 +0000
+++ magentoerpconnect/unit/export_synchronizer.py	2014-04-22 13:40:24 +0000
@@ -83,7 +83,9 @@
             return True
         record = self.backend_adapter.read(self.magento_id,
                                            attributes=['updated_at'])
-
+        if not record['updated_at']:
+            # in rare case it can be empty, in doubt, import it
+            return False
         fmt = DEFAULT_SERVER_DATETIME_FORMAT
         sync_date = datetime.strptime(sync, fmt)
         magento_date = datetime.strptime(record['updated_at'], fmt)

=== modified file 'magentoerpconnect/unit/import_synchronizer.py'
--- magentoerpconnect/unit/import_synchronizer.py	2013-11-09 22:56:22 +0000
+++ magentoerpconnect/unit/import_synchronizer.py	2014-04-22 13:40:24 +0000
@@ -87,8 +87,42 @@
         # miss changes done in Magento
         return magento_date < sync_date
 
+    def _import_dependency(self, magento_id, binding_model,
+                           importer_class=None, always=False):
+        """ Import a dependency.
+
+        The importer class is a class or subclass of
+        :class:`MagentoImportSynchronizer`. A specific class can be defined.
+
+        :param magento_id: id of the related binding to import
+        :param binding_model: name of the binding model for the relation
+        :type binding_model: str | unicode
+        :param importer_cls: :class:`openerp.addons.connector.connector.ConnectorUnit`
+                             class or parent class to use for the export.
+                             By default: MagentoImportSynchronizer
+        :type importer_cls: :class:`openerp.addons.connector.connector.MetaConnectorUnit`
+        :param always: if True, the record is updated even if it already exists,
+                       note that it is still skipped if it has not been
+                       modified on Magento since the last update. When False,
+                       it will import it only when it does not yet exist.
+        :type always: boolean
+        """
+        if not magento_id:
+            return
+        if importer_class is None:
+            importer_class = MagentoImportSynchronizer
+        binder = self.get_binder_for_model(binding_model)
+        if always or binder.to_openerp(magento_id) is None:
+            importer = self.get_connector_unit_for_model(
+                importer_class, model=binding_model)
+            importer.run(magento_id)
+
     def _import_dependencies(self):
-        """ Import the dependencies for the record"""
+        """ Import the dependencies for the record
+
+        Import of dependencies can be done manually or by calling
+        :meth:`_import_dependency` for each dependency.
+        """
         return
 
     def _map_data(self):

=== added file 'magentoerpconnect/unit/mapper.py'
--- magentoerpconnect/unit/mapper.py	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/unit/mapper.py	2014-04-22 13:40:24 +0000
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2013 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/>.
+#
+##############################################################################
+
+   
+def normalize_datetime(field):
+    """Change a invalid date which comes from Magento, if 
+    no real date is set to null for correct import to
+    OpenERP"""
+    def modifier(self, record, to_attr):
+        if record[field] == '0000-00-00 00:00:00':
+            return None
+        return record[field]
+    return modifier

=== added directory 'magentoerpconnect_bundle_split'
=== added file 'magentoerpconnect_bundle_split/__init__.py'
--- magentoerpconnect_bundle_split/__init__.py	1970-01-01 00:00:00 +0000
+++ magentoerpconnect_bundle_split/__init__.py	2014-04-22 13:40:24 +0000
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+import connector
+import sale
+import product

=== added file 'magentoerpconnect_bundle_split/__openerp__.py'
--- magentoerpconnect_bundle_split/__openerp__.py	1970-01-01 00:00:00 +0000
+++ magentoerpconnect_bundle_split/__openerp__.py	2014-04-22 13:40:24 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Chafique DELLI
+#    Copyright 2014 Akretion
+#
+#    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 Bundle Split',
+ 'version': '1.0.0',
+ 'category': 'Connector',
+ 'depends': [
+    'magentoerpconnect',
+    'sale_stock_relation_line',
+    'sale_invoice_relation_line',
+    ],
+ 'author': 'MagentoERPconnect Core Editors',
+ 'license': 'AGPL-3',
+ 'description': """
+Magento Connector - BUNDLE SPLIT
+=======================================
+Extension for **Magento Connector**, add management of bundle products
+
+Simple management of bundle items imported from Magento.
+
+Each item choosed in a bundle is imported as a sale order line, so you are able to have correct margin and products turnover.
+
+The bundle product is imported with a price of 0.0 or with the total price and is a service.
+
+For the shipment, the first item which was part of the bundle create the full shipment on Magento (limitation because Magento wait for the bundle product).
+The side effect is that the order will be marked as fully shipped on Magento even if the packing is sent in 2 times in OpenERP.
+ """,
+ 'data': [],
+ 'installable': True,
+ 'application': False,
+}

=== added file 'magentoerpconnect_bundle_split/connector.py'
--- magentoerpconnect_bundle_split/connector.py	1970-01-01 00:00:00 +0000
+++ magentoerpconnect_bundle_split/connector.py	2014-04-22 13:40:24 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Chafique DELLI
+#    Copyright 2014 Akretion 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 openerp.addons.connector.connector import install_in_connector
+
+
+install_in_connector()

=== added file 'magentoerpconnect_bundle_split/product.py'
--- magentoerpconnect_bundle_split/product.py	1970-01-01 00:00:00 +0000
+++ magentoerpconnect_bundle_split/product.py	2014-04-22 13:40:24 +0000
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier, David Beal, Chafique Delli
+#    Copyright 2013 Camptocamp SA
+#    Copyright 2013-14 Akretion
+#
+#    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 import orm, fields
+from openerp.addons.magentoerpconnect import product
+from openerp.addons.magentoerpconnect.backend import magento
+from openerp.addons.connector.unit.mapper import mapping
+
+
+class magento_product_product(orm.Model):
+    _inherit = 'magento.product.product'
+
+    _columns = {
+        'price_type': fields.selection([('dynamic', 'Dynamic'),('fixed', 'Fixed')],
+            'Price Type'),
+    }
+
+    def product_type_get(self, cr, uid, context=None):
+        option = ('bundle', 'Bundle Product')
+        type_selection = super(magento_product_product, self).product_type_get(
+            cr, uid, context=context)
+        if option not in type_selection:
+            type_selection.append(option)
+        return type_selection
+
+
+@magento(replacing=product.ProductImportMapper)
+class BundleProductImportMapper(product.ProductImportMapper):
+    _model_name = 'magento.product.product'
+
+    @mapping
+    def type(self, record):
+        if record['type_id'] == 'bundle':
+            return {'type': 'service'}
+        return super(BundleProductImportMapper,self).type(record)
+
+    @mapping
+    def price_type(self, record):
+        if 'price_type' in record:
+            if record['price_type'] == '0':
+                price_type = 'dynamic'
+            else:
+                price_type = 'fixed'
+            return {'price_type': price_type}
+        return {}

=== added file 'magentoerpconnect_bundle_split/sale.py'
--- magentoerpconnect_bundle_split/sale.py	1970-01-01 00:00:00 +0000
+++ magentoerpconnect_bundle_split/sale.py	2014-04-22 13:40:24 +0000
@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Chafique Delli
+#    Copyright 2014 Akretion 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 openerp.addons.magentoerpconnect import sale
+from openerp.addons.magentoerpconnect.backend import magento
+from openerp.osv import fields, orm
+from openerp.addons.connector.unit.mapper import mapping
+
+
+
+@magento(replacing=sale.SaleOrderLineImportMapper)
+class BundleSaleOrderLineImportMapper(sale.SaleOrderLineImportMapper):
+    _model_name = 'magento.sale.order.line'
+
+    direct = sale.SaleOrderLineImportMapper.direct + [
+        ('parent_item_id', 'magento_parent_item_id'),
+        ]
+
+    @mapping
+    def price(self, record):
+        sess = self.session
+        mag_product_model = sess.pool['magento.product.product']
+        mag_product_ids = mag_product_model.search(
+            sess.cr, sess.uid,
+            [('magento_id', '=', record['product_id'])])
+        mag_product = mag_product_model.browse(sess.cr,
+                                               sess.uid,
+                                               mag_product_ids[0])
+        result = {}
+        if record['product_type'] == 'bundle' and mag_product.price_type == 'dynamic':
+            result['price_unit'] = 0.0
+        else:
+            result = super(BundleSaleOrderLineImportMapper, self).price(record)
+        return result
+
+
+@magento(replacing=sale.SaleOrderImport)
+class BundleSaleOrderImport(sale.SaleOrderImport):
+    _model_name = ['magento.sale.order']
+
+
+    def _merge_sub_items(self, product_type, top_item, child_items):
+        """
+        In the module magentoerpconnect_bundle_split, instead of merging
+        the child items, we create a sale order line for each of them.
+        As the bundle item price is the same
+        as the sum of all the items, we set its price at 0.0
+
+        :param top_item: main item (bundle, configurable)
+        :param child_items: list of childs of the top item
+        :return: list of items
+        """
+        if product_type == 'bundle':
+            items = []
+            bundle_item = top_item.copy()
+            items = [child for child in child_items]
+            items.insert(0, bundle_item)
+            return items
+        return super(BundleSaleOrderImport, self)._merge_sub_items(
+                product_type, top_item, child_items)
+
+    def _create(self, data):
+        session = self.session
+        order_id = super(BundleSaleOrderImport, self)._create(data)
+        order_line_ids = session.search(
+            'magento.sale.order.line',
+            [('magento_order_id', '=', order_id)])
+        bundle_ids = {}
+        mag_id_2_openerp_id = {}
+        for line in session.browse('magento.sale.order.line', order_line_ids):
+            if line.magento_parent_item_id:
+                bundle_ids.setdefault(line.magento_parent_item_id, []).append(line.id)
+            mag_id_2_openerp_id[line.magento_id] = line.openerp_id.id
+        for mag_parent_item_id, mag_child_line_ids in bundle_ids.iteritems():
+            parent_line_id = mag_id_2_openerp_id[str(mag_parent_item_id)]
+            session.write('magento.sale.order.line', mag_child_line_ids, {
+                'line_parent_id': parent_line_id,
+                })
+        return order_id
+
+
+class magento_sale_order_line(orm.Model):
+    _inherit = 'magento.sale.order.line'
+
+    _columns = {
+        'magento_parent_item_id': fields.integer('Magento Parent Item ID'),
+        }

=== modified file 'magentoerpconnect_order_comment/sale.py'
--- magentoerpconnect_order_comment/sale.py	2014-04-22 13:40:24 +0000
+++ magentoerpconnect_order_comment/sale.py	2014-04-22 13:40:24 +0000
@@ -283,8 +283,12 @@
 
     @mapping
     def status(self, record):
-        state = record.magento_sale_order_id.openerp_id.state
-        return {'status': sale.ORDER_STATUS_MAPPING.get(state, 'pending')}
+        if record.status:
+            status = record.status
+        else:
+            state = record.magento_sale_order_id.openerp_id.state
+            status = sale.ORDER_STATUS_MAPPING.get(state, 'pending')
+        return {'status': status}
 
     @mapping
     def order_increment(self, record):