🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #14833: Fix a non well formed numeric value encountered on Magento/Directory/� (by @bmxmale)
 - #14795: Invoice grid shows wrong shipping & handling for partial items invoice. It shows order's shipping & handling instead if invoiced shipping& handling charge (by @ankurvr)

Author: magento-engcom-team

app/code/Magento/Directory/Model/Currency.php

@@ -225,7 +225,7 @@ public function convert($price, $toCurrency = null)
         if ($toCurrency === null) {
             return $price;
         } elseif ($rate = $this->getRate($toCurrency)) {
-            return $price * $rate;
+            return floatval($price) * floatval($rate);
         }
 
         throw new \Exception(__(

app/code/Magento/Sales/etc/di.xml

@@ -687,7 +687,7 @@
                 <item name="shipping_address" xsi:type="object">ShippingAddressAggregator</item>
                 <item name="shipping_information" xsi:type="string">sales_order.shipping_description</item>
                 <item name="subtotal" xsi:type="string">sales_invoice.base_subtotal</item>
-                <item name="shipping_and_handling" xsi:type="string">sales_order.base_shipping_amount</item>
+                <item name="shipping_and_handling" xsi:type="string">sales_invoice.base_shipping_amount</item>
                 <item name="base_grand_total" xsi:type="string">sales_invoice.base_grand_total</item>
                 <item name="grand_total" xsi:type="string">sales_invoice.grand_total</item>
                 <item name="created_at" xsi:type="string">sales_invoice.created_at</item>