← Back to branch summary

~sebastien.beau/magentoerpconnect/oerp6.1-stable-minor-improvement

« 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: 2013-06-09 02:25:57 UTC
  • mfrom: (689.1.4 oerp6.1-stable)
  • Revision ID: sebastien.beau@akretion.com-20130609022557-octue95b5v4mbmwj
[MERGE] merge with stable and solve conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
magentoerpconnect/settings/1.5.0.0/sale.order/external.mappinglines.template.csv
26
26
else:
27
27
    tax_rate = 0
28
28
 
 
29
if not amount_tax_inc:
 
30
    amount_tax_exc = 0
 
31
 
29
32
result=[
30
33
    ('shipping_amount_tax_included', amount_tax_inc),
31
34
    ('shipping_amount_tax_excluded', amount_tax_exc),