Merge lp:~stephane-openerp/magentoerpconnect/certification_for_openerp into lp:magentoerpconnect/oerp5.0-stable

[Raphaël Valyi - http://www.akretion.com]

see diff

=== modified file '__init__.py' (properties changed: +x to -x)
=== modified file '__terp__.py' (properties changed: +x to -x)
=== modified file 'delivery.py'
--- delivery.py	2010-08-13 11:42:42 +0000
+++ delivery.py	2010-08-24 19:54:41 +0000
@@ -31,9 +31,9 @@
     }
     
     def check_ext_carrier_reference(self, cr, uid, id, magento_incrementid, ctx):
-        conn = ctx.get('conn_obj', False)
+        conn = ctx and ctx.get('conn_obj', False) or False
         mag_carrier = conn.call('sales_order_shipment.getCarriers', [magento_incrementid])
-        carrier = self.read(cr, uid, id, ['magento_code', 'name'],ctx)
+        carrier = self.read(cr, uid, id, ['magento_code', 'name'], context=ctx)
         if not carrier['magento_code'] in mag_carrier.keys():
             raise osv.except_osv(_("Error"), _("The carrier %s don't have a magento_code valid!! Indeed the value %s is not in the magento carrier list %s" %(carrier['name'], carrier['magento_code'], mag_carrier.keys())))
         return True

=== modified file 'magerp_core.py' (properties changed: +x to -x)
--- magerp_core.py	2010-08-19 14:43:01 +0000
+++ magerp_core.py	2010-08-24 19:54:41 +0000
@@ -23,6 +23,8 @@
 import magerp_osv
 from base_external_referentials import external_osv
 
+import tools
+
 DEBUG = True
 TIMEOUT = 2
         
@@ -54,7 +56,7 @@
 
         return False
 
-    def core_sync(self, cr, uid, ids, ctx={}):
+    def core_sync(self, cr, uid, ids, ctx=None):
         instances = self.browse(cr, uid, ids, ctx)
         filter = []
         for inst in instances:

=== modified file 'magerp_core_view.xml' (properties changed: +x to -x)
=== modified file 'magerp_data.xml' (properties changed: +x to -x)
=== modified file 'magerp_menu.xml' (properties changed: +x to -x)
=== modified file 'magerp_osv.py' (properties changed: +x to -x)
--- magerp_osv.py	2010-06-24 17:16:02 +0000
+++ magerp_osv.py	2010-08-24 19:54:41 +0000
@@ -204,7 +204,11 @@
                     subject[key] = True
         return subject
     
-    def mage_import_base(self,cr,uid,conn, external_referential_id, defaults={}, context={}):
+    def mage_import_base(self,cr,uid,conn, external_referential_id, defaults=None, context=None):
+        if context is None:
+            context = {}
+        if defaults is None:
+            defaults = {}
         if not 'ids_or_filter' in context.keys():
             context['ids_or_filter'] = []
         result = {'create_ids': [], 'write_ids': []}
@@ -237,12 +241,15 @@
 
         return result
     
-    def get_external_data(self, cr, uid, conn, external_referential_id, defaults={}, context={}):
+    def get_external_data(self, cr, uid, conn, external_referential_id, defaults=None, context=None):
         """Constructs data using WS or other synch protocols and then call ext_import on it"""
         return self.mage_import_base(cr, uid, conn, external_referential_id, defaults, context)#TODO refactor mage_import_base calls to this interface
 
     #TODO deprecated, remove use
-    def mage_import(self, cr, uid, ids_or_filter, conn, instance, debug=False, defaults={}, *attrs):
+    def mage_import(self, cr, uid, ids_or_filter, conn, instance, debug=False, defaults=None, *attrs):
+        if defaults is None:
+            defaults = {}
+
         if self._LIST_METHOD:
             magento_records = conn.call(self._LIST_METHOD, ids_or_filter)
             if attrs:
@@ -253,7 +260,7 @@
             raise osv.except_osv(_('Undefined List method !'), _("list method is undefined for this object!"))
     
     #TODO deprecated, remove use
