Merge lp:~magentoerpconnect-community/magentoerpconnect/openerp6.1-module-fixes-and-legacy-ports into lp:magentoerpconnect/oerp6.1-stable

[Guewen Baconnier @ Camptocamp]

Fixes forwarded from the legacy branch.

Unmerged revisions

674. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-07-23

[FIX] available_sort_by should send a list with an empty string when default value is wished

673. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-07-19

[FIX] mappings, sort_by and page_layout whose value should not be None (lp:876312) and some other mappings which fail

672. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-07-05

bump up version number, reflecting schema change

671. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-07-05

[FIX] magentoerpconnect: the product.category metat_title has a max length of 255 char on magento

670. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-07-19

[IMP] port the logging improvements by Alexandre Fayolle on legacy branch (truncate too long values, like base64 images...,, user proper arguments in logger)

669. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-05-25

[IMP] magentoerpconnect_payment: deactivate need_to_update when the payment are created from openerp

668. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-07-13

[FIX] Synchronization reporting menu was broken, fixed domain

=== modified file 'magentoerpconnect/__openerp__.py'
--- magentoerpconnect/__openerp__.py	2012-05-16 08:01:05 +0000
+++ magentoerpconnect/__openerp__.py	2012-07-23 07:27:31 +0000
@@ -18,7 +18,7 @@
 #########################################################################
 {
     "name" : "Magento e-commerce",
-    "version" : "1.0",
+    "version" : "1.0.1",
     "depends" : ["base",
                  "product",
                  "product_m2mcategories",

=== modified file 'magentoerpconnect/magerp_osv.py'
--- magentoerpconnect/magerp_osv.py	2012-05-24 20:52:38 +0000
+++ magentoerpconnect/magerp_osv.py	2012-07-23 07:27:31 +0000
@@ -191,7 +191,7 @@
         if not self.location[-1] == '/':
             self.location += '/'
         if self.debug:
-            self.logger.info("Attempting connection with Settings:%s,%s,%s" % (self.location, self.username, self.password))
+            self.logger.info("Attempting connection with Settings:%s,%s,%s", self.location, self.username, self.password)
         self.ser = xmlrpclib.ServerProxy(self.location)
         for sleep_time in [1, 3, 6]:
             try:
@@ -200,17 +200,36 @@
                     self.logger.info("Login Successful")
                 return True
             except IOError, e:
-                self.logger.error("Error in connecting:%s" % e)
-                self.logger.warning("Webservice Failure, sleeping %s second before next attempt" % sleep_time)
+                self.logger.error("Error in connecting:%s", e, exc_info=True)
+                self.logger.warn("Webservice Failure, sleeping %s second before next attempt", sleep_time)
                 time.sleep(sleep_time)
             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): 
+                self.logger.error("Error in connecting:%s", e, exc_info=True)
+                self.logger.warn("Webservice Failure, sleeping %s second before next attempt", sleep_time)
+                time.sleep(sleep_time)
+        raise osv.except_osv(_('User Error'), _('Error connecting to magento, are your sure that your login is right? Did you configure API user in magento?'))
+
+    def _truncate_arguments(self, arguments, max_length=128):
+        """truncate long strings in arguments for logging purpose"""
+        logged_args = []
+        try:
+            for arg in arguments:
+                # reduce verbosity of log for large strings (e.g. base64 encoded images...)
+                if isinstance(arg, basestring) and len(arg) > max_length:
+                    arg = arg[:max_length] + '...'
+                elif isinstance(arg, dict):
+                    new_arg = {}
+                    for key, value in arg.iteritems():
+                        if isinstance(value, basestring) and len(value) > max_length:
+                            value = value[:max_length] + '...'
+                        new_arg[key] = value
+                    arg = new_arg
+                logged_args.append(arg)
+            return logged_args
+        except TypeError: # arguments can be a bool
+            return arguments
+
+    def call(self, method, *arguments):
         if arguments:
             arguments = list(arguments)[0]
         else:
@@ -218,18 +237,20 @@
         for sleep_time in [1, 3, 6]:
             try:
                 if self.debug:
-                    self.logger.info(_("Calling Method:%s,Arguments:%s") % (method, arguments))
+                    logged_args = self._truncate_arguments(arguments)
+                    self.logger.info("Calling Method:%s,Arguments:%s", method, logged_args)
                 res = self.ser.call(self.session, method, arguments)
                 if self.debug:
+                    logged_res = self._truncate_arguments(res)
                     if method=='catalog_product.list':
                         # the response of the method catalog_product.list can be very very long so it's better to see it only if debug log is activate
-                        self.logger.debug(_("Query Returned:%s") % (res))
+                        self.logger.debug("Query Returned:%s", logged_res)
                     else:
-                        self.logger.info(_("Query Returned:%s") % (res))
+                        self.logger.info("Query Returned:%s", logged_res)
                 return res
             except IOError, e:
-                self.logger.error(_("Method: %s\nArguments:%s\nError:%s") % (method, arguments, e))
-                self.logger.warning(_("Webservice Failure, sleeping %s second before next attempt") % (sleep_time))
+                self.logger.error("Method: %s\nArguments:%s\nError:%s", method, arguments, e, exc_info=True)
+                self.logger.warn("Webservice Failure, sleeping %s second before next attempt", sleep_time)
                 time.sleep(sleep_time)
         raise
 

=== modified file 'magentoerpconnect/product.py'
--- magentoerpconnect/product.py	2012-06-21 16:33:03 +0000
+++ magentoerpconnect/product.py	2012-07-23 07:27:31 +0000
@@ -100,6 +100,12 @@
         'label':fields.char('Label', size=100),
     }
 
