Merge lp:~akretion-team/magentoerpconnect/Multi-website-fix into lp:~magentoerpconnect-core-editors/magentoerpconnect/magentoerpconnect_generic

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

multi's fixes

=== modified file 'magerp_core.py'
--- magerp_core.py	2009-12-11 15:04:11 +0000
+++ magerp_core.py	2010-03-18 13:54:19 +0000
@@ -31,8 +31,9 @@
     _inherit = "external.referential"
 
     _columns = {
-	'attribute_sets':fields.one2many('magerp.product_attribute_set', 'referential_id', 'Attribute Sets'),
-        'default_pro_cat':fields.many2one('product.category','Default Product Category',required=True, help="Products imported from magento may have many categories.\nOpenERP requires a specific category for a product to facilitate invoicing etc.")
+        'attribute_sets':fields.one2many('magerp.product_attribute_set', 'referential_id', 'Attribute Sets'),
+        'default_pro_cat':fields.many2one('product.category','Default Product Category',required=True, help="Products imported from magento may have many categories.\nOpenERP requires a specific category for a product to facilitate invoicing etc."),
+        'default_lang_id':fields.many2one('res.lang', 'Default Language',required=True, help="Choose the language which will be used for the Default Value in Magento"),
     }
 
              
@@ -172,12 +173,13 @@
 class external_shop_group(magerp_osv.magerp_osv):
     _inherit = "external.shop.group"
     #Return format of API:{'code': 'base', 'name': 'Main', 'website_id': '1', 'is_default': '1', 'sort_order': '0', 'default_group_id': '1'}
+    # default_group_id is the default shop of the external_shop_group (external_shop_group = website)
 
     def _get_default_shop_id(self, cr, uid, ids, prop, unknow_none, context):
         res = {}
         for shop_group in self.browse(cr, uid, ids, context):
-            if shop_group.default_group_id:
-                rid = self.pool.get('sale.shop').extid_to_oeid(cr, uid, shop_group.default_group_id, shop_group.referential_id.id)
+            if shop_group.default_shop_integer_id:
+                rid = self.pool.get('sale.shop').extid_to_oeid(cr, uid, shop_group.default_shop_integer_id, shop_group.referential_id.id)
                 res[shop_group.id] = rid
             else:
                 res[shop_group.id] = False
@@ -187,9 +189,9 @@
         'code':fields.char('Code', size=100),
         'is_default':fields.boolean('Is Active?'),
         'sort_order':fields.integer('Sort Order'),
-        'default_group_id':fields.integer('Default Store Group'), #Many 2 one?
-        'default_shop_id':fields.function(_get_default_shop_id, type="many2one", relation="sale.shop", method=True, string="Default Store (Group)"),
-        'default_lang_id':fields.many2one('res.lang', 'Default Language', help="Magento website wise default locale if different from English"),
+        'default_shop_integer_id':fields.integer('Default Store'), #This field can't be a many2one because shop_group field will be mapped before creating Shop (Shop = Store, shop_group = website)
+        'default_shop_id':fields.function(_get_default_shop_id, type="many2one", relation="sale.shop", method=True, string="Default Store"),
+        'referential_type' : fields.related('referential_id', 'type_id', type='many2one', relation='external.referential.type', string='External Referential Type'),
     }
 
 external_shop_group()
@@ -197,28 +199,16 @@
 
 class magerp_storeviews(magerp_osv.magerp_osv):
     _name = "magerp.storeviews"
-    _description = "The magento store views information"    
+    _description = "The magento store views information"
     