-    def get_all_mage_ids(self, cr, uid, ids=[], instance=False):
+    def get_all_mage_ids(self, cr, uid, ids, instance=False):
         search_param = []
         if instance:
             search_param = [('referential_id', '=', instance)]

=== modified file 'partner.py' (properties changed: +x to -x)
=== modified file 'partner_view.xml' (properties changed: +x to -x)
=== modified file 'product.py' (properties changed: +x to -x)
--- product.py	2010-08-13 03:02:55 +0000
+++ product.py	2010-08-24 19:54:41 +0000
@@ -84,7 +84,7 @@
         'level':lambda * a:1
                  }
     
-    def write(self, cr, uid, ids, vals, ctx={}):
+    def write(self, cr, uid, ids, vals, ctx=None):
         if not 'magerp_stamp' in vals.keys():
             vals['magerp_stamp'] = time.strftime('%Y-%m-%d %H:%M:%S')
         return super(product_category, self).write(cr, uid, ids, vals, ctx)
@@ -109,7 +109,7 @@
     _description = "Attributes of products"
     _rec_name = "attribute_code"
     
-    def _get_group(self, cr, uid, ids, prop, unknow_none, context):
+    def _get_group(self, cr, uid, ids, prop, unknow_none, context=None):
         res = {}
         for attribute in self.browse(cr, uid, ids, context):
             res[attribute.id] = self.pool.get('magerp.product_attribute_groups').extid_to_oeid(cr, uid, attribute.group_id, attribute.referential_id.id)
@@ -232,8 +232,12 @@
         else:
             return False
 
-    def write(self, cr, uid, ids, vals, context={}):
+    def write(self, cr, uid, ids, vals, context=None):
         """Will recreate the mapping attributes, beware if you customized some!"""
+
+        if context is None:
+            context = {}
+
         if type(ids) == int:
             ids = [ids]
         result = super(magerp_product_attributes, self).write(cr, uid, ids, vals, context) 
@@ -255,8 +259,10 @@
             self.create_mapping (cr, uid, self._type_conversion[all_vals.get('frontend_input', False)], field_ids, field_name, referential_id, model_id, all_vals, id)
         return result
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
         """Will create product.product new fields accordingly to Magento product custom attributes and also create mappings for them"""
+        if context is None:
+            context = {}
         if not vals['attribute_code'] in self._no_create_list:
             field_name = "x_magerp_" + vals['attribute_code']
             vals['field_name'] =  field_name
@@ -369,9 +375,11 @@
         'referential_id':fields.many2one('external.referential', 'Magento Instance', readonly=True),
     }
 
-    def data_to_save(self, cr, uid, vals_list, update=False, context={}):
+    def data_to_save(self, cr, uid, vals_list, update=False, context=None):
         """This method will take data from vals and use context to create record"""
         
+        if context is None:
+            context = {}
         to_remove_ids = []
         if update:
             to_remove_ids = self.search(cr, uid, [('attribute_id', '=', context['attribute_id'])])
@@ -457,12 +465,12 @@
                 menu_vals['action'] = 'ir.actions.act_window,'+str(action_id)
                 self.pool.get('ir.ui.menu').create(cr, uid, menu_vals, context)
     
-    def write(self, cr, uid, ids, vals, context={}):
+    def write(self, cr, uid, ids, vals, context=None):
         res = super(magerp_product_attribute_set, self).write(cr, uid, ids, vals, context)
         self.create_product_menu(cr, uid, ids, vals, context)
         return res
     
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
          id = super(magerp_product_attribute_set, self).create(cr, uid, vals, context)
          self.create_product_menu(cr, uid, id, vals, context)
          return id
@@ -573,7 +581,7 @@
 class product_product(magerp_osv.magerp_osv):
     _inherit = "product.product"
 
