Merge branch 'MAGETWO-45612' into bugfixes

magento · Nov 16, 2015 · 8e8453d · 8e8453d
2 parents 5c085d7 + 212a2d8
commit 8e8453d
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/app/code/Magento/Sales/etc/fieldset.xml b/app/code/Magento/Sales/etc/fieldset.xml
@@ -508,7 +508,6 @@
             </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" />

diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Convert/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Convert/OrderTest.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Model\Convert;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class OrderTest
+ */
+class OrderTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var Order */
+    protected $_model;
+
+    protected function setUp()
+    {
+        $this->_model = Bootstrap::getObjectManager()->create('Magento\Sales\Model\Convert\Order');
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     */
+    public function testConvertToCreditmemo()
+    {
+        /** @var \Magento\Sales\Model\Order $order */
+        $order = Bootstrap::getObjectManager()->create('Magento\Sales\Model\Order');
+        $order->loadByIncrementId('100000001');
+        //MAGETWO-45612 fix
+        $order->setBaseShippingAmount(5);
+        $this->assertNull($this->_model->toCreditmemo($order)->getBaseShippingAmount());
+    }
+}