Merge pull request #182 from magento-sparta/MAGETWO-55465

[Support] Portdown MAGETWO-50026 down to M2.0.x branch

Author: slavvka

app/code/Magento/Sales/Api/Data/CreditmemoInterface.php

@@ -304,7 +304,7 @@ public function getBaseGrandTotal();
     /**
      * Gets the credit memo base discount tax compensation amount.
      *
-     * @return float Credit memo base discount tax compensation amount.
+     * @return float|null Credit memo base discount tax compensation amount.
      */
     public function getBaseDiscountTaxCompensationAmount();
 
@@ -318,7 +318,7 @@ public function getBaseShippingAmount();
     /**
      * Gets the credit memo base shipping discount tax compensation amount.
      *
-     * @return float Credit memo base shipping discount tax compensation amount.
+     * @return float|null Credit memo base shipping discount tax compensation amount.
      */
     public function getBaseShippingDiscountTaxCompensationAmnt();
 
@@ -453,7 +453,7 @@ public function getGrandTotal();
     /**
      * Gets the credit memo discount tax compensation amount.
      *
-     * @return float Credit memo discount tax compensation amount.
+     * @return float|null Credit memo discount tax compensation amount.
      */
     public function getDiscountTaxCompensationAmount();
 
@@ -501,7 +501,7 @@ public function getShippingAmount();
     /**
      * Gets the credit memo shipping discount tax compensation amount.
      *
-     * @return float Credit memo shipping discount tax compensation amount.
+     * @return float|null Credit memo shipping discount tax compensation amount.
      */
     public function getShippingDiscountTaxCompensationAmount();
 

app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php

@@ -169,14 +169,14 @@ public function getBaseCost();
     /**
      * Gets the base discount amount for a credit memo item.
      *
-     * @return float
+     * @return float|null
      */
     public function getBaseDiscountAmount();
 
     /**
      * Gets the base discount tax compensation amount for a credit memo item.
      *
-     * @return float
+     * @return float|null
      */
     public function getBaseDiscountTaxCompensationAmount();
 
@@ -275,7 +275,7 @@ public function setEntityId($entityId);
     /**
      * Gets the discount tax compensation amount for a credit memo item.
      *
-     * @return float Discount tax compensation amount.
+     * @return float|null Discount tax compensation amount.
      */
     public function getDiscountTaxCompensationAmount();
 

app/code/Magento/Sales/Api/Data/InvoiceInterface.php

@@ -225,7 +225,7 @@ public function getBaseGrandTotal();
     /**
      * Gets the base discount tax compensation amount for the invoice.
      *
-     * @return float Base discount tax compensation amount.
+     * @return float|null Base discount tax compensation amount.
      */
     public function getBaseDiscountTaxCompensationAmount();
 
@@ -239,7 +239,7 @@ public function getBaseShippingAmount();
     /**
      * Gets the base shipping discount tax compensation amount for the invoice.
      *
-     * @return float Base shipping discount tax compensation amount.
+     * @return float|null Base shipping discount tax compensation amount.
      */
     public function getBaseShippingDiscountTaxCompensationAmnt();
 
@@ -381,7 +381,7 @@ public function getGrandTotal();
     /**
      * Gets the discount tax compensation amount for the invoice.
      *
-     * @return float Discount tax compensation amount.
+     * @return float|null Discount tax compensation amount.
      */
     public function getDiscountTaxCompensationAmount();
 
@@ -430,7 +430,7 @@ public function getShippingAmount();
     /**
      * Gets the shipping discount tax compensation amount for the invoice.
      *
-     * @return float Shipping discount tax compensation amount.
+     * @return float|null Shipping discount tax compensation amount.
      */
     public function getShippingDiscountTaxCompensationAmount();
 

app/code/Magento/Sales/Api/Data/InvoiceItemInterface.php

@@ -140,7 +140,7 @@ public function getBaseDiscountAmount();
     /**
      * Gets the base discount tax compensation amount for the invoice item.
      *
-     * @return float Base discount tax compensation amount.
+     * @return float|null Base discount tax compensation amount.
      */
     public function getBaseDiscountTaxCompensationAmount();
 
@@ -211,7 +211,7 @@ public function setEntityId($entityId);
     /**
      * Gets the discount tax compensation amount for the invoice item.
      *
-     * @return float Discount tax compensation amount.
+     * @return float|null Discount tax compensation amount.
      */
     public function getDiscountTaxCompensationAmount();
 

app/code/Magento/Sales/Api/Data/OrderInterface.php