+    def init(self, cr):
+        # the 'None' value was wrong and misinterpreted by Magento
+        # this value should never be used even if Magento accept it.
+        cr.execute("UPDATE magerp_product_category_attribute_options "
+                   "SET value = '' "
+                   "WHERE value = 'None'")
 
 magerp_product_category_attribute_options()
 
@@ -176,7 +182,7 @@
         'description': fields.text('Description'),
         'image': fields.binary('Image'),
         'image_name':fields.char('File Name', size=100),
-        'meta_title': fields.char('Title (Meta)', size=75),
+        'meta_title': fields.char('Title (Meta)', size=255),
         'meta_keywords': fields.text('Meta Keywords'),
         'meta_description': fields.text('Meta Description'),
         'url_key': fields.char('URL-key', size=100), #Readonly
@@ -187,22 +193,24 @@
                     ('PRODUCTS_AND_PAGE', 'Static Block & Products')], 'Display Mode', required=True),
         'is_anchor': fields.boolean('Anchor?'),
         'use_default_available_sort_by': fields.boolean('Default Config For Available Sort By', help="Use default config for available sort by"),
-        'available_sort_by': fields.sparse(type='many2many', relation='magerp.product_category_attribute_options', string='Available Product Listing (Sort By)', serialization_field='magerp_fields', domain="[('attribute_name', '=', 'sort_by'), ('value', '!=','None')]"),
+        'available_sort_by': fields.sparse(type='many2many',
+            relation='magerp.product_category_attribute_options',
+            string='Available Product Listing (Sort By)',
+            serialization_field='magerp_fields',
+            domain="[('attribute_name', '=', 'sort_by'), ('value', '!=', False)]"),
         'default_sort_by': fields.many2one('magerp.product_category_attribute_options', 'Default Product Listing Sort (Sort By)', domain="[('attribute_name', '=', 'sort_by')]", require=True),
         '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')]"),
         }
 
-
-
     _defaults = {
         'display_mode':lambda * a:'PRODUCTS',
         'use_default_available_sort_by': lambda * a:True,
-        'default_sort_by': lambda self,cr,uid,c: self.pool.get('magerp.product_category_attribute_options')._get_default_option(cr, uid, 'sort_by', 'None', context=c),
+        'default_sort_by': lambda self,cr,uid,c: self.pool.get('magerp.product_category_attribute_options')._get_default_option(cr, uid, 'sort_by', '', context=c),
         '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),
+        'page_layout': lambda self,cr,uid,c: self.pool.get('magerp.product_category_attribute_options')._get_default_option(cr, uid, 'page_layout', '', context=c),
                  }
 
     def write(self, cr, uid, ids, vals, context=None):

=== 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-07-23 07:27:31 +0000
@@ -86,17 +86,14 @@
         attr_ids.append(cat_attr_obj.get_create_option_id(cr, uid, val,'sort_by', context=context))
     result=[('available_sort_by', [(6, 0, attr_ids)]), ('use_default_available_sort_by', False)]
 else:
