From dcb557b06ccb4aba9cf9d12bda96518188d94c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylvain=20Raye=CC=81?= Date: Tue, 31 Jan 2017 15:35:56 +0100 Subject: [PATCH 1/4] Replace into the layout adminhtml_order_shipment_new.xml block alias attribute with block name attribute to allow template overrides. --- .../view/adminhtml/layout/adminhtml_order_shipment_view.xml | 2 +- .../view/adminhtml/layout/adminhtml_order_shipment_new.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml b/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml index 6b97971a0ee51..d7db4ec9ca6c3 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml index 25e0739339647..70701b6cf2cb0 100644 --- a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml +++ b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml @@ -14,7 +14,7 @@ - + From 0e40a603f2cb7b09df3297bf757d7c42321313ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylvain=20Ray=C3=A9?= Date: Fri, 3 Feb 2017 10:49:29 +0100 Subject: [PATCH 2/4] change block name shipment item renderer bundle --- .../view/adminhtml/layout/adminhtml_order_shipment_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml b/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml index d7db4ec9ca6c3..2f9812faff659 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml @@ -8,7 +8,7 @@ - + From df698568d5cfe4a5b3e0bc8c3331fec342f29286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylvain=20Ray=C3=A9?= Date: Fri, 3 Feb 2017 10:50:42 +0100 Subject: [PATCH 3/4] Update adminhtml_order_shipment_view.xml --- .../view/adminhtml/layout/adminhtml_order_shipment_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml index e36aa4fd5e7de..67b946735f605 100644 --- a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml +++ b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml @@ -14,7 +14,7 @@ - + From 5831ca1e833b3ccf18f43fcc6e6988b2e7c7afb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylvain=20Ray=C3=A9?= Date: Fri, 3 Feb 2017 10:52:51 +0100 Subject: [PATCH 4/4] Update adminhtml_order_shipment_new.xml --- .../view/adminhtml/layout/adminhtml_order_shipment_new.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml index 70701b6cf2cb0..ffeb80d4a304a 100644 --- a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml +++ b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml @@ -14,7 +14,7 @@ - +