-    def _get_default_shop_id(self, cr, uid, ids, prop, unknow_none, context):
-        res = {}
-        for storeview in self.browse(cr, uid, ids, context):
-            if storeview.magento_store_id:
-                rid = self.pool.get('sale.shop').extid_to_oeid(cr, uid, storeview.magento_store_id, storeview.website_id.referential_id.id)
-                res[storeview.id] = rid
-            else:
-                res[storeview.id] = False
-        return res
-
     _columns = {
         'name':fields.char('Store View Name', size=100),
         'code':fields.char('Code', size=100),
-        'magento_store_id':fields.integer('Store ID'),
         'website_id':fields.many2one('external.shop.group', 'Website', select=True, ondelete='cascade'),
         'is_active':fields.boolean('Default ?'),
         'sort_order':fields.integer('Sort Order'),
         'shop_id':fields.many2one('sale.shop', 'Shop', select=True, ondelete='cascade'),
         'lang_id':fields.many2one('res.lang', 'Language'),
-        'default_shop_id':fields.function(_get_default_shop_id, type="many2one", relation="sale.shop", method=True, string="Default Store (Group)"),
     }
 
     #Return format of API:{'code': 'default', 'store_id': '1', 'website_id': '1', 'is_active': '1', 'sort_order': '0', 'group_id': '1', 'name': 'Default Store View'}

=== modified file 'magerp_core_view.xml'
--- magerp_core_view.xml	2009-12-11 15:04:11 +0000
+++ magerp_core_view.xml	2010-03-18 13:54:19 +0000
@@ -19,9 +19,9 @@
 								<button name="sync_categs" string="2 - Import Product Categories" colspan="2" type="object" />
 								<button name="sync_attribs" string="5 - Import Product Attributes" colspan="2" type="object" />
 								<button name="sync_attrib_sets" string="3 - Import Product Attribute Sets" colspan="2" type="object" />
-								<newline />
+								<button name="sync_products" string="6 - Import Products" colspan="2" type="object" />
 								<field name="default_pro_cat" />
-								<button name="sync_products" string="6 - Import Products" colspan="2" type="object" />
+								<field name="default_lang_id" />
 <!--								<button name="sync_customer_addresses" string="Sync Customer Addresses" colspan="2" type="object" />-->
 <!--								<button name="export_products" string="Export Products" colspan="2" type="object" />-->
 							</page>
@@ -65,12 +65,10 @@
 						<field name="is_default" readonly="1" />
 						<field name="sort_order" readonly="1" />
 						<field name="default_shop_id" readonly="1" />
-						<field name="default_group_id" readonly="1" />
-						<field name="default_lang_id" />
-						<field name="referential_id" />
+						<field name="referential_id" readonly="1" />
 					</group>
 					<group col="4" colspan="4">
-						<field name="shop_ids" />
+						<field name="shop_ids" readonly="1"/>
 					</group>
 				</form>
 			</field>
@@ -86,7 +84,7 @@
 					<field name="is_default" readonly="1" select="2" />
 					<field name="sort_order" readonly="1" select="2" />
 					<field name="default_shop_id" readonly="1" select="2" />
-					<field name="shop_ids" />
+					<field name="shop_ids" readonly="1" />
 				</tree>
 			</field>
 		</record>
@@ -107,14 +105,12 @@
 			<field name="arch" type="xml">
 				<form string="Magento storeviews">
 					<group col="4" colspan="4">
-						<field name="magento_store_id" readonly="1" />
 						<field name="name" readonly="1" />
 						<field name="code" readonly="1" />
 						<field name="shop_id" readonly="1" />
 						<field name="website_id" readonly="1" />
 						<field name="is_active" readonly="1" />
 						<field name="sort_order" readonly="1" />
-						<field name="default_shop_id" readonly="1" />
 						<field name="lang_id" />
 					</group>
 				</form>
@@ -126,13 +122,11 @@
 			<field name="type">tree</field>
 			<field name="arch" type="xml">
 				<tree string="Magento storeviews">
-					<field name="magento_store_id" readonly="1" select="1" />
 					<field name="name" readonly="1" select="1" />
 					<field name="code" readonly="1" select="1" />
 					<field name="shop_id" readonly="1" select="1" />
 					<field name="is_active" readonly="1" select="2" />
 					<field name="sort_order" readonly="1" select="2" />
-					<field name="default_shop_id" readonly="1" select="2" />
 					<field name="lang_id" />
 				</tree>
 			</field>

