mirror of
				https://github.com/inventree/InvenTree.git
				synced 2025-11-03 22:55:43 +00:00 
			
		
		
		
	Fix rendering for "sales order allocations" table
This commit is contained in:
		@@ -1034,7 +1034,7 @@ order_api_urls = [
 | 
				
			|||||||
        url(r'^.*$', POLineItemList.as_view(), name='api-po-line-list'),
 | 
					        url(r'^.*$', POLineItemList.as_view(), name='api-po-line-list'),
 | 
				
			||||||
    ])),
 | 
					    ])),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # API endpoints for sales ordesr
 | 
					    # API endpoints for sales orders
 | 
				
			||||||
    url(r'^so/', include([
 | 
					    url(r'^so/', include([
 | 
				
			||||||
        url(r'attachment/', include([
 | 
					        url(r'attachment/', include([
 | 
				
			||||||
            url(r'^(?P<pk>\d+)/$', SOAttachmentDetail.as_view(), name='api-so-attachment-detail'),
 | 
					            url(r'^(?P<pk>\d+)/$', SOAttachmentDetail.as_view(), name='api-so-attachment-detail'),
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2048,15 +2048,7 @@ function loadSalesOrderAllocationTable(table, options={}) {
 | 
				
			|||||||
                field: 'location',
 | 
					                field: 'location',
 | 
				
			||||||
                title: '{% trans "Location" %}',
 | 
					                title: '{% trans "Location" %}',
 | 
				
			||||||
                formatter: function(value, row) {
 | 
					                formatter: function(value, row) {
 | 
				
			||||||
 | 
					                    return locationDetail(row.item_detail, true);
 | 
				
			||||||
                    if (!value) {
 | 
					 | 
				
			||||||
                        return '{% trans "Location not specified" %}';
 | 
					 | 
				
			||||||
                    }
 | 
					 | 
				
			||||||
                    
 | 
					 | 
				
			||||||
                    var link = `/stock/location/${value}`;
 | 
					 | 
				
			||||||
                    var text = row.location_detail.description;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                    return renderLink(text, link);
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -341,6 +341,15 @@ function getAvailableTableFilters(tableKey) {
 | 
				
			|||||||
        };
 | 
					        };
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (tableKey == 'salesorderallocation') {
 | 
				
			||||||
 | 
					        return {
 | 
				
			||||||
 | 
					            outstanding: {
 | 
				
			||||||
 | 
					                type: 'bool',
 | 
				
			||||||
 | 
					                title: '{% trans "Outstanding" %}',
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        };
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (tableKey == 'salesorder') {
 | 
					    if (tableKey == 'salesorder') {
 | 
				
			||||||
        return {
 | 
					        return {
 | 
				
			||||||
            status: {
 | 
					            status: {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user