Merge lp:~akretion-team/openerp-connector-magento/openerp-connector-magento-base-catalog-export into lp:~openerp-connector-core-editors/openerp-connector-magento/7.0

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

This is change done on the existing stable module for being compatible with the magentoerpconnect_catalog and magentoerpconnect_product_variant modules.

Not ready for being merge yet

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

This merge have been move on github https://github.com/OCA/connector-magento/pull/4

review: Disapprove

Unmerged revisions

1005. By Sébastien BEAU - http://www.akretion.com on 2014-06-23

[MERGE] merge lock branch from Guewen, this will prevent job to export twice the same record

1004. By Sébastien BEAU - http://www.akretion.com on 2014-06-18

[REF] remove magentoerpconnect_catalog as the developpement is manage in a separated branch, will be merged soon

1003. By Sébastien BEAU - http://www.akretion.com on 2014-06-18

[IMP] commit work done by Augustin Cisterne-Kaas <email address hidden>, David Beal <email address hidden> Chafique Delli <email address hidden> and myself. This have been extracted from working branch on catalog export. Add the delay_unlink_all_binding, add fields visibility/status at the import. Add backendAdapter method, no refactor have been done yet

=== modified file 'magentoerpconnect/consumer.py'
--- magentoerpconnect/consumer.py	2013-10-09 19:41:58 +0000
+++ magentoerpconnect/consumer.py	2014-06-23 11:02:24 +0000
@@ -66,6 +66,22 @@
                             fields=fields)
 
 
+@on_record_unlink(model_names=_MODEL_NAMES)
+def delay_unlink_all_bindings(session, model_name, record_id):
+    """ Delay jobs which delete all the bindings of a record.
+
+    In this case, it is called on records of normal models and will delay
+    the deletion for all the bindings.
+    """
+    if session.context.get('connector_no_export'):
+        return
+    model = session.pool.get(model_name)
+    record = model.browse(session.cr, session.uid,
+                          record_id, context=session.context)
+    for binding in record.magento_bind_ids:
+        delay_unlink(session, binding._model._name, binding.id)
+
+
 @on_record_unlink(model_names=_BIND_MODEL_NAMES)
 def delay_unlink(session, model_name, record_id):
     """ Delay a job which delete a record on Magento.

=== modified file 'magentoerpconnect/product.py'
--- magentoerpconnect/product.py	2014-06-14 20:30:26 +0000
+++ magentoerpconnect/product.py	2014-06-23 11:02:24 +0000
@@ -88,6 +88,18 @@
         'product_type': fields.selection(_product_type_get,
                                          'Magento Product Type',
                                          required=True),
+        'visibility': fields.selection(
+            [('1', 'Not Visible Individually'),
+             ('2', 'Catalog'),
+             ('3', 'Search'),
+             ('4', 'Catalog, Search')],
+            string='Visibility in Magento',
+            required=True),
+        'status': fields.selection(
+            [('1', 'Enabled'),
+             ('2', 'Disabled')],
+            string='Status in Magento',
+            required=True),
         'manage_stock': fields.selection(
             [('use_default', 'Use Default Config'),
              ('no', 'Do Not Manage Stock'),
@@ -116,6 +128,8 @@
         'manage_stock': 'use_default',
         'backorders': 'use_default',
         'no_stock_sync': False,
+        'visibility': '4',
+        'status': '1',
         }
 
     _sql_constraints = [
@@ -205,6 +219,10 @@
                 in self._call('%s.list' % self._magento_model,
                               [filters] if filters else [{}])]
 
+    def create(self, data):
+        return self._call('%s.create'% self._magento_model,
+            [data.pop('product_type'),data.pop('attrset'),data.pop('sku'),data])
+
     def read(self, id, storeview_id=None, attributes=None):
         """ Returns the information of a record
 
@@ -429,6 +447,8 @@
               ('type_id', 'product_type'),
               (normalize_datetime('created_at'), 'created_at'),
               (normalize_datetime('updated_at'), 'updated_at'),
