Merge branch 'master' of https://github.com/inventree/InvenTree into price-history

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_base.html

@@ -9,13 +9,15 @@
 {% inventree_title %} | {% trans "Sales Order" %}
 {% endblock %}
 
-{% block pre_content %}
-{% if order.status == SalesOrderStatus.PENDING and not order.is_fully_allocated %}
-<div class='alert alert-block alert-danger'>
-    {% trans "This SalesOrder has not been fully allocated" %}
+{% block below_thumbnail %}
+<div class='info-messages'>
+    {% if order.status == SalesOrderStatus.PENDING and not order.is_fully_allocated %}
+    <div class='alert alert-block alert-danger'>
+        {% trans "This Sales Order has not been fully allocated" %}
+    </div>
+    {% endif %}
 </div>
-{% endif %}
-{% endblock %}
+    {% endblock %}
 
 {% block thumbnail %}
 <img class='part-thumb'

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" %}',
@@ -159,9 +162,12 @@ function showFulfilledSubTable(index, row, element) {
                         text = `{% trans "Quantity" %}: ${row.quantity}`;
                     }
 
-                    return renderLink(text, `/stock/item/${row.pk}/`);  
+                    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'