From 16a989544b03e5255f60b398f9436d39cb3c6361 Mon Sep 17 00:00:00 2001
From: Vladyslav Shcherbyna <vshcherbyna@ebay.com>
Date: Thu, 12 Nov 2015 19:54:56 +0200
Subject: [PATCH] MAGETWO-45421: Discount to shipping amount is not applied
 when creating invoice

---
 app/code/Magento/Sales/etc/fieldset.xml     |  5 +++++
 app/code/Magento/SalesRule/etc/fieldset.xml | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/app/code/Magento/Sales/etc/fieldset.xml b/app/code/Magento/Sales/etc/fieldset.xml
index 3b2ea7172c024..cd8dfd48f2152 100644
--- a/app/code/Magento/Sales/etc/fieldset.xml
+++ b/app/code/Magento/Sales/etc/fieldset.xml
@@ -484,9 +484,11 @@
             </field>
             <field name="discount_amount">
                 <aspect name="to_quote_address_shipping" />
+                <aspect name="to_cm"/>
             </field>
             <field name="shipping_amount">
                 <aspect name="to_quote_address_shipping" />
+                <aspect name="to_cm"/>
             </field>
             <field name="shipping_incl_tax">
                 <aspect name="to_quote_address_shipping" />
@@ -502,12 +504,15 @@
             </field>
             <field name="base_discount_amount">
                 <aspect name="to_quote_address_shipping" />
+                <aspect name="to_cm"/>
             </field>
             <field name="base_shipping_amount">
                 <aspect name="to_quote_address_shipping" />
+                <aspect name="to_cm"/>
             </field>
             <field name="base_shipping_incl_tax">
                 <aspect name="to_quote_address_shipping" />
+                <aspect name="to_cm"/>
             </field>
             <field name="base_custbalance_amount">
                 <aspect name="to_quote_address_shipping" />
diff --git a/app/code/Magento/SalesRule/etc/fieldset.xml b/app/code/Magento/SalesRule/etc/fieldset.xml
index db2ddd4a4ac94..fed106fa5d595 100644
--- a/app/code/Magento/SalesRule/etc/fieldset.xml
+++ b/app/code/Magento/SalesRule/etc/fieldset.xml
@@ -19,5 +19,15 @@
                 <aspect name="to_order" />
             </field>
         </fieldset>
+        <fieldset id="sales_convert_order">
+            <field name="shipping_discount_amount">
+                <aspect name="to_cm" />
+                <aspect name="to_quote_address_shipping" />
+            </field>
+            <field name="base_shipping_discount_amount">
+                <aspect name="to_cm" />
+                <aspect name="to_quote_address_shipping" />
+            </field>
+        </fieldset>
     </scope>
 </config>