diff --git a/Phraseanet-production-client/config/config.js b/Phraseanet-production-client/config/config.js
index 87e6682d3e..bd371908e7 100644
--- a/Phraseanet-production-client/config/config.js
+++ b/Phraseanet-production-client/config/config.js
@@ -13,5 +13,5 @@ module.exports = {
     setupDir: _root + 'tests/setup/node.js',
     karmaConf: _root + 'config/karma.conf.js',
     // change this version when you change JS file for lazy loading
-    assetFileVersion: 66
+    assetFileVersion: 67
 };
diff --git a/Phraseanet-production-client/dist/authenticate.js b/Phraseanet-production-client/dist/authenticate.js
index ad6931cc23..a2b591c10f 100644
--- a/Phraseanet-production-client/dist/authenticate.js
+++ b/Phraseanet-production-client/dist/authenticate.js
@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=66";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=67";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {
diff --git a/Phraseanet-production-client/dist/authenticate.min.js b/Phraseanet-production-client/dist/authenticate.min.js
index c2e7059949..9a6bc1f3b6 100644
--- a/Phraseanet-production-client/dist/authenticate.min.js
+++ b/Phraseanet-production-client/dist/authenticate.min.js
@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=66";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=67";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {
diff --git a/Phraseanet-production-client/dist/commons.js b/Phraseanet-production-client/dist/commons.js
index d320673c3e..8f1c4e6c91 100644
--- a/Phraseanet-production-client/dist/commons.js
+++ b/Phraseanet-production-client/dist/commons.js
@@ -91,7 +91,7 @@
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=66";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=67";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {
diff --git a/Phraseanet-production-client/dist/commons.min.js b/Phraseanet-production-client/dist/commons.min.js
index 9969d51db3..cfa9846c68 100644
--- a/Phraseanet-production-client/dist/commons.min.js
+++ b/Phraseanet-production-client/dist/commons.min.js
@@ -91,7 +91,7 @@
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=66";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=67";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {
diff --git a/Phraseanet-production-client/dist/production.js b/Phraseanet-production-client/dist/production.js
index 952902ccfa..f50e52c9e3 100644
--- a/Phraseanet-production-client/dist/production.js
+++ b/Phraseanet-production-client/dist/production.js
@@ -66435,7 +66435,7 @@ var orderItem = function orderItem(services) {
                 //$('#order-action button.send').prop('disabled', true);
             } else if (_underscore2.default.contains(elementArrayType, ELEMENT_TYPE.DENIED)) {
                 (0, _jquery2.default)('#order-action button.deny, #order-action button.reset').hide();
-                (0, _jquery2.default)('#order-action span.action-text').html('window.orderItemData.translatedText.refusedPreviously');
+                (0, _jquery2.default)('#order-action span.action-text').html(window.orderItemData.translatedText.refusedPreviously);
                 //$('#order-action button.send').prop('disabled', false);
                 (0, _jquery2.default)('#order-action button.send, #order-action span.action-text').show();
             } else {
diff --git a/Phraseanet-production-client/dist/production.min.js b/Phraseanet-production-client/dist/production.min.js
index 952902ccfa..f50e52c9e3 100644
--- a/Phraseanet-production-client/dist/production.min.js
+++ b/Phraseanet-production-client/dist/production.min.js
@@ -66435,7 +66435,7 @@ var orderItem = function orderItem(services) {
                 //$('#order-action button.send').prop('disabled', true);
             } else if (_underscore2.default.contains(elementArrayType, ELEMENT_TYPE.DENIED)) {
                 (0, _jquery2.default)('#order-action button.deny, #order-action button.reset').hide();
-                (0, _jquery2.default)('#order-action span.action-text').html('window.orderItemData.translatedText.refusedPreviously');
+                (0, _jquery2.default)('#order-action span.action-text').html(window.orderItemData.translatedText.refusedPreviously);
                 //$('#order-action button.send').prop('disabled', false);
                 (0, _jquery2.default)('#order-action button.send, #order-action span.action-text').show();
             } else {
diff --git a/Phraseanet-production-client/src/components/order/orderItem.js b/Phraseanet-production-client/src/components/order/orderItem.js
index 978e71a496..5f1d21ff24 100644
--- a/Phraseanet-production-client/src/components/order/orderItem.js
+++ b/Phraseanet-production-client/src/components/order/orderItem.js
@@ -880,7 +880,7 @@ const orderItem = services => {
                 //$('#order-action button.send').prop('disabled', true);
             } else if (_.contains(elementArrayType, ELEMENT_TYPE.DENIED)) {
                 $('#order-action button.deny, #order-action button.reset').hide();
-                $('#order-action span.action-text').html('window.orderItemData.translatedText.refusedPreviously');
+                $('#order-action span.action-text').html(window.orderItemData.translatedText.refusedPreviously);
                 //$('#order-action button.send').prop('disabled', false);
                 $('#order-action button.send, #order-action span.action-text').show();
             } else {
diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderCancelled.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderCancelled.php
index be513109b9..801b849d87 100644
--- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderCancelled.php
+++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderCancelled.php
@@ -72,7 +72,6 @@ class MailInfoOrderCancelled extends AbstractMail
      */
     public function getButtonText()
     {
-        return $this->app->trans('See my order', [], 'messages', $this->getLocale());
     }
 
     /**
@@ -80,6 +79,5 @@ class MailInfoOrderCancelled extends AbstractMail
      */
     public function getButtonURL()
     {
-        return $this->app->url('prod');
     }
 }
diff --git a/lib/Alchemy/Phrasea/Order/Controller/ProdOrderController.php b/lib/Alchemy/Phrasea/Order/Controller/ProdOrderController.php
index b92d57fca0..de7f759a1c 100644
--- a/lib/Alchemy/Phrasea/Order/Controller/ProdOrderController.php
+++ b/lib/Alchemy/Phrasea/Order/Controller/ProdOrderController.php
@@ -144,9 +144,11 @@ class ProdOrderController extends BaseOrderController
     public function displayOneOrder($order_id)
     {
         $order = $this->findOr404($order_id);
+        $grantedBaseIds = array_keys($this->getAclForUser()->get_granted_base([\ACL::ORDER_MASTER]));
 
         return $this->render('prod/orders/order_item.html.twig', [
-            'order' => $order,
+            'order'             => $order,
+            'grantedBaseIds'    => $grantedBaseIds
         ]);
     }
 
diff --git a/lib/Alchemy/Phrasea/Order/ValidationNotifier/MailNotifier.php b/lib/Alchemy/Phrasea/Order/ValidationNotifier/MailNotifier.php
index 2df7366ac6..675024f769 100644
--- a/lib/Alchemy/Phrasea/Order/ValidationNotifier/MailNotifier.php
+++ b/lib/Alchemy/Phrasea/Order/ValidationNotifier/MailNotifier.php
@@ -104,17 +104,19 @@ class MailNotifier implements ValidationNotifier
         $sender = Emitter::fromUser($delivery->getAdmin());
         $recipient = Receiver::fromUser($delivery->getOrder()->getUser());
 
-        $mail = MailInfoOrderCancelled::create($this->application, $recipient, $sender);
+        // DO not send email PHRAS-1545
 
-        $mail->setQuantity($delivery->getQuantity());
-        $mail->setDeliverer($delivery->getAdmin());
-
-        if (($locale = $delivery->getOrder()->getUser()->getLocale()) != null) {
-            $mail->setLocale($locale);
-        } elseif (($locale1 = $delivery->getAdmin()->getLocale()) != null) {
-            $mail->setLocale($locale1);
-        }
-
-        $this->getDeliverer()->deliver($mail);
+//        $mail = MailInfoOrderCancelled::create($this->application, $recipient, $sender);
+//
+//        $mail->setQuantity($delivery->getQuantity());
+//        $mail->setDeliverer($delivery->getAdmin());
+//
+//        if (($locale = $delivery->getOrder()->getUser()->getLocale()) != null) {
+//            $mail->setLocale($locale);
+//        } elseif (($locale1 = $delivery->getAdmin()->getLocale()) != null) {
+//            $mail->setLocale($locale1);
+//        }
+//
+//        $this->getDeliverer()->deliver($mail);
     }
 }
diff --git a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
index 7cce217ea8..fbc868c8a6 100644
--- a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
+++ b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
@@ -59,7 +59,7 @@ class PhraseanetExtension extends \Twig_Extension
     {
         return [
             // change this version when you change JS file to force the navigation to reload js file
-            'assetFileVersion' => 66
+            'assetFileVersion' => 67
         ];
 
     }
diff --git a/templates/web/prod/orders/order_item.html.twig b/templates/web/prod/orders/order_item.html.twig
index d3f20c7384..c54ca000a7 100644
--- a/templates/web/prod/orders/order_item.html.twig
+++ b/templates/web/prod/orders/order_item.html.twig
@@ -133,7 +133,8 @@
                     <table class="table-order">
                         <tbody>
                         {% for element in order.getElements() %}
-                            <tr id="element_{{ loop.index }}" class="order_row {% if element.getOrderMaster() is none %}selectable{% else %}{% if element.getDeny() == true %}selectable denied{% else %}selectable validated{% endif %}{% endif %}" elementids="{{element.getSbasId(app)}}_{{element.getRecordId()}}">
+                            {% if element.getBaseId() in grantedBaseIds %}
+                                <tr id="element_{{ loop.index }}" class="order_row {% if element.getOrderMaster() is none %}selectable{% else %}{% if element.getDeny() == true %}selectable denied{% else %}selectable validated{% endif %}{% endif %}" elementids="{{element.getSbasId(app)}}_{{element.getRecordId()}}">
                                 <td width="10%" align="center">
                                     {% if element.getOrderMaster() %}
                                         {% set name = element.getOrderMaster().getDisplayName() | e %}
@@ -169,6 +170,7 @@
                                     <span>{{element.getRecord(app).getOriginalName() }}</span>
                                 </td>
                             </tr>
+                            {% endif %}
                         {% endfor %}
                         </tbody>
                     </table>