← Back to branch summary

~sebastien.beau/magentoerpconnect/oerp6.1-cleanning

« back to all changes in this revision

Viewing changes to magentoerpconnect/settings/1.5.0.0/sale.order/external.mappinglines.template.csv

  • Committer: Sébastien Beau
  • Date: 2012-12-07 13:18:05 UTC
  • mfrom: (676.2.39 magentoerpconnect)
  • Revision ID: sebastien.beau@akretion.com-20121207131805-o4tgotytj3ku580m
[MERGE] merge with cleaning branch, please do not forget to update dependency, product-extra-addons, openobject-extention, e-commerce-adddons. 

magentoerpconnect :
- REFACTOR
    - refactor the invoice syncronisation 
        2 modules are available, 1 for using Magento Invoice, one for using OpenERP invoice
        moreover if invoice syncronisation failed try to map if an existing one already exist : fonction => map_magento_order 
    - refactor view for compatibility in multi-e-commerce solution
    - NAME REFACTOR : by default use only name if you need to use the lastname and firstname please first update magentoerpconnect and them install magentoerpconnect_partner_surname. DO IT ON A DATABASE TEST BEFORE. If you have any trouble please open a bug on lp
    - use new api for moving the category and updating the stock information

    ADD
        - add reporting when exporting stock level

Show diffs side-by-side

added added

removed removed

Lines of Context:
magentoerpconnect/settings/1.5.0.0/sale.order/external.mappinglines.template.csv
16
16
mag1500_sale_order_cod_fee=>,,in,function,cod_fee,,float,False,mag1500_sale_order,cod_fee,"#TODO map me
17
17
",,,
18
18
mag1500_sale_order_gift_certificates_amount=>,,in,function,giftcert_amount,,float,False,mag1500_sale_order,gift_certificates_amount,"result=[('gift_certificates_amount', ifield)]",,,
19
 
mag1500_sale_order_shipping_amount_tax_excluded=>,,in,function,shipping_amount,,float,False,mag1500_sale_order,shipping_amount_tax_excluded,"result=[('shipping_amount_tax_excluded', ifield)]",,,
20
19
mag1500_sale_order_gift_certificates_code=>,,in,function,giftcert_code,,unicode,False,mag1500_sale_order,gift_certificates_code,"result = [('gift_certificates_code', ifield)]",,,
21
20
mag1500_sale_order_carrier_id=>,,in,function,shipping_method,,unicode,False,mag1500_sale_order,carrier_id,"if ifield:
22
21
    carrier_ids = self.pool.get('delivery.carrier').search(cr, uid, [('magento_code', '=', ifield)])
28
27
        model, product_id = model_data_obj.get_object_reference(cr, uid, 'base_sale_multichannels', 'product_product_shipping')
29
28
        carrier_id = self.pool.get('delivery.carrier').create(cr, uid, {'partner_id' : fake_partner_id, 'product_id' : product_id, 'name' : ifield, 'magento_code' : ifield})
30
29
        result=[('carrier_id', carrier_id)]",,,
31
 
mag1500_sale_order_shipping_amount_tax_included=>,,in,function,base_shipping_incl_tax,,float,False,mag1500_sale_order,shipping_amount_tax_included,"result=[('shipping_amount_tax_included', ifield), ('shipping_tax_rate', ifield and (ifield/float(data['shipping_amount'])-1)) or 0]",,,
32
 
mag1500_s   ale_order_date,,in,direct,created_at,sale.field_sale_order_date_order,datetime,False,mag1500_sale_order,,,,,%Y-%m-%d %H:%M:%S
 
30
mag1500_sale_order_shipping_amount_tax_included=>,,in,function,base_shipping_incl_tax,,float,False,mag1500_sale_order,shipping_amount_tax_included,"amount_tax_inc = float(resource.get('base_shipping_incl_tax', 0.0)) - float(resource.get('shipping_discount_amount', 0.0))
 
31
amount_tax_exc = float(resource.get('shipping_amount', 0))
 
32
 
 
33
if amount_tax_exc:
 
34
    tax_rate = amount_tax_inc/amount_tax_exc -1
 
35
else:
 
36
    tax_rate = 0
 
37
 
 
38
result=[
 
39
    ('shipping_amount_tax_included', amount_tax_inc),
 
40
    ('shipping_amount_tax_excluded', amount_tax_exc),
 
41
    ('shipping_tax_rate', tax_rate),
 
42
]",,,
 
43
mag1500_sale_order_date,,in,direct,created_at,sale.field_sale_order_date_order,datetime,False,mag1500_sale_order,,,,,%Y-%m-%d %H:%M:%S