=== modified file 'product.py'
--- product.py	2010-02-23 18:04:20 +0000
+++ product.py	2010-03-18 13:54:19 +0000
@@ -603,6 +603,7 @@
         'set':fields.many2one('magerp.product_attribute_set', 'Attribute Set'),
         'tier_price':fields.one2many('product.tierprice', 'product', 'Tier Price'),
         'product_type': fields.selection(_product_type_get, 'Product Type'),
+        'websites_ids': fields.many2many('external.shop.group', 'magerp_product_shop_group_rel', 'product_id', 'shop_group_id', 'Websites', help='By defaut product will be exported on every website, if you want to exporte it only on some website select them here'),
         }
 
     _defaults = {
@@ -725,6 +726,8 @@
                 else:
                     break
             xml+="</group></page>\n"
+        if context.get('multiwebsite', False):
+            xml+="""<page string='Websites'>\n<group colspan='4' col='4'>\n<field name='websites_ids'/>\n</group>\n</page>\n"""
         xml+="</notebook>"
         return xml
 
@@ -739,6 +742,9 @@
                 for field in self.pool.get('ir.model.fields').browse(cr, uid, ir_model_field_ids):
                     if str(field.name).startswith('x_'):
                         field_names.append(field.name)
+                if len(self.pool.get('external.shop.group').search(cr,uid,[('referential_type', 'ilike', 'mag')])) >1 :
+                    context['multiwebsite'] = True
+                    field_names.append('websites_ids')
                 result['fields'].update(self.fields_get(cr, uid, field_names, context))
                 view_part = self.redefine_prod_view(cr, uid, field_names, context) #.decode('utf8') It is not necessary, the translated view could be in UTF8
                 result['arch'] = result['arch'].decode('utf8').replace('<page string="attributes_placeholder"/>', '<page string="'+_("Magento Information")+'"'+""" attrs="{'invisible':[('magento_exportable','!=',1)]}"><field name='product_type' attrs="{'required':[('magento_exportable','=',True)]}"/>\n""" + view_part + """\n</page>""")
@@ -806,6 +812,29 @@
     
     def ext_export(self, cr, uid, ids, external_referential_ids=[], defaults={}, context={}):
         ids = self.search(cr, uid, [('id', 'in', ids), ('magento_exportable', '=', True)]) #restrict export to only exportable products
+        dates_2_ids = []
+        ids_2_dates = {}
+        
+        shop = self.pool.get('sale.shop').browse(cr, uid, context['shop_id'])
+        
+        last_exported_time = datetime.datetime.fromtimestamp(time.mktime(time.strptime(shop.last_products_export_date, '%Y-%m-%d %H:%M:%S')))
+        
+        #strangely seems that on inherits structure, write_date/create_date are False for children
+        cr.execute("select id, write_date, create_date from product_product where id in ("+ ','.join(map(lambda x: str(x),ids))+')')
+        read = cr.fetchall()
+        ids = []
+        context['force']=True
+        for product_read in read:
+            last_updated_product = product_read[1] and product_read[1].split('.')[0] or product_read[2] and product_read[2].split('.')[0] or False
+            last_updated_time = datetime.datetime.fromtimestamp(time.mktime(time.strptime(last_updated_product, '%Y-%m-%d %H:%M:%S')))
+            if last_updated_time and last_exported_time:
+                if last_exported_time + datetime.timedelta(seconds=1) > last_updated_time:
+                    continue
+            dates_2_ids += [(last_updated_product, product_read[0])]
+            ids_2_dates[product_read[0]] = last_updated_product
+
+        dates_2_ids.sort()
+        ids = [x[1] for x in dates_2_ids]
 
         #set the default_set_id in context and avoid extra request for each product upload
         conn = context.get('conn_obj', False)
@@ -816,27 +845,28 @@
                 default_set_id = set['set_id']
                 break
         context['default_set_id'] = default_set_id
+        context_dic = {}
 
-        shop = self.pool.get('sale.shop').browse(cr, uid, context['shop_id'])
-        no_local = context.copy()
-        no_local['globalstoreview'] = True
-        
-        if shop.shop_group_id.default_lang_id: #default magento language might not be English
-            no_local['lang'] = shop.shop_group_id.default_lang_id.code
-        elif no_local.get('lang', False):
-            del(no_local['lang'])
-        result = super(magerp_osv.magerp_osv, self).ext_export(cr, uid, ids, external_referential_ids, defaults, no_local)
-        ids = result['create_ids'] + result['write_ids']
-        
-        #language wise update:
         for storeview in shop.storeview_ids:
-            if storeview.lang_id and not (shop.shop_group_id.default_lang_id and storeview.lang_id.code == shop.shop_group_id.default_lang_id.code):
-                context.update({'storeview_code': storeview.code, 'lang': storeview.lang_id.code, 'force': True})
-                super(magerp_osv.magerp_osv, self).ext_export(cr, uid, ids, external_referential_ids, defaults, context)
-
-        #inventory level updates:
-        shop = self.pool.get('sale.shop').browse(cr, uid, context['shop_id'])
-        stock_id = shop.warehouse_id.lot_stock_id.id
+            if storeview.lang_id :
+                context_dic[storeview] = context.copy()
+                context_dic[storeview].update({'storeview_code': storeview.code, 'lang': storeview.lang_id.code})
+                if storeview.lang_id.code == shop.referential_id.default_lang_id.code:
+                    context_dic[storeview]['export_url'] = True # for the magento version 1.3.2.4, only one url is autorized by product, so we only export with the MAPPING TEMPLATE the url of the default language
+
+        if len(shop.storeview_ids) > len(context_dic):
+            context_dic['default_value'] = context.copy()
+            context_dic['default_value']['export_url'] = True # for the magento version 1.3.2.4, only one url is autorized by product, so we only export with the MAPPING TEMPLATE the url of the default language 
+            context_dic['default_value']['lang'] = shop.referential_id.default_lang_id.code
+
+        result = {'create_ids':[], 'write_ids':[]}
+        for id in ids:
+            for storeview in context_dic:
+                temp_result = super(magerp_osv.magerp_osv, self).ext_export(cr, uid, [id], external_referential_ids, defaults, context_dic[storeview])
+            self.pool.get('sale.shop').write(cr, uid,context['shop_id'], {'last_products_export_date': ids_2_dates[id]})
+            result['create_ids'] += temp_result['create_ids']
+            result['write_ids'] += temp_result['write_ids']
+
         return result
     
     

=== modified file 'sale.py'
--- sale.py	2010-03-04 13:47:23 +0000
+++ sale.py	2010-03-18 13:54:19 +0000
@@ -34,6 +34,26 @@
 class sale_shop(magerp_osv.magerp_osv):
     _inherit = "sale.shop"
     
+    def _get_exportable_product_ids(self, cr, uid, ids, name, args, context=None):
+        res = super(sale_shop, self)._get_exportable_product_ids(cr, uid, ids, name, args, context=None)
+        for shop_id in res:
+            website_id =  self.read(cr, uid, shop_id, ['shop_group_id'])
+            if website_id.get('shop_group_id', False):
+                res[shop_id] = self.pool.get('product.product').search(cr, uid, [('id', 'in', res[shop_id]), "|", ('websites_ids', 'in', [website_id['shop_group_id'][0]]) , ('websites_ids', '=', False)])
+            else:
+                res[shop_id] = []
+        return res
+
+    def _get_default_storeview_id(self, cr, uid, ids, prop, unknow_none, context):
+        res = {}
+        for shop in self.browse(cr, uid, ids, context):
+            if shop.default_storeview_id:
+                rid = self.pool.get('magerp.storeviews').extid_to_oeid(cr, uid, shop.default_storeview_integer_id, shop.referential_id.id)
+                res[shop.id] = rid
+            else:
+                res[shop.id] = False
+        return res
+    
     def export_images(self, cr, uid, ids, ctx):
         for shop in self.browse(cr, uid, ids):
             ctx['shop_id'] = shop.id
@@ -44,20 +64,11 @@
             res = True
             self.write(cr,uid,ctx['shop_id'],{'last_images_export_date':datetime.now()})
                
-    def _shop_group_get(self, cr, uid, ids, prop, unknow_none, context):
-        res = {}
-        for shop in self.browse(cr, uid, ids, context):
-            if shop.website_id:
-                rid = self.pool.get('external.shop.group').extid_to_oeid(cr, uid, shop.website_id, shop.referential_id.id)
-                res[shop.id] = rid
-            else:
-                res[shop.id] = False
-        return res
   
     def _get_rootcategory(self, cr, uid, ids, prop, unknow_none, context):
         res = {}
         for shop in self.browse(cr, uid, ids, context):
-            if shop.website_id:
+            if shop.root_category_id:
                 rid = self.pool.get('product.category').extid_to_oeid(cr, uid, shop.root_category_id, shop.referential_id.id)
                 res[shop.id] = rid
             else:
@@ -72,14 +83,14 @@
         return res
 
     _columns = {
-        'default_store_id':fields.integer('Magento Store ID'), #Many 2 one ?
-        'website_id':fields.integer('Magento Website ID'), # Many 2 one ?
-        'group_id':fields.integer('Magento ID'),
-        'root_category_id':fields.integer('Root product Category'),
+        'default_storeview_integer_id':fields.integer('Magento default Storewiev ID'), #This field can't be a many2one because store field will be mapped before creating storeviews
+        'default_storeview_id':fields.function(_get_default_storeview_id, type="many2one", relation="magerp.storeviews", method=True, string="Default Storeview"),
+        'root_category_id':fields.integer('Root product Category'), #This field can't be a many2one because store field will be mapped before creating category
         'magento_root_category':fields.function(_get_rootcategory, type="many2one", relation="product.category", method=True, string="Root Category", store=True),
         'exportable_root_category_ids': fields.function(_get_exportable_root_category_ids, type="many2many", relation="product.category", method=True, string="Root Category"), #fields.function(_get_exportable_root_category_ids, type="many2one", relation="product.category", method=True, 'Exportable Root Categories'),
         'storeview_ids': fields.one2many('magerp.storeviews', 'shop_id', 'Store Views'),
         'payment_types': fields.one2many('magerp.sale.shop.payment.type', 'shop_id', 'Payment Type'),
+        'exportable_product_ids': fields.function(_get_exportable_product_ids, method=True, type='one2many', relation="product.product", string='Exportable Products'),
     }   
 
     def import_shop_orders(self, cr, uid, shop, defaults, ctx):

=== modified file 'sale_view.xml'
--- sale_view.xml	2010-02-26 21:03:53 +0000
+++ sale_view.xml	2010-03-18 13:54:19 +0000
@@ -13,7 +13,11 @@
 					<field name="exportable_root_category_ids" position="replace">
 						<field name="exportable_root_category_ids" invisible="1" />
 					</field>
-					<field name="shop_group_id" position="after">
+					<field name="referential_id" position="replace">
+						<field name="referential_id" readonly="1"/>	
+					</field>
+					<field name="shop_group_id" position="replace">
+						<field name="shop_group_id" readonly="1"/>
 						<field name="magento_root_category" readonly="1" />
 						<field name="storeview_ids" nolabel="1" colspan="4" />
 					</field>

=== modified file 'settings/external.mappinglines.template.csv'
--- settings/external.mappinglines.template.csv	2010-02-26 21:03:53 +0000
+++ settings/external.mappinglines.template.csv	2010-03-18 13:54:19 +0000
@@ -4,10 +4,9 @@
 "mag_erp_s_web","magento1324","base_sale_multichannels.model_external_shop_group","website_id","in_out","int","result=[('website_id',ifield)]",
 "mag_erp_s_isa","magento1324","base_sale_multichannels.model_external_shop_group","is_default","in_out","str","result=[('is_default',bool(eval(ifield)))]",
 "mag_erp_s_stord","magento1324","base_sale_multichannels.model_external_shop_group","sort_order","in_out","int","result=[('sort_order',ifield)]",
-"mag_erp_s_gpid","magento1324","base_sale_multichannels.model_external_shop_group","default_group_id","in_out","int","result=[('default_group_id',ifield)]",
+"mag_erp_s_gpid","magento1324","base_sale_multichannels.model_external_shop_group","default_group_id","in_out","int","result=[('default_shop_integer_id',ifield)]",
 "mag_erp_sv_name","magento1324","model_magerp_storeviews","name","in_out","str","result=[('name',ifield)]","result=[('name',record['name'])]"
 "mag_erp_sv_code","magento1324","model_magerp_storeviews","code","in_out","str","result=[('code',ifield)]",
-"mag_erp_sv_sid","magento1324","model_magerp_storeviews","store_id","in_out","int","result=[('magento_store_id',ifield)]",
 "mag_erp_sv_sg","magento1324","model_magerp_storeviews","website_id","in_out","int","result=[('website_id',self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ifield, external_referential_id))]",
 "mag_erp_sv_isa","magento1324","model_magerp_storeviews","is_active","in_out","str","result=[('is_active',bool(eval(ifield)))]",
 "mag_erp_sv_stord","magento1324","model_magerp_storeviews","sort_order","in_out","int","result=[('sort_order',ifield)]",
@@ -15,8 +14,7 @@
 "mag_erp_st_name","magento1324","sale.model_sale_shop","name","in_out","str","result=[('name',ifield)]","result=[('name',record['name'])]"
 "mag_erp_st_gpid","magento1324","sale.model_sale_shop","group_id","in_out","int","result=[('group_id',ifield)]",
 "mag_erp_st_grp","magento1324","sale.model_sale_shop","website_id","in_out","int","result=[('shop_group_id',self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ifield, external_referential_id))]",
-"mag_erp_st_web","magento1324","sale.model_sale_shop","website_id","in_out","int","result=[('website_id',ifield)]",
-"mag_erp_st_default_st","magento1324","sale.model_sale_shop","default_store_id","in_out","int","result=[('default_store_id',ifield)]",
+"mag_erp_st_default_st","magento1324","sale.model_sale_shop","default_store_id","in_out","int","result=[('default_storeview_integer_id',ifield)]",
 "mag_erp_st_root_categ","magento1324","sale.model_sale_shop","root_category_id","in_out","int","result=[('root_category_id',ifield)]",
 "mag_erp_so_name","magento1324","sale.model_sale_order","increment_id","in_out","str","result=[('magento_incrementid',str(ifield)), ('name','mag_' + str(ifield))]",
 "mag_erp_so_custo","magento1324","sale.model_sale_order","customer_id","in_out","int","result=[('partner_id',self.pool.get('res.partner').extid_to_oeid(cr, uid, ifield, external_referential_id))]",
@@ -108,7 +106,7 @@
 "mag_erp_attr_23","magento1324","model_magerp_product_attributes","note","in_out","str","result=[('note', ifield)]","result=[('note', record['note'])]"
 "mag_erp_attr_24","magento1324","model_magerp_product_attributes","entity_type_id","in_out","int","result=[('entity_type_id', ifield)]","result=[('entity_type_id', record['entity_type_id'])]"
 "mag_erp_attr_25","magento1324","model_magerp_product_attributes","apply_to","in_out","str","result=[('apply_to', str(ifield))]","result=[('apply_to', eval(record['%s']))]"
-"mag_erp_prd_1","magento1324","product.model_product_product","url_key","in_out","str","result=[('x_magerp_url_key',ifield)]","if context.get('globalstoreview', False) :
+"mag_erp_prd_1","magento1324","product.model_product_product","url_key","in_out","str","result=[('x_magerp_url_key',ifield)]","if context.get('export_url', False) :
     result=[('url_key',record['x_magerp_url_key'])]"
 "mag_erp_prd_2","magento1324","product.model_product_product","name","in_out","str","result = [('name',ifield)]","result = [('name',record['name'])]"
 "mag_erp_prd_3","magento1324","product.model_product_product","description","in_out","str","result = [('description',ifield)]",