-    result=[('use_default_available_sort_by', True)]","if record['use_default_available_sort_by']:
-    res = u'None'
-else:
-    res = []
-    for cat_attr_option in self.pool.get('magerp.product_category_attribute_options').browse(cr, uid, record['available_sort_by'], context=context):
-        res.append(cat_attr_option.value)
+    result=[('use_default_available_sort_by', True)]","res = ['']
+if not resource.get('use_default_available_sort_by') and resource.get('available_sort_by'):
+    res = [option.value for option in self.pool.get('magerp.product_category_attribute_options').browse(cr, uid, resource['available_sort_by'], context=context)]
 result=[('available_sort_by', res)]"
 "mag_1324_erp_procat_13","magento1324","product.model_product_category","default_sort_by",,"in_out","function","unicode",,"if ifield:
     att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, ifield,'sort_by', context=context)
 else:
-    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, 'None','sort_by', context=context)
+    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, '','sort_by', context=context)
 result=[('default_sort_by',att_id)]","cat_attr_option = self.pool.get('magerp.product_category_attribute_options').browse(cr, uid, record['default_sort_by'][0], context=context)
 result=[('default_sort_by', cat_attr_option.value)]"
 "mag_1324_erp_procat_14","magento1324","product.model_product_category","updated_at",,"in","function","unicode",,"result=[('magerp_stamp',ifield)]",
@@ -120,7 +117,7 @@
 "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)
 else:
-    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, 'None','page_layout', context=context)
+    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, '','page_layout', context=context)
 result=[('page_layout',att_id)]","result=[('page_layout', record['page_layout'][1] or '')]"
 "mag_1324_erp_attrgrp_2","magento1324","model_magerp_product_attribute_groups","attribute_set_id",,"in_out","function","int",,"result=[('attribute_set_id', ifield)]","result=[('attribute_set_id', record['attribute_set_id'])]"
 "mag_1324_erp_attrgrp_3","magento1324","model_magerp_product_attribute_groups","attribute_group_name",,"in_out","function","unicode",,"result=[('attribute_group_name', ifield)]","result=[('attribute_group_name', record['attribute_group_name'])]"

=== 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-07-23 07:27:31 +0000
@@ -8,17 +8,17 @@
     if resource['default_sort_by']:
         att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, resource['default_sort_by'],'sort_by', context=context)
     else:
-        att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, 'None','sort_by', context=context)
-    result=[('default_sort_by',att_id)]","if 'default_sort_by' in resource:
+        att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, '','sort_by', context=context)
+    result=[('default_sort_by',att_id)]","if resource.get('default_sort_by'):
     cat_attr_option = self.pool.get('magerp.product_category_attribute_options').browse(cr, uid, resource['default_sort_by'][0], context=context)
     result=[('default_sort_by', cat_attr_option.value)]"
 magentoerpconnect.mag1500_product_category_updated_at,magentoerpconnect.mag1500_product_category,updated_at,magentoerpconnect.field_product_category_magerp_stamp,in,direct,unicode,,False,,
 magentoerpconnect.mag1500_product_category_include_in_menu,magentoerpconnect.mag1500_product_category,include_in_menu,magentoerpconnect.field_product_category_include_in_menu,in_out,direct,int,,False,,
-magentoerpconnect.mag1500_product_category_page_layout,magentoerpconnect.mag1500_product_category,page_layout,,in_out,function,unicode,,False,"if resource['page_layout']:
+magentoerpconnect.mag1500_product_category_page_layout,magentoerpconnect.mag1500_product_category,page_layout,,in_out,function,unicode,,False,"if resource.get('page_layout'):
     att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, resource['page_layout'],'page_layout', context=context)
 else:
-    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, 'None','page_layout', context=context)
-result=[('page_layout',att_id)]","if 'page_layout' in resource:
+    att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, '','page_layout', context=context)
+result=[('page_layout',att_id)]","if resource.get('page_layout'):
     result=[('page_layout', resource['page_layout'][1] or '')]"
 magentoerpconnect.mag1500_product_category_available_sort_by,magentoerpconnect.mag1500_product_category,available_sort_by,,in_out,function,unicode,,False,"if 'use_default_available_sort_by' in resource:
     attr_ids = []
@@ -28,14 +28,10 @@
             attr_ids.append(cat_attr_obj.get_create_option_id(cr, uid, val,'sort_by', context=context))
         result=[('available_sort_by', [(6, 0, attr_ids)]), ('use_default_available_sort_by', False)]
     else:
