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

[Stefan Rijnhart (Opener)]

[FIX] Actually update the image on product image update
[FIX] Magento requires image info to be updated for each storeview

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (code review)

Unmerged revisions

695. By Stefan Rijnhart (Opener) on 2013-10-12

[FIX] Refer to local variable name

694. By Stefan Rijnhart (Opener) on 2013-10-12

[FIX] Actually update the image on product image update
[FIX] Magento requires image info to be updated for each storeview

=== modified file 'magentoerpconnect/product_images.py'
--- magentoerpconnect/product_images.py	2012-12-03 15:08:39 +0000
+++ magentoerpconnect/product_images.py	2013-10-12 17:01:06 +0000
@@ -97,6 +97,10 @@
 
         ir_model_data_obj = self.pool.get('ir.model.data')
 
+        storeviews = [
+            storeview.code for storeview in
+            external_session.sync_from_object.storeview_ids]
+
         def detect_types(image):
             types = []
             if image.small_image:
@@ -107,16 +111,37 @@
                 types.append('thumbnail')
             return types
 
-        #TODO update the image file
-        def update_image(product_extid, image_name, image):
+        def update_image(product_extid, image_name, image, send_image=False):
+            
+            values = {'label': image.name,
+                      'exclude': image.exclude,
+                      'types': detect_types(image),
+                      }
+            
+            # Update image info per storeview
+            for storeview in storeviews:
+                result = external_session.connection.call(
+                    'catalog_product_attribute_media.update',
+                    [product_extid, image_name, values, storeview])
+
+            if send_image:
+                values['file'] = {
+                    'name': image.name,
+                    'content': image.file,
+                    'mime': (
+                        image.link and image.url and mimetypes.guess_type(image.url)[0] or
+                        image.extention and
+                        mimetypes.guess_type(image.name + image.extention)[0] or
+                        'image/jpeg'),
+                        }
+                
+            # Update global settings, including the image
             result = external_session.connection.call('catalog_product_attribute_media.update',
                                [product_extid,
                                 image_name,
-                                {'label':image.name,
-                                 'exclude':image.exclude,
-                                 'types':detect_types(image),
-                                }
+                                values,
                                ])
+
             return result
         list_image = []
         list_image = self.read(cr, uid, ids, ['write_date', 'create_date'], context=context)
@@ -152,7 +177,8 @@
                     if ext_file_name: #If update
                         try:
                             external_session.logger.info("Updating %s's image: %s" %(each.product_id.default_code, each.name))
-                            result = update_image(product_extid, ext_file_name, each)
+                            result = update_image(
+                                product_extid, ext_file_name, each, send_image=True)
                             external_session.logger.info("%s's image updated with sucess: %s" %(each.product_id.default_code, each.name))
                             need_to_be_created = False
                         except Exception, e: