Merge branch 'master' into partial-shipment

# Conflicts:
#	InvenTree/build/serializers.py
#	InvenTree/order/templates/order/so_sidebar.html

InvenTree/order/api.py

@@ -42,7 +42,7 @@ class POList(generics.ListCreateAPIView):
         """
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
-        
+
         item = serializer.save()
         item.created_by = request.user
         item.save()
@@ -397,7 +397,7 @@ class SOList(generics.ListCreateAPIView):
         """
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
-        
+
         item = serializer.save()
         item.created_by = request.user
         item.save()

InvenTree/order/models.py

@@ -743,7 +743,7 @@ class PurchaseOrderLineItem(OrderLineItem):
     def get_base_part(self):
         """
         Return the base part.Part object for the line item
-        
+
         Note: Returns None if the SupplierPart is not set!
         """
         if self.part is None:

InvenTree/order/serializers.py

@@ -551,10 +551,10 @@ class SOLineItemSerializer(InvenTreeModelSerializer):
     allocations = SalesOrderAllocationSerializer(many=True, read_only=True, location_detail=True)
 
     quantity = InvenTreeDecimalField()
-    
+
     allocated = serializers.FloatField(source='allocated_quantity', read_only=True)
     fulfilled = serializers.FloatField(source='fulfilled_quantity', read_only=True)
-    
+
     sale_price = InvenTreeMoneySerializer(
         allow_null=True
     )

InvenTree/order/templates/order/order_wizard/po_upload.html

@@ -5,7 +5,8 @@
 
 {% block sidebar %}
 {% url "po-detail" order.id as url %}
-{% include "sidebar_item.html" with url=url text="Return to Orders" icon="fa-undo" %}
+{% trans "Return to Orders" as text %}
+{% include "sidebar_item.html" with url=url text=text icon="fa-undo" %}
 {% endblock %}
 
 {% block page_content %}

InvenTree/order/templates/order/po_sidebar.html

@@ -2,7 +2,11 @@
 {% load static %}
 {% load inventree_extras %}
 
-{% include "sidebar_item.html" with label='order-items' text="Line Items" icon="fa-list-ol" %}
-{% include "sidebar_item.html" with label='received-items' text="Received Stock" icon="fa-sign-in-alt" %}
-{% include "sidebar_item.html" with label='order-attachments' text="Attachments" icon="fa-paperclip" %}
-{% include "sidebar_item.html" with label='order-notes' text="Notes" icon="fa-clipboard" %}
+{% trans "Line Items" as text %}
+{% include "sidebar_item.html" with label='order-items' text=text icon="fa-list-ol" %}
+{% trans "Received Stock" as text %}
+{% include "sidebar_item.html" with label='received-items' text=text icon="fa-sign-in-alt" %}
+{% trans "Attachments" as text %}
+{% include "sidebar_item.html" with label='order-attachments' text=text icon="fa-paperclip" %}
+{% trans "Notes" as text %}
+{% include "sidebar_item.html" with label='order-notes' text=text icon="fa-clipboard" %}

InvenTree/order/templates/order/so_sidebar.html

@@ -2,8 +2,13 @@
 {% load static %}
 {% load inventree_extras %}
 
-{% include "sidebar_item.html" with label='order-items' text="Line Items" icon="fa-list-ol" %}
-{% include "sidebar_item.html" with label='order-shipments' text="Shipments" icon="fa-truck" %}
-{% include "sidebar_item.html" with label='order-builds' text="Build Orders" icon="fa-tools" %}
-{% include "sidebar_item.html" with label='order-attachments' text="Attachments" icon="fa-paperclip" %}
-{% include "sidebar_item.html" with label='order-notes' text="Notes" icon="fa-clipboard" %}
+{% trans "Line Items" as text %}
+{% include "sidebar_item.html" with label='order-items' text=text icon="fa-list-ol" %}
+{% trans "Shipments" as text %}
+{% include "sidebar_item.html" with label='order-shipments' text=text icon="fa-truck" %}
+{% trans "Build Orders" as text %}
+{% include "sidebar_item.html" with label='order-builds' text=text icon="fa-tools" %}
+{% trans "Attachments" as text %}
+{% include "sidebar_item.html" with label='order-attachments' text=text icon="fa-paperclip" %}
+{% trans "Notes" as text %}
+{% include "sidebar_item.html" with label='order-notes' text=text icon="fa-clipboard" %}

InvenTree/order/test_api.py

@@ -229,7 +229,7 @@ class PurchaseOrderReceiveTest(OrderTest):
 
     def setUp(self):
         super().setUp()
-        
+
         self.assignRole('purchase_order.add')
 
         self.url = reverse('api-po-receive', kwargs={'pk': 1})

InvenTree/order/views.py

@@ -406,7 +406,7 @@ class PurchaseOrderUpload(FileManagementFormView):
 
     def done(self, form_list, **kwargs):
         """ Once all the data is in, process it to add PurchaseOrderLineItem instances to the order """
-        
+
         order = self.get_order()
         items = self.get_clean_items()
 
@@ -432,7 +432,7 @@ class PurchaseOrderUpload(FileManagementFormView):
                 except IntegrityError:
                     # PurchaseOrderLineItem already exists
                     pass
-            
+
         return HttpResponseRedirect(reverse('po-detail', kwargs={'pk': self.kwargs['pk']}))
 
 
@@ -449,7 +449,7 @@ class SalesOrderExport(AjaxView):
     role_required = 'sales_order.view'
 
     def get(self, request, *args, **kwargs):
-        
+
         order = get_object_or_404(SalesOrder, pk=self.kwargs.get('pk', None))
 
         export_format = request.GET.get('format', 'csv')