+              ('visibility', 'visibility'),
+              ('status', 'status')
               ]
 
     @mapping

=== modified file 'magentoerpconnect/product_category.py'
--- magentoerpconnect/product_category.py	2014-05-26 09:37:00 +0000
+++ magentoerpconnect/product_category.py	2014-06-23 11:02:24 +0000
@@ -25,7 +25,8 @@
 from openerp.addons.connector.unit.mapper import (mapping,
                                                   ImportMapper
                                                   )
-from openerp.addons.connector.exception import IDMissingInBackend
+from openerp.addons.connector.exception import (MappingError,
+                                                IDMissingInBackend)
 from .unit.backend_adapter import GenericAdapter
 from .unit.import_synchronizer import (DelayedBatchImport,
                                        MagentoImportSynchronizer,
@@ -49,6 +50,8 @@
                                       required=True,
                                       ondelete='cascade'),
         'description': fields.text('Description', translate=True),
+        'is_active': fields.boolean('Active in magento'),
+        'include_in_menu': fields.boolean('Include in magento menu'),
         'magento_parent_id': fields.many2one(
             'magento.product.category',
              string='Magento Parent Category',
@@ -59,6 +62,11 @@
              string='Magento Child Categories'),
     }
 
+    _defaults = {
+        'is_active': True,
+        'include_in_menu': False,
+    }
+
     _sql_constraints = [
         ('magento_uniq', 'unique(backend_id, magento_id)',
          'A product category with same ID on Magento already exists.'),
@@ -100,6 +108,30 @@
             else:
                 raise
 
+    def update_image(self, data):
+        for name in ['image', 'thumbnail']:
+            if data.get(name + '_binary'):
+                img = self._call('%s.create'% 'ol_catalog_category_media',
+                                 [data[name], data.pop(name + '_binary')])
+                if img == 'Error in file creation':
+                    #TODO FIX error management
+                    raise Exception("Image creation: ",
+                           "Magento tried to insert image (%s) but there is "
+                           "no sufficient grants in the folder "
+                           "'media/catalog/category' if it exists" %data[name])
+        return True
+
+    def create(self, data):
+        self.update_image(data)
+        return self._call('%s.create'% self._magento_model,
+                          [data['parent_id'],data])
+
+    def write(self, id, data, storeview=None):
+        """ Update records on the external system """
+        self.update_image(data)
+        return self._call('%s.update' % self._magento_model,
+                          [int(id), data, storeview])
+
     def search(self, filters=None, from_date=None):
         """ Search records according to some criterias and returns a
         list of ids
@@ -217,6 +249,8 @@
 
     direct = [
             ('description', 'description'),
+            ('is_active','is_active'),
+            ('include_in_menu','include_in_menu')
             ]
 
     @mapping

=== modified file 'magentoerpconnect/product_view.xml'
--- magentoerpconnect/product_view.xml	2014-05-26 09:32:38 +0000
+++ magentoerpconnect/product_view.xml	2014-06-23 11:02:24 +0000
@@ -77,7 +77,10 @@
                         <field name="magento_id"/>
                         <field name="created_at" readonly="1"/>
                         <field name="updated_at" readonly="1"/>
+                        <field name="visibility" />
+                        <field name="status" />
                         <field name="product_type" readonly="1"/>
+                        <field name="website_ids" />
                     </group>
                     <group string="Inventory Options">
                         <field name="no_stock_sync"/>

=== modified file 'magentoerpconnect/unit/export_synchronizer.py'
--- magentoerpconnect/unit/export_synchronizer.py	2014-06-23 11:02:24 +0000
+++ magentoerpconnect/unit/export_synchronizer.py	2014-06-23 11:02:24 +0000
@@ -103,6 +103,10 @@
         """ Return the raw OpenERP data for ``self.binding_id`` """
         return self.session.browse(self.model._name, self.binding_id)
 
+    def _after_export(self):
+        """ Run the after export"""
+        return
+
     def run(self, binding_id, *args, **kwargs):
         """ Run the synchronization
 
@@ -128,6 +132,7 @@
         # The commit will also release the lock acquired on the binding
         # record
         self.session.commit()
+        self._after_export() 
         return result
 
     def _run(self):
@@ -366,14 +371,64 @@
             record = self._update_data(map_record, fields=fields)
             if not record:
                 return _('Nothing to export.')
+            # special check on data before export
+            self._validate_data(record)
             self._update(record)
         else:
             record = self._create_data(map_record, fields=fields)
             if not record:
                 return _('Nothing to export.')
             self.magento_id = self._create(record)
+        self.session.cr.commit()
         return _('Record exported with ID %s on Magento.') % self.magento_id
 
+class MagentoTranslationExporter(MagentoExporter):
+    """ A common flow for the exports record with translation to Magento """
+
+    def _get_translatable_field(self, fields):
+        # find the translatable fields of the model
+        # Note we consider that a translatable field in Magento
+        # must be a translatable field in OpenERP and vice-versa
+        # you can change this behaviour in your own module
+        all_fields = self.model.fields_get(self.session.cr, self.session.uid,
+                                   context=self.session.context)
+
+        translatable_fields = [field for field, attrs in all_fields.iteritems()
+                           if attrs.get('translate') and (not fields or field in fields)]
+        return translatable_fields
+
+
+    def _run(self, fields=None):
+        default_lang = self.backend_record.default_lang_id
+        session = self.session
+        if session.context is None:
+            session.context = {}
+        session.context['lang'] = default_lang.code
+        res = super(MagentoTranslationExporter, self)._run(fields)
+        
+        storeview_ids = session.search(
+                'magento.storeview',
+                [('backend_id', '=', self.backend_record.id)])
+        storeviews = session.browse('magento.storeview', storeview_ids)
+        lang_storeviews = [sv for sv in storeviews
+                           if sv.lang_id and sv.lang_id != default_lang]
+        if lang_storeviews:
+            translatable_fields = self._get_translatable_field(fields)   
+            if translatable_fields:
+                for storeview in lang_storeviews:
+                    session.context['lang'] = storeview.lang_id.code
+                    self.binding_record = self._get_openerp_data()
+                    self._map_data(fields=translatable_fields)
+                    record = self.mapper.data
+                    if not record:
+                        return _('nothing to export.')
+                    # special check on data before export
+                    self._validate_data(record)
+                    binder = self.get_binder_for_model('magento.storeview')
+                    magento_storeview_id = binder.to_backend(storeview.id)
+                    self.backend_adapter.write(self.magento_id, record, magento_storeview_id)
+        return res
+
 
 @job
 @related_action(action=unwrap_binding)

=== removed directory 'magentoerpconnect_catalog'
=== removed file 'magentoerpconnect_catalog/__init__.py'
--- magentoerpconnect_catalog/__init__.py	2013-03-19 15:41:34 +0000
+++ magentoerpconnect_catalog/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-# -*- coding: utf-8 -*-

=== removed file 'magentoerpconnect_catalog/__openerp__.py'
--- magentoerpconnect_catalog/__openerp__.py	2013-03-19 15:41:34 +0000
+++ magentoerpconnect_catalog/__openerp__.py	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Guewen Baconnier
-#    Copyright 2013 Camptocamp SA
-#    Copyright 2013 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': 'Magento Connector - Catalog',
- 'version': '2.0.0',
- 'category': 'Connector',
- 'depends': ['magentoerpconnect',
-             'product_links',
-             'product_images',
-             ],
- 'author': 'MagentoERPconnect Core Editors',
- 'license': 'AGPL-3',
- 'website': 'https://launchpad.net/magentoerpconnect',
- 'description': """
-Magento Connector - Catalog
-===========================
-
-Extension for **Magento Connector**, add management of the product's catalog:
-
-* product links
-* product images
-* export of products, categories, links and images
-
-""",
- 'images': [],
- 'demo': [],
- 'data': [],
- 'installable': True,
- 'application': False,
-}
-