Skip to content

Commit

Permalink
Merge remote-tracking branch 'firedrakes/MAGETWO-45421' into PR
Browse files Browse the repository at this point in the history
  • Loading branch information
guz-anton committed Nov 12, 2015
2 parents cb24698 + 16a9895 commit 923fcaf
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
5 changes: 5 additions & 0 deletions app/code/Magento/Sales/etc/fieldset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand Down
10 changes: 10 additions & 0 deletions app/code/Magento/SalesRule/etc/fieldset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit 923fcaf

Please sign in to comment.