Merge pull request #2368 from SchrodingersGat/responsible-column

Adds "responsible" row to purchase order table

InvenTree/order/serializers.py

@@ -17,16 +17,16 @@ from rest_framework.serializers import ValidationError
 
 from sql_util.utils import SubqueryCount
 
+from common.settings import currency_code_mappings
+from company.serializers import CompanyBriefSerializer, SupplierPartSerializer
+
 from InvenTree.serializers import InvenTreeAttachmentSerializer
 from InvenTree.serializers import InvenTreeModelSerializer
 from InvenTree.serializers import InvenTreeDecimalField
 from InvenTree.serializers import InvenTreeMoneySerializer
 from InvenTree.serializers import InvenTreeAttachmentSerializerField
-
 from InvenTree.status_codes import StockStatus
 
-from company.serializers import CompanyBriefSerializer, SupplierPartSerializer
-
 from part.serializers import PartBriefSerializer
 
 import stock.models
@@ -37,7 +37,7 @@ from .models import PurchaseOrderAttachment, SalesOrderAttachment
 from .models import SalesOrder, SalesOrderLineItem
 from .models import SalesOrderAllocation
 
-from common.settings import currency_code_mappings
+from users.serializers import OwnerSerializer
 
 
 class POSerializer(InvenTreeModelSerializer):
@@ -86,6 +86,8 @@ class POSerializer(InvenTreeModelSerializer):
 
     reference = serializers.CharField(required=True)
 
+    responsible_detail = OwnerSerializer(source='responsible', read_only=True, many=False)
+
     class Meta:
         model = PurchaseOrder
 
@@ -100,6 +102,7 @@ class POSerializer(InvenTreeModelSerializer):
             'overdue',
             'reference',
             'responsible',
+            'responsible_detail',
             'supplier',
             'supplier_detail',
             'supplier_reference',

InvenTree/templates/js/translated/order.js

@@ -695,6 +695,23 @@ function loadPurchaseOrderTable(table, options) {
                 title: '{% trans "Items" %}',
                 sortable: true,
             },
+            {
+                field: 'responsible',
+                title: '{% trans "Responsible" %}',
+                switchable: true,
+                sortable: false,
+                formatter: function(value, row) {
+                    var html = row.responsible_detail.name;
+
+                    if (row.responsible_detail.label == 'group') {
+                        html += `<span class='float-right fas fa-users'></span>`;
+                    } else {
+                        html += `<span class='float-right fas fa-user'></span>`;
+                    }
+
+                    return html;
+                }
+            },
         ],
     });
 }