Merge remote-tracking branch 'firedrakes/MAGETWO-45421' into PR

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" />

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>