-    def _product_type_get(self, cr, uid, context={}):
+    def _product_type_get(self, cr, uid, context=None):
         ids = self.pool.get('magerp.product_product_type').search(cr, uid, [], order='id')
         product_types = self.pool.get('magerp.product_product_type').read(cr, uid, ids, ['product_type','name'], context=context)
         return [(pt['product_type'], pt['name']) for pt in product_types]
@@ -597,7 +605,7 @@
     #and will have a nice default vaule anyway, that's why we avoid making them mandatory in the product view
     _magento_fake_mandatory_attrs = ['created_at', 'updated_at', 'has_options', 'required_options', 'model']
 
-    def write(self, cr, uid, ids, vals, context={}):
+    def write(self, cr, uid, ids, vals, context=None):
         if vals.get('referential_id', False):
             instance = vals['referential_id']
             #Filter the keys to be changes
@@ -645,7 +653,7 @@
                 tier_vals['website_id'] = self.pool.get('external.shop.group').mage_to_oe(cr, uid, int(each['website_id']), instance)
             tp_obj.create(cr, uid, tier_vals)
     
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
         tier_price = False
         if vals.get('referential_id', False):
             instance = vals['referential_id']
@@ -660,7 +668,7 @@
         #Perform other operations
         return crid
 
-    def unlink(self, cr, uid, ids, context={}):
+    def unlink(self, cr, uid, ids, context=None):
         #if product is mapped to magento, not delete it
         not_delete = False
         sale_obj = self.pool.get('sale.shop')
@@ -755,7 +763,11 @@
         xml+="</notebook>"
         return xml
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+
+        if context is None:
+            context = {}
+
         result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context,toolbar=toolbar)
         if view_type == 'form':
             if context.get('set', False):
@@ -831,7 +843,16 @@
         self.write(cr, uid, oe_id, {'magento_sku': sku})
         return res
     
-    def ext_export(self, cr, uid, ids, external_referential_ids=[], defaults={}, context={}):
+    def ext_export(self, cr, uid, ids, external_referential_ids=None, defaults=None, context=None):
+        if context is None:
+            context = {}
+
+        if defaults is None:
+            defaults = {}
+
+        if external_referential_ids is None:
+            external_referential_ids = []
+
         result = {'create_ids':[], 'write_ids':[]}
 
         ids = self.search(cr, uid, [('id', 'in', ids), ('magento_exportable', '=', True)]) #restrict export to only exportable products

=== modified file 'product_images.py'
--- product_images.py	2010-06-29 11:59:10 +0000
+++ product_images.py	2010-08-24 19:54:41 +0000
@@ -47,70 +47,58 @@
     }
     
     def get_changed_ids(self, cr, uid, start_date=False):
-        if start_date:
-            crids = self.pool.get('product.images').search(cr, uid, [('create_date', '>=', start_date)])
-            wrids = self.pool.get('product.images').search(cr, uid, [('write_date', '>=', start_date)])
-            for each in crids:
-                if not each in wrids:
-                    wrids.append(each)
-            return wrids    #return one list of ids
-        else:
-            ids = self.pool.get('product.images').search(cr, uid, [])
-            return ids
+        proxy = self.pool.get('product.images')
+        domain = start_date and ['|', ('create_date', '>=', start_date), ('write_date', '>=', start_date)] or []
+        return proxy.search(cr, uid, domain)
      
