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

Merge remote-tracking branch 'inventree/master'

Browse Source
This commit is contained in:
Oliver Walters 2019-06-20 21:49:19 +10:00
commit e0bfda2b14
9 changed files with 136 additions and 88 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'/> <span class='glyphicon glyphicon-cog'/>
</button> </button>
<button type='button' class='btn btn-default btn-glyph' id='company-delete' title='Delete company'> <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> </button>
</div> </div>
</div> </div>

8
InvenTree/order/templates/order/purchase_order_detail.html
View File

@ -121,11 +121,11 @@ InvenTree | {{ order }}
{% if order.status == OrderStatus.PENDING %} {% if order.status == OrderStatus.PENDING %}
<td> <td>
<div class='btn-group'> <div class='btn-group'>
<button class='btn btn-default btn-edit' line='{{ line.id }}' id='edit-line-item-{{ line.id }} title='Edit line item' onclick='editPurchaseOrderLineItem()'> <button class='btn btn-default btn-glyph' line='{{ line.id }}' id='edit-line-item-{{ line.id }} title='Edit line item' onclick='editPurchaseOrderLineItem()'>
<span url="{% url 'po-line-item-edit' line.id %}" line='{{ line.id }}' class='glyphicon glyphicon-small glyphicon-edit'></span> <span url="{% url 'po-line-item-edit' line.id %}" line='{{ line.id }}' class='glyphicon glyphicon-edit'></span>
</button> </button>
<button class='btn btn-default btn-remove' line='{{ line.id }}' id='remove-line-item-{{ line.id }' title='Remove line item' type='button' onclick='removePurchaseOrderLineItem()'> <button class='btn btn-default btn-glyph' line='{{ line.id }}' id='remove-line-item-{{ line.id }' title='Remove line item' type='button' onclick='removePurchaseOrderLineItem()'>
<span url="{% url 'po-line-item-delete' line.id %}" line='{{ line.id }}' class='glyphicon glyphicon-small glyphicon-remove'></span> <span url="{% url 'po-line-item-delete' line.id %}" line='{{ line.id }}' class='glyphicon glyphicon-remove'></span>
</button> </button>
</div> </div>
</td> </td>

8
InvenTree/part/templates/part/attachments.html
View File

@ -31,8 +31,12 @@
<td>{{ attachment.comment }}</td> <td>{{ attachment.comment }}</td>
<td> <td>
<div class='btn-group' style='float: right;'> <div class='btn-group' style='float: right;'>
<button type='button' class='btn btn-primary attachment-edit-button' url="{% url 'part-attachment-edit' attachment.id %}" data-toggle='tooltip' title='Edit attachment ({{ attachment.basename }})'><span class='glyphicon glyphicon-small glyphicon-edit'></span></button> <button type='button' class='btn btn-default btn-glyph' url="{% url 'part-attachment-edit' attachment.id %}" data-toggle='tooltip' title='Edit attachment ({{ attachment.basename }})'>
<button type='button' class='btn btn-danger attachment-delete-button' url="{% url 'part-attachment-delete' attachment.id %}" data-toggle='tooltip' title='Delete attachment ({{ attachment.basename }})'><span class='glyphicon glyphicon-small glyphicon-trash'></span></button> <span class='glyphicon glyphicon-edit'/>
</button>
<button type='button' class='btn btn-default btn-glyph' url="{% url 'part-attachment-delete' attachment.id %}" data-toggle='tooltip' title='Delete attachment ({{ attachment.basename }})'>
<span class='glyphicon glyphicon-trash'/>
</button>
</div> </div>
</td> </td>
</tr> </tr>

35
InvenTree/part/templates/part/category.html
View File

@ -4,7 +4,7 @@
{% block content %} {% block content %}
<div class='row'> <div class='row'>
<div class='col-sm-6'> <div class='col-sm-6'>
{% if category %} {% if category %}
<h3>{{ category.name }}</h3> <h3>{{ category.name }}</h3>
<p>{{ category.description }}</p> <p>{{ category.description }}</p>
@ -13,27 +13,26 @@
{% endif %} {% endif %}
{% else %} {% else %}
<h3>Part Categories</h3> <h3>Part Categories</h3>
<p>All parts</p>
{% endif %} {% endif %}
</div> <p>
<div class='col-sm-6'> <div class='btn-group'>
<h3> <button class='btn btn-default btn-glyph' id='cat-create' title='Create new part category'>
<div style='float: right;'> <span class='glyphicon glyphicon-plus'/>
<button class='btn btn-success' id='cat-create'>New Category</button> </button>
{% if category %} {% if category %}
<div class="dropdown" style="float: right;"> <button class='btn btn-default btn-glyph' id='cat-edit' title='Edit part category'>
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown"> <span class='glyphicon glyphicon-cog'/>
Options </button>
<span class="caret"></span> <button class='btn btn-default btn-glyph' id='cat-delete' title='Delete part category'>
<span class='glyphicon glyphicon-trash'/>
</button> </button>
<ul class="dropdown-menu">
<li><a href="#" id='cat-edit' title='Edit part category'>Edit</a></li>
<li><a href="#" id='cat-delete' title='Delete part category'>Delete</a></li>
</ul>
</div>
{% endif %} {% endif %}
</div> </div>
</h3> </p>
</div> </div>
<div class='col-sm-6'>
</div>
</div> </div>
{% if category and category.children.all|length > 0 %} {% if category and category.children.all|length > 0 %}

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