@@ -643,21 +643,21 @@ public function getBaseGrandTotal();
     /**
      * Gets the base discount tax compensation amount for the order.
      *
-     * @return float Base discount tax compensation amount.
+     * @return float|null Base discount tax compensation amount.
      */
     public function getBaseDiscountTaxCompensationAmount();
 
     /**
      * Gets the base discount tax compensation invoiced amount for the order.
      *
-     * @return float Base discount tax compensation invoiced.
+     * @return float|null Base discount tax compensation invoiced.
      */
     public function getBaseDiscountTaxCompensationInvoiced();
 
     /**
      * Gets the base discount tax compensation refunded amount for the order.
      *
-     * @return float Base discount tax compensation refunded.
+     * @return float|null Base discount tax compensation refunded.
      */
     public function getBaseDiscountTaxCompensationRefunded();
 
@@ -685,7 +685,7 @@ public function getBaseShippingDiscountAmount();
     /**
      * Gets the base shipping discount tax compensation amount for the order.
      *
-     * @return float Base shipping discount tax compensation amount.
+     * @return float|null Base shipping discount tax compensation amount.
      */
     public function getBaseShippingDiscountTaxCompensationAmnt();
 
@@ -1107,21 +1107,21 @@ public function getGrandTotal();
     /**
      * Gets the discount tax compensation amount for the order.
      *
-     * @return float Discount tax compensation amount.
+     * @return float|null Discount tax compensation amount.
      */
     public function getDiscountTaxCompensationAmount();
 
     /**
      * Gets the discount tax compensation invoiced amount for the order.
      *
-     * @return float Discount tax compensation invoiced amount.
+     * @return float|null Discount tax compensation invoiced amount.
      */
     public function getDiscountTaxCompensationInvoiced();
 
     /**
      * Gets the discount tax compensation refunded amount for the order.
      *
-     * @return float Discount tax compensation refunded amount.
+     * @return float|null Discount tax compensation refunded amount.
      */
     public function getDiscountTaxCompensationRefunded();
 
@@ -1268,7 +1268,7 @@ public function getShippingDiscountAmount();
     /**
      * Gets the shipping discount tax compensation amount for the order.
      *
-     * @return float Shipping discount tax compensation amount.
+     * @return float|null Shipping discount tax compensation amount.
      */
     public function getShippingDiscountTaxCompensationAmount();
 

app/code/Magento/Sales/Api/Data/OrderItemInterface.php

@@ -457,21 +457,21 @@ public function getBaseDiscountRefunded();
     /**
      * Gets the base discount tax compensation amount for the order item.
      *
-     * @return float Base discount tax compensation amount.
+     * @return float|null Base discount tax compensation amount.
      */
     public function getBaseDiscountTaxCompensationAmount();
 
     /**
      * Gets the base discount tax compensation invoiced for the order item.
      *
-     * @return float Base discount tax compensation invoiced.
+     * @return float|null Base discount tax compensation invoiced.
      */
     public function getBaseDiscountTaxCompensationInvoiced();
 
     /**
      * Gets the base discount tax compensation refunded for the order item.
      *
-     * @return float Base discount tax compensation refunded.
+     * @return float|null Base discount tax compensation refunded.
      */
     public function getBaseDiscountTaxCompensationRefunded();
 
@@ -738,28 +738,28 @@ public function getGwTaxAmountRefunded();
     /**
      * Gets the discount tax compensation amount for the order item.
      *
-     * @return float Discount tax compensation amount.
+     * @return float|null Discount tax compensation amount.
      */
     public function getDiscountTaxCompensationAmount();
 
     /**
      * Gets the discount tax compensation canceled for the order item.
      *
-     * @return float Discount tax compensation canceled.
+     * @return float|null Discount tax compensation canceled.
      */
     public function getDiscountTaxCompensationCanceled();
 
     /**
      * Gets the discount tax compensation invoiced for the order item.
      *
-     * @return float Discount tax compensation invoiced.
+     * @return float|null Discount tax compensation invoiced.
      */
     public function getDiscountTaxCompensationInvoiced();
 
     /**
      * Gets the discount tax compensation refunded for the order item.
      *
-     * @return float Discount tax compensation refunded.
+     * @return float|null Discount tax compensation refunded.
      */
     public function getDiscountTaxCompensationRefunded();
 

app/code/Magento/Sales/Api/Data/TotalInterface.php

@@ -113,7 +113,7 @@ public function getBaseShippingDiscountAmount();
     /**
      * Gets the base shipping discount tax compensation amount.
      *
-     * @return float Base shipping discount tax compensation amount.
+     * @return float|null Base shipping discount tax compensation amount.
      */
     public function getBaseShippingDiscountTaxCompensationAmnt();
 
@@ -176,7 +176,7 @@ public function getShippingDiscountAmount();
     /**
      * Gets the shipping discount tax compensation amount.
      *
-     * @return float Shipping discount tax compensation amount.
+     * @return float|null Shipping discount tax compensation amount.
      */
     public function getShippingDiscountTaxCompensationAmount();