From 7b332d93ee8bc5f1d7c9cfeb1c25a89cb4ccc58a Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sat, 8 Aug 2020 08:48:27 +1000
Subject: [PATCH] Rearrange button layouts

---
 .../stock/templates/stock/item_base.html      | 21 ++++++++++++-------
 InvenTree/templates/js/stock.html             |  8 +------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index a35b5f0346..8a57c8bdaf 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -86,30 +86,35 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
             {% endif %}
         </ul>
     </div>
-    {% if item.in_stock %}
     <!-- Stock adjustment menu -->
     <div class='dropdown dropdown-buttons'>
         <button id='stock-options' title='{% trans "Stock adjustment actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-boxes'></span> <span class='caret'></span></button>
         <ul class='dropdown-menu' role='menu'>
+            {% if item.in_stock %}
             {% if not item.serialized %}
             <li><a href='#' id='stock-count' title='{% trans "Count stock" %}'><span class='fas fa-clipboard-list'></span> {% trans "Count stock" %}</a></li>
             <li><a href='#' id='stock-add' title='{% trans "Add stock" %}'><span class='fas fa-plus-circle icon-green'></span> {% trans "Add stock" %}</a></li>
             <li><a href='#' id='stock-remove' title='{% trans "Remove stock" %}'><span class='fas fa-minus-circle icon-red'></span> {% trans "Remove stock" %}</a></li>
             {% endif %}
             <li><a href='#' id='stock-move' title='{% trans "Transfer stock" %}'><span class='fas fa-exchange-alt icon-blue'></span> {% trans "Transfer stock" %}</a></li>
+            {% endif %}
+            {% if item.part.trackable and not item.serialized %}
+            <li><a href='#' id='stock-serialize' title='{% trans "Serialize stock" %}'><span class='fas fa-hashtag'></span> {% trans "Serialize stock" %}</a> </li>
+            {% endif %}
+            {% if item.part.salable %}
+            {% if item.customer %}
+            <li><a href='#' id='stock-return-from-customer' title='{% trans "Return to stock" %}'><span class='fas fa-undo'></span> {% trans "Return to stock" %}</a></li>
+            {% else %}
+            <li><a href='#' id='stock-assign-to-customer' title='{% trans "Assign to customer" %}'><span class='fas fa-user-tie'></span> {% trans "Assign to customer" %}</a></li>
+            {% endif %}
+            {% endif %}
         </ul>
     </div>
-    {% endif %}
     <!-- Edit stock item -->
     <div class='dropdown dropdown-buttons'>
         <button id='stock-edit-actions' title='{% trans "Stock actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-tools'></span> <span class='caret'></span></button>
         <ul class='dropdown-menu' role='menu'>
-            {% if item.part.trackable and not item.serialized %}
-            <li><a href='#' id='stock-serialize' title='{% trans "Serialize stock" %}'><span class='fas fa-hashtag'></span> {% trans "Serialize stock" %}</a> </li>
-            {% endif %}
-            {% if item.part.salable and not item.customer %}
-            <li><a href='#' id='stock-assign-to-customer' title='{% trans "Assign to customer" %}'><span class='fas fa-user-tie'></span> {% trans "Assign to customer" %}</a></li>
-            {% endif %}
+
             {% if item.part.has_variants %}
             <li><a href='#' id='stock-convert' title='{% trans "Convert to variant" %}'><span class='fas fa-screwdriver'></span> {% trans "Convert to variant" %}</a></li>
             {% endif %}
diff --git a/InvenTree/templates/js/stock.html b/InvenTree/templates/js/stock.html
index 7a92d0df39..adaf07b4f6 100644
--- a/InvenTree/templates/js/stock.html
+++ b/InvenTree/templates/js/stock.html
@@ -425,16 +425,10 @@ function loadStockTable(table, options) {
                 sortable: true,
                 formatter: function(value, row, index, field) {
 
-                    var url = '';
+                    var url = `/stock/item/${row.pk}/`;
                     var thumb = row.part_detail.thumbnail;
                     var name = row.part_detail.full_name;
 
-                    if (row.supplier_part) {
-                        url = `/supplier-part/${row.supplier_part}/`;
-                    } else {
-                        url = `/part/${row.part}/`;
-                    }
-
                     html = imageHoverIcon(thumb) + renderLink(name, url);
                     
                     return html;