Fix annotations for Company serializers

InvenTree/company/serializers.py

@@ -4,7 +4,7 @@ JSON serializers for Company app
 
 from rest_framework import serializers
 
-from django.db.models import Count
+from sql_util.utils import SubqueryCount
 
 from .models import Company
 from .models import SupplierPart, SupplierPriceBreak
@@ -38,11 +38,17 @@ class CompanySerializer(InvenTreeModelSerializer):
     @staticmethod
     def annotate_queryset(queryset):
 
-        return queryset.annotate(
+        # Add count of parts manufactured
-            parts_supplied=Count('supplied_parts'),
+        queryset = queryset.annotate(
-            parts_manufactured=Count('manufactured_parts')
+            parts_manufactured=SubqueryCount('manufactured_parts')
         )
 
+        queryset = queryset.annotate(
+            parts_supplied=SubqueryCount('supplied_parts')
+        )
+
+        return queryset
+
     url = serializers.CharField(source='get_absolute_url', read_only=True)
     
     image = serializers.CharField(source='get_thumbnail_url', read_only=True)

InvenTree/company/templates/company/index.html

@@ -33,6 +33,7 @@ InvenTree | {% trans "Supplier List" %}
 
     loadCompanyTable("#company-table", "{% url 'api-company-list' %}",
         {
+            pagetype: '{{ pagetype }}',
             params: {
                 {% for key,value in filters.items %}{{ key }}: "{{ value }}",{% endfor %}
             }

InvenTree/company/views.py

@@ -51,18 +51,21 @@ class CompanyIndex(ListView):
                 'button_text': _('New Supplier'),
                 'filters': {'is_supplier': 'true'},
                 'create_url': reverse('supplier-create'),
+                'pagetype': 'suppliers',
             },
             reverse('manufacturer-index'): {
                 'title': _('Manufacturers'),
                 'button_text': _('New Manufacturer'),
                 'filters': {'is_manufacturer': 'true'},
                 'create_url': reverse('manufacturer-create'),
+                'pagetype': 'manufacturers',
             },
             reverse('customer-index'): {
                 'title': _('Customers'),
                 'button_text': _('New Customer'),
                 'filters': {'is_customer': 'true'},
                 'create_url': reverse('customer-create'),
+                'pagetype': 'customers',
             }
         }
 
@@ -71,6 +74,7 @@ class CompanyIndex(ListView):
             'button_text': _('New Company'),
             'filters': {},
             'create_url': reverse('company-create'),
+            'pagetype': 'companies'
         }
 
         context = None

InvenTree/templates/js/company.html

@@ -21,15 +21,7 @@ function loadCompanyTable(table, url, options={}) {
 
     setupFilterList("company", $(table));
 
-    $(table).inventreeTable({
+    var columns = [
-        url: url,
-        method: 'get',
-        queryParams: filters,
-        groupBy: false,
-        formatNoMatches: function() { return "{% trans "No company information found" %}"; },
-        showColumns: true,
-        name: 'company',
-        columns: [
         {
             field: 'pk',
             title: 'ID',
@@ -74,7 +66,37 @@ function loadCompanyTable(table, url, options={}) {
                 return '';
             }
         },
-        ],
+    ];
+
+    if (options.pagetype == 'suppliers') {
+        columns.push({
+            sortable: true,
+            field: 'parts_supplied',
+            title: '{% trans "Parts Supplied" %}',
+            formatter: function(value, row) {
+                return renderLink(value, `/company/${row.pk}/parts/`);
+            }
+        });
+    } else if (options.pagetype == 'manufacturers') {
+        columns.push({
+            sortable: true,
+            field: 'parts_manufactured',
+            title: '{% trans "Parts Manufactured" %}',
+            formatter: function(value, row) {
+                return renderLink(value, `/company/${row.pk}/parts/`);
+            }
+        });
+    }
+
+    $(table).inventreeTable({
+        url: url,
+        method: 'get',
+        queryParams: filters,
+        groupBy: false,
+        formatNoMatches: function() { return "{% trans "No company information found" %}"; },
+        showColumns: true,
+        name: options.pagetype || 'company',
+        columns: columns,
     });
 }