-    def update_remote_images(self, cr, uid, ids, context={}):
+    def update_remote_images(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         logger = netsvc.Logger()
         conn = context.get('conn_obj', False)
-        if conn:
-            for each in self.browse(cr, uid, ids):
-                if each.product_id.magento_exportable:
-                    if each.mage_file: #If update
-                        types = []
-                        if each.small_image:
-                            types.append('small_image')
-                        if each.base_image:
-                            types.append('image')
-                        if each.thumbnail:
-                            types.append('thumbnail')
-                        result = conn.call('catalog_product_attribute_media.update',
-                                  [each.product_id.magento_sku,
-                                   each.mage_file,
-                                   {'label':each.name,
-                                    'exclude':each.exclude,
-                                    'types':types,
-                                    }
-                                   ])
-                        #self.write(cr, uid, each.id, {'mage_file':result})
-                    else:
-                        if each.product_id.magento_sku:
-                            logger.notifyChannel('ext synchro', netsvc.LOG_INFO, "Sending %s's image: %s" %(each.product_id.name, each.product_id.magento_sku))
-                            result = conn.call('catalog_product_attribute_media.create',
-                                      [each.product_id.magento_sku,
-                                       {'file':{
-                                                'content':self.get_image(cr, uid, each.id),
-                                                'mime':each.filename and mimetypes.guess_type(each.filename)[0] or 'image/jpeg',
-                                                }
-                                       }
-                                       ])
-                            self.write(cr, uid, each.id, {'mage_file':result})
-                            types = []
-                            if each.small_image:
-                                types.append('small_image')
-                            if each.base_image:
-                                types.append('image')
-                            if each.thumbnail:
-                                types.append('thumbnail')
-                            new_result = conn.call('catalog_product_attribute_media.update',
-                                      [each.product_id.magento_sku,
-                                       result,
-                                       {'label':each.name,
-                                        'exclude':each.exclude,
-                                        'types':types,
+        if not conn:
+            return False
+
+        def detect_types(image):
+            types = []
+            if image.small_image:
+                types.append('small_image')
+            if image.base_image:
+                types.append('image')
+            if image.thumbnail:
+                types.append('thumbnail')
+            return types
+
+        def update_image(content, image):
+            result = conn.call('catalog_product_attribute_media.update',
+                               [image.product_id.magento_sku,
+                                content,
+                                {'label':image.name,
+                                 'exclude':image.exclude,
+                                 'types':detect_types(image),
+                                }
+                               ])
+            return result
+
+        for each in self.browse(cr, uid, ids, context=context):
+            if not each.product_id.magento_exportable:
+                continue
+
+            if each.mage_file: #If update
+                result = update_image(each.mage_file, each)
+            else:
+                if each.product_id.magento_sku:
+                    logger.notifyChannel('ext synchro', netsvc.LOG_INFO, "Sending %s's image: %s" %(each.product_id.name, each.product_id.magento_sku))
+                    result = conn.call('catalog_product_attribute_media.create',
+                              [each.product_id.magento_sku,
+                               {'file':{
+                                        'content':self.get_image(cr, uid, each.id),
+                                        'mime':each.filename and mimetypes.guess_type(each.filename)[0] or 'image/jpeg',
                                         }
-                                       ])
-                        #self.write(cr, uid, each.id, {'mage_file':new_result})
-        else:
-            return False
+                               }
+                               ])
+                    self.write(cr, uid, each.id, {'mage_file':result})
+                    result = update_image(result, each)
         return True
         
 product_images()

=== modified file 'product_view.xml' (properties changed: +x to -x)
=== modified file 'sale.py' (properties changed: +x to -x)
--- sale.py	2010-07-16 15:57:40 +0000
+++ sale.py	2010-08-24 19:54:41 +0000
@@ -139,90 +139,35 @@
 
 
 
+    def _sale_shop(self, cr, uid, callback, context=None):
+        proxy = self.pool.get('sale.shop')
+        domain = [ ('magento_shop', '=', True), ('auto_import', '=', True) ]
+
+        ids = proxy.search(cr, uid, domain, context=context)
+        if ids:
+            callback(cr, uid, ids, context=context)
+
+        tools.debug(callback)
+        tools.debug(ids)
+
     # Schedules functions ============ #
     def run_import_orders_scheduler(self, cr, uid, context=None):
-        if context == None:
-            context = {}
-        sale_obj = self.pool.get('sale.shop')
-        search_params = [
-            ('magento_shop', '=', True),
-            ('auto_import', '=', True),
-        ]
-        shops_ids = sale_obj.search(cr, uid, search_params)
-        if shops_ids:
-            self.import_orders(cr, uid, shops_ids, context)
-        if DEBUG:
-            print "run_import_orders_scheduler: %s" % shops_ids
+        self._sale_shop(cr, uid, self.import_orders, context=context)
 
     def run_update_orders_scheduler(self, cr, uid, context=None):
-        if context == None:
-            context = {}
-        sale_obj = self.pool.get('sale.shop')
-        search_params = [
-            ('magento_shop', '=', True),
-            ('auto_import', '=', True),
-        ]
-        shops_ids = sale_obj.search(cr, uid, search_params)
-        if shops_ids:
-            self.update_orders(cr, uid, shops_ids, context)
-        if DEBUG:
-            print "run_update_orders_scheduler: %s" % shops_ids
+        self._sale_shop(cr, uid, self.update_orders, context=context)
 
     def run_export_catalog_scheduler(self, cr, uid, context=None):
-        if context == None:
-            context = {}
-        sale_obj = self.pool.get('sale.shop')
-        search_params = [
-            ('magento_shop', '=', True),
-            ('auto_import', '=', True),
-        ]
-        shops_ids = sale_obj.search(cr, uid, search_params)
-        if shops_ids:
-            self.export_catalog(cr, uid, shops_ids, context)
-        if DEBUG:
-            print "run_export_catalog_scheduler: %s" % shops_ids
+        self._sale_shop(cr, uid, self.export_catalog, context=context)
 
     def run_export_stock_levels_scheduler(self, cr, uid, context=None):
-        if context == None:
-            context = {}
-        sale_obj = self.pool.get('sale.shop')
-        search_params = [
-            ('magento_shop', '=', True),
-            ('auto_import', '=', True),
-        ]
-        shops_ids = sale_obj.search(cr, uid, search_params)
-        if shops_ids:
-            self.export_inventory(cr, uid, shops_ids, context)
-        if DEBUG:
-            print "run_export_stock_levels_scheduler: %s" % shops_ids
+        self._sale_shop(cr, uid, self.export_inventory, context=context)
 
     def run_update_images_scheduler(self, cr, uid, context=None):
-        if context == None:
-            context = {}
-        sale_obj = self.pool.get('sale.shop')
-        search_params = [
-            ('magento_shop', '=', True),
-            ('auto_import', '=', True),
-        ]
-        shops_ids = sale_obj.search(cr, uid, search_params)
-        if shops_ids:
-            self.export_images(cr, uid, shops_ids, context)
-        if DEBUG:
-            print "run_update_images_scheduler: %s" % shops_ids
+        self._sale_shop(cr, uid, self.export_images, context=context)
                    
     def run_export_shipping_scheduler(self, cr, uid, context=None):
-        if context == None:
-            context = {}
-        sale_obj = self.pool.get('sale.shop')
-        search_params = [
-            ('magento_shop', '=', True),
-            ('auto_import', '=', True),
-        ]
-        shops_ids = sale_obj.search(cr, uid, search_params)
-        if shops_ids:
-            self.export_shipping(cr, uid, shops_ids, context)
-        if DEBUG:
-            print "run_export_shipping_scheduler: %s" % shops_ids
+        self._sale_shop(cr, uid, self.export_shipping, context=context)
 
 sale_shop()
 
@@ -235,7 +180,7 @@
                 'magento_storeview_id': fields.many2one('magerp.storeviews', 'Magento Store View'),
     }
     
-    def _auto_init(self, cr, context={}):
+    def _auto_init(self, cr, context=None):
         cr.execute("ALTER TABLE sale_order_line ALTER COLUMN discount TYPE numeric(16,6);")
         cr.execute("ALTER TABLE account_invoice_line ALTER COLUMN discount TYPE numeric(16,6);")
         super(sale_order, self)._auto_init(cr, context)

=== modified file 'security/ir.model.access.csv' (properties changed: +x to -x)
=== modified file 'settings/external.mapping.template.csv' (properties changed: +x to -x)
=== modified file 'settings/external.mappinglines.template.csv' (properties changed: +x to -x)
=== modified file 'settings/external.referential.type.csv' (properties changed: +x to -x)
=== modified file 'settings/magerp_product_product_type.xml' (properties changed: +x to -x)