Merge lp:~akretion-team/magentoerpconnect/magentoerpconnect-fix-shipping-amount-if-discount into lp:magentoerpconnect/oerp6.1-stable

[Benoit Guillot - http://www.akretion.com]

This merge proposal set the shipping_amount_tax_excluded to 0 in the sale order if the shipping_amount_tax_included is also 0 because of discount.

An example to make it more clear:

A sale order in magento:
- shipping cost tax included : 7.00 euros
- shipping cost tax excluded : 5.85 euros
- discount on shipping : 7.00 euros

so in the mapping :

amount_tax_inc = 7.00 - 7.00 = 0
amount_tax_exc = 5.85

if amount_tax_exc and amount_tax_inc:
    tax_rate = amount_tax_inc/amount_tax_exc -1
else:
    tax_rate = 0

result=[
    ('shipping_amount_tax_included', 0),
    ('shipping_amount_tax_excluded', 5.85),
    ('shipping_tax_rate', 0),
]

It will create a shipping cost line with price : 5.85 and no taxes but it's wrong there is no shipping cost

I propose to set the amount_tax_exc to 0 also by adding:

if not amount_tax_inc:
    amount_tax_exc = 0

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

It's ok for me. I merge it

review: Approve

=== modified file 'magentoerpconnect/settings/1.5.0.0/sale.order/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.5.0.0/sale.order/external.mappinglines.template.csv	2012-12-19 14:00:47 +0000
+++ magentoerpconnect/settings/1.5.0.0/sale.order/external.mappinglines.template.csv	2013-02-26 12:33:23 +0000
@@ -36,6 +36,9 @@
 else:
     tax_rate = 0
 
+if not amount_tax_inc:
+    amount_tax_exc = 0
+
 result=[
     ('shipping_amount_tax_included', amount_tax_inc),
     ('shipping_amount_tax_excluded', amount_tax_exc),