diff --git a/InvenTree/order/serializers.py b/InvenTree/order/serializers.py index 00373227ee..86281a9761 100644 --- a/InvenTree/order/serializers.py +++ b/InvenTree/order/serializers.py @@ -662,6 +662,8 @@ class SalesOrderSerializer(AbstractOrderSerializer, InvenTreeModelSerializer): 'creation_date', 'customer', 'customer_detail', + 'contact', + 'contact_detail', 'customer_reference', 'description', 'line_items', @@ -715,6 +717,8 @@ class SalesOrderSerializer(AbstractOrderSerializer, InvenTreeModelSerializer): return queryset + contact_detail = ContactSerializer(source='contact', many=False, read_only=True) + customer_detail = CompanyBriefSerializer(source='customer', many=False, read_only=True) line_items = serializers.IntegerField(read_only=True) diff --git a/InvenTree/order/templates/order/sales_order_base.html b/InvenTree/order/templates/order/sales_order_base.html index 6c84cb022c..dfc208304e 100644 --- a/InvenTree/order/templates/order/sales_order_base.html +++ b/InvenTree/order/templates/order/sales_order_base.html @@ -177,6 +177,13 @@ src="{% static 'img/blank_image.png' %}" {% endif %} + {% if order.contact %} + + + {% trans "Contact" %} + {{ order.contact.name }} + + {% endif %} {% if order.responsible %} diff --git a/InvenTree/templates/js/translated/sales_order.js b/InvenTree/templates/js/translated/sales_order.js index 8bd2d25931..42637e2ce1 100644 --- a/InvenTree/templates/js/translated/sales_order.js +++ b/InvenTree/templates/js/translated/sales_order.js @@ -72,6 +72,18 @@ function salesOrderFields(options={}) { link: { icon: 'fa-link', }, + contact: { + icon: 'fa-user', + adjustFilters: function(filters) { + let customer = getFormFieldValue('customer', {}, {modal: options.modal}); + + if (customer) { + filters.company = customer; + } + + return filters; + } + }, responsible: { icon: 'fa-user', }