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 'upstream/master'

Browse Source
This commit is contained in:
Oliver Walters 2021-07-18 23:00:16 +10:00
commit ba9c1345d4
11 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/order/serializers.py
View File

@ -132,7 +132,7 @@ class POLineItemSerializer(InvenTreeModelSerializer):
purchase_price_string = serializers.CharField(source='purchase_price', read_only=True)
destination = LocationBriefSerializer(source='get_destination', read_only=True)
destination_detail = LocationBriefSerializer(source='get_destination', read_only=True)
purchase_price_currency = serializers.ChoiceField(
choices=currency_code_mappings(),
@ -156,6 +156,7 @@ class POLineItemSerializer(InvenTreeModelSerializer):
'purchase_price_currency',
'purchase_price_string',
'destination',
'destination_detail',
]

1
InvenTree/order/templates/order/order_base.html
View File

@ -170,6 +170,7 @@ $("#edit-order").click(function() {
supplier: {
},
{% endif %}
supplier_reference: {},
description: {},
target_date: {
icon: 'fa-calendar-alt',

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

@ -401,8 +401,15 @@ $("#po-table").inventreeTable({
}
},
{
field: 'destination.pathstring',
field: 'destination',
title: '{% trans "Destination" %}',
formatter: function(value, row) {
if (value) {
return renderLink(row.destination_detail.pathstring, `/stock/location/${value}/`);
} else {
return '-';
}
}
},
{
field: 'notes',

1
InvenTree/order/templates/order/sales_order_base.html
View File

@ -163,6 +163,7 @@ $("#edit-order").click(function() {
customer: {
},
{% endif %}
customer_reference: {},
description: {},
target_date: {
icon: 'fa-calendar-alt',

10
InvenTree/part/api.py
View File

@ -118,9 +118,17 @@ class CategoryList(generics.ListCreateAPIView):
ordering_fields = [
'name',
'level',
'tree_id',
'lft',
]
ordering = 'name'
# Use hierarchical ordering by default
ordering = [
'tree_id',
'lft',
'name'
]
search_fields = [
'name',

7
InvenTree/part/serializers.py
View File

@ -32,6 +32,8 @@ class CategorySerializer(InvenTreeModelSerializer):
parts = serializers.IntegerField(source='item_count', read_only=True)
level = serializers.IntegerField(read_only=True)
class Meta:
model = PartCategory
fields = [
@ -40,10 +42,11 @@ class CategorySerializer(InvenTreeModelSerializer):
'description',
'default_location',
'default_keywords',
'pathstring',
'url',
'level',
'parent',
'parts',
'pathstring',
'url',
]

9
InvenTree/stock/api.py
View File

@ -363,6 +363,15 @@ class StockLocationList(generics.ListCreateAPIView):
ordering_fields = [
'name',
'items',
'level',
'tree_id',
'lft',
]
ordering = [
'tree_id',
'lft',
'name',
]

3
InvenTree/stock/serializers.py
View File

@ -260,12 +260,15 @@ class LocationSerializer(InvenTreeModelSerializer):
items = serializers.IntegerField(source='item_count', read_only=True)
level = serializers.IntegerField(read_only=True)
class Meta:
model = StockLocation
fields = [
'pk',
'url',
'name',
'level',
'description',
'parent',
'pathstring',

3
InvenTree/templates/js/modals.js
View File

@ -765,6 +765,9 @@ function attachSecondaryModal(modal, options) {
function attachSecondaries(modal, secondaries) {
/* Attach a provided list of secondary modals */
// 2021-07-18 - Secondary modals will be disabled for now, until they are re-implemented in the "API forms" architecture
return;
for (var i = 0; i < secondaries.length; i++) {
attachSecondaryModal(modal, secondaries[i]);
}

16
InvenTree/templates/js/model_renderers.js
View File

@ -67,7 +67,9 @@ function renderStockItem(name, data, parameters, options) {
// Renderer for "StockLocation" model
function renderStockLocation(name, data, parameters, options) {
var html = `<span>${data.name}</span>`;
var level = '- '.repeat(data.level);
var html = `<span>${level}${data.pathstring}</span>`;
if (data.description) {
html += ` - <i>${data.description}</i>`;
@ -75,10 +77,6 @@ function renderStockLocation(name, data, parameters, options) {
html += `<span class='float-right'>{% trans "Location ID" %}: ${data.pk}</span>`;
if (data.pathstring) {
html += `<p><small>${data.pathstring}</small></p>`;
}
return html;
}
@ -154,7 +152,9 @@ function renderOwner(name, data, parameters, options) {
// Renderer for "PartCategory" model
function renderPartCategory(name, data, parameters, options) {
var html = `<span><b>${data.name}</b></span>`;
var level = '- '.repeat(data.level);
var html = `<span>${level}${data.pathstring}</span>`;
if (data.description) {
html += ` - <i>${data.description}</i>`;
@ -162,10 +162,6 @@ function renderPartCategory(name, data, parameters, options) {
html += `<span class='float-right'>{% trans "Category ID" %}: ${data.pk}</span>`;
if (data.pathstring) {
html += `<p><small>${data.pathstring}</small></p>`;
}
return html;
}

2
InvenTree/templates/js/order.js
View File

@ -14,6 +14,7 @@ function createSalesOrder(options={}) {
customer: {
value: options.customer,
},
customer_reference: {},
description: {},
target_date: {
icon: 'fa-calendar-alt',
@ -44,6 +45,7 @@ function createPurchaseOrder(options={}) {
supplier: {
value: options.supplier,
},
supplier_reference: {},
description: {},
target_date: {
icon: 'fa-calendar-alt',