Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up buttons for stock location

Browse Source
This commit is contained in:
Oliver Walters 2019-06-19 18:49:05 +10:00
parent 21479e39d9
commit fefbcf2ed9
5 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/company/templates/company/company_base.html
View File

@ -34,7 +34,7 @@ InvenTree | Company - {{ company.name }}
<span class='glyphicon glyphicon-cog'/>
</button>
<button type='button' class='btn btn-default btn-glyph' id='company-delete' title='Delete company'>
<span class='glyphicon glyphicon-trash' style='color: #a11;'/>
<span class='glyphicon glyphicon-trash'/>
</button>
</div>
</div>

2
InvenTree/part/templates/part/part_base.html
View File

@ -65,7 +65,7 @@
</button>
{% if not part.active %}
<button type='button' class='btn btn-default btn-glyph' id='part-delete' title='Delete part'>
<span id='part-delete-icon' class='glyphicon glyphicon-trash' style='color: #a11;'/>
<span id='part-delete-icon' class='glyphicon glyphicon-trash'/>
</button>
{% endif %}
</div>

12
InvenTree/static/css/inventree.css
View File

@ -23,11 +23,19 @@
}
.glyphicon-ok {
color: #5f5;
color: #5C5;
}
.glyphicon-remove {
color: #f55;
color: #C55;
}
.glyphicon-trash {
color: #C55;
}
.glyphicon-plus {
color: #5C5;
}
/* CSS overrides for treeview */

9
InvenTree/stock/templates/stock/item.html
View File

@ -16,6 +16,9 @@
<button type='button' class='btn btn-default btn-glyph' id='stock-remove' title='Take from stock'>
<span class='glyphicon glyphicon-minus-sign' style='color: #a11;'/>
</button>
<button type='button' class='btn btn-default btn-glyph' id='stock-count' title='Count stock'>
<span class='glyphicon glyphicon-ok-circle'/>
</button>
<button type='button' class='btn btn-default btn-glyph' id='stock-move' title='Transfer stock'>
<span class='glyphicon glyphicon-transfer' style='color: #11a;'/>
</button>
@ -27,7 +30,7 @@
<span class='glyphicon glyphicon-cog'/>
</button>
<button type='button' class='btn btn-default btn-glyph' id='stock-delete' title='Edit stock item'>
<span class='glyphicon glyphicon-trash' style='color: #a11;'/>
<span class='glyphicon glyphicon-trash'/>
</button>
</div>
</p>
@ -124,7 +127,7 @@
{% if item.has_tracking_info %}
<hr>
<div id='table-toolbar'>
<h4>Stock Tracking Information</h4>
</div>
@ -181,7 +184,7 @@
itemAdjust("move");
});
$("#stock-stocktake").click(function() {
$("#stock-count").click(function() {
itemAdjust('count');
});

37
InvenTree/stock/templates/stock/location.html
View File

@ -9,7 +9,19 @@
<p>{{ location.description }}</p>
<p>
<div class='btn-group'>
<button class='btn btn-default btn-glyph' id='location-create' title='Create new stock location'>
<span class='glyphicon glyphicon-plus'/>
</button>
{% include "qr_button.html" %}
<button class='btn btn-default btn-glyph' id='location-count' title='Count stock items'>
<span class='glyphicon glyphicon-ok-circle'/>
</button>
<button class='btn btn-default btn-glyph' id='location-edit' title='Edit stock location'>
<span class='glyphicon glyphicon-cog'/>
</button>
<button class='btn btn-default btn-glyph' id='location-delete' title='Delete stock location'>
<span class='glyphicon glyphicon-trash'/>
</button>
</div>
</p>
{% else %}
@ -18,19 +30,6 @@
{% endif %}
</div>
<div class='col-sm-6'>
<h3>
<div style='float: right;'>
<button class='btn btn-success' id='location-create'>New Stock Location</button>
{% if location %}
<div class="dropdown" style="float: right;">
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
<span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="#" id='location-edit' title='Edit stock location'>Edit</a></li>
<li><a href="#" id='location-delete' title='Delete stock location'>Delete</a></li>
</ul>
</div>
{% endif %}
</div>
</h3>
</div>
@ -91,6 +90,18 @@
return false;
});
{% if location %}
$("#location-count").click(function() {
launchModalForm("/stock/adjust/", {
data: {
action: "count",
location: {{ location.id }},
reload: true,
}
});
});
{% endif %}
$('#show-qr-code').click(function() {
launchModalForm("{% url 'stock-location-qr' location.id %}",
{