Merge remote-tracking branch 'inventree/master'

InvenTree/part/templates/part/variants.html

@@ -1,5 +1,6 @@
 {% extends "part/part_base.html" %}
 {% load static %}
+{% load inventree_extras %}
 
 {% block details %}
 {% include "part/tabs.html" with tab='variants' %}
@@ -40,7 +41,7 @@
                 {% endif %}
             </td>
             <td>{{ variant.description }}</td>
-            <td>{{ variant.total_stock }}</td>
+            <td>{% decimal variant.total_stock %}</td>
         </tr>
     {% endfor %}
     </tbody>

InvenTree/stock/templates/stock/item_base.html

@@ -112,7 +112,7 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
         <span class='fas fa-edit icon-blue'/>
     </button>
     {% if item.can_delete %}
-    <button type='button' class='btn btn-default' id='stock-delete' title='{% trans "Edit stock item" %}'>
+    <button type='button' class='btn btn-default' id='stock-delete' title='{% trans "Delete stock item" %}'>
         <span class='fas fa-trash-alt icon-red'/>
     </button>
     {% endif %}