Merge branch 'master' of https://github.com/inventree/InvenTree into part-import

InvenTree/InvenTree/settings.py

@@ -88,6 +88,11 @@ DEBUG = _is_true(get_setting(
     CONFIG.get('debug', True)
 ))
 
+DOCKER = _is_true(get_setting(
+    'INVENTREE_DOCKER',
+    False
+))
+
 # Configure logging settings
 log_level = get_setting(
     'INVENTREE_LOG_LEVEL',

InvenTree/InvenTree/static/script/inventree/inventree.js

@@ -12,7 +12,7 @@ function attachClipboard(selector, containerselector, textElement) {
             return document.getElementById(textElement).textContent;
         }
     } else {
-        text = function() {
+        text = function(trigger) {
             var content = trigger.parentElement.parentElement.textContent;return content.trim();
         }
     }
@@ -22,7 +22,6 @@ function attachClipboard(selector, containerselector, textElement) {
         text: text,
         container: containerselector
     });
-    console.log(cis);
 }
 
 
@@ -81,7 +80,6 @@ function inventreeDocReady() {
     attachClipboard('.clip-btn');
     attachClipboard('.clip-btn', 'modal-about');  // modals
     attachClipboard('.clip-btn-version', 'modal-about', 'about-copy-text');  // version-text
-
 }
 
 function isFileTransfer(transfer) {

InvenTree/common/views.py

@@ -459,8 +459,8 @@ class FileManagementFormView(MultiStepFormView):
 
             if guess:
                 n = list(self.column_selections.values()).count(self.column_selections[col])
-                if n > 1:
+                if n > 1 and self.column_selections[col] not in duplicates:
-                    duplicates.append(col)
+                    duplicates.append(self.column_selections[col])
         
         # Store extra context data
         self.extra_context_data = {

InvenTree/order/admin.py

@@ -13,6 +13,10 @@ from .models import SalesOrder, SalesOrderLineItem
 from .models import SalesOrderAllocation
 
 
+class PurchaseOrderLineItemInlineAdmin(admin.StackedInline):
+    model = PurchaseOrderLineItem
+
+
 class PurchaseOrderAdmin(ImportExportModelAdmin):
 
     list_display = (
@@ -29,6 +33,10 @@ class PurchaseOrderAdmin(ImportExportModelAdmin):
         'description',
     ]
 
+    inlines = [
+        PurchaseOrderLineItemInlineAdmin
+    ]
+
 
 class SalesOrderAdmin(ImportExportModelAdmin):
 

InvenTree/order/models.py

@@ -826,6 +826,9 @@ class SalesOrderAllocation(models.Model):
         else:
             return ""
 
+    def get_po(self):
+        return self.item.purchase_order
+
     def complete_allocation(self, user):
         """
         Complete this allocation (called when the parent SalesOrder is marked as "shipped"):

InvenTree/order/serializers.py

@@ -235,6 +235,7 @@ class SalesOrderAllocationSerializer(InvenTreeModelSerializer):
     location_path = serializers.CharField(source='get_location_path')
     location_id = serializers.IntegerField(source='get_location')
     serial = serializers.CharField(source='get_serial')
+    po = serializers.CharField(source='get_po')
     quantity = serializers.FloatField()
 
     class Meta:
@@ -247,6 +248,7 @@ class SalesOrderAllocationSerializer(InvenTreeModelSerializer):
             'quantity',
             'location_id',
             'location_path',
+            'po',
             'item',
         ]
 

InvenTree/order/templates/order/order_wizard/match_fields.html

@@ -55,7 +55,7 @@
             <td>
                 {{ col }}
                 {% for duplicate in duplicates %}
-                    {% if duplicate == col.name %}
+                    {% if duplicate == col.value %}
                     <div class='alert alert-danger alert-block text-center' role='alert' style='padding:2px; margin-top:6px; margin-bottom:2px'>
                         <b>{% trans "Duplicate selection" %}</b>
                     </div>

InvenTree/order/templates/order/sales_order_detail.html

@@ -87,6 +87,9 @@ function showAllocationSubTable(index, row, element) {
                 return renderLink(row.location_path, `/stock/location/${row.location_id}/`);
             },
         },
+        {
+            field: 'po'
+        },
         {
             field: 'buttons',
             title: '{% trans "Actions" %}',
@@ -161,7 +164,10 @@ function showFulfilledSubTable(index, row, element) {
 
                     return renderLink(text, `/stock/item/${row.pk}/`);
                 },
-            }
+            },
+            {
+                field: 'po'
+            },
         ],
     });
 }
@@ -271,6 +277,25 @@ $("#so-lines-table").inventreeTable({
             field: 'notes',
             title: '{% trans "Notes" %}',
         },
+        {
+            field: 'po',
+            title: '{% trans "PO" %}',
+            formatter: function(value, row, index, field) {
+                var po_name = "";
+                if (row.allocated) {
+                    row.allocations.forEach(function(allocation) {
+                        if (allocation.po != po_name) {
+                            if (po_name) {
+                                po_name = "-";
+                            } else {
+                                po_name = allocation.po
+                            }
+                        }
+                    })
+                }
+                return `<div>` + po_name + `</div>`;
+            }
+        },
         {% if order.status == SalesOrderStatus.PENDING %}
         {
             field: 'buttons',

InvenTree/order/views.py

@@ -90,7 +90,7 @@ class SalesOrderDetail(InvenTreeRoleMixin, DetailView):
     """ Detail view for a SalesOrder object """
 
     context_object_name = 'order'
-    queryset = SalesOrder.objects.all().prefetch_related('lines')
+    queryset = SalesOrder.objects.all().prefetch_related('lines__allocations__item__purchase_order')
     template_name = 'order/sales_order_detail.html'
 
 

InvenTree/part/templatetags/inventree_extras.py

@@ -1,8 +1,14 @@
+# -*- coding: utf-8 -*-
+
 """ This module provides template tags for extra functionality
 over and above the built-in Django tags.
 """
+
 import os
 
+from django.utils.translation import ugettext_lazy as _
+from django.conf import settings as djangosettings
+
 from django import template
 from django.urls import reverse
 from django.utils.safestring import mark_safe
@@ -68,6 +74,33 @@ def part_allocation_count(build, part, *args, **kwargs):
     return InvenTree.helpers.decimal2string(build.getAllocatedQuantity(part))
 
 
+@register.simple_tag()
+def inventree_in_debug_mode(*args, **kwargs):
+    """ Return True if the server is running in DEBUG mode """
+
+    return djangosettings.DEBUG
+
+
+@register.simple_tag()
+def inventree_docker_mode(*args, **kwargs):
+    """ Return True if the server is running as a Docker image """
+
+    return djangosettings.DOCKER
+
+
+@register.simple_tag()
+def inventree_db_engine(*args, **kwargs):
+    """ Return the InvenTree database backend e.g. 'postgresql' """
+
+    db = djangosettings.DATABASES['default']
+
+    engine = db.get('ENGINE', _('Unknown database'))
+
+    engine = engine.replace('django.db.backends.', '')
+
+    return engine
+
+
 @register.simple_tag()
 def inventree_instance_name(*args, **kwargs):
     """ Return the InstanceName associated with the current database """

InvenTree/stock/models.py

@@ -1370,6 +1370,12 @@ class StockItem(MPTTModel):
         if self.location:
             s += ' @ {loc}'.format(loc=self.location.name)
 
+        if self.purchase_order:
+            s += " ({pre}{po})".format(
+                pre=helpers.getSetting("PURCHASEORDER_REFERENCE_PREFIX"),
+                po=self.purchase_order,
+            )
+
         return s
 
     @transaction.atomic

InvenTree/templates/js/modals.js

@@ -89,6 +89,15 @@ function setFieldOptions(fieldName, optionList, options={}) {
 }
 
 
+function clearFieldOptions(fieldName) {
+    /**
+     * Clear (emtpy) the options list for a particular field
+     */
+
+    setFieldOptions(fieldName, []);
+}
+
+
 function reloadFieldOptions(fieldName, options) {
     /* Reload the options for a given field,
      * using an AJAX request.

InvenTree/templates/js/stock.js

@@ -1218,6 +1218,17 @@ function createNewStockItem(options) {
             field: 'part',
             action: function(value) {
 
+                if (!value) {
+                    // No part chosen
+                    
+                    clearFieldOptions('supplier_part');
+                    enableField('serial_numbers', false);
+                    enableField('purchase_price_0', false);
+                    enableField('purchase_price_1', false);
+
+                    return;
+                }
+
                 // Reload options for supplier part
                 reloadFieldOptions(
                     'supplier_part',
@@ -1243,6 +1254,9 @@ function createNewStockItem(options) {
                             enableField('serial_numbers', response.trackable);
                             clearField('serial_numbers');
 
+                            enableField('purchase_price_0', response.purchaseable);
+                            enableField('purchase_price_1', response.purchaseable);
+
                             // Populate the expiry date
                             if (response.default_expiry <= 0) {
                                 // No expiry date

InvenTree/templates/stats.html

@@ -13,6 +13,27 @@
         <td>{% trans "Instance Name" %}</td>
         <td>{% inventree_instance_name %}</td>
     </tr>
+    <tr>
+        <td><span class='fas fa-database'></span></td>
+        <td>{% trans "Database" %}</td>
+        <td>{% inventree_db_engine %}</td>
+    </tr>
+    {% inventree_in_debug_mode as debug_mode %}
+    {% if debug_mode %}
+    <tr>
+        <td><span class='fas fa-laptop-code'></span></td>
+        <td>{% trans "Debug Mode" %}</td>
+        <td>{% trans "Server is running in debug mode" %}</td>
+    </tr>
+    {% endif %}
+    {% inventree_docker_mode as docker_mode %}
+    {% if docker_mode %}
+    <tr>
+        <td><span class='fab fa-docker'></span></td>
+        <td>{% trans "Docker Mode" %}</td>
+        <td>{% trans "Server is deployed using docker" %}</td>
+    </tr>
+    {% endif %}
     {% if user.is_staff %}
     <tr>
         <td><span class='fas fa-server'></span></td>

InvenTree/templates/version.html

@@ -3,3 +3,6 @@ InvenTree-Version: {% inventree_version %}
 Django Version: {% django_version %}
 {% inventree_commit_hash as hash %}{% if hash %}Commit Hash: {{ hash }}{% endif %}
 {% inventree_commit_date as commit_date %}{% if commit_date %}Commit Date: {{ commit_date }}{% endif %}
+Database: {% inventree_db_engine %}
+Debug-Mode: {% inventree_in_debug_mode %}
+Deployed using Docker: {% inventree_docker_mode %}

docker/Dockerfile

@@ -14,6 +14,7 @@ ENV INVENTREE_REPO="${repository}"
 ENV INVENTREE_BRANCH="${branch}"
 
 ENV INVENTREE_LOG_LEVEL="INFO"
+ENV INVENTREE_DOCKER="true"
 
 # InvenTree paths
 ENV INVENTREE_SRC_DIR="${INVENTREE_HOME}/src"