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 pull request #858 from SchrodingersGat/stock-table-ipn

Browse Source 
Add "IPN" column to stock list table
This commit is contained in:
Oliver 2020-06-06 08:58:59 +10:00 committed by GitHub
commit b2c302cb2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/InvenTree/static/script/inventree/tables.js
View File

@ -107,8 +107,6 @@ $.fn.inventreeTable = function(options) {
function customGroupSorter(sortName, sortOrder, sortData) { function customGroupSorter(sortName, sortOrder, sortData) {
console.log('got here');
var order = sortOrder === 'desc' ? -1 : 1; var order = sortOrder === 'desc' ? -1 : 1;
sortData.sort(function(a, b) { sortData.sort(function(a, b) {

4
InvenTree/build/templates/build/build_base.html
View File

@ -111,10 +111,6 @@ src="{% static 'img/blank_image.png' %}"
</table> </table>
{% endblock %} {% endblock %}
{% block js_load %}
<script type='text/javascript' src="{% static 'script/inventree/stock.js' %}"></script>
{% endblock %}
{% block js_ready %} {% block js_ready %}
$("#build-edit").click(function () { $("#build-edit").click(function () {

5
InvenTree/company/templates/company/supplier_part_stock.html
View File

@ -14,11 +14,6 @@
{% endblock %} {% endblock %}
{% block js_load %}
{{ block.super }}
<script type='text/javascript' src="{% static 'script/inventree/stock.js' %}"></script>
{% endblock %}
{% block js_ready %} {% block js_ready %}
{{ block.super }} {{ block.super }}

3
InvenTree/part/serializers.py
View File

@ -103,6 +103,9 @@ class PartBriefSerializer(InvenTreeModelSerializer):
model = Part model = Part
fields = [ fields = [
'pk', 'pk',
'IPN',
'name',
'revision',
'full_name', 'full_name',
'description', 'description',
'thumbnail', 'thumbnail',

6
InvenTree/part/templates/part/part_app_base.html
View File

@ -26,12 +26,6 @@ InvenTree | {% trans "Part List" %}
{% endblock %} {% endblock %}
{% block js_load %}
{{ block.super }}
<script type='text/javascript' src="{% static 'script/inventree/part.js' %}"></script>
<script type='text/javascript' src="{% static 'script/inventree/stock.js' %}"></script>
{% endblock %}
{% block js_ready %} {% block js_ready %}
{{ block.super }} {{ block.super }}

5
InvenTree/stock/templates/stock/stock_app_base.html
View File

@ -22,11 +22,6 @@ InvenTree | Stock
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block js_load %}
{{ block.super }}
<script type='text/javascript' src="{% static 'script/inventree/stock.js' %}"></script>
{% endblock %}
{% block js_ready %} {% block js_ready %}
{{ block.super }} {{ block.super }}
loadTree("{% url 'api-stock-tree' %}", loadTree("{% url 'api-stock-tree' %}",

13
InvenTree/templates/js/stock.html
View File

@ -262,6 +262,7 @@ function loadStockTable(table, options) {
customSort: customGroupSorter, customSort: customGroupSorter,
groupBy: true, groupBy: true,
original: original, original: original,
showColumns: true,
groupByField: options.groupByField || 'part', groupByField: options.groupByField || 'part',
groupByFormatter: function(field, id, data) { groupByFormatter: function(field, id, data) {
@ -273,6 +274,9 @@ function loadStockTable(table, options) {
return imageHoverIcon(row.part_detail.thumbnail) + name + ' <i>(' + data.length + ' items)</i>'; return imageHoverIcon(row.part_detail.thumbnail) + name + ' <i>(' + data.length + ' items)</i>';
} }
else if (field == 'IPN') {
return row.part_detail.IPN;
}
else if (field == 'part_description') { else if (field == 'part_description') {
return row.part_detail.description; return row.part_detail.description;
} }
@ -403,6 +407,15 @@ function loadStockTable(table, options) {
field: 'pk', field: 'pk',
title: 'ID', title: 'ID',
visible: false, visible: false,
switchable: false,
},
{
field: 'IPN',
title: 'IPN',
sortable: true,
formatter: function(value, row, index, field) {
return row.part_detail.IPN;
},
}, },
{ {
field: 'part_name', field: 'part_name',