🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #12888: [Port 2.3-develop] Remove unused if statement in order invoice save (by @JeroenVanLeusden)

Author: Oleksii Korshenko

app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php

@@ -191,14 +191,7 @@ public function execute()
             }
             $transactionSave->save();
 
-            if (isset($shippingResponse) && $shippingResponse->hasErrors()) {
-                $this->messageManager->addError(
-                    __(
-                        'The invoice and the shipment  have been created. ' .
-                        'The shipping label cannot be created now.'
-                    )
-                );
-            } elseif (!empty($data['do_shipment'])) {
+            if (!empty($data['do_shipment'])) {
                 $this->messageManager->addSuccess(__('You created the invoice and shipment.'));
             } else {
                 $this->messageManager->addSuccess(__('The invoice has been created.'));

app/code/Magento/Sales/i18n/en_US.csv

@@ -233,7 +233,6 @@ Sales,Sales
 "You can't create an invoice without products.","You can't create an invoice without products."
 "New Invoice","New Invoice"
 "We can't save the invoice right now.","We can't save the invoice right now."
-"The invoice and the shipment  have been created. The shipping label cannot be created now.","The invoice and the shipment  have been created. The shipping label cannot be created now."
 "You created the invoice and shipment.","You created the invoice and shipment."
 "The invoice has been created.","The invoice has been created."
 "We can't send the invoice email right now.","We can't send the invoice email right now."