-        result=[('use_default_available_sort_by', True)]","if 'use_default_available_sort_by' in resource:
-    if resource['use_default_available_sort_by']:
-        res = u'None'
-    else:
-        res = []
-        for cat_attr_option in self.pool.get('magerp.product_category_attribute_options').browse(cr, uid, record['available_sort_by'], context=context):
-            res.append(cat_attr_option.value)
-    result=[('available_sort_by', res)]"
+        result=[('use_default_available_sort_by', True)]","res = ['']
+if not resource.get('use_default_available_sort_by') and resource.get('available_sort_by'):
+    res = [option.value for option in self.pool.get('magerp.product_category_attribute_options').browse(cr, uid, resource['available_sort_by'], context=context)]
+result=[('available_sort_by', res)]"
 magentoerpconnect.mag1500_product_category_url_key,magentoerpconnect.mag1500_product_category,url_key,magentoerpconnect.field_product_category_url_key,in_out,direct,unicode,,False,,
 magentoerpconnect.mag1500_product_category_meta_description,magentoerpconnect.mag1500_product_category,meta_description,magentoerpconnect.field_product_category_meta_description,in_out,direct,unicode,,False,,
 magentoerpconnect.mag1500_product_category_description,magentoerpconnect.mag1500_product_category,description,magentoerpconnect.field_product_category_description,in_out,direct,unicode,,False,,
@@ -50,11 +46,10 @@
 		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) 
-        conn.call('ol_catalog_category_media.create', [record['image_name'], img_bin_enc])
-        result = [('image',record['image_name'])]
-    else:
-        result=[]"
+result=[('image_name',ifield),('image',image_binary)]","result = []
+# FIXME: conn is False, call create at each update of the category?!
+#if resource.get('image'):
+#    img = base64.decodestring(resource['image'])
+#    img_bin_enc = base64.encodestring(img)
+#    conn.call('ol_catalog_category_media.create', [resource['image_name'], img_bin_enc])
+#    result = [('image',resource['image_name'])]"

=== modified file 'magentoerpconnect/settings/magerp.product_category_attribute_options.csv'
--- magentoerpconnect/settings/magerp.product_category_attribute_options.csv	2011-10-16 17:14:20 +0000
+++ magentoerpconnect/settings/magerp.product_category_attribute_options.csv	2012-07-23 07:27:31 +0000
@@ -1,11 +1,11 @@
 "id","attribute_name","label","value"
-"mag_product_category_attribute_1","page_layout","No layout updates","None"
+"mag_product_category_attribute_1","page_layout","No layout updates",""
 "mag_product_category_attribute_2","page_layout","Empty","empty"
 "mag_product_category_attribute_3","page_layout","1 column","one_column"
 "mag_product_category_attribute_4","page_layout","2 columns with left bar","two_column_left"
 "mag_product_category_attribute_5","page_layout","2 columns with right bar","two_columns_right"
 "mag_product_category_attribute_6","page_layout","3 columns","three_columns"
-"mag_product_category_attribute_7","sort_by","Use Config Settings","None"
+"mag_product_category_attribute_7","sort_by","Use Config Settings",""
 "mag_product_category_attribute_8","sort_by","Best Value","position"
 "mag_product_category_attribute_9","sort_by","Name","name"
 "mag_product_category_attribute_10","sort_by","Price","price"

=== modified file 'magentoerpconnect_payment/sale.py'
--- magentoerpconnect_payment/sale.py	2012-03-27 09:40:33 +0000
+++ magentoerpconnect_payment/sale.py	2012-07-23 07:27:31 +0000
@@ -123,4 +123,16 @@
             vals['magento_ref'] = order.magento_ref
         return vals
 
+    def _apply_payment_settings(self, cr, uid, order, paid, context=None):
+        """We should deactivate need_to_update to avoid to query magento
+        on each import of orders and not to mislead the users if they use
+        a filter on need_to_update.
+        """
+        res = super(sale_order, self)._apply_payment_settings(cr, uid, order,
+            paid, context=context)
+        payment_settings = order.base_payment_type_id
+        if payment_settings and payment_settings.allow_magento_manual_invoice:
+            self.write(cr, uid, order.id, {'need_to_update': False}, context=context)
+        return res
+
 sale_order()