@ -40,6 +40,7 @@
</h4> </h4>
<p><i>{{ part.description }}</i></p> <p><i>{{ part.description }}</i></p>
<p> <p>
<div class='btn-row'>
<div class='btn-group'> <div class='btn-group'>
<button type='button' class='btn btn-default btn-glyph' id='toggle-starred' title='Star this part'> <button type='button' class='btn btn-default btn-glyph' id='toggle-starred' title='Star this part'>
<span id='part-star-icon' class='starred-part glyphicon {% if starred %}glyphicon-star{% else %}glyphicon-star-empty{% endif %}'/> <span id='part-star-icon' class='starred-part glyphicon {% if starred %}glyphicon-star{% else %}glyphicon-star-empty{% endif %}'/>
@ -50,6 +51,11 @@
<button type='button' class='btn btn-default btn-glyph' id='price-button' title='Show pricing information'> <button type='button' class='btn btn-default btn-glyph' id='price-button' title='Show pricing information'>
<span id='part-price-icon' class='part-price glyphicon glyphicon-usd'/> <span id='part-price-icon' class='part-price glyphicon glyphicon-usd'/>
</button> </button>
{% if not part.virtual %}
<button type='button' class='btn btn-default btn-glyph' id='part-count' title='Count part stock'>
<span class='glyphicon glyphicon-ok-circle'/>
</button>
{% endif %}
{% if part.purchaseable %} {% if part.purchaseable %}
<button type='button' class='btn btn-default btn-glyph' id='part-order' title='Order part'> <button type='button' class='btn btn-default btn-glyph' id='part-order' title='Order part'>
<span id='part-order-icon' class='part-order glyphicon glyphicon-shopping-cart'/> <span id='part-order-icon' class='part-order glyphicon glyphicon-shopping-cart'/>
@ -61,14 +67,15 @@
<span id='part-duplicate-icon' class='part-duplicate glyphicon glyphicon-duplicate'/> <span id='part-duplicate-icon' class='part-duplicate glyphicon glyphicon-duplicate'/>
</button> </button>
<button type='button' class='btn btn-default btn-glyph' id='part-edit' title='Edit part'> <button type='button' class='btn btn-default btn-glyph' id='part-edit' title='Edit part'>
<span id='part-edit-icon' class='glyphicon glyphicon-cog part-cog'/> <span id='part-edit-icon' class='glyphicon glyphicon-edit'/>
</button> </button>
{% if not part.active %} {% if not part.active %}
<button type='button' class='btn btn-default btn-glyph' id='part-delete' title='Delete part'> <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> </button>
{% endif %} {% endif %}
</div> </div>
</div>
</p> </p>
<table class='table table-condensed'> <table class='table table-condensed'>
{% if part.IPN %} {% if part.IPN %}
@ -171,6 +178,16 @@
); );
}); });
$("#part-count").click(function() {
launchModalForm("/stock/adjust/", {
data: {
action: "count",
part: {{ part.id }},
reload: true,
}
});
});
$("#price-button").click(function() { $("#price-button").click(function() {
launchModalForm( launchModalForm(
"{% url 'part-pricing' part.id %}", "{% url 'part-pricing' part.id %}",

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

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

4
InvenTree/static/script/inventree/bom.js
View File

@ -189,8 +189,8 @@ function loadBomTable(table, options) {
if (options.editable) { if (options.editable) {
cols.push({ cols.push({
formatter: function(value, row, index, field) { formatter: function(value, row, index, field) {
var bEdit = "<button title='Edit BOM Item' class='btn btn-primary bom-edit-button btn-sm' type='button' url='/part/bom/" + row.pk + "/edit'><span class='glyphicon glyphicon-small glyphicon-edit'></span></button>"; var bEdit = "<button title='Edit BOM Item' class='btn btn-default btn-glyph' type='button' url='/part/bom/" + row.pk + "/edit'><span class='glyphicon glyphicon-edit'/></button>";
var bDelt = "<button title='Delete BOM Item' class='btn btn-danger bom-delete-button btn-sm' type='button' url='/part/bom/" + row.pk + "/delete'><span class='glyphicon glyphicon-small glyphicon-trash'></span></button>"; var bDelt = "<button title='Delete BOM Item' class='btn btn-default btn-glyph' type='button' url='/part/bom/" + row.pk + "/delete'><span class='glyphicon glyphicon-trash'/></button>";
return "<div class='btn-group'>" + bEdit + bDelt + "</div>"; return "<div class='btn-group'>" + bEdit + bDelt + "</div>";
} }

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

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

@ -7,30 +7,31 @@
{% if location %} {% if location %}
<h3>{{ location.name }}</h3> <h3>{{ location.name }}</h3>
<p>{{ location.description }}</p> <p>{{ location.description }}</p>
<p>
<div class='btn-group'>
{% include "qr_button.html" %}
</div>
</p>
{% else %} {% else %}
<h3>Stock</h3> <h3>Stock</h3>
<p>All stock items</p> <p>All stock items</p>
{% endif %} {% endif %}
<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>
{% if location %}
{% 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>
{% endif %}
</div>
</p>
</div> </div>
<div class='col-sm-6'> <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> </div>
</h3> </h3>
</div> </div>
@ -91,6 +92,18 @@
return false; 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() { $('#show-qr-code').click(function() {
launchModalForm("{% url 'stock-location-qr' location.id %}", launchModalForm("{% url 'stock-location-qr' location.id %}",
{ {