Merge lp:~magentoerpconnect-core-editors/magentoerpconnect/improved_discount_n_address into lp:magentoerpconnect/oerp5.0-stable

[Sharoon Thomas http://openlabs.co.in]

This contribution funded by C2C includes two major updates:

1. Better customer address handling: When the address is updated by customer on web store it is created as a new address in Open ERP.

2. Handling of discount from having a percentage in the line (Caused rounding issues) to a separate line. It also has the advantage that the coupon code is now shown.

Existing:
Both these are changes which will affect existing systems in terms of future behaviour.

Schema:
There are no Schema changes

We believe that the new behaviour is more desirable

[Paul Todd (paul-todd-solos)]

Need to add
import netsvc to the partner.py file

and the following code throws an error.

[2010-08-25 13:24:35,773] ERROR:web-services:[36]: if magento_address['is_active'] == 1:
[2010-08-25 13:24:35,773] ERROR:web-services:[37]: KeyError: 'is_active'

review: Needs Fixing

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

Hello what is the status of this branch? Should we still merge it? Is some extra work required?

Unmerged revisions

306. By Sharoon Thomas <sharoonthomas@sharoonthomas-laptop> on 2010-05-08

[IMP]Better Address Change monitoring and updation in openerp|
Better handling of discount coupons as a separate line item
**Funded by Camp to Camp SA**

=== modified file 'partner.py'
--- partner.py	2010-01-02 18:43:26 +0000
+++ partner.py	2010-05-08 12:45:41 +0000
@@ -41,6 +41,63 @@
     _defaults = {
                     'is_magento_order_address': lambda * a:False,
                  }
+                 
+    def mage_to_oe_address(self, cr, uid ,magento_address, address_default):
+        oe_address = {}
+        oe_address['city'] = magento_address.get('city',False)
+        if magento_address['address_type'] == 'billing':
+            type = 'invoice'
+        elif magento_address['address_type'] == 'shipping':
+            type = 'delivery'
+        oe_address['city']= magento_address.get('city',False)
+        oe_address['zip']= magento_address.get('postcode',False)
+        oe_address['fax']= magento_address.get('fax', False)
+        oe_address['phone']= magento_address.get('telephone', False)
+        if magento_address.get('street', False):
+            street = magento_address['street'].split('\n')
+            oe_address['street']= street[0]
+        if len(street) ==2:
+            oe_address['street2'] = street[1]
+        mag_country_code = magento_address.get('country_id', '')
+        mag_country_id = self.pool.get('res.country').search(cr, uid, [('code' , '=', mag_country_code)])[0]
+        partner_name = ''
+        if magento_address['firstname']:
+            partner_name+= magento_address['firstname']
+#        if magento_address['middlename'] :
+#            partner_name+= ' ' + magento_address['middlename']
+        if magento_address['lastname'] :
+            partner_name+= ' ' + magento_address['lastname']
+        oe_address['name'] = partner_name
+        oe_address['type'] = type
+        oe_address['partner_id'] = address_default['partner_id']
+        oe_address['country_id'] = mag_country_id
+        return oe_address
+
+    def find_or_create(self, cr, uid, magento_address, external_referential_id, address_default, context={}):
+        logger = netsvc.Logger()
+        create_ids = []
+        write_ids = []
+        oe_address = self.mage_to_oe_address(cr, uid, magento_address, address_default)
+        args = [(key,'=',oe_address.get(key)) for key in oe_address.keys()]
+        addr_id = self.search(cr,uid,args,context=context)
+        if magento_address['is_active'] == 1:
+            active = True
+        else:
+            active = False
+        #oe_address['active'] = active # this should not be a basis of creating a new address.
+        oe_address['email'] = address_default.get('email', False)
+        if not addr_id :
+            # create address
+            crid= self.create(cr, uid, oe_address, context)
+            create_ids.append(crid)
+            logger.notifyChannel('ext synchro', netsvc.LOG_INFO, "Created in OpenERP %s from External Ref with external_id %s and OpenERP id %s successfully" %('res.partner.address', external_referential_id, crid))
+            return {'create_ids': create_ids, 'write_ids': []}
+        else:
+            self.write(cr, uid, addr_id[0], oe_address, context)
+            write_ids.append(addr_id[0])
+            logger.notifyChannel('ext synchro', netsvc.LOG_INFO, "Updated in OpenERP %s from External Ref with external_id %s and OpenERP id %s successfully" %('res.partner.address', external_referential_id, addr_id[0]))
+            return {'write_ids': write_ids, 'create_ids': []}
+            
 res_partner_address()
 
 class res_partner(magerp_osv.magerp_osv):
 
=== modified file 'sale.py'
--- sale.py	2010-03-26 17:32:47 +0000
+++ sale.py	2010-05-08 12:45:41 +0000
@@ -251,13 +251,11 @@
             shipping_default = {'partner_id': res.get('partner_id', False)}
         billing_default = shipping_default.copy()
         billing_default.update({'email' : data_record.get('customer_email', False)})
-
-        inv_res = partner_address_obj.ext_import(cr, uid, [data_record['billing_address']], external_referential_id, billing_default, context)
+        inv_res = partner_address_obj.find_or_create(cr, uid, data_record['billing_address'], external_referential_id, address_default, context)
         if 'address_type' in data_record['shipping_address']:
-            ship_res = partner_address_obj.ext_import(cr, uid, [data_record['shipping_address']], external_referential_id, shipping_default, context)
+            ship_res = partner_address_obj.find_or_create(cr, uid, data_record['shipping_address'], external_referential_id, address_default, context)
         else:
-            ship_res = partner_address_obj.ext_import(cr, uid, [data_record['billing_address']], external_referential_id, shipping_default, context)
-
+            ship_res = partner_address_obj.find_or_create(cr, uid, data_record['billing_address'], external_referential_id, address_default, context)
         res['partner_order_id'] = len(inv_res['create_ids']) > 0 and inv_res['create_ids'][0] or inv_res['write_ids'][0]
         res['partner_invoice_id'] = res['partner_order_id']
         res['partner_shipping_id'] = (len(ship_res['create_ids']) > 0 and ship_res['create_ids'][0]) or (len(ship_res['write_ids']) > 0 and ship_res['write_ids'][0]) or res['partner_order_id'] #shipping might be the same as invoice address
@@ -337,6 +335,28 @@
                                     'tax_id': tax_id
                                 }))
         return res
