ENGCOM-3939: [Backport] Fix negative credit memo #19899 #20508

magento-engcom-team · magento-engcom-team · commit 0e1a62e4242d · 2019-01-28T03:36:23.000-06:00
- Merge Pull Request #20508 from mageprince/magento2:2.2-develop-PR-port-19900 - Merged commits: 1. d46a076 2. c830d61
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
@@ -200,6 +200,7 @@ protected function initData($creditmemo, $data)
     {
         if (isset($data['shipping_amount'])) {
             $creditmemo->setBaseShippingAmount((double)$data['shipping_amount']);
+            $creditmemo->setBaseShippingInclTax((double)$data['shipping_amount']);
         }
         if (isset($data['adjustment_positive'])) {
             $creditmemo->setAdjustmentPositive($data['adjustment_positive']);
@@ -210,6 +211,8 @@ protected function initData($creditmemo, $data)
     }
 
     /**
+     * Calculate product options.
+     *
      * @param Item $orderItem
      * @param int $parentQty
      * @return int

Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,7 @@ protected function initData($creditmemo, $data)`
`200`	`200`	`{`
`201`	`201`	`if (isset($data['shipping_amount'])) {`
`202`	`202`	`$creditmemo->setBaseShippingAmount((double)$data['shipping_amount']);`
	`203`	`+ $creditmemo->setBaseShippingInclTax((double)$data['shipping_amount']);`
`203`	`204`	`}`
`204`	`205`	`if (isset($data['adjustment_positive'])) {`
`205`	`206`	`$creditmemo->setAdjustmentPositive($data['adjustment_positive']);`
`@@ -210,6 +211,8 @@ protected function initData($creditmemo, $data)`
`210`	`211`	`}`
`211`	`212`
`212`	`213`	`/**`
	`214`	`+ * Calculate product options.`
	`215`	`+ *`
`213`	`216`	`* @param Item $orderItem`
`214`	`217`	`* @param int $parentQty`
`215`	`218`	`* @return int`