Merge lp:~therp-nl/magentoerpconnect/6.1-stable-process_categories_per_storeview into lp:magentoerpconnect/oerp6.1-stable

[Stefan Rijnhart (Opener)]

[IMP] Import and export categories per store view
    to import translations and to import and export active store views

So far, categories are imported without taking store views into account. This means that if translations are available in another storeview, such translations get lost. This branch fixes that by importing categories for every store view, taking its language setting into account.

Another issue is that the categories' activeness is being registered globally. An import/export round trip resets an alternate setting per store view. This branch fixes that using the same mechanism as for the language issue, and introducing a field on the category to store and manage the active store views. Because an empty value for this field is interpreted as 'active in all store views', this feature is backwards compatible. The 'active' flag keeps its global meaning practically speaking, because if set to False, it will set the category inactive for all store views, regardless of the value of the active store views field.

You may find that the code in this branch is manipulating and preprocessing data in a way that is not in the spirit of the external referential mapping framework, so I'd be curious to know if there is more 'convential' way to the same effect.

Unmerged revisions

695. By Stefan Rijnhart (Opener) on 2013-06-18

[FIX] Line length and dubious spacing

694. By Stefan Rijnhart (Opener) on 2013-06-18

[IMP] Import and export categories per store view
 to import translations and to import and export active store views

=== modified file 'magentoerpconnect/magerp_core.py'
--- magentoerpconnect/magerp_core.py	2013-05-13 11:33:20 +0000
+++ magentoerpconnect/magerp_core.py	2013-06-18 20:58:27 +0000
@@ -99,10 +99,53 @@
 
     @only_for_referential('magento')
     def import_product_categories(self, cr, uid, ids, context=None):
+        """
+        Like in the case of product, get category info per storeview
+        to get multilingual terminology and active storeviews and in OpenERP. 
+        """
+
         if context is None:
             context = {}
-        context['conn_obj'] = self.external_connection(cr, uid, ids, context=context)
-        self.import_resources(cr, uid, ids, 'product.category', method='search_then_read_no_loop', context=context)
+
+        def get_ids(tree):
+            ids = []
+            if tree:
+                ids.append(tree['category_id'])
+                for child in tree['children']:
+                    ids += get_ids(child)
+            return ids
+
+        for referential in self.browse(cr, uid, ids, context):
+            category_obj = self.pool.get('product.category')
+            external_session = ExternalSession(referential, referential)
+            attr_conn = external_session.connection
+
+            tree = attr_conn.call('catalog_category.tree')
+            ext_cat_ids = [tree['category_id']]
+            for child in tree['children']:
+                ext_cat_ids += get_ids(child)
+
+            ctx = context.copy()
+            ctx['conn_obj'] = attr_conn
+
+            defaults={'magento_exportable': True}
+            mapping = {'product.product': category_obj._get_mapping(
+                    cr, uid, referential.id, context=context)}
+            for cat_id in ext_cat_ids:
+                is_active = False
+                for website in referential.shop_group_ids:
+                    for shop in website.shop_ids:
+                        for storeview in shop.storeview_ids:
+                            ctx.update({'lang': storeview.lang_id.code})
+                            category_info = external_session.connection.call(
+                                'category.info', [cat_id, storeview.code, False])
+                            category_info['storeview_active'] = (
+                                storeview.id, category_info['is_active'] == '1')
+                            # Global value for is_active is true if it is for any storeview
+                            category_info['is_active'] = is_active or category_info['is_active'] == '1'
+                            category_obj._record_one_external_resource(
+                                cr, uid, external_session, category_info,
+                                defaults=defaults, mapping=mapping, context=ctx)
         return True
 
 

=== modified file 'magentoerpconnect/product.py'
--- magentoerpconnect/product.py	2013-06-06 18:09:24 +0000
+++ magentoerpconnect/product.py	2013-06-18 20:58:27 +0000
@@ -136,11 +136,27 @@
         main_lang = context['main_lang']
         for resource_id, resource in resources.items():
             #Move this part of code in a python lib
-            parent_id = resource[main_lang]['parent_id']
-            del resource[main_lang]['parent_id']
-            ext_id = external_session.connection.call('catalog_category.create', [parent_id, resource[main_lang]])
-            for storeview, lang in storeview_to_lang.items():
-                external_session.connection.call('catalog_category.update', [ext_id, resource[lang], storeview])
+            storeviews = list(context['storeviews'])
+            storeview_id, storeview, lang = storeviews.pop(0)
+            is_active = resource[lang]['is_active']
+            category_storeview_ids = resource[lang]['magento_storeview_ids']
+            del resource[lang]['magento_storeview_ids']
+            if (is_active and category_storeview_ids and
+                    storeview_id not in category_storeview_ids):
+                resource[lang]['is_active'] = 0
+            parent_id = resource[lang]['parent_id']
+            del resource[lang]['parent_id']
+            ext_id = external_session.connection.call(
+                'catalog_category.create', [parent_id, resource[lang], storeview])
+            for storeview_id, storeview, lang in storeviews:
+                del resource[lang]['magento_storeview_ids']
+                if (is_active and category_storeview_ids and
+                        storeview_id not in category_storeview_ids):
+                    resource[lang]['is_active'] = 0
+                else:
+                    resource[lang]['is_active'] = is_active
+                external_session.connection.call(
+                    'catalog_category.update', [ext_id, resource[lang], storeview])
             ext_create_ids[resource_id] = ext_id
         return ext_create_ids
 
@@ -151,14 +167,26 @@
         main_lang = context['main_lang']
         for resource_id, resource in resources.items():
             #Move this part of code in a python lib
-            ext_id = resource[main_lang]['ext_id']
-            del resource[main_lang]['ext_id']
-            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])
+            storeviews = list(context['storeviews'])
+            storeview_id, storeview, lang = storeviews.pop(0)
+            category_storeview_ids = resource[lang]['magento_storeview_ids']
+            del resource[lang]['magento_storeview_ids']
+            is_active = resource[lang]['is_active']
+            if (is_active and category_storeview_ids and
+                    storeview_id not in category_storeview_ids):
+                resource[lang]['is_active'] = 0
+            ext_id = resource[lang]['ext_id']
+            parent_id = resource[lang]['parent_id']
+            del resource[lang]['parent_id']
+            external_session.connection.call('catalog_category.update', [ext_id, resource[lang], storeview])
             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']
+            for storeview_id, storeview, lang in storeviews:
+                del resource[lang]['magento_storeview_ids']
+                if (is_active and category_storeview_ids and
+                        storeview_id not in category_storeview_ids):
+                    resource[lang]['is_active'] = 0
+                else:
+                    resource[lang]['is_active'] = is_active
                 external_session.connection.call('catalog_category.update', [ext_id, resource[lang], storeview])
             ext_update_ids[resource_id] = ext_id
         return ext_update_ids
@@ -193,6 +221,13 @@
         'magerp_stamp':fields.datetime('Magento stamp'),
         'include_in_menu': fields.boolean('Include in Navigation Menu'),
         'page_layout': fields.many2one('magerp.product_category_attribute_options', 'Page Layout', domain="[('attribute_name', '=', 'page_layout')]"),
+        'magento_storeview_ids': fields.many2many(
+            'magerp.storeviews',
+            'magerp_category_storeview_rel',
+            'category_id', 'storeview_id',
+            'Magento Storeviews',
+            help=('By default categories will be exported to every storeview. '
+                  'If you want to export it only on some storeviews you can select them here')),
         }
 
     _defaults = {

=== modified file 'magentoerpconnect/product_view.xml'
--- magentoerpconnect/product_view.xml	2012-12-07 13:50:28 +0000
+++ magentoerpconnect/product_view.xml	2013-06-18 20:58:27 +0000
@@ -23,6 +23,8 @@
                                         <field name="url_key" colspan="2" />
                                         <field name="level" colspan="2" />
                                         <field name="include_in_menu" colspan="2" />
+                                        <separator string="Magento storeviews (leave empty for all)" colspan="2" />
+                                        <field name="magento_storeview_ids" nolabel="1" colspan="2" />
                                     </group>
                                     <group col="1" colspan="1">
                                         <separator string="Category Image" />

=== modified file 'magentoerpconnect/sale.py'
--- magentoerpconnect/sale.py	2013-05-13 11:36:53 +0000
+++ magentoerpconnect/sale.py	2013-06-18 20:58:27 +0000
@@ -63,7 +63,9 @@
         context['main_lang'] = shop.referential_id.default_lang_id.code
         context['lang_to_export'] = [shop.referential_id.default_lang_id.code]
         context['storeview_to_lang'] = {}
+        context['storeviews'] = []
         for storeview in shop.storeview_ids:
+            context['storeviews'].append((storeview.id, storeview.code, storeview.lang_id.code))
             if storeview.lang_id and storeview.lang_id.code != shop.referential_id.default_lang_id.code:
                 context['storeview_to_lang'][storeview.code] = storeview.lang_id.code
                 if not storeview.lang_id.code in context['lang_to_export']:

=== 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	2013-06-06 18:18:28 +0000
+++ magentoerpconnect/settings/1.5.0.0/product.category/external.mappinglines.template.csv	2013-06-18 20:58:27 +0000
@@ -69,3 +69,7 @@
         result = [('image',resource['image_name'])]
     else:
         result=[]"
+magentoerpconnect.mag1500_product_category_magento_storeview_ids,magentoerpconnect.mag1500_product_category,magento_storeview_ids,magentoerpconnect.field_product_category_magento_storeview_ids,in,function,list,,,"if resource.get('storeview_active'):
+    storeview_id = resource['storeview_active'][0]
+    command = resource['storeview_active'][1] and 4 or 3
+    result = [('magento_storeview_ids', [(command, storeview_id)])]",