+        
+    def get_order_discount(self, cr, uid, res, data_record, context):
+        if float(data_record['discount_amount']) == 0 :
+            discount = 0.0
+        else :
+            discount = -float(data_record['discount_amount'])
+        discount_product_id = self.pool.get('product.product').search(cr, uid, [('default_code', '=', 'DISCOUNT MAGENTO')])[0]
+        discount_product = self.pool.get('product.product').browse(cr, uid, discount_product_id, context)
+        coupon_code = data_record.get('coupon_code', False)
+        if coupon_code:
+            name = 'Discount[Coupon Code: %s]' % coupon_code
+        else:
+            name = 'Discount'
+        res['order_line'].append((0, 0, {
+                                    'product_id': discount_product.id,
+                                    'name': discount_product.name,
+                                    'product_uom': discount_product.uom_id.id,
+                                    'product_uom_qty': 1,
+                                    'price_unit': discount,
+                                    'name': name
+                                }))
+        return res
     
     def oevals_from_extdata(self, cr, uid, external_referential_id, data_record, key_field, mapping_lines, defaults, context):
         res = super(magerp_osv.magerp_osv, self).oevals_from_extdata(cr, uid, external_referential_id, data_record, key_field, mapping_lines, defaults, context)
@@ -344,6 +364,7 @@
         if not context.get('one_by_one', False):
             if data_record.get('billing_address', False):
                 res = self.get_order_addresses(cr, uid, res, external_referential_id, data_record, key_field, mapping_lines, defaults, context)
+                res = self.get_order_discount(cr, uid, res, data_record, context)
             if data_record.get('items', False):
                 try:
                     res = self.get_order_lines(cr, uid, res, external_referential_id, data_record, key_field, mapping_lines, defaults, context)
 
=== modified file 'settings/external.mappinglines.template.csv'
--- settings/external.mappinglines.template.csv	2010-03-16 13:59:26 +0000
+++ settings/external.mappinglines.template.csv	2010-05-08 12:45:41 +0000
@@ -32,7 +32,7 @@
 "mag_erp_soline_uomqty","magento1324","sale.model_sale_order_line","qty_ordered","in_out","str","result=[('product_uom_qty',ifield)]",
 "mag_erp_soline_uosqty","magento1324","sale.model_sale_order_line","qty_ordered","in","str","result=[('product_uos_qty',ifield)]",
 "mag_erp_soline_price","magento1324","sale.model_sale_order_line","price","in","str","result=[('price_unit', float(data['row_total'])/float(data['qty_ordered']))]",
-"mag_erp_soline_disc","magento1324","sale.model_sale_order_line","discount_amount","in","str","result=[('discount', float(data['price']) != 0 and float(data['qty_ordered']) != 0 and float(100*float(ifield))/(float(data['price'])*float(data['qty_ordered'])) or 0)]",
+"mag_erp_soline_disc","magento1324","sale.model_sale_order_line","discount_amount","in","str","result=[('discount', 0.0)]",
 "mag_erp_procat_2","magento1324","product.model_product_category","level","in","int","result=[('sequence',ifield),('level',ifield)]",
 "mag_erp_procat_3","magento1324","product.model_product_category","parent_id","in_out","int","record_id = self.pool.get('ir.model.data').search(cr, uid, [('model', '=', self._name), ('name', '=', self.prefixed_id(ifield))])
 parent_id = False
@@ -132,7 +132,7 @@
 "mag_erp_prd_8","magento1324","product.model_product_product","price","in_out","float","result=[('list_price',ifield)]","result=[]#map later"
 "mag_erp_prd_9","magento1324","product.model_product_product","cost","in_out","float","result=[('standard_price',ifield)]","result = [('cost',record['standard_price'] or 0)]"
 "mag_erp_prd_10","magento1324","product.model_product_product","set","in_out","str","result=[('set',self.pool.get('magerp.product_attribute_set').extid_to_oeid(cr, uid, ifield, external_referential_id))]",
-"mag_erp_prd_11","magento1324","product.model_product_product","special_price","in_out","float","result = [('x_magerp_special_price',ifield)]",""
+"mag_erp_prd_11","magento1324","product.model_product_product","special_price","in_out","float","result = [('x_magerp_special_price',ifield)]",
 "mag_erp_prd_12","magento1324","product.model_product_product","tier_price","in_out","str","result=[]#no mapping by default","result=[]#no mapping by default"
 "mag_erp_prd_13","magento1324","product.model_product_product","minimal_price","in_out","float","result = [('x_magerp_minimal_price',ifield)]","
 if record['x_magerp_minimal_price'] and record['x_magerp_minimal_price'] != 0: